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

sql fixes

Browse source
This commit is contained in:
Matthew Wilson 2006-05-13 10:40:51 +00:00
parent 5367692a0a
commit 665f39319f
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -272,7 +272,7 @@ sub addToScratchCart {
return $event; return $event;
} }
my $bid = $self->session->scratch->get('currentBadgeId'); my $bid = $self->session->scratch->get('currentBadgeId');
my @pastEvents = ($bid)?$self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$bid]):(); my @pastEvents = ($bid)?$self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? and t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$bid]):();
push(@eventsInCart, $event) unless (isIn($event,@eventsInCart) || isIn($event,@pastEvents)); push(@eventsInCart, $event) unless (isIn($event,@eventsInCart) || isIn($event,@pastEvents));
$self->session->scratch->delete('EMS_scratch_cart'); $self->session->scratch->delete('EMS_scratch_cart');
@ -1366,7 +1366,7 @@ sub addCartVars {
} }
push(@currentEvents,$_->{productId}); push(@currentEvents,$_->{productId});
} }
my @pastEvents = $self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$purchase->{badgeId}]); my @pastEvents = $self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? and t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$purchase->{badgeId}]);
push(@currentEvents,@pastEvents); push(@currentEvents,@pastEvents);
$purchase->{newPrice} = 0; $purchase->{newPrice} = 0;
foreach (@$theseRegs) { foreach (@$theseRegs) {
@ -1403,6 +1403,14 @@ sub www_checkout {
return WebGUI::Operation::Commerce::www_checkout($self->session); return WebGUI::Operation::Commerce::www_checkout($self->session);
} }
#-------------------------------------------------------------------
sub www_emptyCart {
my $self = shift;
my $shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
$shoppingCart->empty;
return $self->www_view();
}
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_editRegistrantInfo { sub www_editRegistrantInfo {
my $self = shift; my $self = shift;
@ -2043,7 +2051,7 @@ sub www_addEventsToBadge {
my $eventId = $self->session->form->process('eventId'); my $eventId = $self->session->form->process('eventId');
unless ($bid eq 'none') { unless ($bid eq 'none') {
$self->session->scratch->set('EMS_add_purchase_badgeId',$bid); $self->session->scratch->set('EMS_add_purchase_badgeId',$bid);
my @pastEvents = $self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$bid]); my @pastEvents = $self->session->db->buildArray("select r.productId from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p, transaction as t where r.returned=0 and r.badgeId=? and t.transactionId=p.transactionId and t.status='Completed' and p.purchaseId=r.purchaseId group by productId",[$bid]);
my $purchaseCounter = $self->session->form->process('purchaseCounter'); my $purchaseCounter = $self->session->form->process('purchaseCounter');
$self->session->scratch->set('EMS_add_purchase_events',join("\n",@pastEvents)); $self->session->scratch->set('EMS_add_purchase_events',join("\n",@pastEvents));
if ($purchaseCounter ne "") { if ($purchaseCounter ne "") {