add support for storing custom metadata to cart/order items and options

the get_custom() on BSE::CfgProductOptionValue is for compatibility
with database options.

diff --git a/site/cgi-bin/modules/BSE/CustomData.pm b/site/cgi-bin/modules/BSE/CustomData.pm
new file mode 100644 (file)
index 0000000..d7b19a3
--- /dev/null
+++ b/site/cgi-bin/modules/BSE/CustomData.pm
@@ -0,0 +1,112 @@
+package BSE::CustomData;
+use strict;
+use JSON ();
+
+our $VERSION = "1.000";
+
+my $json;
+
+sub get_custom_all {
+  my ($self) = @_;
+
+  my $data = $self->custom_data;
+  my $result;
+  if (defined $data && length $data) {
+    eval { $result = JSON::decode_json($data); 1};
+  }
+  return $result || {};
+}
+
+sub set_custom_all {
+  my ($self, $hash) = @_;
+
+  ref $hash eq "HASH"
+    or die "set_custom_all() called with non-hash";
+  my $data;
+  eval { $data = JSON::encode_json($hash) };
+  $data ||= "{}";
+  $self->set_custom_data($data);
+}
+
+sub set_custom {
+  my ($self, $name, $value) = @_;
+
+  my $data = $self->get_custom_all;
+  $data->{$name} = $value;
+  $self->set_custom_all($data);
+}
+
+sub get_custom {
+  my ($self, $name) = @_;
+
+  my $data = $self->get_custom_all;
+  return $data->{$name};
+}
+
+1;
+
+=head1 NAME
+
+BSE::CustomData - mix in for treating a field of a table as JSON.
+
+=head1 SYNOPSIS
+
+  package YourTable;
+  use parent 'Squirrel::Row', 'BSE::Custom';
+
+  sub columns { ... custom_data }
+
+  my $item = YourTable->getByPkey(...);
+  $item->set_custom($name => $value);
+  my $value = $item->get_custom($name);
+
+=head1 DESCRIPTION
+
+A simpler, cheaper alternative to the table metadata system, intended
+for uses where that would be far too heavy.
+
+Expects your class to define the following methods:
+
+=over
+
+=item *
+
+set_custom_data($value) - sets the custom data field in the row object.
+
+=item *
+
+custom_data - retrieves the custom data field in the row object.
+
+=back
+
+The data should be stored/retrieved as a BLOB, though JSON column
+types may also work.
+
+Provides the following methods:
+
+=over
+
+=item *
+
+set_custom($name, $value) - set the given field in the custom data to
+C<$value>.  C<$name> must be a simple string.  C<$value> must be a
+JSON compatible structure, including strings, numbers, arrays, hashes,
+and may not include blessed objects.
+
+=item *
+
+set_custom_all($hash) - set the entire custom data to a given hash,
+used by set_custom().
+
+=item *
+
+get_custom($name) - retrieve a value set previously by set_custom.
+
+=item *
+
+get_custom_all() - get the custom data hash.  Used by get_custom() and
+set_custom().
+
+=back
+
+=cut

diff --git a/site/cgi-bin/modules/BSE/TB/OrderItem.pm b/site/cgi-bin/modules/BSE/TB/OrderItem.pm
index 52af7359cefecc265fcb4d2e641f65c8e053000c..1bebf86cc6d76ad93057f1aa74a93519e045bb58 100644 (file)
--- a/site/cgi-bin/modules/BSE/TB/OrderItem.pm
+++ b/site/cgi-bin/modules/BSE/TB/OrderItem.pm
@@ -2,10 +2,11 @@ package BSE::TB::OrderItem;
 use strict;
 # represents an order line item from the database
 use Squirrel::Row;
+use BSE::CustomData;
 use vars qw/@ISA/;
-@ISA = qw/Squirrel::Row/;
+@ISA = qw/Squirrel::Row BSE::CustomData/;
 
-our $VERSION = "1.007";
+our $VERSION = "1.008";
 
 sub table { "order_item" }
 
@@ -13,7 +14,8 @@ sub columns {
   return qw/id productId orderId units price wholesalePrice gst options
             customInt1 customInt2 customInt3 customStr1 customStr2 customStr3
             title description subscription_id subscription_period max_lapsed
-            session_id product_code tier_id product_discount product_discount_units/;
+            session_id product_code tier_id product_discount product_discount_units
+          custom_data/;
 }
 
 sub db_columns {
@@ -34,6 +36,7 @@ sub defaults {
      tier_id => undef,
      product_discount => 0,
      product_discount_units => 0,
+     custom_data => undef,
     );
 }
 

diff --git a/site/cgi-bin/modules/BSE/TB/OrderItemOption.pm b/site/cgi-bin/modules/BSE/TB/OrderItemOption.pm
index 6924e31ebde4fc5df784d16a2953de7e27974b3d..2bb6026fe246ecf035cda48a62f3dca2d83002bb 100644 (file)
--- a/site/cgi-bin/modules/BSE/TB/OrderItemOption.pm
+++ b/site/cgi-bin/modules/BSE/TB/OrderItemOption.pm
@@ -1,15 +1,21 @@
 package BSE::TB::OrderItemOption;
 use strict;
-use base 'Squirrel::Row';
+use parent 'Squirrel::Row', 'BSE::CustomData';
 
-our $VERSION = "1.000";
+our $VERSION = "1.001";
 
 sub table {
   "bse_order_item_options";
 }
 
+sub defaults {
+  return (
+    custom_data => undef,
+    );
+}
+
 sub columns {
-  return qw/id order_item_id original_id name value display display_order/;
+  return qw/id order_item_id original_id name value display display_order custom_data/;
 }
 
 1;

diff --git a/site/cgi-bin/modules/BSE/TB/Product.pm b/site/cgi-bin/modules/BSE/TB/Product.pm
index 988f03a4dbe23ce0ff90a00a3a39eba5ddbd9234..efa485d54cecf8f76819d66871753759452018fb 100644 (file)
--- a/site/cgi-bin/modules/BSE/TB/Product.pm
+++ b/site/cgi-bin/modules/BSE/TB/Product.pm
@@ -5,7 +5,7 @@ use BSE::TB::Articles;
 use vars qw/@ISA/;
 @ISA = qw/BSE::TB::Article/;
 
-our $VERSION = "1.005";
+our $VERSION = "1.006";
 
 # subscription_usage values
 use constant SUBUSAGE_START_ONLY => 1;
@@ -291,4 +291,6 @@ sub id { $_[0]{id} }
 
 sub value { $_[0]{value} }
 
+sub get_custom { undef }
+
 1;

diff --git a/site/cgi-bin/modules/BSE/TB/ProductOption.pm b/site/cgi-bin/modules/BSE/TB/ProductOption.pm
index e1c4f491f6b68913db9f3a8102d6f3a4afb7863c..ba8345bfc25f7b465651c820060c950feaabb24d 100644 (file)
--- a/site/cgi-bin/modules/BSE/TB/ProductOption.pm
+++ b/site/cgi-bin/modules/BSE/TB/ProductOption.pm
@@ -1,11 +1,11 @@
 package BSE::TB::ProductOption;
 use strict;
-use base 'Squirrel::Row';
+use parent 'Squirrel::Row', 'BSE::CustomData';
 
-our $VERSION = "1.001";
+our $VERSION = "1.002";
 
 sub columns {
-  return qw/id product_id name type global_ref display_order enabled default_value/;
+  return qw/id product_id name type global_ref display_order enabled default_value custom_data/;
 }
 
 sub table {
@@ -19,6 +19,7 @@ sub defaults {
      enabled => 1,
      type => "select",
      default_value => 0,
+     custom_data => undef,
     );
 }
 

diff --git a/site/cgi-bin/modules/BSE/TB/ProductOptionValue.pm b/site/cgi-bin/modules/BSE/TB/ProductOptionValue.pm
index 65e63253ead13d2d82031231be5060a5396267a7..6c068020101d8cb07daf77e26baf0434b81e3738 100644 (file)
--- a/site/cgi-bin/modules/BSE/TB/ProductOptionValue.pm
+++ b/site/cgi-bin/modules/BSE/TB/ProductOptionValue.pm
@@ -1,11 +1,18 @@
 package BSE::TB::ProductOptionValue;
 use strict;
-use base "Squirrel::Row";
+use parent "Squirrel::Row", "BSE::CustomData";
 
-our $VERSION = "1.000";
+our $VERSION = "1.001";
 
 sub columns {
-  return qw/id product_option_id value display_order/;
+  return qw/id product_option_id value display_order custom_data/;
+}
+
+sub defaults {
+  return
+    (
+     custom_data => undef,
+    );
 }
 
 sub table {