+ {if $input.type == 'text_customer'}
+ {$customer->firstname} {$customer->lastname}
+
+ {l s='View details on customer page'}
+
+ {elseif $input.type == 'text_order'}
+ {$text_order}
+
+ {l s='View details on order page'}
+
+ {elseif $input.type == 'list_products'}
+
+
+ | |
+
+
+
+ | {l s='Reference'} |
+ {l s='Product name'} |
+ {l s='Quantity'} |
+ {l s='Action'} |
+
+
+ {foreach $returnedCustomizations as $returnedCustomization}
+
+ | {$returnedCustomization['reference']} |
+ {$returnedCustomization['name']} |
+ {$returnedCustomization['product_quantity']|intval} |
+
+
+ 
+
+ |
+
+ {foreach $customizationDatas as $type => $datas}
+
+
+ {if $type == 'type_file'}
+
+ {foreach $datas a $data name='loop'}
+ -
+
+
+ {/foreach}
+
+ {elseif $type == 'type_textfield'}
+
+ {foreach $datas as $data name='loop'}
+ - {if $data['name']}$data['name']{else}{l s='Text #'}loop.iteration{/if}{l s=':'} {$data['value']}
+ {/foreach}
+
+ {/if}
+ |
+
+ {/foreach}
+ {/foreach}
+
+ {* Classic products *}
+ {foreach $products as $k => $product}
+ {if !isset($quantityDisplayed[$product['id_order_detail']]) || $product['product_quantity']|intval > $quantityDisplayed[$product['id_order_detail']]|intval}
+
+ | {$product['product_reference']} |
+ {$product['product_name']} |
+ {$product['product_quantity']} |
+
+
+
+
+ |
+
+ {/if}
+ {/foreach}
+
+ |
+
+
+ {/if}
+{/block}
\ No newline at end of file
diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php
new file mode 100644
index 000000000..bcfadba1c
--- /dev/null
+++ b/controllers/admin/AdminReturnController.php
@@ -0,0 +1,229 @@
+
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision: 7060 $
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminReturnControllerCore extends AdminController
+{
+ public function __construct()
+ {
+ $this->context = Context::getContext();
+ $this->table = 'order_return';
+ $this->className = 'OrderReturn';
+ $this->colorOnBackground = true;
+ $this->_select = 'orsl.`name`';
+ $this->_join = 'LEFT JOIN '._DB_PREFIX_.'order_return_state_lang orsl ON (orsl.`id_order_return_state` = a.`state` AND orsl.`id_lang` = '.(int)$this->context->language->id.')';
+
+ $this->fieldsDisplay = array(
+ 'id_order_return' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
+ 'id_order' => array('title' => $this->l('Order ID'), 'width' => 25, 'align' => 'center'),
+ 'name' => array('title' => $this->l('Status'), 'width' => 'auto', 'align' => 'left'),
+ 'date_add' => array('title' => $this->l('Date issued'), 'width' => 120, 'type' => 'date', 'align' => 'right'),
+ );
+
+ $this->options = array(
+ 'general' => array(
+ 'title' => $this->l('Merchandise return (RMA) options'),
+ 'fields' => array(
+ 'PS_ORDER_RETURN' => array('title' => $this->l('Enable returns:'), 'desc' => $this->l('Select whether or not to activate merchandise return for your shop'), 'cast' => 'intval', 'type' => 'bool'),
+ 'PS_ORDER_RETURN_NB_DAYS' => array('title' => $this->l('Time limit of validity:'), 'desc' => $this->l('Number of days the customer can make a return after the delivery date'), 'cast' => 'intval', 'type' => 'text', 'size' => '2'),
+ ),
+ 'submit' => array()
+ ),
+ );
+
+ parent::__construct();
+ }
+
+ public function initForm()
+ {
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Return Merchandise Authorization (RMA)'),
+ 'image' => '../img/admin/return.gif'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'hidden',
+ 'name' => 'id_order'
+ ),
+ array(
+ 'type' => 'hidden',
+ 'name' => 'id_customer'
+ ),
+ array(
+ 'type' => 'text_customer',
+ 'label' => $this->l('Customer:'),
+ 'name' => '',
+ 'size' => '',
+ 'required' => false,
+ ),
+ array(
+ 'type' => 'text_order',
+ 'label' => $this->l('Order:'),
+ 'name' => '',
+ 'size' => '',
+ 'required' => false,
+ ),
+ array(
+ 'type' => 'free',
+ 'label' => $this->l('Customer explanation:'),
+ 'name' => 'question',
+ 'size' => '',
+ 'required' => false,
+ ),
+ array(
+ 'type' => 'select',
+ 'label' => $this->l('Status:'),
+ 'name' => 'state',
+ 'required' => false,
+ 'options' => array(
+ 'query' => OrderReturnState::getOrderReturnStates($this->context->language->id),
+ 'id' => 'id_order_return_state',
+ 'name' => 'name'
+ ),
+ 'p' => $this->l('Merchandise return (RMA) status')
+ ),
+ array(
+ 'type' => 'list_products',
+ 'label' => $this->l('Products:'),
+ 'name' => '',
+ 'size' => '',
+ 'required' => false,
+ 'p' => $this->l('List of products in return package')
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l(' Save '),
+ 'class' => 'button'
+ )
+ );
+
+ $order = new Order($this->object->id_order);
+ $quantityDisplayed = array();
+ /* Customized products */
+ if ($returnedCustomizations = OrderReturn::getReturnedCustomizedProducts((int)($this->object->id_order)))
+ {
+ $allCustomizedDatas = Product::getAllCustomizedDatas((int)($order->id_cart));
+ foreach ($returnedCustomizations AS $returnedCustomization)
+ {
+ $customizationDatas = &$allCustomizedDatas[(int)($returnedCustomization['product_id'])][(int)($returnedCustomization['product_attribute_id'])][(int)($returnedCustomization['id_customization'])]['datas'];
+ $quantityDisplayed[(int)($returnedCustomization['id_order_detail'])] = isset($quantityDisplayed[(int)($returnedCustomization['id_order_detail'])]) ? $quantityDisplayed[(int)($returnedCustomization['id_order_detail'])] + (int)($returnedCustomization['product_quantity']) : (int)($returnedCustomization['product_quantity']);
+ }
+ }
+
+ /* Classic products */
+ $products = OrderReturn::getOrdersReturnProducts($this->object->id, $order);
+
+
+ $this->tpl_form_vars = array(
+ 'customer' => new Customer($this->object->id_customer),
+ 'url_customer' => 'index.php?tab=AdminCustomers&id_customer='.(int)$this->object->id_customer.'&viewcustomer&token='.Tools::getAdminToken('AdminCustomers'.(int)(Tab::getIdFromClassName('AdminCustomers')).(int)$this->context->employee->id),
+ 'text_order' => $this->l('Order #').sprintf('%06d', $order->id).' '.$this->l('from').' '.Tools::displayDate($order->date_upd, $order->id_lang),
+ 'url_order' => 'index.php?tab=AdminOrders&id_order='.(int)$order->id.'&vieworder&token='.Tools::getAdminToken('AdminOrders'.(int)Tab::getIdFromClassName('AdminOrders').(int)$this->context->employee->id),
+ 'picture_folder' => _THEME_PROD_PIC_DIR_,
+ 'type_file' => Product::CUSTOMIZE_FILE,
+ 'type_textfield' => Product::CUSTOMIZE_TEXTFIELD,
+ 'returnedCustomizations' => $returnedCustomizations,
+ 'products' => $products,
+ 'quantityDisplayed' => $quantityDisplayed,
+ 'id_order_return' => $this->object->id,
+ );
+ return parent::initForm();
+ }
+
+ public function initToolbar()
+ {
+ if (!$this->display)
+ return;
+ parent::initToolbar();
+ }
+
+ public function postProcess()
+ {
+ $this->context = Context::getContext();
+ if (Tools::isSubmit('deleteorder_return_detail'))
+ {
+ if ($this->tabAccess['delete'] === '1')
+ {
+ if (($id_order_detail = (int)(Tools::getValue('id_order_detail'))) AND Validate::isUnsignedId($id_order_detail))
+ {
+ if (($id_order_return = (int)(Tools::getValue('id_order_return'))) AND Validate::isUnsignedId($id_order_return))
+ {
+ $orderReturn = new OrderReturn($id_order_return);
+ if (!Validate::isLoadedObject($orderReturn))
+ die(Tools::displayError());
+ if ((int)($orderReturn->countProduct()) > 1)
+ {
+ if (OrderReturn::deleteOrderReturnDetail($id_order_return, $id_order_detail, (int)(Tools::getValue('id_customization', 0))))
+ Tools::redirectAdmin(self::$currentIndex.'&conf=4token='.$this->token);
+ else
+ $this->_errors[] = Tools::displayError('An error occurred while deleting an order return detail.');
+ }
+ else
+ $this->_errors[] = Tools::displayError('You need at least one product.');
+ }
+ else
+ $this->_errors[] = Tools::displayError('The order return is invalid.');
+ }
+ else
+ $this->_errors[] = Tools::displayError('The order return detail is invalid.');
+ }
+ else
+ $this->_errors[] = Tools::displayError('You do not have permission to delete here.');
+ }
+ elseif (Tools::isSubmit('submitAddorder_return'))
+ {
+ if ($this->tabAccess['edit'] === '1')
+ {
+ if (($id_order_return = (int)(Tools::getValue('id_order_return'))) AND Validate::isUnsignedId($id_order_return))
+ {
+ $orderReturn = new OrderReturn($id_order_return);
+ $order = new Order($orderReturn->id_order);
+ $customer = new Customer($orderReturn->id_customer);
+ $orderReturn->state = (int)(Tools::getValue('state'));
+ if ($orderReturn->save())
+ {
+ $orderReturnState = new OrderReturnState($orderReturn->state);
+ $vars = array(
+ '{lastname}' => $customer->lastname,
+ '{firstname}' => $customer->firstname,
+ '{id_order_return}' => $id_order_return,
+ '{state_order_return}' => (isset($orderReturnState->name[(int)$order->id_lang]) ? $orderReturnState->name[(int)$order->id_lang] : $orderReturnState->name[(int)Configuration::get('PS_LANG_DEFAULT')]));
+ Mail::Send((int)$order->id_lang, 'order_return_state', Mail::l('Your order return state has changed', $order->id_lang),
+ $vars, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL,
+ NULL, _PS_MAIL_DIR_, true);
+ Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
+ }
+ }
+ else
+ $this->_errors[] = Tools::displayError('No order return ID.');
+ }
+ else
+ $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
+ }
+ parent::postProcess();
+ }
+}
'.$this->l('Back to list').'