oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for mixed items in the cart AFTER processing delete requests. Fixes bug #12239.

Browse source
This commit is contained in:
Colin Kuskie 2011-08-30 08:45:57 -07:00
parent 7a89bf19c7
commit 36f818ed5e
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -4,6 +4,7 @@
- fixed #12195: Visitor group by scratch membership shared among all Visitors (Dale Trexel) - fixed #12195: Visitor group by scratch membership shared among all Visitors (Dale Trexel)
- fixed #12227: Corrected AssetReport such that OrderBy works correctly. - fixed #12227: Corrected AssetReport such that OrderBy works correctly.
- fixed #12238: Old template attachement in search template slows down sites - fixed #12238: Old template attachement in search template slows down sites
- fixed #12239: Still get cart error message after removing extra recurring items from the cart
7.10.22 7.10.22
- rfe #12223: Add date type to content profiling (metadata) - rfe #12223: Add date type to content profiling (metadata)

11
lib/WebGUI/Shop/Cart.pm
View file

@ -758,17 +758,18 @@ sub updateFromForm {
$item->update({shippingAddressId => $itemAddressId}); $item->update({shippingAddressId => $itemAddressId});
} }
} }
if ($self->hasMixedItems) {
my $i18n = WebGUI::International->new($self->session, "Shop");
$error{id $self} = $i18n->get('mixed items warning');
}
my @cartItemIds = $form->process('remove_item', 'checkList'); my @cartItemIds = $form->process('remove_item', 'checkList');
foreach my $cartItemId (@cartItemIds) { foreach my $cartItemId (@cartItemIds) {
my $item = eval { $self->getItem($cartItemId); }; my $item = eval { $self->getItem($cartItemId); };
$item->remove if ! Exception::Class->caught(); $item->remove if ! Exception::Class->caught();
} }
##Remove the items BEFORE we check to see if there are duplicates.
if ($self->hasMixedItems) {
my $i18n = WebGUI::International->new($self->session, "Shop");
$error{id $self} = $i18n->get('mixed items warning');
}
##Visitor cannot have an address book, or set a payment gateway, so skip the rest of this. ##Visitor cannot have an address book, or set a payment gateway, so skip the rest of this.
return 1 if $session->user->isVisitor; return 1 if $session->user->isVisitor;