ems user experience mostly done

docs/upgrades/upgrade_7.5.2-7.5.3.pl

@@ -70,7 +70,7 @@ sub upgradeEMS {
 	$db->write("alter table EventManagementSystem drop column ticketPrinterTemplateId");
 	$db->write("alter table EventManagementSystem add column timezone varchar(30) not null default 'America/Chicago'");
 	$db->write("alter table EventManagementSystem add column templateId varchar(22) binary not null");
-	$db->write("alter table EventManagementSystem add column extrasTemplateId varchar(22) binary not null");
+	$db->write("alter table EventManagementSystem add column badgeBuilderTemplateId varchar(22) binary not null default 'BMybD3cEnmXVk2wQ_qEsRQ'");
 	$db->write("alter table EventManagementSystem add column badgeInstructions mediumtext");
 	$db->write("alter table EventManagementSystem add column ribbonInstructions mediumtext");
 	$db->write("alter table EventManagementSystem add column ticketInstructions mediumtext");
@@ -93,6 +93,7 @@ sub upgradeEMS {
 		phoneNumber varchar(35),
 		organization varchar(35),
 		email varchar(255),
+		notes mediumtext,
 		purchaseComplete boolean,
 		hasCheckedIn boolean,
 		index badgeAssetId_purchaseComplete (badgeAssetId,purchaseComplete)
@@ -128,7 +129,7 @@ sub upgradeEMS {
 		price float not null default 0.00,
 		seatsAvailable int not null default 100,
 		startDate datetime,
-		endDate datetime,
+		duration float not null default 1.0,
 		eventNumber int,
 		location varchar(100),
 		relatedBadges mediumtext,

lib/WebGUI/Asset/Sku/EMSBadge.pm

@@ -348,7 +348,7 @@ sub www_addToCart {
 	
 	# add it to the cart
 	$self->addToCart(\%badgeInfo);
-	return $self->getParent->www_viewExtras($self->getOptions->{badgeId});
+	return $self->getParent->www_buildBadge($self->getOptions->{badgeId});
 }
 
 

lib/WebGUI/Asset/Sku/EMSRibbon.pm

@@ -189,7 +189,7 @@ sub www_addToCart {
 	return $self->session->privilege->noAccess() unless $self->getParent->canView;
 	my $badgeId = $self->session->form->get('badgeId');
 	$self->addToCart({badgeId=>$badgeId});
-	return $self->getParent->www_viewExtras($badgeId);
+	return $self->getParent->www_buildBadge($badgeId);
 }
 
 #-------------------------------------------------------------------
@@ -222,21 +222,21 @@ sub www_edit {
 						   |);	
 	my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem");
 	my $form = $self->getEditForm;
-	$form->hidden({name=>'proceed', value=>'viewAllRibbons'});
+	$form->hidden({name=>'proceed', value=>'viewAll'});
 	return $self->processStyle('<h1>'.$i18n->get('ems ribbon').'</h1>'.$form->print);
 }
 
 #-------------------------------------------------------------------
 
-=head2 www_viewAllRibbons ()
+=head2 www_viewAll ()
 
 Displays the list of ribbons in the parent.
 
 =cut
 
-sub www_viewAllRibbons {
+sub www_viewAll {
 	my $self = shift;
-	return $self->getParent->www_viewExtras(undef,"ribbons");
+	return $self->getParent->www_buildBadge(undef,"ribbons");
 }
 
 

lib/WebGUI/Asset/Sku/EMSTicket.pm

@@ -98,12 +98,13 @@ sub definition {
 			label           => $i18n->get("event start date"),
 			hoverHelp       => $i18n->get("start date help"),
 			},
-		endDate => {
+		duration => {
 			tab             => "properties",
-			fieldType       => "dateTime",
+			fieldType       => "float",
-			defaultValue    => $date->toDatabase,
+			defaultValue    => 1.0,
-			label           => $i18n->get("event end date"),
+			subtext			=> $i18n->get('hours'),
-			hoverHelp       => $i18n->get("event end date help"),
+			label           => $i18n->get("duration"),
+			hoverHelp       => $i18n->get("duration help"),
 			},
 		location => {
 			tab             => "properties",
@@ -292,7 +293,7 @@ sub www_addToCart {
 	return $self->session->privilege->noAccess() unless $self->getParent->canView;
 	my $badgeId = $self->session->form->get('badgeId');
 	$self->addToCart({badgeId=>$badgeId});
-	return $self->getParent->www_viewExtras($badgeId);
+	return $self->getParent->www_buildBadge($badgeId);
 }
 
 #-------------------------------------------------------------------
@@ -325,21 +326,21 @@ sub www_edit {
 						   |);	
 	my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem");
 	my $form = $self->getEditForm;
-	$form->hidden({name=>'proceed', value=>'viewAllTickets'});
+	$form->hidden({name=>'proceed', value=>'viewAll'});
 	return $self->processStyle('<h1>'.$i18n->get('ems ticket').'</h1>'.$form->print);
 }
 
 #-------------------------------------------------------------------
 
-=head2 www_viewAllTickets ()
+=head2 www_viewAll ()
 
 Displays the list of tickets in the parent.
 
 =cut
 
-sub www_viewAllTickets {
+sub www_viewAll {
 	my $self = shift;
-	return $self->getParent->www_viewExtras(undef,"tickets");
+	return $self->getParent->www_buildBadge(undef,"tickets");
 }
 
 

lib/WebGUI/Asset/Sku/EMSToken.pm

@@ -186,7 +186,7 @@ sub www_addToCart {
 	return $self->session->privilege->noAccess() unless $self->getParent->canView;
 	my $badgeId = $self->session->form->get('badgeId');
 	$self->addToCart({badgeId=>$badgeId});
-	return $self->getParent->www_viewExtras($badgeId);
+	return $self->getParent->www_buildBadge($badgeId);
 }
 
 #-------------------------------------------------------------------
@@ -219,21 +219,21 @@ sub www_edit {
 						   |);	
 	my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem");
 	my $form = $self->getEditForm;
-	$form->hidden({name=>'proceed', value=>'viewAllTokens'});
+	$form->hidden({name=>'proceed', value=>'viewAll'});
 	return $self->processStyle('<h1>'.$i18n->get('ems token').'</h1>'.$form->print);
 }
 
 #-------------------------------------------------------------------
 
-=head2 www_viewAllTokens ()
+=head2 www_viewAll ()
 
 Displays the list of tokens in the parent.
 
 =cut
 
-sub www_viewAllTokens {
+sub www_viewAll {
 	my $self = shift;
-	return $self->getParent->www_viewExtras(undef,"tokens");
+	return $self->getParent->www_buildBadge(undef,"tokens");
 }
 
 

lib/WebGUI/Shop/Cart.pm

@@ -503,6 +503,9 @@ sub www_update {
                 my $i18n = WebGUI::International->new($self->session, "Shop");
                 $error{id $self} = sprint($i18n->get("too many of this item"), $item->get("configuredTitle"));
             }
+            elsif (my $e = WebGUI::Error->caught) {
+                $error{id $self} = "An unknown error has occured: ".$e->message;
+            }
         }
     }
 
@@ -568,6 +571,7 @@ sub www_view {
         formHeader              => WebGUI::Form::formHeader($session)
             . WebGUI::Form::hidden($session, {name=>"shop", value=>"cart"})
             . WebGUI::Form::hidden($session, {name=>"method", value=>"update"})
+            . WebGUI::Form::hidden($session, {name=>"itemId", value=>""})
             . WebGUI::Form::hidden($session, {name=>"callback", value=>""}),
         formFooter              => WebGUI::Form::formFooter($session),
         updateButton            => WebGUI::Form::submit($session, {value=>$i18n->get("update cart button")}),

lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm

@@ -1,7 +1,139 @@
 package WebGUI::i18n::English::Asset_EventManagementSystem;
 use strict;
 
-our $I18N = { ##hashref of hashes
+our $I18N = {
+	'hours' => {
+		message 	=> q|Hours|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'view cart' => {
+		message 	=> q|View Cart|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'buy badge' => {
+		message 	=> q|Buy A Badge|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'switch to badge for' => {
+		message 	=> q|Switch To '%s' Badge|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'lookup badge' => {
+		message 	=> q|Look Up A Badge|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'remove' => {
+		message 	=> q|Remove|,
+		lastUpdated	=> 0,
+		context		=> q|a link label, as in "remove from cart"|,
+	},
+	
+	'import' => {
+		message 	=> q|Import|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'export' => {
+		message 	=> q|Export|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'add a badge' => {
+		message 	=> q|Add a badge|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'add a token' => {
+		message 	=> q|Add a token|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'add a ticket' => {
+		message 	=> q|Add a ticket|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'add a ribbon' => {
+		message 	=> q|Add a ribbon|,
+		lastUpdated	=> 0,
+		context		=> q|a link label|,
+	},
+	
+	'sold out' => {
+		message 	=> q|Sold Out|,
+		lastUpdated	=> 0,
+		context		=> q|a message telling the user there are none left to buy|,
+	},
+	
+	'manage' => {
+		message 	=> q|Manage|,
+		lastUpdated	=> 0,
+		context		=> q|a column label in the badge builder|,
+	},
+	
+	'quantity available' => {
+		message 	=> q|# Available|,
+		lastUpdated	=> 0,
+		context		=> q|a column label in the badge builder|,
+	},
+	
+	'buy' => {
+		message 	=> q|Buy|,
+		lastUpdated	=> 0,
+		context		=> q|a button label in the badge builder|,
+	},
+	
+	'delete' => {
+		message 	=> q|Delete|,
+		lastUpdated	=> 0,
+		context		=> q|a button label in the badge builder|,
+	},
+	
+	'edit' => {
+		message 	=> q|Edit|,
+		lastUpdated	=> 0,
+		context		=> q|a button label in the badge builder|,
+	},
+	
+	'search' => {
+		message 	=> q|Search|,
+		lastUpdated	=> 0,
+		context		=> q|a button label in the badge builder|,
+	},
+	
+	'tickets' => {
+		message 	=> q|Tickets|,
+		lastUpdated	=> 0,
+		context		=> q|a template label a tab in the badge builder|,
+	},
+	
+	'ribbons' => {
+		message 	=> q|Ribbons|,
+		lastUpdated	=> 0,
+		context		=> q|a template label a tab in the badge builder|,
+	},
+	
+	'tokens' => {
+		message 	=> q|Tokens|,
+		lastUpdated	=> 0,
+		context		=> q|a template label a tab in the badge builder|,
+	},
+	
 	'location' => {
 		message 	=> q|Location|,
 		lastUpdated	=> 0,
@@ -15,13 +147,13 @@ our $I18N = { ##hashref of hashes
 	},
 	
 	'event number' => {
-		message 	=> q|Event Number|,
+		message 	=> q|Event #|,
 		lastUpdated	=> 0,
 		context		=> q|a property label|,
 	},
 	
 	'event number help' => {
-		message 	=> q|A number which uniquely identifies this event, so it can be matched up with printed catalogs.|,
+		message 	=> q|A number that represents the event, which is easily referenceable for things like event catalogs.|,
 		lastUpdated	=> 0,
 		context		=> q|help for a property label|,
 	},
@@ -176,18 +308,6 @@ our $I18N = { ##hashref of hashes
 		context		=> q|help for a property label|,
 	},
 	
-	'event number' => {
-		message 	=> q|Event Number|,
-		lastUpdated	=> 0,
-		context		=> q|a property label|,
-	},
-	
-	'event number help' => {
-		message 	=> q|A number that represents the event, which is easily referenceable for things like event catalogs.|,
-		lastUpdated	=> 0,
-		context		=> q|help for a property label|,
-	},
-	
 	'time zone' => {
 		message 	=> q|Time Zone|,
 		lastUpdated	=> 0,
@@ -201,7 +321,7 @@ our $I18N = { ##hashref of hashes
 	},
 	
  	'event start date' => {
-		message 	=> q|Event Start Date|,
+		message 	=> q|Start|,
 		lastUpdated => 0,
 		context 	=> q|Event start date field label|
 	},
@@ -212,16 +332,16 @@ our $I18N = { ##hashref of hashes
 		context 	=> q|hover help for Event Start Date field|
 	},
 
-	'event end date' => {
+	'duration' => {
-		message 	=> q|Event End Date|,
+		message 	=> q|Duration|,
 		lastUpdated => 0,
-		context 	=> q|Event end date field label|
+		context 	=> q|duration field label|
 	},
 
-	'end date help' => {
+	'duration help' => {
-		message 	=> q|The time and date when the event ends.|,
+		message 	=> q|How long does this event last?|,
 		lastUpdated => 0,
-		context 	=> q|hover help for Event End Date field|
+		context 	=> q|hover help for duration field|
 	},