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

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/OrderDetailController.php
+5 -4
View File
@@ -27,12 +27,12 @@
class OrderDetailControllerCore extends FrontController
{
public $auth = true;
public $authRedirection = 'history.php';
public $ssl = true;
public function __construct()
{
$this->auth = true;
$this->authRedirection = 'history.php';
$this->ssl = true;
parent::__construct();
header("Cache-Control: no-cache, must-revalidate");
@@ -146,6 +146,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'),
'use_tax' => Configuration::get('PS_TAX'),
'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC),
'customizedDatas' => $customizedDatas));