move cart access from bse.variables to the request object

diff --git a/site/cgi-bin/modules/BSE/Request/Base.pm b/site/cgi-bin/modules/BSE/Request/Base.pm
index 3ed1e8e57d98e603c39a8390148443cd1e69bf91..21a5f4cdb3e5220edfd2650066e593c601f8d755 100644 (file)
--- a/site/cgi-bin/modules/BSE/Request/Base.pm
+++ b/site/cgi-bin/modules/BSE/Request/Base.pm
@@ -1314,4 +1314,13 @@ sub ip_address {
   return $ENV{REMOTE_ADDR};
 }
 
+sub cart {
+  my ($self, $stage) = @_;
+
+  require BSE::Cart;
+  $self->{cart} ||= BSE::Cart->new($self, $stage);
+
+  return $self->{cart};
+}
+
 1;

diff --git a/site/cgi-bin/modules/BSE/Variables.pm b/site/cgi-bin/modules/BSE/Variables.pm
index 39b72fbac62457a7c51ddad705a6b8f6baa629a0..8ca416bd1ea023c7fa6c320e5557b3d29e36b949 100644 (file)
--- a/site/cgi-bin/modules/BSE/Variables.pm
+++ b/site/cgi-bin/modules/BSE/Variables.pm
@@ -4,7 +4,7 @@ use Scalar::Util qw(blessed);
 use BSE::TB::Site;
 use BSE::Util::HTML;
 
-our $VERSION = "1.007";
+our $VERSION = "1.008";
 
 sub _base_variables {
   my ($self, %opts) = @_;
@@ -49,16 +49,10 @@ sub dyn_variables {
 
   my $req = $opts{request} or die "No request parameter";
   my $cgi = $req->cgi;
-  my $cart;
   return
     +{
       $self->_base_variables(%opts),
       paged => sub { return _paged($cgi, @_) },
-      cart => sub {
-       require BSE::Cart;
-       $cart ||= BSE::Cart->new($req);
-       return $cart;
-      },
      };
 }
 
@@ -432,10 +426,6 @@ ppname - the name of the items per page parameter
 
 =back
 
-=item bse.cart
-
-The contents of the cart.  See L<BSE::Cart> for details.
-
 =back
 
 =head1 AUTHOR

diff --git a/site/templates/cart_base.tmpl b/site/templates/cart_base.tmpl
index a9006d02d131711f6507a8739264116b8d8ce47d..01a6d99956424d5228aa80a5687f51a17a7a633b 100644 (file)
--- a/site/templates/cart_base.tmpl
+++ b/site/templates/cart_base.tmpl
@@ -42,7 +42,7 @@
             <td height="18"> &nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2" color="#FFFFFF"><b>Price:</b></font>&nbsp;</td>
             <td height="18">&nbsp; </td>
           </tr>
-         <:-.set items = assert_dynamic ? bse.cart.items : 0 -:>
+         <:-.set items = request.cart.items -:>
           <:.if items.size -:>
            <:.for item in items -:>
              <:.set options = item.option_list -:>