diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index cced2ad49..c9ade0640 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -1365,6 +1365,7 @@ sub validateEditEventForm {
"description" => $i18n->get("add/edit event description"),
"price" => $i18n->get("add/edit event price"),
"maximumAttendees" => $i18n->get("add/edit event maximum attendees"),
+ "sku" => "SKU Number"
);
my $mdFields = $self->getEventMetaDataFields;
@@ -1598,7 +1599,7 @@ sub www_editEvent {
my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
my $event = $self->session->db->quickHashRef("
- select p.productId, p.title, p.description, p.price, p.weight, p.sku, p.templateId,
+ select p.productId, p.title, p.description, p.price, p.weight, p.sku, p.templateId, p.skuTemplate,
e.startDate, e.endDate, e.maximumAttendees, e.approved
from
products as p, EventManagementSystem_products as e
@@ -1649,7 +1650,7 @@ sub www_editEvent {
$f->image(
-name => "image",
-hoverHelp => $i18n->get('add/edit event image description'),
- -label => $i18n->get('add/edit event image description')
+ -label => $i18n->get('add/edit event image'),
-value => $storageId
);
@@ -1668,14 +1669,25 @@ sub www_editEvent {
-label => $i18n->get('add/edit event template')
);
- $f->hidden(
+ $f->float(
-name => "weight",
- -value => "0"
+ -value => $self->session->form->get("weight") || $event->{weight} || 0,
+ -hoverHelp => "The weight of anything that may be associated with your event.",
+ -label => "Weight"
);
- $f->hidden(
+ $f->text(
-name => "sku",
- -value => $event->{sku} || $self->session->id->generate()
+ -value => $self->session->form->get("sku") || $event->{sku} || $self->session->id->generate(),
+ -hoverHelp => "A SKU Number to assign to the event. A Globaly Unique Identifier is generated by default.",
+ -label => "SKU Number"
+ );
+
+ $f->text(
+ -name => "skuTemplate",
+ -value => $self->session->form->get("skuTemplate") || $event->{skuTemplate},
+ -hoverHelp => "A template to use for assigning SKU numbers.",
+ -label => "SKU Template"
);
$f->dateTime(
@@ -1848,9 +1860,9 @@ sub www_editEventSave {
title => $self->session->form->get("title", "text"),
description => $self->session->form->get("description", "HTMLArea"),
price => $self->session->form->get("price", "float"),
- weight => $self->session->form->get("weight"),
- sku => $self->session->form->get("sku"),
- skuTemplate => "",
+ weight => $self->session->form->get("weight", "float"),
+ sku => $self->session->form->get("sku", "text"),
+ skuTemplate => $self->session->form->get("skuTemplate", "text"),
templateId => $self->session->form->get("templateId", "template"),
};
@@ -2671,7 +2683,7 @@ sub www_search {
$searchPhrases &&= " and ( ".$searchPhrases." )";
# $self->session->errorHandler->warn("searchPhrases: $searchPhrases
basicSearch: $basicSearch
");
# Get the products available for sale for this page
- my $sql = "select p.productId, p.title, p.description, p.price, p.templateId, e.approved, e.maximumAttendees, e.startDate, e.endDate $selects
+ my $sql = "select p.productId, p.title, p.description, p.price, p.templateId, p.weight, p.sku, p.skuTemplate, e.approved, e.maximumAttendees, e.startDate, e.endDate $selects
from products as p, EventManagementSystem_products as e
$joins
where
@@ -2753,6 +2765,9 @@ sub www_search {
$eventFields{'title'} = $event->{'title'};
$eventFields{'description'} = $event->{'description'};
$eventFields{'price'} = '$'.$event->{'price'};
+ $eventFields{'sku'} = $event->{'sku'};
+ $eventFields{'skuTemplate'} = $event->{'skuTemplate'};
+ $eventFields{'weight'} = $event->{'weight'};
my ($numberRegistered) = $self->session->db->quickArray("select count(*) from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p
where r.purchaseId = p.purchaseId and r.productId=".$self->session->db->quote($event->{'productId'}));
$eventFields{'numberRegistered'} = $numberRegistered;
@@ -2881,7 +2896,7 @@ sub view {
my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
# Get the products available for sale for this page
- my $sql = "select p.productId, p.title, p.description, p.price, p.templateId, e.approved, e.maximumAttendees
+ my $sql = "select p.productId, p.title, p.description, p.price, p.weight, p.sku, p.skuTemplate, p.templateId, e.approved, e.maximumAttendees
from products as p, EventManagementSystem_products as e
where
p.productId = e.productId and approved=1
@@ -2903,6 +2918,9 @@ sub view {
$eventFields{'title.url'} = $self->getUrl('func=search;cfilter_s0=requirement;cfilter_c0=eq;subSearch=1;cfilter_t0='.$event->{'productId'});
$eventFields{'description'} = $event->{'description'};
$eventFields{'price'} = '$'.$event->{'price'};
+ $eventFields{'sku'} = $event->{'sku'};
+ $eventFields{'skuTemplate'} = $event->{'skuTemplate'};
+ $eventFields{'weight'} = $event->{'weight'};
my ($numberRegistered) = $self->session->db->quickArray("select count(*) from EventManagementSystem_registrations as r, EventManagementSystem_purchases as p
where r.purchaseId = p.purchaseId and r.returned=0 and r.productId=".$self->session->db->quote($event->{'productId'}));
$eventFields{'numberRegistered'} = $numberRegistered;