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

// Merge -> revision 8114

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-19 09:46:12 +00:00
parent 14a8c84bdd
commit a1843c1900
12 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/payment/paypalpayment.php
+11 -2
View File
@@ -71,14 +71,23 @@ class PaypalPayment extends Paypal
$discounts = (float)($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
if ($discounts == 0)
{
if ($params['cart']->id_customer)
{
$customer = new Customer((int)$params['cart']->id_customer);
$taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);
}
else
$taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
$priceField = (($taxCalculationMethod == PS_TAX_EXC) ? 'price' : 'price_wt');
$products = $cart->getProducts();
$amt = 0;
for ($i = 0; $i < sizeof($products); $i++)
{
$request .= '&L_NAME'.$i.'='.substr(urlencode($products[$i]['name'].(isset($products[$i]['attributes'])?' - '.$products[$i]['attributes']:'').(isset($products[$i]['instructions'])?' - '.$products[$i]['instructions']:'') ), 0, 127);
$request .= '&L_AMT'.$i.'='.urlencode($this->PayPalRound($products[$i]['price_wt']));
$request .= '&L_AMT'.$i.'='.urlencode($this->PayPalRound($products[$i][$priceField]));
$request .= '&L_QTY'.$i.'='.urlencode($products[$i]['cart_quantity']);
$amt += $this->PayPalRound($products[$i]['price_wt']*$products[$i]['cart_quantity']);
$amt += $this->PayPalRound($products[$i][$priceField] * $products[$i]['cart_quantity']);
}
$shipping = $this->PayPalRound($cart->getOrderShippingCost($cart->id_carrier, false));
$request .= '&ITEMAMT='.urlencode($amt);