From 72169f803619886e41aa6979aca0b7e9e303fbfa Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Mon, 15 May 2006 19:19:27 +0000 Subject: [PATCH] here's a fix --- lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 365b9e58b..66ed20499 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -958,8 +958,18 @@ sub prerequisiteIsMet { sub removeFromScratchCart { my $self = shift; my $event = shift; - if ($event eq $self->session->get('currentMainEvent')) { - return $self->resetScratchCart(); +# if ($event eq $self->session->scratch->get('currentMainEvent')) { +# return $self->resetScratchCart(); +# } + my $currentPurchase = $self->session->scratch->get('purchaseId'.$self->session->scratch->get('currentPurchaseCounter')); + if ($currentPurchase ne "") { + my $shoppingCart = WebGUI::Commerce::ShoppingCart->new($self->session); + my ($items, $nothing) = $shoppingCart->getItems; + foreach my $item (@$items) { + if ($item->{item}->{_event}->{productId} eq $event) { + $shoppingCart->setQuantity($event,'Event',($item->{quantity} - 1)); + } + } } my $events = $self->getEventsInScratchCart(); my @newArr; @@ -1964,6 +1974,7 @@ sub www_viewPurchase { return $self->processStyle($self->processTemplate(\%var,$self->getValue("viewPurchaseTemplateId"))); } elsif($tid) { my %var = $self->get(); + my $showAll = $self->session-> my $isAdmin = $self->canAddEvents; my ($userId) = $self->session->db->quickArray("select userId from transaction where transactionId=?",[$tid]); my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');