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

Merge commit 'v7.10.18' into 8

Browse source 
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Storage.pm
	t/Asset/AssetExportHtml.t
	t/Asset/Story.t
	t/Shop/TaxDriver/Generic.t
	t/Storage.t
This commit is contained in:
Doug Bell 2011-06-21 16:03:49 -05:00
commit 0c5acb697b
75 changed files with 979 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
View file

@ -286,12 +286,14 @@ sub www_sendToPayPal {
my $url = $session->url;
my $base = $url->getSiteURL . $url->page;
my $i18n = WebGUI::International->new( $self->session, $I18N );
my $returnUrl = URI->new($base);
$returnUrl->query_form( {
shop => 'pay',
method => 'do',
do => 'payPalCallback',
paymentGatewayId => $self->getId,
LOCALECODE => $i18n->getLanguage->{locale},
}
);
@ -310,7 +312,6 @@ sub www_sendToPayPal {
my $testMode = $self->testMode;
my $response = LWP::UserAgent->new->post( $self->apiUrl, $form );
my $params = $self->responseHash($response);
my $i18n = WebGUI::International->new( $self->session, $I18N );
my $error;
if ($params) {

23
lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
View file

@ -225,6 +225,7 @@ sub paymentVariables {
my $url = $self->session->url;
my $base = $url->getSiteURL . $url->page;
my $cart = $self->getCart;
my $i18n = WebGUI::International->new($self->session);
my $return = URI->new($base);
$return->query_form( {
@ -247,10 +248,11 @@ sub paymentVariables {
return => $return->as_string,
cancel_return => $cancel->as_string,
lc => $i18n->getLanguage->{locale},
handling_cart => $cart->calculateShipping, ##According to https://www.x.com/message/180018#180018
#handling_cart => $cart->calculateShipping, ##According to https://www.x.com/message/180018#180018
tax_cart => $cart->calculateTaxes,
discount_amount_cart => -($cart->calculateShopCreditDeduction),
discount_amount_cart => abs($cart->calculateShopCreditDeduction),
# When we verify that we have a valid transaction ID later on in
# processPayment, we'll make sure it's the cart we think it is.
@ -259,11 +261,18 @@ sub paymentVariables {
my $counter = 0;
foreach my $item (@{ $cart->getItems}) {
my $n = ++$counter;
$params{"amount_$n"} = $item->getSku->getPrice;
$params{"quantity_$n"} = $item->quantity;
$params{"item_name_$n"} = $item->configuredTitle;
$params{"item_number_$n"} = $item->itemId;
++$counter;
$params{"amount_$counter"} = $item->getSku->getPrice;
$params{"quantity_$counter"} = $item->get('quantity');
$params{"item_name_$counter"} = $item->get('configuredTitle');
$params{"item_number_$counter"} = $item->get('itemId');
}
if ($cart->requiresShipping) {
++$counter;
$params{"amount_$counter"} = $cart->calculateShipping;
$params{"quantity_$counter"} = 1;
$params{"item_name_$counter"} = $i18n->get('shipping', 'Shop');
$params{"item_number_$counter"} = 'Shipping';
}
return \%params;