// Merge -> 10309

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
+2 -2
View File
@@ -43,8 +43,8 @@ class PaypalExpress extends Paypal
return false;
// Making request
$returnURL = Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/paypal/express/submit.php';
$cancelURL = Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'order.php';
$returnURL = PayPal::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/paypal/express/submit.php';
$cancelURL = PayPal::getShopDomainSsl(true, true).__PS_BASE_URI__.'order.php';
$paymentAmount = (float)$cart->getOrderTotal();
$currencyCodeType = strval($currency->iso_code);
$paymentType = Configuration::get('PAYPAL_CAPTURE') == 1 ? 'Authorization' : 'Sale';