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

// Fix order detail controller bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8147 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-08-22 14:29:13 +00:00
1 parent 93b9a835d4
commit 99c89469fb
1 file changed
+9 -14
Download Patch File Download Diff File Expand all files Collapse all files
controllers/OrderDetailController.php
+9 -14
View File
@@ -54,9 +54,9 @@ class OrderDetailControllerCore extends FrontController
$this->errors[] = Tools::displayError('Message cannot be blank'); $this->errors[] = Tools::displayError('Message cannot be blank');
elseif (!Validate::isMessage($msgText)) elseif (!Validate::isMessage($msgText))
$this->errors[] = Tools::displayError('Message is invalid (HTML is not allowed)'); $this->errors[] = Tools::displayError('Message is invalid (HTML is not allowed)');
if(!sizeof($this->errors)) if (!sizeof($this->errors))
{ {
$order = new Order((int)($idOrder)); $order = new Order($idOrder);
if (Validate::isLoadedObject($order) AND $order->id_customer == $this->context->customer->id) if (Validate::isLoadedObject($order) AND $order->id_customer == $this->context->customer->id)
{ {
$message = new Message(); $message = new Message();
@@ -84,12 +84,10 @@ class OrderDetailControllerCore extends FrontController
'{message}' => $message->message), '{message}' => $message->message),
$to, $toName, $customer->email, $customer->firstname.' '.$customer->lastname); $to, $toName, $customer->email, $customer->firstname.' '.$customer->lastname);
if (Tools::getValue('ajax') != 'true') if (Tools::getValue('ajax') != 'true')
Tools::redirect('index.php?controller=order-detail&id_order='.(int)($idOrder)); Tools::redirect('index.php?controller=order-detail&id_order='.(int)$idOrder);
} }
else else
{
$this->errors[] = Tools::displayError('Order not found'); $this->errors[] = Tools::displayError('Order not found');
}
} }
} }
@@ -108,7 +106,7 @@ class OrderDetailControllerCore extends FrontController
$inv_adr_fields = AddressFormat::getOrderedAddressFields($addressInvoice->id_country); $inv_adr_fields = AddressFormat::getOrderedAddressFields($addressInvoice->id_country);
$dlv_adr_fields = AddressFormat::getOrderedAddressFields($addressDelivery->id_country); $dlv_adr_fields = AddressFormat::getOrderedAddressFields($addressDelivery->id_country);
$invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressInvoice, $inv_adr_fields); $invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressInvoice, $inv_adr_fields);
$deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressDelivery, $dlv_adr_fields); $deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($addressDelivery, $dlv_adr_fields);
@@ -153,10 +151,8 @@ class OrderDetailControllerCore extends FrontController
$this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url)); $this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url));
$this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Module::hookExec('orderDetailDisplayed', array('order' => $order))); $this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Module::hookExec('orderDetailDisplayed', array('order' => $order)));
Module::hookExec('OrderDetail', array('carrier' => $carrier, 'order' => $order)); Module::hookExec('OrderDetail', array('carrier' => $carrier, 'order' => $order));
unset($carrier); unset($carrier, $addressInvoice, $addressDelivery);
unset($addressInvoice);
unset($addressDelivery);
} }
else else
$this->errors[] = Tools::displayError('Cannot find this order'); $this->errors[] = Tools::displayError('Cannot find this order');
@@ -169,11 +165,11 @@ class OrderDetailControllerCore extends FrontController
if (Tools::getValue('ajax') != 'true') if (Tools::getValue('ajax') != 'true')
{ {
parent::setMedia(); parent::setMedia();
Tools::addCSS(_THEME_CSS_DIR_.'history.css'); $this->addCSS(_THEME_CSS_DIR_.'history.css');
Tools::addCSS(_THEME_CSS_DIR_.'addresses.css'); $this->addCSS(_THEME_CSS_DIR_.'addresses.css');
} }
} }
public function displayHeader() public function displayHeader()
{ {
if (Tools::getValue('ajax') != 'true') if (Tools::getValue('ajax') != 'true')
@@ -192,4 +188,3 @@ class OrderDetailControllerCore extends FrontController
parent::displayFooter(); parent::displayFooter();
} }
} }