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

fixes

Browse source
This commit is contained in:
Matthew Wilson 2006-05-10 01:11:47 +00:00
parent eeddad8f9a
commit 61263f2284
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@ sub addToScratchCart {
return undef unless $isApproved; return undef unless $isApproved;
if (scalar(@eventsInCart) == 0) { if (scalar(@eventsInCart) == 0) {
# the cart is empty, so check if this is a master event or not. # the cart is empty, so check if this is a master event or not.
my ($isChild) = $self->session->db->quickArray("select p.productId from EventManagementSystem_products where productId = ? and (e.prerequisiteId is NULL or e.prerequisiteId = '')",[$eventId]); my ($isChild) = $self->session->db->quickArray("select p.productId from EventManagementSystem_products where productId = ? and (e.prerequisiteId is NULL or e.prerequisiteId = '')",[$event]);
return undef if $isChild; return undef if $isChild;
$self->session->scratch->set('currentMainEvent',$event); $self->session->scratch->set('currentMainEvent',$event);
push(@eventsInCart, $event) unless isIn($event,@eventsInCart); push(@eventsInCart, $event) unless isIn($event,@eventsInCart);
@ -2175,7 +2175,8 @@ sub saveRegistration {
my $eventsInCart = $self->getEventsInScratchCart; my $eventsInCart = $self->getEventsInScratchCart;
my $purchaseId = $self->session->id->generate; my $purchaseId = $self->session->id->generate;
my $badgeId = $self->session->scratch->get('currentBadgeId'); my $badgeId = $self->session->scratch->get('currentBadgeId');
my $theirUserId;
my $shoppingCart = WebGUI::Commerce::ShoppingCart->new($self->session); my $shoppingCart = WebGUI::Commerce::ShoppingCart->new($self->session);
my @addingToPurchase = split("\n",$self->session->scratch->get('EMS_add_purchase_events')); my @addingToPurchase = split("\n",$self->session->scratch->get('EMS_add_purchase_events'));
@ -2197,21 +2198,7 @@ sub saveRegistration {
$self->session->scratch->delete('EMS_add_purchase_events'); $self->session->scratch->delete('EMS_add_purchase_events');
$self->session->scratch->delete('currentBadgeId'); $self->session->scratch->delete('currentBadgeId');
$self->session->scratch->delete('currentMainEvent'); $self->session->scratch->delete('currentMainEvent');
my ($theirUserId) = $self->session->db->quickArray("select userId from EventManagementSystem_badges where badgeId=?",[$badgeId]);
$userId = $theirUserId unless $thisIsI;
if ($userId && $userId ne '1') {
my $u = WebGUI::User->new($self->session,$userId);
$u->profileField('firstName',$firstName);
$u->profileField('lastName',$lastName);
$u->profileField('homeAddress',$address);
$u->profileField('homeCity',$city);
$u->profileField('homeState',$state);
$u->profileField('homeZip',$zipCode);
$u->profileField('homeCountry',$country);
$u->profileField('homePhone',$phoneNumber);
$u->profileField('email',$email);
}
#Our item plug-in needs to be able to associate these records with the result of the payment attempt #Our item plug-in needs to be able to associate these records with the result of the payment attempt
my $counter = 0; my $counter = 0;
while (1) { while (1) {
@ -2272,6 +2259,23 @@ sub www_saveRegistrantInfo {
$details->{userId} = $userId if ($userId && $userId ne '1'); $details->{userId} = $userId if ($userId && $userId ne '1');
$details->{createdByUserId} = $self->session->var->get('userId') if ($addingNew && $userId ne '1'); $details->{createdByUserId} = $self->session->var->get('userId') if ($addingNew && $userId ne '1');
$badgeId = $self->setCollateral("EventManagementSystem_badges", "badgeId",$details,0,0); $badgeId = $self->setCollateral("EventManagementSystem_badges", "badgeId",$details,0,0);
my ($theirUserId) = $self->session->db->quickArray("select userId from EventManagementSystem_badges where badgeId=?",[$badgeId]);
$userId = $theirUserId unless $thisIsI;
if ($userId && $userId ne '1') {
my $u = WebGUI::User->new($self->session,$userId);
$u->profileField('firstName',$firstName);
$u->profileField('lastName',$lastName);
$u->profileField('homeAddress',$address);
$u->profileField('homeCity',$city);
$u->profileField('homeState',$state);
$u->profileField('homeZip',$zipCode);
$u->profileField('homeCountry',$country);
$u->profileField('homePhone',$phoneNumber);
$u->profileField('email',$email);
}
$self->session->scratch->set('currentBadgeId',$badgeId); $self->session->scratch->set('currentBadgeId',$badgeId);
return $self->www_view; return $self->www_view;
} }