From e01ffd309fdd3b756f8a900707bce653bb45367f Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Mon, 5 Feb 2018 12:50:19 +0100 Subject: [PATCH] CS --- classes/Order.php | 10 +++++----- controllers/OrderDetailController.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/Order.php b/classes/Order.php index 2f715bff..1b195a55 100755 --- a/classes/Order.php +++ b/classes/Order.php @@ -184,7 +184,7 @@ class OrderCore extends ObjectModel /* MySQL does not allow 'order' for a table name */ protected $table = 'orders'; protected $identifier = 'id_order'; - protected $_taxCalculationMethod = PS_TAX_EXC; + protected $_taxCalculationMethod = PS_TAX_EXC; protected static $_historyCache = array(); @@ -449,9 +449,9 @@ class OrderCore extends ObjectModel if ($row['group_reduction'] > 0) { if ($this->_taxCalculationMethod == PS_TAX_EXC) - $row['product_price'] = $row['product_price'] * $group_reduction; + $row['product_price'] = $row['product_price'] * $group_reduction; 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) @@ -526,7 +526,7 @@ class OrderCore extends ObjectModel /** * Check if order contains (only) virtual products - * + * * @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 * @@ -922,7 +922,7 @@ class OrderCore extends ObjectModel // I use mysql 4, I can't make sub query in FROM $number = Order::getLastInvoiceNumber() + 1; } - else + else $number = '(SELECT `invoice_number` FROM ( SELECT MAX(`invoice_number`) + 1 AS `invoice_number` diff --git a/controllers/OrderDetailController.php b/controllers/OrderDetailController.php index 22f0037c..61cefc1b 100755 --- a/controllers/OrderDetailController.php +++ b/controllers/OrderDetailController.php @@ -145,7 +145,7 @@ class OrderDetailControllerCore extends FrontController 'messages' => Message::getMessagesByOrderId((int)($order->id)), 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, 'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_, - 'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'), + 'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'), 'use_tax' => Configuration::get('PS_TAX'), 'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC), 'customizedDatas' => $customizedDatas));