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

// Code cleaning

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12585 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-01-20 15:58:40 +00:00
parent b9cd6594b7
commit aa402d73bd
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+32 -25
View File
@@ -41,13 +41,15 @@ class AdminOrdersControllerCore extends AdminController
$this->context = Context::getContext(); $this->context = Context::getContext();
$this->_select = ' $this->_select = '
a.id_order AS id_pdf, a.id_order AS id_pdf,
CONCAT(LEFT(c.`firstname`, 1), \'. \', c.`lastname`) AS `customer`, CONCAT(LEFT(c.`firstname`, 1), \'. \', c.`lastname`) AS `customer`,
osl.`name` AS `osname`, osl.`name` AS `osname`,
os.`color`, os.`color`,
IF((SELECT COUNT(so.id_order) FROM `'._DB_PREFIX_.'orders` so WHERE so.id_customer = a.id_customer) > 1, 0, 1) as new, IF((SELECT COUNT(so.id_order) FROM `'._DB_PREFIX_.'orders` so WHERE so.id_customer = a.id_customer) > 1, 0, 1) as new,
(SELECT COUNT(od.`id_order`) FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = a.`id_order` GROUP BY `id_order`) AS product_number'; (SELECT COUNT(od.`id_order`) FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = a.`id_order` GROUP BY `id_order`) AS product_number';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = a.`id_customer`)
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = a.`id_customer`)
LEFT JOIN `'._DB_PREFIX_.'order_history` oh ON (oh.`id_order` = a.`id_order`) LEFT JOIN `'._DB_PREFIX_.'order_history` oh ON (oh.`id_order` = a.`id_order`)
LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`) LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`)
LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)$this->context->language->id.')'; LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)$this->context->language->id.')';
@@ -55,11 +57,11 @@ class AdminOrdersControllerCore extends AdminController
$this->_orderBy = '`id_order`'; $this->_orderBy = '`id_order`';
$this->_orderWay = 'DESC'; // FIXME $this->_orderWay = 'DESC'; // FIXME
$statesArray = array(); $statusesArray = array();
$states = OrderState::getOrderStates((int)$this->context->language->id); $statuses = OrderState::getOrderStates((int)$this->context->language->id);
foreach ($states AS $state) foreach ($statuses as $status)
$statesArray[$state['id_order_state']] = $state['name']; $statusesArray[$status['id_order_state']] = $status['name'];
$this->fieldsDisplay = array( $this->fieldsDisplay = array(
'id_order' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'id_order' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
@@ -68,7 +70,7 @@ class AdminOrdersControllerCore extends AdminController
'customer' => array('title' => $this->l('Customer'), 'filter_key' => 'customer', 'tmpTableFilter' => true), 'customer' => array('title' => $this->l('Customer'), 'filter_key' => 'customer', 'tmpTableFilter' => true),
'total_paid_tax_incl' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '<b>', 'suffix' => '</b>', 'type' => 'price', 'currency' => true), 'total_paid_tax_incl' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '<b>', 'suffix' => '</b>', 'type' => 'price', 'currency' => true),
'payment' => array('title' => $this->l('Payment'), 'width' => 100), 'payment' => array('title' => $this->l('Payment'), 'width' => 100),
'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 280, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'), 'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 280, 'type' => 'select', 'list' => $statusesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'),
'date_add' => array('title' => $this->l('Date'), 'width' => 130, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), 'date_add' => array('title' => $this->l('Date'), 'width' => 130, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true)); 'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true));
@@ -110,9 +112,12 @@ class AdminOrdersControllerCore extends AdminController
if ($this->display == 'view') if ($this->display == 'view')
{ {
$order = new Order((int)Tools::getValue('id_order')); $order = new Order((int)Tools::getValue('id_order'));
if ($order->hasBeenDelivered()) $type = $this->l('Return products'); if ($order->hasBeenDelivered())
elseif ($order->hasBeenPaid()) $type = $this->l('Standard refund'); $type = $this->l('Return products');
else $type = $this->l('Cancel products'); elseif ($order->hasBeenPaid())
$type = $this->l('Standard refund');
else
$type = $this->l('Cancel products');
if (!$order->hasBeenDelivered()) if (!$order->hasBeenDelivered())
$this->toolbar_btn['new'] = array( $this->toolbar_btn['new'] = array(
@@ -198,7 +203,7 @@ class AdminOrdersControllerCore extends AdminController
{ {
// Send mail to customer // Send mail to customer
$customer = new Customer((int)$order->id_customer); $customer = new Customer((int)$order->id_customer);
$carrier = new Carrier((int)$order->id_carrier); $carrier = new Carrier((int)$order->id_carrier, $order->id_lang);
if (!Validate::isLoadedObject($customer)) if (!Validate::isLoadedObject($customer))
throw new PrestaShopException('Can\'t load Customer object'); throw new PrestaShopException('Can\'t load Customer object');
if (!Validate::isLoadedObject($carrier)) if (!Validate::isLoadedObject($carrier))
@@ -256,7 +261,7 @@ class AdminOrdersControllerCore extends AdminController
); );
// Save all changes // Save all changes
if ($history->addWithemail(true, $templateVars)) if ($history->addWithemail(true, $templateVars))
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder'.'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$order->id.'&vieworder'.'&token='.$this->token);
$this->errors[] = Tools::displayError('An error occurred while changing the status or was unable to send e-mail to the customer.'); $this->errors[] = Tools::displayError('An error occurred while changing the status or was unable to send e-mail to the customer.');
} }
} }
@@ -310,15 +315,17 @@ class AdminOrdersControllerCore extends AdminController
} }
else else
$customer_thread = new CustomerThread((int)$id_customer_thread); $customer_thread = new CustomerThread((int)$id_customer_thread);
$customer_message = new CustomerMessage(); $customer_message = new CustomerMessage();
$customer_message->id_customer_thread = $customer_thread->id; $customer_message->id_customer_thread = $customer_thread->id;
$customer_message->id_employee = (int)$this->context->employee->id; $customer_message->id_employee = (int)$this->context->employee->id;
$customer_message->message = htmlentities(Tools::getValue('message'), ENT_COMPAT, 'UTF-8'); $customer_message->message = htmlentities(Tools::getValue('message'), ENT_COMPAT, 'UTF-8');
$customer_message->private = Tools::getValue('visibility'); $customer_message->private = Tools::getValue('visibility');
if (!$customer_message->add()) if (!$customer_message->add())
$this->errors[] = Tools::displayError('An error occurred while sending message.'); $this->errors[] = Tools::displayError('An error occurred while sending message.');
elseif ($customer_message->private) elseif ($customer_message->private)
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=11'.'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int)$order->id.'&vieworder&conf=11'.'&token='.$this->token);
else else
{ {
$message = $customer_message->message; $message = $customer_message->message;
@@ -496,7 +503,7 @@ class AdminOrdersControllerCore extends AdminController
} }
// Delete product // Delete product
$orderDetail = new OrderDetail((int)($id_order_detail)); $orderDetail = new OrderDetail((int)$id_order_detail);
if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct)) if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct))
$this->errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>'; $this->errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>';
Hook::exec('actionProductCancel', array('order' => $order, 'id_order_detail' => $id_order_detail)); Hook::exec('actionProductCancel', array('order' => $order, 'id_order_detail' => $id_order_detail));
@@ -623,7 +630,7 @@ class AdminOrdersControllerCore extends AdminController
{ {
$payment_module = Module::getInstanceByName($module_name); $payment_module = Module::getInstanceByName($module_name);
$cart = new Cart((int)$id_cart); $cart = new Cart((int)$id_cart);
$payment_module->validateOrder((int)$cart->id, (int)$id_order_state, $cart->getOrderTotal(true, Cart::BOTH), $payment_module->displayName, $this->l(sprintf('Manual order - ID Employee :%1', (int)Context::getContext()->cookie->id_employee))); $payment_module->validateOrder((int)$cart->id, (int)$id_order_state, $cart->getOrderTotal(true, Cart::BOTH), $payment_module->displayName, sprintf($this->l('Manual order - ID Employee :%1'), (int)Context::getContext()->cookie->id_employee));
if ($payment_module->currentOrder) if ($payment_module->currentOrder)
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$payment_module->currentOrder.'&vieworder'.'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&id_order='.$payment_module->currentOrder.'&vieworder'.'&token='.$this->token);
} }
@@ -663,7 +670,7 @@ class AdminOrdersControllerCore extends AdminController
throw new PrestaShopException('Can\'t load Currency object'); throw new PrestaShopException('Can\'t load Currency object');
// Update order detail amount // Update order detail amount
foreach($order->getOrderDetailList() as $row) foreach ($order->getOrderDetailList() as $row)
{ {
$order_detail = new OrderDetail($row['id_order_detail']); $order_detail = new OrderDetail($row['id_order_detail']);
$order_detail->product_price = Tools::convertPriceFull($order_detail->product_price, $old_currency, $currency); $order_detail->product_price = Tools::convertPriceFull($order_detail->product_price, $old_currency, $currency);
@@ -679,14 +686,14 @@ class AdminOrdersControllerCore extends AdminController
} }
// Update order payment amount // Update order payment amount
foreach($order->getOrderPaymentCollection() as $payment) foreach ($order->getOrderPaymentCollection() as $payment)
{ {
$payment->id_currency = (int)$currency->id; $payment->id_currency = (int)$currency->id;
$payment->amount = Tools::convertPriceFull((float)$payment->amount, $old_currency, $currency); $payment->amount = Tools::convertPriceFull((float)$payment->amount, $old_currency, $currency);
$payment->update(); $payment->update();
} }
$id_order_carrier = Db::getInstance()->getRow(' $id_order_carrier = Db::getInstance()->getValue('
SELECT `id_order_carrier` SELECT `id_order_carrier`
FROM `'._DB_PREFIX_.'order_carrier` FROM `'._DB_PREFIX_.'order_carrier`
WHERE `id_order` = '.(int)$order->id); WHERE `id_order` = '.(int)$order->id);
@@ -743,7 +750,7 @@ class AdminOrdersControllerCore extends AdminController
if ($order_cart_rule->id_order_invoice) if ($order_cart_rule->id_order_invoice)
{ {
$order_invoice = new OrderInvoice($order_cart_rule->id_order_invoice); $order_invoice = new OrderInvoice($order_cart_rule->id_order_invoice);
if (!ValidateCore::isLoadedObject($order_invoice)) if (!Validate::isLoadedObject($order_invoice))
throw new PrestaShopException('Can\'t load Order Invoice object'); throw new PrestaShopException('Can\'t load Order Invoice object');
// Update amounts of Order Invoice // Update amounts of Order Invoice
@@ -908,7 +915,7 @@ class AdminOrdersControllerCore extends AdminController
} }
$res = true; $res = true;
foreach($cart_rules as $id_order_invoice => $cart_rule) foreach ($cart_rules as $id_order_invoice => $cart_rule)
{ {
// Create OrderCartRule // Create OrderCartRule
$order_cart_rule = new OrderCartRule(); $order_cart_rule = new OrderCartRule();