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

Update Shop for new instanciators and for exception handling.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-03 21:07:38 -08:00
parent 03427eed10
commit ecc71d455d
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Shop/AddressBook.pm
View file

@ -464,7 +464,10 @@ sub www_editAddress {
defaultValue =>$form->get('email') || $properties->{ email } defaultValue =>$form->get('email') || $properties->{ email }
} ); } );
my $template = WebGUI::Asset::Template->new( $session, $session->setting->get('shopAddressTemplateId') ); my $template = eval { WebGUI::Asset::Template->newById( $session, $session->setting->get('shopAddressTemplateId') ); };
if (Exception::Class->caught()) {
return '';
}
$template->prepare; $template->prepare;
return $session->style->userStyle( $template->process( $var ) ); return $session->style->userStyle( $template->process( $var ) );
@ -602,7 +605,10 @@ sub www_view {
.WebGUI::Form::submit($session, {value=>$i18n->get("add a new address")}) .WebGUI::Form::submit($session, {value=>$i18n->get("add a new address")})
.WebGUI::Form::formFooter($session), .WebGUI::Form::formFooter($session),
); );
my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopAddressBookTemplateId")); my $template = eval { WebGUI::Asset::Template->newById($session, $session->setting->get("shopAddressBookTemplateId")); };
if (Exception::Class->caught()) {
return '';
}
$template->prepare; $template->prepare;
return $session->style->userStyle($template->process(\%var)); return $session->style->userStyle($template->process(\%var));
} }

4
lib/WebGUI/Shop/Cart.pm
View file

@ -769,7 +769,7 @@ sub www_view {
); );
# render the cart # render the cart
my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopCartTemplateId")); my $template = WebGUI::Asset::Template->newById($session, $session->setting->get("shopCartTemplateId"));
return $session->style->userStyle($template->process(\%var)); return $session->style->userStyle($template->process(\%var));
} }
@ -883,7 +883,7 @@ sub www_view {
$var{ error } = $error{id $self}; $var{ error } = $error{id $self};
# render the cart # render the cart
my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopCartTemplateId")); my $template = WebGUI::Asset::Template->newById($session, $session->setting->get("shopCartTemplateId"));
return $session->style->userStyle($template->process(\%var)); return $session->style->userStyle($template->process(\%var));
} }

2
lib/WebGUI/Shop/PayDriver.pm
View file

@ -697,7 +697,7 @@ sub sendNotifications {
my $var = $transaction->getTransactionVars; my $var = $transaction->getTransactionVars;
# render # render
my $template = WebGUI::Asset::Template->new( $session, $self->get("receiptEmailTemplateId") ); my $template = WebGUI::Asset::Template->newById( $session, $self->get("receiptEmailTemplateId") );
my $inbox = WebGUI::Inbox->new($session); my $inbox = WebGUI::Inbox->new($session);
my $receipt = $template->process( $var ); my $receipt = $template->process( $var );
WebGUI::Macro::process($session, \$receipt); WebGUI::Macro::process($session, \$receipt);

4
lib/WebGUI/Shop/PayDriver/ITransact.pm
View file

@ -811,9 +811,9 @@ sub www_getCredentials {
value => $i18n->get('checkout button', 'Shop'), value => $i18n->get('checkout button', 'Shop'),
}); });
my $template = WebGUI::Asset::Template->new($session, $self->get("credentialsTemplateId")); my $template = eval { WebGUI::Asset::Template->newById($session, $self->get("credentialsTemplateId")); };
my $output; my $output;
if (defined $template) { if (! Exception::Class->caught()) {
$template->prepare; $template->prepare;
$output = $template->process($var); $output = $template->process($var);
} }

2
lib/WebGUI/Shop/TaxDriver/EU.pm
View file

@ -665,7 +665,7 @@ sub getUserScreen {
$var->{ addVatNumber_form } = $f->print; $var->{ addVatNumber_form } = $f->print;
my $template = WebGUI::Asset::Template->new( $self->session, $self->get('userTemplateId') ); my $template = WebGUI::Asset::Template->newById( $self->session, $self->get('userTemplateId') );
return $template->process( $var ); return $template->process( $var );
} }

4
lib/WebGUI/Shop/TransactionItem.pm
View file

@ -132,8 +132,8 @@ Returns an instanciated WebGUI::Asset::Sku object for this item.
sub getSku { sub getSku {
my ($self) = @_; my ($self) = @_;
my $asset = WebGUI::Asset->newById($self->transaction->session, $self->get("assetId")); my $asset = eval { WebGUI::Asset->newById($self->transaction->session, $self->get("assetId")); };
if (defined $asset) { if (Exception::Class->caught()) {
$asset->applyOptions($self->get("options")); $asset->applyOptions($self->get("options"));
return $asset; return $asset;
} }