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/standard/redirect.php
+5 -5
View File
@@ -66,18 +66,18 @@ $smarty->assign(array(
'address' => $address,
'country' => $country,
'state' => $state,
'amount' => (float)($cart->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING)),
'amount' => (float)($cart->getOrderTotal(true, PayPal::BOTH_WITHOUT_SHIPPING)),
'customer' => $customer,
'total' => (float)($cart->getOrderTotal(true, Cart::BOTH)),
'shipping' => Tools::ps_round((float)($cart->getOrderShippingCost()) + (float)($cart->getOrderTotal(true, Cart::ONLY_WRAPPING)), 2),
'discount' => $cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS),
'total' => (float)($cart->getOrderTotal(true, PayPal::BOTH)),
'shipping' => Tools::ps_round((float)($cart->getOrderShippingCost()) + (float)($cart->getOrderTotal(true, PayPal::ONLY_WRAPPING)), 2),
'discount' => $cart->getOrderTotal(true, PayPal::ONLY_DISCOUNTS),
'business' => $business,
'currency_module' => $currency_module,
'cart_id' => (int)($cart->id).'_'.pSQL($cart->secure_key),
'products' => $cart->getProducts(),
'paypal_id' => (int)($paypal->id),
'header' => $header,
'url' => Tools::getShopDomain(true, true).__PS_BASE_URI__
'url' => PayPal::getShopDomain(true, true).__PS_BASE_URI__
));