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

Merge pull request #818 from cedricfontaine/patch-2

Browse Source 
[-] MO : Price should apply tax as in configuration.
This commit is contained in:
Gregory Roussac
2013-10-07 09:55:35 -07:00
parent 644e38c05f d63288affd
commit 4daaa206d2
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/loyalty/loyalty.php
View File

@@ -493,13 +493,20 @@ class Loyalty extends Module
include_once(dirname(__FILE__).'/LoyaltyModule.php');
$total_price = 0;
$taxesEnabled = Product::getTaxCalculationMethod();
$details = OrderReturn::getOrdersReturnDetail((int)$params['orderReturn']->id);
foreach ($details as $detail)
{
$total_price += Db::getInstance()->getValue('
SELECT ROUND(total_price_tax_incl, 2)
FROM '._DB_PREFIX_.'order_detail od
WHERE id_order_detail = '.(int)$detail['id_order_detail']);
if ($taxesEnabled == PS_TAX_EXC)
$total_price += Db::getInstance()->getValue('
SELECT ROUND(total_price_tax_excl, 2)
FROM '._DB_PREFIX_.'order_detail od
WHERE id_order_detail = '.(int)$detail['id_order_detail']);
else
$total_price += Db::getInstance()->getValue('
SELECT ROUND(total_price_tax_incl, 2)
FROM '._DB_PREFIX_.'order_detail od
WHERE id_order_detail = '.(int)$detail['id_order_detail']);
}
$loyalty_new = new LoyaltyModule();
@@ -650,8 +657,12 @@ class Loyalty extends Module
|| !Validate::isLoadedObject($loyalty = new LoyaltyModule((int)LoyaltyModule::getByOrderId((int)$params['order']->id))))
return false;
$taxesEnabled = Product::getTaxCalculationMethod();
$loyalty_new = new LoyaltyModule();
$loyalty_new->points = -1 * LoyaltyModule::getNbPointsByPrice(number_format($order_detail->total_price_tax_incl, 2, '.', ''));
if ($taxesEnabled == PS_TAX_EXC)
$loyalty_new->points = -1 * LoyaltyModule::getNbPointsByPrice(number_format($order_detail->total_price_tax_excl, 2, '.', ''));
else
$loyalty_new->points = -1 * LoyaltyModule::getNbPointsByPrice(number_format($order_detail->total_price_tax_incl, 2, '.', ''));
$loyalty_new->id_loyalty_state = (int)LoyaltyStateModule::getCancelId();
$loyalty_new->id_order = (int)$params['order']->id;
$loyalty_new->id_customer = (int)$loyalty->id_customer;
@@ -672,4 +683,4 @@ class Loyalty extends Module
return (array_key_exists($key, $translations)) ? $translations[$key] : $key;
}
}
}