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

Merge branch 'WebGUI8' into psgi

Browse source 
Conflicts:
	sbin/testEnvironment.pl
This commit is contained in:
Patrick Donelan 2010-06-04 21:01:03 -04:00
commit f16ba76b86
109 changed files with 1546 additions and 2197 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Shop/CartItem.pm
View file

@ -173,9 +173,10 @@ Returns an instanciated WebGUI::Asset::Sku object for this cart item.
sub getSku {
my ($self) = @_;
my $asset = '';
$asset = WebGUI::Asset->newById($self->cart->session, $self->get("assetId"));
$asset->applyOptions($self->get("options")) if $asset;
my $asset = eval { WebGUI::Asset->newById($self->cart->session, $self->get("assetId")); };
if (!Exception::Class->caught) {
$asset->applyOptions($self->get("options"));
}
return $asset;
}
@ -229,7 +230,7 @@ Removes this item from the cart and calls $sku->onRemoveFromCart. See also delet
sub remove {
my $self = shift;
my $sku = $self->getSku;
my $sku = eval { $self->getSku; };
$sku->onRemoveFromCart($self) if $sku;
return $self->delete;
}

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

@ -431,7 +431,7 @@ sub www_selectPaymentGateway {
}
$var->{ paymentGateways } = \@paymentGateways;
$var->{ choose } = $i18n->get('choose payment gateway message');
my $template = WebGUI::Asset::Template->new($session, $session->setting->get("selectGatewayTemplateId"));
my $template = WebGUI::Asset::Template->newById($session, $session->setting->get("selectGatewayTemplateId"));
return $session->style->userStyle($template->process($var));
}

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

@ -18,6 +18,8 @@ use strict;
use XML::Simple;
use Data::Dumper;
use Tie::IxHash;
use LWP::UserAgent;
use HTTP::Request;
use base qw/WebGUI::Shop::PayDriver/;

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

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

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

@ -133,11 +133,11 @@ sub getSku {
my ($self) = @_;
my $asset = eval { WebGUI::Asset->newById($self->transaction->session, $self->get("assetId")); };
if (Exception::Class->caught()) {
$asset->applyOptions($self->get("options"));
return $asset;
WebGUI::Error::ObjectNotFound->throw(error=>'SKU Asset '.$self->get('assetId').' could not be instanciated. Perhaps it no longer exists.', id=>$self->get('assetId'));
return undef;
}
WebGUI::Error::ObjectNotFound->throw(error=>'SKU Asset '.$self->get('assetId').' could not be instanciated. Perhaps it no longer exists.', id=>$self->get('assetId'));
return undef;
$asset->applyOptions($self->get("options"));
return $asset;
}
#-------------------------------------------------------------------