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/integral_evolution/redirect.php
+11 -5
View File
@@ -87,11 +87,11 @@ $smarty->assign(array(
'shipping_address' => $shippingAddress,
'shipping_country' => $shippingCountry,
'shipping_state' => $shippingState,
'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),
@@ -99,11 +99,17 @@ $smarty->assign(array(
'paypal_id' => (int)($paypal->id),
'header' => $header,
'template' => 'Template'.Configuration::get('PAYPAL_TEMPLATE'),
'url' => Tools::getShopDomain(true, true).__PS_BASE_URI__,
'url' => PayPal::getShopDomain(true, true).__PS_BASE_URI__,
'paymentaction' => (Configuration::get('PAYPAL_CAPTURE') ? 'authorization' : 'sale')
));
if (substr(_PS_VERSION_, 0, 3) == '1.3')
$smarty->assign('jquery', 'jquery-1.2.6.pack.js');
else
$smarty->assign('jquery', 'jquery-1.4.4.min.js');
if (is_file(_PS_THEME_DIR_.'modules/paypal/integral_evolution/redirect.tpl'))
$smarty->display(_PS_THEME_DIR_.'modules/'.$paypal->name.'/integral_evolution/redirect.tpl');
else
modules/paypal/integral_evolution/redirect.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
<html>
<head>
<script type="text/javascript" src="{$url}js/jquery/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="{$url}js/jquery/{$jquery}"></script>
</head>
<body>
<p>{$redirect_text}<br /><a href="javascript:history.go(-1);">{$cancel_text}</a></p>