Display an error message anytime the cart is viewed if it has mixed i…

…tems (recurring and non-recurring, or too many recurring). Fixes bug #12211.
plainblack · Sep 12, 2011 · 1f9413e · 1f9413e
1 parent 1acc641
commit 1f9413e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -11,6 +11,7 @@
  - fixed #12246: added extra_www_add_properties as properties fix-up hook in child for www_add
  - fixed #12231: Thingy reindex fails on upgrade
  - fixed #12245: Encrypt Login and Display Message on Login conflict
+ - fixed #12211: Recurring Item error message in Cart
 
 7.10.22
  - rfe   #12223: Add date type to content profiling (metadata)

diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
@@ -1024,6 +1024,10 @@ sub www_view {
         return $session->style->userStyle($template->process(\%var));
     }
 
+    if ($self->hasMixedItems) {
+        $error{id $self} = $i18n->get('mixed items warning');
+    }
+
     my %var = (
         %{$self->get},
         formHeader              => WebGUI::Form::formHeader($session, { extras => q|id="wgCartId"|, })
@@ -1047,7 +1051,6 @@ sub www_view {
         shippableItemsInCart    => $self->requiresShipping,
     );
 
-
     # get the shipping address    
     my $address = eval { $self->getShippingAddress };
     if (my $e = WebGUI::Error->caught("WebGUI::Error::ObjectNotFound") && $self->get('shippingAddressId')) {