antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CS

Browse Source
This commit is contained in:
Michael RICOIS 2018-02-05 12:50:19 +01:00
parent b0cafcbe70
commit e01ffd309f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/Order.php
View File

@ -184,7 +184,7 @@ class OrderCore extends ObjectModel
/* MySQL does not allow 'order' for a table name */ /* MySQL does not allow 'order' for a table name */
protected $table = 'orders'; protected $table = 'orders';
protected $identifier = 'id_order'; protected $identifier = 'id_order';
protected $_taxCalculationMethod = PS_TAX_EXC; protected $_taxCalculationMethod = PS_TAX_EXC;
protected static $_historyCache = array(); protected static $_historyCache = array();
@ -449,9 +449,9 @@ class OrderCore extends ObjectModel
if ($row['group_reduction'] > 0) if ($row['group_reduction'] > 0)
{ {
if ($this->_taxCalculationMethod == PS_TAX_EXC) if ($this->_taxCalculationMethod == PS_TAX_EXC)
$row['product_price'] = $row['product_price'] * $group_reduction; $row['product_price'] = $row['product_price'] * $group_reduction;
else else
$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] * $group_reduction , 2); $row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] * $group_reduction , 2);
} }
if (($row['reduction_percent'] OR $row['reduction_amount'] OR $row['group_reduction']) AND $this->_taxCalculationMethod == PS_TAX_EXC) if (($row['reduction_percent'] OR $row['reduction_amount'] OR $row['group_reduction']) AND $this->_taxCalculationMethod == PS_TAX_EXC)
@ -526,7 +526,7 @@ class OrderCore extends ObjectModel
/** /**
* Check if order contains (only) virtual products * Check if order contains (only) virtual products
* *
* @param boolean $strict If false return true if there are at least one product virtual * @param boolean $strict If false return true if there are at least one product virtual
* @return boolean true if is a virtual order or false * @return boolean true if is a virtual order or false
* *
@ -922,7 +922,7 @@ class OrderCore extends ObjectModel
// I use mysql 4, I can't make sub query in FROM // I use mysql 4, I can't make sub query in FROM
$number = Order::getLastInvoiceNumber() + 1; $number = Order::getLastInvoiceNumber() + 1;
} }
else else
$number = '(SELECT `invoice_number` $number = '(SELECT `invoice_number`
FROM ( FROM (
SELECT MAX(`invoice_number`) + 1 AS `invoice_number` SELECT MAX(`invoice_number`) + 1 AS `invoice_number`

2
controllers/OrderDetailController.php
View File

@ -145,7 +145,7 @@ class OrderDetailControllerCore extends FrontController
'messages' => Message::getMessagesByOrderId((int)($order->id)), 'messages' => Message::getMessagesByOrderId((int)($order->id)),
'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_,
'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_, 'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_,
'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'), 'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'),
'use_tax' => Configuration::get('PS_TAX'), 'use_tax' => Configuration::get('PS_TAX'),
'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC), 'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC),
'customizedDatas' => $customizedDatas)); 'customizedDatas' => $customizedDatas));