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

// Merge -> revision 8076

Browse Source
This commit is contained in:
rMalie
2011-08-17 08:15:38 +00:00
parent 710be54b89
commit cba5631db0
22 changed files with 100 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/paypal.php
+12 -10
View File
@@ -40,7 +40,7 @@ class PayPal extends PaymentModule
{
$this->name = 'paypal';
$this->tab = 'payments_gateways';
$this->version = '2.7';
$this->version = '2.8';
$this->currencies = true;
$this->currencies_mode = 'radio';
@@ -352,7 +352,7 @@ class PayPal extends PaymentModule
$products = $order->getProducts();
$amt = $products[(int)($order_detail->id)]['product_price_wt'] * (int)($_POST['cancelQuantity'][(int)($order_detail->id)]);
$response = $this->_makeRefund($id_transaction, (float)($amt));
$response = $this->_makeRefund($id_transaction, $order->id, (float)($amt));
$message = $this->l('Cancel products result:').'<br>';
foreach ($response AS $k => $value)
$message .= $k.': '.$value.'<br>';
@@ -975,7 +975,7 @@ class PayPal extends PaymentModule
WHERE `id_order` = '.(int)$id_order);
}
private function _makeRefund($id_transaction, $amt = false)
private function _makeRefund($id_transaction, $id_order, $amt = false)
{
include_once(_PS_MODULE_DIR_.'paypal/api/paypallib.php');
@@ -991,7 +991,8 @@ class PayPal extends PaymentModule
$isoCurrency = Db::getInstance()->getValue('
SELECT `iso_code`
FROM `'._DB_PREFIX_.'orders` o
LEFT JOIN `'._DB_PREFIX_.'currency` c ON (o.`id_currency` = c.`id_currency`)');
LEFT JOIN `'._DB_PREFIX_.'currency` c ON (o.`id_currency` = c.`id_currency`)
WHERE o.`id_order` = '.(int)$id_order);
$request = '&TRANSACTIONID='.urlencode($id_transaction).'&REFUNDTYPE=Partial&AMT='.(float)($amt).'&CURRENCYCODE='.urlencode(strtoupper($isoCurrency));
}
$paypalLib = new PaypalLib();
@@ -1028,17 +1029,18 @@ class PayPal extends PaymentModule
if (!Validate::isLoadedObject($order))
return false;
$products = $order->getProducts();
// Amount for refund
$amt = 0.00;
foreach ($products AS $product)
if ($product['product_quantity_refunded'] == 0)
$amt += (float)($product['total_price']);
$amt += (float)($order->total_shipping);
$amt += (float)($product['total_price']) * ($product['product_quantity'] - $product['product_quantity_refunded']);
$amt += (float)($order->total_shipping) + (float)($order->total_wrapping) - (float)($order->total_discounts);
// check if total or partial
if ($order->total_products_wt == $amt)
$response = $this->_makeRefund($id_transaction);
if ($this->PayPalRound($order->total_paid_real) == $this->PayPalRound($amt))
$response = $this->_makeRefund($id_transaction, $id_order);
else
$response = $this->_makeRefund($id_transaction, (float)($amt));
$response = $this->_makeRefund($id_transaction, $id_order, (float)($amt));
$message = $this->l('Refund operation result:').'<br>';
foreach ($response AS $k => $value)
$message .= $k.': '.$value.'<br>';