dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> 10309

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/express/submit.php
+4 -3
View File
@@ -112,7 +112,7 @@ function displayConfirm()
'ppToken' => strval(Context::getContext()->cookie->paypal_token),
'cust_currency' => Context::getContext()->cart->id_currency,
'currencies' => $ppExpress->getCurrency((int)Context::getContext()->cart->id_currency),
'total' => Context::getContext()->cart->getOrderTotal(true, Cart::BOTH),
'total' => Context::getContext()->cart->getOrderTotal(true, PayPal::BOTH),
'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'. $ppExpress->name.'/',
'payerID' => $payerID,
'mode' => 'express/'
@@ -133,7 +133,7 @@ function submitConfirm()
die('No currency');
elseif (!$payerID = Tools::htmlentitiesUTF8(strval(Tools::getValue('payerID'))))
die('No payer ID');
elseif (!Context::getContext()->cart->getOrderTotal(true, Cart::BOTH))
elseif (!Context::getContext()->cart->getOrderTotal(true, PayPal::BOTH))
die('Empty cart');
$ppExpress->makePayPalAPIValidation(Context::getContext()->cookie, Context::getContext()->cart, $currency, $payerID, 'express');
@@ -344,7 +344,8 @@ function displayAccount()
displayAccount();
die('Not logged');
}*/
if (!Context::getContext()->cart->getOrderTotal(true, Cart::BOTH))
if (!Context::getContext()->cart->getOrderTotal(true, PayPal::BOTH))
die('Empty cart');
// No token, we need to get one by making PayPal Authorisation