first commit

iadmin/themes/default/template/controllers/orders/_customized_data.tpl

@@ -0,0 +1,236 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+{assign var="currencySymbolBeforeAmount" value=$currency->format[0] === '¤'}
+{if $product['customizedDatas']}
+{* Assign product price *}
+{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+	{assign var=product_price value=($product['unit_price_tax_excl'] + $product['ecotax'])}
+{else}
+	{assign var=product_price value=$product['unit_price_tax_incl']}
+{/if}
+	<tr class="customized customized-{$product['id_order_detail']|intval} product-line-row">
+		<td>
+			<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+			{if isset($product['image']) && $product['image']->id|intval}{$product['image_tag']}{else}--{/if}
+		</td>
+		<td>
+			<a href="{$link->getAdminLink('AdminProducts', true, ['id_product' => $product['product_id']|intval, 'updateproduct' => '1'])|escape:'html':'UTF-8'}">
+			<span class="productName">{$product['product_name']} - {l s='Customized' d='Admin.Orderscustomers.Feature'}</span><br />
+			{if ($product['product_reference'])}{l s='Reference number:' d='Admin.Orderscustomers.Feature'} {$product['product_reference']}<br />{/if}
+			{if ($product['product_supplier_reference'])}{l s='Supplier reference:' d='Admin.Orderscustomers.Feature'} {$product['product_supplier_reference']}{/if}
+			</a>
+		</td>
+		<td>
+			<span class="product_price_show">{displayPrice price=$product_price currency=$currency->id|intval}</span>
+			{if $can_edit}
+			<div class="product_price_edit" style="display:none;">
+				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+				<div class="form-group">
+					<div class="fixed-width-xl">
+						<div class="input-group">
+							{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+							<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" />
+							{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+						</div>
+					</div>
+					<br/>
+					<div class="fixed-width-xl">
+						<div class="input-group">
+							{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+							<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" />
+							{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+						</div>
+					</div>
+				</div>
+			</div>
+			{/if}
+		</td>
+		<td class="productQuantity text-center">{$product['customizationQuantityTotal']}</td>
+		{if $display_warehouse}<td>&nbsp;</td>{/if}
+		{if ($order->hasBeenPaid())}<td class="productQuantity text-center">{$product['customizationQuantityRefunded']}</td>{/if}
+		{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<td class="productQuantity text-center">{$product['customizationQuantityReturned']}</td>{/if}
+		{if $stock_location_is_available}<td class="productQuantity location text-center">{$product['location']}</td>{/if}
+		{if $stock_management}<td class="text-center">{$product['current_stock']}</td>{/if}
+		<td class="total_product">
+		{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+			{displayPrice price=Tools::ps_round($product['product_price'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+		{else}
+			{displayPrice price=Tools::ps_round($product['product_price_wt'] * $product['customizationQuantityTotal'], 2) currency=$currency->id|intval}
+		{/if}
+		</td>
+		<td class="cancelQuantity standard_refund_fields current-edit" style="display:none" colspan="2">
+			&nbsp;
+		</td>
+		<td class="edit_product_fields" colspan="2" style="display:none">&nbsp;</td>
+		<td class="partial_refund_fields current-edit" style="text-align:left;display:none;"></td>
+		{if ($can_edit && !$order->hasBeenDelivered())}
+			<td class="product_action text-right">
+				{* edit/delete controls *}
+				<div class="btn-group">
+					<button type="button" class="btn btn-default edit_product_change_link">
+						<i class="icon-pencil"></i>
+						{l s='Edit' d='Admin.Actions'}
+					</button>
+					<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+						<span class="caret"></span>
+					</button>
+					<ul class="dropdown-menu" role="menu">
+						<li>
+							<a href="#" class="delete_product_line">
+								<i class="icon-trash"></i>
+								{l s='Delete' d='Admin.Actions'}
+							</a>
+						</li>
+					</ul>
+				</div>
+				{* Update controls *}
+				<button type="button" class="btn btn-default submitProductChange" style="display: none;">
+					<i class="icon-ok"></i>
+					{l s='Update' d='Admin.Actions'}
+				</button>
+				<button type="button" class="btn btn-default cancel_product_change_link" style="display: none;">
+					<i class="icon-remove"></i>
+					{l s='Cancel' d='Admin.Actions'}
+				</button>
+			</td>
+		{/if}
+	</tr>
+	{foreach $product['customizedDatas'] as $customizationPerAddress}
+		{foreach $customizationPerAddress as $customizationId => $customization}
+			<tr class="customized customized-{$product['id_order_detail']|intval}">
+				<td colspan="2">
+				<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
+					<div class="form-horizontal">
+						{foreach $customization.datas as $type => $datas}
+							{if ($type == Product::CUSTOMIZE_FILE)}
+								{foreach from=$datas item=data}
+									<div class="form-group">
+										<span class="col-lg-4 control-label"><strong>{if $data['name']}{$data['name']}{else}{l s='Picture #' d='Admin.Orderscustomers.Feature'}{$data@iteration}{/if}</strong></span>
+										<div class="col-lg-8">
+											<a href="displayImage.php?img={$data['value']}&amp;name={$order->id|intval}-file{$data@iteration}" class="_blank">
+												<img class="img-thumbnail" src="{$smarty.const._THEME_PROD_PIC_DIR_}{$data['value']}_small" alt=""/>
+											</a>
+										</div>
+									</div>
+								{/foreach}
+							{elseif ($type == Product::CUSTOMIZE_TEXTFIELD)}
+								{foreach from=$datas item=data}
+									<div class="form-group">
+										<span class="col-lg-4 control-label"><strong>{if $data['name']}{$data['name']}{else}{l s='Text #%s' sprintf=[$data@iteration] d='Admin.Orderscustomers.Feature'}{/if}</strong></span>
+										<div class="col-lg-8">
+											<p class="form-control-static">{$data['value']}</p>
+										</div>
+									</div>
+								{/foreach}
+							{/if}
+						{/foreach}
+					</div>
+				</td>
+				<td>-</td>
+				<td class="productQuantity text-center">
+					<span class="product_quantity_show{if (int)$customization['quantity'] > 1} red bold{/if}">{$customization['quantity']}</span>
+					{if $can_edit}
+					<span class="product_quantity_edit" style="display:none;">
+						<input type="text" name="product_quantity[{$customizationId|intval}]" class="edit_product_quantity" value="{$customization['quantity']|htmlentities}" size="2" />
+					</span>
+					{/if}
+				</td>
+				{if $display_warehouse}<td>&nbsp;</td>{/if}
+				{if ($order->hasBeenPaid())}
+				<td class="text-center">
+					{if !empty($product['amount_refund'])}
+					{l s='%quantity_refunded% (%amount_refunded% refund)' sprintf=['%quantity_refunded%' => $customization['quantity_refunded'], '%amount_refunded%' => $product['amount_refund']] d='Admin.Orderscustomers.Feature'}
+					{/if}
+					<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
+					<input type="hidden" value="{(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal']))}" class="partialRefundProductAmount" />
+				</td>
+				{/if}
+				{if ($order->hasBeenDelivered())}<td class="text-center">{$customization['quantity_returned']}</td>{/if}
+				<td class="text-center">-</td>
+				{if $stock_location_is_available}<td class="text-center">-</td>{$product['location']}</td>{/if}
+				<td class="total_product">
+					{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+						{displayPrice price=Tools::ps_round($product['product_price'] * $customization['quantity'], 2) currency=$currency->id|intval}
+					{else}
+						{displayPrice price=Tools::ps_round($product['product_price_wt'] * $customization['quantity'], 2) currency=$currency->id|intval}
+					{/if}
+				</td>
+				<td class="cancelCheck standard_refund_fields current-edit" style="display:none">
+					<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$customization['quantity_returned']|intval}" />
+					<input type="hidden" name="totalQty" id="totalQty" value="{$customization['quantity']|intval}" />
+					<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
+					{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($customization['quantity_returned']) < (int)($customization['quantity']))}
+						<input type="checkbox" name="id_customization[{$customizationId|intval}]" id="id_customization[{$customizationId|intval}]" value="{$product['id_order_detail']|intval}" onchange="setCancelQuantity(this, {$customizationId|intval}, {$customization['quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_reinjected']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
+					{else}
+					--
+				{/if}
+				</td>
+				<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
+				{if ($customization['quantity_returned'] + $customization['quantity_refunded'] >= $customization['quantity'])}
+					<input type="hidden" name="cancelCustomizationQuantity[{$customizationId|intval}]" value="0" />
+				{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
+					<input type="text" id="cancelQuantity_{$customizationId|intval}" name="cancelCustomizationQuantity[{$customizationId|intval}]" size="2" onclick="selectCheckbox(this);" value="" />0/{$customization['quantity']-$customization['quantity_refunded']}
+				{/if}
+				</td>
+				<td class="partial_refund_fields current-edit" colspan="2" style="display:none; width: 250px;">
+					{if $product['quantity_refundable'] > 0}
+					{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+						{assign var='amount_refundable' value=$product['amount_refundable']}
+					{else}
+						{assign var='amount_refundable' value=$product['amount_refundable_tax_incl']}
+					{/if}
+					<div class="form-group">
+						<div class="{if $product['amount_refundable'] > 0}col-lg-4{else}col-lg-12{/if}">
+							<label class="control-label">
+								{l s='Quantity:' d='Admin.Orderscustomers.Feature'}
+							</label>
+							<div class="input-group">
+								<input onchange="checkPartialRefundProductQuantity(this)" type="text" name="partialRefundProductQuantity[{$product['id_order_detail']|intval}]" value="{if ($customization['quantity']-$customization['quantity_refunded']) >0}1{else}0{/if}" />
+								<div class="input-group-addon">/ {$product['quantity_refundable']}</div>
+							</div>
+						</div>
+						<div class="{if $product['quantity_refundable'] > 0}col-lg-8{else}col-lg-12{/if}">
+							<label class="control-label">
+								<span class="title_box ">{l s='Amount:' d='Admin.Orderscustomers.Feature'}</span>
+								<small class="text-muted">({$smarty.capture.TaxMethod})</small>
+							</label>
+							<div class="input-group">
+								{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign}</div>{/if}
+								<input onchange="checkPartialRefundProductAmount(this)" type="text" name="partialRefundProduct[{$product['id_order_detail']|intval}]" />
+								{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign}</div>{/if}
+							</div>
+							<p class="help-block"><i class="icon-warning-sign"></i> {l s='(Max %amount_refundable% %tax_method%)' sprintf=[ '%amount_refundable%' => Tools::displayPrice(Tools::ps_round($amount_refundable, 2), $currency->id), '%tax_method%' => $smarty.capture.TaxMethod] d='Admin.Orderscustomers.Help'}</p>
+						</div>
+					</div>
+					{/if}
+				</td>
+				{if ($can_edit && !$order->hasBeenDelivered())}
+					<td class="edit_product_fields" colspan="2" style="display:none"></td>
+					<td class="product_action" style="text-align:right"></td>
+				{/if}
+			</tr>
+		{/foreach}
+	{/foreach}
+{/if}

iadmin/themes/default/template/controllers/orders/_discount_form.tpl

@@ -0,0 +1,110 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+
+<div class="form-horizontal well">
+	<div class="form-group">
+		<label class="control-label col-lg-3">
+			{l s='Name' d='Admin.Global'}
+		</label>
+		<div class="col-lg-9">
+			<input class="form-control" type="text" name="discount_name" value="" />
+		</div>
+	</div>
+
+	<div class="form-group">
+		<label class="control-label col-lg-3">
+			{l s='Type' d='Admin.Catalog.Feature'}
+		</label>
+		<div class="col-lg-9">
+			<select class="form-control" name="discount_type" id="discount_type">
+				<option value="1">{l s='Percent' d='Admin.Global'}</option>
+				<option value="2">{l s='Amount' d='Admin.Global'}</option>
+				<option value="3">{l s='Free shipping' d='Admin.Shipping.Feature'}</option>
+			</select>
+		</div>
+	</div>
+
+	<div id="discount_value_field" class="form-group">
+		<label class="control-label col-lg-3">
+			{l s='Value' d='Admin.Global'}
+		</label>
+		<div class="col-lg-9">
+			<div class="input-group">
+				<div class="input-group-addon">
+					<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
+					<span id="discount_percent_symbol">%</span>
+				</div>
+				<input class="form-control" type="text" name="discount_value"/>
+			</div>
+			<p class="text-muted" id="discount_value_help" style="display: none;">
+				{l s='This value must include taxes.' d='Admin.Orderscustomers.Notification'}
+			</p>
+		</div>
+	</div>
+
+	{if $order->hasInvoice()}
+	<div class="form-group">
+		<label class="control-label col-lg-3">
+			{l s='Invoice' d='Admin.Global'}
+		</label>
+		<div class="col-lg-9">
+			<select name="discount_invoice">
+				{foreach from=$invoices_collection item=invoice}
+				<option value="{$invoice->id}" selected="selected">
+					{$invoice->getInvoiceNumberFormatted($current_id_lang)} - {displayPrice price=$invoice->total_paid_tax_incl currency=$order->id_currency}
+				</option>
+				{/foreach}
+			</select>
+		</div>
+	</div>
+
+	<div class="form-group">
+		<div class="col-lg-9 col-lg-offset-3">
+			<p class="checkbox">
+				<label class="control-label" for="discount_all_invoices">
+					<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" />
+					{l s='Apply on all invoices' d='Admin.Orderscustomers.Feature'}
+				</label>
+			</p>
+			<p class="help-block">
+				{l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.' d='Admin.Orderscustomers.Help'}
+			</p>
+		</div>
+	</div>
+	{/if}
+
+	<div class="row">
+		<div class="col-lg-9 col-lg-offset-3">
+			<button class="btn btn-default" type="button" id="cancel_add_voucher">
+				<i class="icon-remove text-danger"></i>
+				{l s='Cancel' d='Admin.Actions'}
+			</button>
+			<button class="btn btn-default" type="submit" name="submitNewVoucher">
+				<i class="icon-ok text-success"></i>
+				{l s='Add' d='Admin.Actions'}
+			</button>
+		</div>
+	</div>
+</div>

iadmin/themes/default/template/controllers/orders/_documents.tpl

@@ -0,0 +1,178 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+<div class="table-responsive">
+	<table class="table" id="documents_table">
+		<thead>
+			<tr>
+				<th>
+					<span class="title_box ">{l s='Date' d='Admin.Global'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Document' d='Admin.Orderscustomers.Feature'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Number' d='Admin.Orderscustomers.Feature'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Amount' d='Admin.Global'}</span>
+				</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{foreach from=$order->getDocuments() item=document}
+
+				{if get_class($document) eq 'OrderInvoice'}
+					{if isset($document->is_delivery)}
+					<tr id="delivery_{$document->id}">
+					{else}
+					<tr id="invoice_{$document->id}">
+					{/if}
+				{elseif get_class($document) eq 'OrderSlip'}
+					<tr id="orderslip_{$document->id}">
+				{/if}
+
+						<td>{dateFormat date=$document->date_add}</td>
+						<td>
+							{if get_class($document) eq 'OrderInvoice'}
+								{if isset($document->is_delivery)}
+									{l s='Delivery slip' d='Admin.Orderscustomers.Feature'}
+								{else}
+									{l s='Invoice' d='Admin.Global'}
+								{/if}
+							{elseif get_class($document) eq 'OrderSlip'}
+								{l s='Credit Slip' d='Admin.Orderscustomers.Feature'}
+							{/if}
+						</td>
+						<td>
+							{if get_class($document) eq 'OrderInvoice'}
+								{if isset($document->is_delivery)}
+									<a class="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf', true, [], ['submitAction' => 'generateDeliverySlipPDF', 'id_order_invoice' => $document->id])|escape:'html':'UTF-8'}">
+								{else}
+									<a class="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf', true, [], ['submitAction' => 'generateInvoicePDF', 'id_order_invoice' => $document->id])|escape:'html':'UTF-8'}">
+							   {/if}
+							{elseif get_class($document) eq 'OrderSlip'}
+								<a class="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf', true, [], ['submitAction' => 'generateOrderSlipPDF', 'id_order_slip' => $document->id])|escape:'html':'UTF-8'}">
+							{/if}
+							{if get_class($document) eq 'OrderInvoice'}
+								{if isset($document->is_delivery)}
+									{Configuration::get('PS_DELIVERY_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$document->delivery_number}
+								{else}
+									{$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
+								{/if}
+							{elseif get_class($document) eq 'OrderSlip'}
+								{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
+							{/if}
+							</a>
+						</td>
+						<td>
+						{if get_class($document) eq 'OrderInvoice'}
+							{if isset($document->is_delivery)}
+								--
+							{else}
+								{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
+								{if $document->getTotalPaid()}
+									<span>
+									{if $document->getRestPaid() > 0}
+										({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid' d='Admin.Orderscustomers.Feature'})
+									{elseif $document->getRestPaid() < 0}
+										({displayPrice price=-$document->getRestPaid() currency=$currency->id} {l s='overpaid' d='Admin.Orderscustomers.Feature'})
+									{/if}
+									</span>
+								{/if}
+							{/if}
+						{elseif get_class($document) eq 'OrderSlip'}
+							{displayPrice price=$document->total_products_tax_incl+$document->total_shipping_tax_incl currency=$currency->id}
+						{/if}
+						</td>
+						<td class="text-right document_action">
+						{if get_class($document) eq 'OrderInvoice'}
+							{if !isset($document->is_delivery)}
+
+								{if $document->getRestPaid()}
+									<a href="#formAddPaymentPanel" class="js-set-payment btn btn-default anchor" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
+										<i class="icon-money"></i>
+										{l s='Enter payment' d='Admin.Orderscustomers.Feature'}
+									</a>
+								{/if}
+
+								<a href="#" class="btn btn-default" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
+									{if $document->note eq ''}
+										<i class="icon-plus-sign-alt"></i>
+										{l s='Add note' d='Admin.Orderscustomers.Feature'}
+									{else}
+										<i class="icon-pencil"></i>
+										{l s='Edit note' d='Admin.Orderscustomers.Feature'}
+									{/if}
+								</a>
+
+							{/if}
+						{/if}
+						</td>
+					</tr>
+				{if get_class($document) eq 'OrderInvoice'}
+					{if !isset($document->is_delivery)}
+					<tr id="invoiceNote{$document->id}" style="display:none">
+						<td colspan="5">
+							<form action="{$current_index}&amp;viewOrder&amp;id_order={$order->id}{if isset($smarty.get.token)}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}{/if}" method="post">
+								<p>
+									<label for="editNote{$document->id}" class="t">{l s='Note' d='Admin.Global'}</label>
+									<input type="hidden" name="id_order_invoice" value="{$document->id}" />
+									<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'html':'UTF-8'}</textarea>
+								</p>
+								<p>
+									<button type="submit" name="submitEditNote" class="btn btn-default">
+										<i class="icon-save"></i>
+										{l s='Save' d='Admin.Actions'}
+									</button>
+									<a class="btn btn-default" href="#" id="cancelNote" onclick="$('#invoiceNote{$document->id}').hide();return false;">
+										<i class="icon-remove"></i>
+										{l s='Cancel' d='Admin.Actions'}
+									</a>
+								</p>
+							</form>
+						</td>
+					</tr>
+					{/if}
+				{/if}
+			{foreachelse}
+				<tr>
+					<td colspan="5" class="list-empty">
+						<div class="list-empty-msg">
+							<i class="icon-warning-sign list-empty-icon"></i>
+							{l s='There is no available document' d='Admin.Orderscustomers.Notification'}
+						</div>
+						{if isset($invoice_management_active) && $invoice_management_active}
+							<a class="btn btn-default" href="{$current_index}&amp;viewOrder&amp;submitGenerateInvoice&amp;id_order={$order->id}{if isset($smarty.get.token)}&amp;token={$smarty.get.token|escape:'html':'UTF-8'}{/if}">
+								<i class="icon-repeat"></i>
+								{l s='Generate invoice' d='Admin.Orderscustomers.Feature'}
+							</a>
+						{/if}
+					</td>
+				</tr>
+			{/foreach}
+		</tbody>
+	</table>
+</div>

iadmin/themes/default/template/controllers/orders/_new_product.tpl

@@ -0,0 +1,127 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+{assign var="currencySymbolBeforeAmount" value=$currency->format[0] === '¤'}
+<tr id="new_product" style="display:none">
+	<td style="display:none;" colspan="2">
+		<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
+
+		<div class="form-group">
+			<label>{l s='Product' d='Admin.Global'}</label>
+			<div class="input-group">
+				<input type="text" id="add_product_product_name" value=""/>
+				<div class="input-group-addon">
+					<i class="icon-search"></i>
+				</div>
+			</div>
+		</div>
+
+		<div id="add_product_product_attribute_area" class="form-group" style="display: none;">
+			<label>{l s='Combinations' d='Admin.Global'}</label>
+			<select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+		</div>
+
+		<div id="add_product_product_warehouse_area" class="form-group" style="display: none;">
+			<label>{l s='Warehouse'}</label>
+			<select  id="add_product_warehouse" name="add_product_warehouse"></select>
+		</div>
+	</td>
+
+	<td style="display:none;">
+		<div class="row">
+			<div class="input-group fixed-width-xl">
+				{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+				<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
+				{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+			</div>
+		</div>
+		<br/>
+		<div class="row">
+			<div class="input-group fixed-width-xl">
+				{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+				<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" disabled="disabled" />
+				{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+			</div>
+		</div>
+	</td>
+
+	<td style="display:none;" class="productQuantity">
+		<input type="number" class="form-control fixed-width-sm" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" disabled="disabled" />
+	</td>
+	{if ($order->hasBeenPaid())}<td style="display:none;" class="productQuantity"></td>{/if}
+	{if $display_warehouse}<td></td>{/if}
+	{if ($order->hasBeenDelivered())}<td style="display:none;" class="productQuantity"></td>{/if}
+	<td style="display:none;" class="productQuantity" id="add_product_product_stock">0</td>
+	<td style="display:none;" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
+	<td style="display:none;" colspan="2">
+		{if sizeof($invoices_collection)}
+		<select class="form-control" name="add_product[invoice]" id="add_product_product_invoice" disabled="disabled">
+			<optgroup class="existing" label="{l s='Existing'}">
+				{foreach from=$invoices_collection item=invoice}
+				<option value="{$invoice->id}">{$invoice->getInvoiceNumberFormatted($current_id_lang)}</option>
+				{/foreach}
+			</optgroup>
+			<optgroup label="{l s='New'}">
+				<option value="0">{l s='Create a new invoice' d='Admin.Orderscustomers.Feature'}</option>
+			</optgroup>
+		</select>
+		{/if}
+	</td>
+	<td style="display:none;">
+		<button type="button" class="btn btn-default" id="cancelAddProduct">
+			<i class="icon-remove text-danger"></i>
+			{l s='Cancel' d='Admin.Actions'}
+		</button>
+		<button type="button" class="btn btn-default" id="submitAddProduct" disabled="disabled">
+			<i class="icon-ok text-success"></i>
+			{l s='Add' d='Admin.Actions'}
+		</button>
+	</td>
+</tr>
+
+<tr id="new_invoice" style="display:none">
+	<td colspan="10">
+		<h4>{l s='New invoice information' d='Admin.Orderscustomers.Feature'}</h4>
+		<div class="form-horizontal">
+			<div class="form-group">
+				<label class="control-label col-lg-3">{l s='Carrier' d='Admin.Shipping.Feature'}</label>
+				<div class="col-lg-9">
+					<p class="form-control-static"><strong>{$carrier->name}</strong></p>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="control-label col-lg-3">{l s='Shipping Costs' d='Admin.Orderscustomers.Feature'}</label>
+				<div class="col-lg-9">
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" name="add_invoice[free_shipping]" value="1" />
+							{l s='Free shipping' d='Admin.Shipping.Feature'}
+						</label>
+						<p class="help-block">{l s='If you don\'t select "Free shipping," the normal shipping costs will be applied.' d='Admin.Orderscustomers.Help'}</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</td>
+</tr>

iadmin/themes/default/template/controllers/orders/_print_pdf_icon.tpl

@@ -0,0 +1,41 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+
+{* Generate HTML code for printing Invoice Icon with link *}
+<span class="btn-group-action">
+	<span class="btn-group">
+	{if Configuration::get('PS_INVOICE') && $order->invoice_number}
+		<a class="btn btn-default _blank" href="{$link->getAdminLink('AdminPdf', true, [], ['submitAction' => 'generateInvoicePDF', 'id_order' => $order->id])|escape:'html':'UTF-8'}">
+			<i class="icon-file-text"></i>
+		</a>
+	{/if}
+	{* Generate HTML code for printing Delivery Icon with link *}
+	{if $order->delivery_number}
+		<a class="btn btn-default _blank" href="{$link->getAdminLink('AdminPdf', true, [], ['submitAction' => 'generateDeliverySlipPDF', 'id_order' => $order->id])|escape:'html':'UTF-8'}">
+			<i class="icon-truck"></i>
+		</a>
+	{/if}
+	</span>
+</span>

iadmin/themes/default/template/controllers/orders/_product_line.tpl

@@ -0,0 +1,280 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+{assign var="currencySymbolBeforeAmount" value=$currency->format[0] === '¤'}
+{* Assign product price *}
+{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+	{assign var=product_price value=($product['unit_price_tax_excl'] + $product['ecotax'])}
+{else}
+	{assign var=product_price value=$product['unit_price_tax_incl']}
+{/if}
+
+{if ($product['product_quantity'] > $product['customized_product_quantity'])}
+<tr class="product-line-row">
+	<td>{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
+	<td>
+		<a href="{$link->getAdminLink('AdminProducts', true, ['id_product' => $product['product_id']|intval, 'updateproduct' => '1'])|escape:'html':'UTF-8'}">
+			<span class="productName">{$product['product_name']}</span><br />
+			{if $product.product_reference}{l s='Reference number:' d='Admin.Orderscustomers.Feature'} {$product.product_reference}<br />{/if}
+			{if $product.product_supplier_reference}{l s='Supplier reference:' d='Admin.Orderscustomers.Feature'} {$product.product_supplier_reference}{/if}
+		</a>
+        {if isset($product.pack_items) && $product.pack_items|@count > 0}<br>
+            <button name="package" class="btn btn-default" type="button" onclick="TogglePackage('{$product['id_order_detail']}'); return false;" value="{$product['id_order_detail']}">{l s='Package content' d='Admin.Orderscustomers.Feature'}</button>
+        {/if}
+		<div class="row-editing-warning" style="display:none;">
+			<div class="alert alert-warning">
+				<strong>{l s='Editing this product line will remove the reduction and base price.' d='Admin.Orderscustomers.Notification'}</strong>
+			</div>
+		</div>
+	</td>
+	<td>
+		<span class="product_price_show">{displayPrice price=$product_price currency=$currency->id}</span>
+		{if $can_edit}
+		<div class="product_price_edit" style="display:none;">
+			<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
+			<div class="form-group">
+				<div class="fixed-width-xl">
+					<div class="input-group">
+						{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+						<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}"/>
+						{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax excl.' d='Admin.Global'}</div>{/if}
+					</div>
+				</div>
+				<br/>
+				<div class="fixed-width-xl">
+					<div class="input-group">
+						{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+						<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}"/>
+						{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign} {l s='tax incl.' d='Admin.Global'}</div>{/if}
+					</div>
+				</div>
+			</div>
+		</div>
+		{/if}
+	</td>
+	<td class="productQuantity text-center">
+		<span class="product_quantity_show{if (int)$product['product_quantity'] - (int)$product['customized_product_quantity'] > 1} badge{/if}">{(int)$product['product_quantity'] - (int)$product['customized_product_quantity']}</span>
+		{if $can_edit}
+		<span class="product_quantity_edit" style="display:none;">
+			<input type="text" name="product_quantity" class="edit_product_quantity" value="{$product['product_quantity']|htmlentities}"/>
+		</span>
+		{/if}
+	</td>
+	{if $display_warehouse}
+		<td>
+			{$product.warehouse_name|escape:'html':'UTF-8'}
+			{if $product.warehouse_location}
+				<br>{l s='Location' d='Admin.Orderscustomers.Feature'}: <strong>{$product.warehouse_location|escape:'html':'UTF-8'}</strong>
+			{/if}
+		</td>
+	{/if}
+	{if ($order->hasBeenPaid())}
+		<td class="productQuantity text-center">
+			{if !empty($product['amount_refund'])}
+				{l s='%quantity_refunded% (%amount_refunded% refund)' sprintf=['%quantity_refunded%' => $product['product_quantity_refunded'], '%amount_refunded%' => $product['amount_refund']] d='Admin.Orderscustomers.Feature'}
+			{/if}
+			<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
+			<input type="hidden" value="{(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal']))}" class="partialRefundProductAmount" />
+			{if count($product['refund_history'])}
+				<span class="tooltip">
+					<span class="tooltip_label tooltip_button">+</span>
+					<span class="tooltip_content">
+					<span class="title">{l s='Refund history' d='Admin.Orderscustomers.Feature'}</span>
+					{foreach $product['refund_history'] as $refund}
+						{l s='%refund_date% - %refund_amount%' sprintf=['%refund_date%' => {dateFormat date=$refund.date_add}, '%refund_amount%' => {displayPrice price=$refund.amount_tax_incl}] d='Admin.Orderscustomers.Feature'}<br />
+					{/foreach}
+					</span>
+				</span>
+			{/if}
+		</td>
+	{/if}
+	{if $order->hasBeenDelivered() || $order->hasProductReturned()}
+		<td class="productQuantity text-center">
+			{$product['product_quantity_return']}
+			{if count($product['return_history'])}
+				<span class="tooltip">
+					<span class="tooltip_label tooltip_button">+</span>
+					<span class="tooltip_content">
+					<span class="title">{l s='Return history' d='Admin.Orderscustomers.Feature'}</span>
+					{foreach $product['return_history'] as $return}
+						{l s='%return_date% - %return_quantity% - %return_state%' sprintf=['%return_date%' =>{dateFormat date=$return.date_add}, '%return_quantity%' => $return.product_quantity, '3return_state%' => $return.state] d='Admin.Orderscustomers.Feature'}<br />
+					{/foreach}
+					</span>
+				</span>
+			{/if}
+		</td>
+	{/if}
+	{if $stock_location_is_available}<td class="productQuantity location text-center">{$product['location']}</td>{/if}
+	{if $stock_management}<td class="productQuantity product_stock text-center">{$product['current_stock']}</td>{/if}
+	<td class="total_product">
+		{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
+	</td>
+	<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</td>
+	<td class="cancelCheck standard_refund_fields current-edit" style="display:none">
+		<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$product['product_quantity_return']}" />
+		<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
+		<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
+	{if ((!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN')) AND (int)($product['product_quantity_return']) < (int)($product['product_quantity']))}
+		<input type="checkbox" name="id_order_detail[{$product['id_order_detail']}]" id="id_order_detail[{$product['id_order_detail']}]" value="{$product['id_order_detail']}" onchange="setCancelQuantity(this, {$product['id_order_detail']}, {$product['product_quantity'] - $product['customizationQuantityTotal'] - $product['product_quantity_return'] - $product['product_quantity_refunded']})" {if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}disabled="disabled" {/if}/>
+	{else}
+		--
+	{/if}
+	</td>
+	<td class="cancelQuantity standard_refund_fields current-edit" style="display:none">
+	{if ($product['product_quantity_return'] + $product['product_quantity_refunded'] >= $product['product_quantity'])}
+		<input type="hidden" name="cancelQuantity[{$product['id_order_detail']}]" value="0" />
+	{elseif (!$order->hasBeenDelivered() OR Configuration::get('PS_ORDER_RETURN'))}
+		<input type="text" id="cancelQuantity_{$product['id_order_detail']}" name="cancelQuantity[{$product['id_order_detail']}]" onchange="checkTotalRefundProductQuantity(this)" value="" />
+	{/if}
+
+	{if $product['customizationQuantityTotal']}
+		{assign var=productQuantity value=($product['product_quantity']-$product['customizationQuantityTotal'])}
+	{else}
+		{assign var=productQuantity value=$product['product_quantity']}
+	{/if}
+
+	{if ($order->hasBeenDelivered())}
+		{$product['product_quantity_refunded']}/{$productQuantity-$product['product_quantity_refunded']}
+	{elseif ($order->hasBeenPaid())}
+		{$product['product_quantity_return']}/{$productQuantity}
+	{else}
+		0/{$productQuantity}
+	{/if}
+	</td>
+	<td class="partial_refund_fields current-edit" colspan="2" style="display:none; width: 250px; min-width: 250px;">
+		{if $product['quantity_refundable'] > 0}
+		{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+			{assign var='amount_refundable' value=$product['amount_refundable']}
+		{else}
+			{assign var='amount_refundable' value=$product['amount_refundable_tax_incl']}
+		{/if}
+		<div class="form-group">
+			<div class="{if $product['amount_refundable'] > 0}col-lg-4{else}col-lg-12{/if}">
+				<label class="control-label">
+					{l s='Quantity:'}
+				</label>
+				<div class="input-group">
+					<input onchange="checkPartialRefundProductQuantity(this)" type="text" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" />
+					<div class="input-group-addon">/ {$product['quantity_refundable']}</div>
+				</div>
+			</div>
+			<div class="{if $product['quantity_refundable'] > 0}col-lg-8{else}col-lg-12{/if}">
+				<label class="control-label">
+					<span class="title_box ">{l s='Amount' d='Admin.Global'}</span>
+					<small class="text-muted">({$smarty.capture.TaxMethod})</small>
+				</label>
+				<div class="input-group">
+					{if $currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign}</div>{/if}
+					<input onchange="checkPartialRefundProductAmount(this)" type="text" name="partialRefundProduct[{$product['id_order_detail']}]" />
+					{if !$currencySymbolBeforeAmount}<div class="input-group-addon">{$currency->sign}</div>{/if}
+				</div>
+        <p class="help-block"><i class="icon-warning-sign"></i> {l s='(Max %amount_refundable% %tax_method%)' sprintf=[ '%amount_refundable%' => Tools::displayPrice(Tools::ps_round($amount_refundable, 2), $currency->id), '%tax_method%' => $smarty.capture.TaxMethod] d='Admin.Orderscustomers.Help'}</p>
+			</div>
+		</div>
+		{/if}
+	</td>
+	{if ($can_edit && !$order->hasBeenDelivered())}
+	<td class="product_invoice" style="display: none;">
+		{if sizeof($invoices_collection)}
+		<select name="product_invoice" class="edit_product_invoice">
+			{foreach from=$invoices_collection item=invoice}
+			<option value="{$invoice->id}" {if $invoice->id == $product['id_order_invoice']}selected="selected"{/if}>
+				#{Configuration::get('PS_INVOICE_PREFIX', $current_id_lang, null, $order->id_shop)}{'%06d'|sprintf:$invoice->number}
+			</option>
+			{/foreach}
+		</select>
+		{else}
+		&nbsp;
+		{/if}
+	</td>
+	<td class="product_action text-right">
+		{* edit/delete controls *}
+		<div class="btn-group" id="btn_group_action">
+			<button type="button" class="btn btn-default edit_product_change_link">
+				<i class="icon-pencil"></i>
+				{l s='Edit' d='Admin.Actions'}
+			</button>
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				<span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu" role="menu">
+				<li>
+					<a href="#" class="delete_product_line">
+						<i class="icon-trash"></i>
+						{l s='Delete' d='Admin.Actions'}
+					</a>
+				</li>
+			</ul>
+		</div>
+		{* Update controls *}
+		<button type="button" class="btn btn-default submitProductChange" style="display: none;">
+			<i class="icon-ok"></i>
+			{l s='Update' d='Admin.Actions'}
+		</button>
+		<button type="button" class="btn btn-default cancel_product_change_link" style="display: none;">
+			<i class="icon-remove"></i>
+			{l s='Cancel' d='Admin.Actions'}
+		</button>
+	</td>
+	{/if}
+</tr>
+   {if isset($product.pack_items) && $product.pack_items|@count > 0}
+    <tr>
+        <td colspan="8" style="width:100%">
+            <table style="width: 100%; display:none;" class="table" id="pack_items_{$product['id_order_detail']}">
+            <thead>
+                <th style="width:15%;">&nbsp;</th>
+                <th style="width:15%;">&nbsp;</th>
+                <th style="width:50%;"><span class="title_box ">{l s='Product' d='Admin.Global'}</span></th>
+                <th style="width:10%;"><span class="title_box ">{l s='Qty' d='Admin.Orderscustomers.Feature'}</th>
+                {if $stock_management}<th><span class="title_box ">{l s='Available quantity' d='Admin.Orderscustomers.Feature'}</span></th>{/if}
+                <th>&nbsp;</th>
+            </thead>
+            <tbody>
+            {foreach from=$product.pack_items item=pack_item}
+                {if !empty($pack_item.active)}
+                    <tr class="product-line-row" {if isset($pack_item.image) && $pack_item.image->id && isset($pack_item.image_size)} height="{$pack_item['image_size'][1] + 7}"{/if}>
+                        <td>{l s='Package item' d='Admin.Orderscustomers.Feature'}</td>
+                        <td>{if isset($pack_item.image) && $pack_item.image->id}{$pack_item.image_tag}{/if}</td>
+                        <td>
+                            <a href="{$link->getAdminLink('AdminProducts', true, ['id_product' => $pack_item.id_product, 'updateproduct' => '1'])|escape:'html':'UTF-8'}">
+                                <span class="productName">{$pack_item.name}</span><br />
+                                {if $pack_item.reference}{l s='Ref:' d='Admin.Orderscustomers.Feature'} {$pack_item.reference}<br />{/if}
+                                {if $pack_item.supplier_reference}{l s='Ref Supplier:' d='Admin.Orderscustomers.Feature'} {$pack_item.supplier_reference}{/if}
+                            </a>
+                        </td>
+                        <td class="productQuantity">
+                            <span class="product_quantity_show{if (int)$pack_item.pack_quantity > 1} red bold{/if}">{$pack_item.pack_quantity}</span>
+                        </td>
+                        {if $stock_management}<td class="productQuantity product_stock">{$pack_item.current_stock}</td>{/if}
+                        <td>&nbsp;</td>
+                    </tr>
+                {/if}
+            {/foreach}
+            </tbody>
+            </table>
+        </td>
+    </tr>
+    {/if}
+{/if}

iadmin/themes/default/template/controllers/orders/_select_payment.tpl

@@ -0,0 +1,33 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+<select name="payment_module_name" id="payment_module_name">
+  {if !$PS_CATALOG_MODE}
+    {foreach from=$payment_modules item='module'}
+      <option value="{$module->name}" {if isset($smarty.post.payment_module_name) && $module->name == $smarty.post.payment_module_name}selected="selected"{/if}>{$module->displayName}</option>
+    {/foreach}
+  {else}
+      <option value="{l s='Back office order' d='Admin.Orderscustomers.Feature'}">{l s='Back office order' d='Admin.Orderscustomers.Feature'}</option>
+  {/if}
+</select>

iadmin/themes/default/template/controllers/orders/_shipping.tpl

@@ -0,0 +1,129 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+<div class="table-responsive">
+	<table class="table" id="shipping_table">
+		<thead>
+			<tr>
+				<th>
+					<span class="title_box ">{l s='Date' d='Admin.Global'}</span>
+				</th>
+				<th>
+					<span class="title_box ">&nbsp;</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Carrier' d='Admin.Shipping.Feature'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Weight' d='Admin.Global'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Shipping cost' d='Admin.Shipping.Feature'}</span>
+				</th>
+				<th>
+					<span class="title_box ">{l s='Tracking number' d='Admin.Shipping.Feature'}</span>
+				</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{foreach from=$order->getShipping() item=line}
+			<tr>
+				<td>{dateFormat date=$line.date_add full=true}</td>
+				<td>&nbsp;</td>
+				<td>{$line.carrier_name}</td>
+				<td class="weight">{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
+				<td class="price_carrier_{$line.id_carrier|intval}" class="center">
+					<span>
+					{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
+						{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}
+					{else}
+						{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}
+					{/if}
+					</span>
+				</td>
+				<td>
+					<span class="shipping_number_show">{if $line.url && $line.tracking_number}<a class="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
+				</td>
+				<td>
+					{if $line.can_edit}
+						<a href="#" class="edit_shipping_link btn btn-default"
+						data-id-order-carrier="{$line.id_order_carrier|intval}"
+						data-id-carrier="{$line.id_carrier|intval}"
+						data-tracking-number="{$line.tracking_number|htmlentities}"
+						>
+ 							<i class="icon-pencil"></i>
+ 							{l s='Edit' d='Admin.Actions'}
+ 						</a>
+					{/if}
+				</td>
+			</tr>
+			{/foreach}
+		</tbody>
+	</table>
+
+	<!-- shipping update modal -->
+	<div class="modal fade" id="modal-shipping">
+		<div class="modal-dialog">
+			<form method="post" action="{$link->getAdminLink('AdminOrders', true, [], ['id_order' => $order->id|intval, 'vieworder' => 1])|escape:'html':'UTF-8'}">
+				<input type="hidden" name="submitShippingNumber" id="submitShippingNumber" value="1" />
+				<input type="hidden" name="id_order_carrier" id="id_order_carrier" />
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Admin.Actions'}"><span aria-hidden="true">&times;</span></button>
+						<h4 class="modal-title">{l s='Edit shipping details' d='Admin.Orderscustomers.Feature'}</h4>
+					</div>
+					<div class="modal-body">
+						<div class="container-fluid">
+							{if !$recalculate_shipping_cost}
+							<div class="alert alert-info">
+							{l s='Please note that carrier change will not recalculate your shipping costs, if you want to change this please visit Shop Parameters > Order Settings' d='Admin.Orderscustomers.Notification'}
+							</div>
+							{/if}
+							<div class="form-group">
+								<div class="col-lg-5">{l s='Tracking number' d='Admin.Shipping.Feature'}</div>
+								<div class="col-lg-7"><input type="text" name="shipping_tracking_number" id="shipping_tracking_number" /></div>
+							</div>
+							<div class="form-group">
+								<div class="col-lg-5">{l s='Carrier' d='Admin.Shipping.Feature'}</div>
+								<div class="col-lg-7">
+									<select name="shipping_carrier" id="shipping_carrier">
+										{foreach from=$carrier_list item=carrier}
+											<option value="{$carrier.id_carrier|intval}">{$carrier.name|escape:'html':'UTF-8'} {if isset($carrier.delay)}({$carrier.delay|escape:'html':'UTF-8'}){/if}</option>
+										{/foreach}
+									</select>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-default" data-dismiss="modal">{l s='Cancel' d='Admin.Actions'}</button>
+						<button type="submit" class="btn btn-primary">{l s='Update' d='Admin.Actions'}</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<!-- END shipping update modal -->
+</div>

iadmin/themes/default/template/controllers/orders/form_customization_feedback.tpl

@@ -0,0 +1,50 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+<html>
+<head>
+{if isset($css_files)}
+	{foreach from=$css_files key=css_uri item=media}
+		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+	{/foreach}
+{/if}
+</head>
+<body>
+	<script type="text/javascript">
+		var id_selected_product = parent.$('#id_product option:selected').val();
+
+		parent.$('#products_err', window.parent.document).html('{$customization_errors}');
+		parent.$('#id_product option[value="'+id_selected_product+'"]').attr('selected', true);
+		parent.$('#id_product').change();
+
+		{if $customization_errors}
+			parent.customization_errors = true;
+		{else}
+			parent.customization_errors = false;
+		{/if}
+
+		parent.customizationProductListener();
+	</script>
+	</body>
+</html>

iadmin/themes/default/template/controllers/orders/helpers/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../');
+exit;

iadmin/themes/default/template/controllers/orders/helpers/list/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../');
+exit;

iadmin/themes/default/template/controllers/orders/helpers/list/list_header.tpl

@@ -0,0 +1,67 @@
+{**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ *}
+
+{extends file="helpers/list/list_header.tpl"}
+
+{block name=leadin}
+{if isset($updateOrderStatus_mode) && $updateOrderStatus_mode}
+	<div class="panel">
+		<div class="panel-heading">
+			{l s='Choose an order status' d='Admin.Orderscustomers.Feature'}
+		</div>
+		<form action="{$REQUEST_URI}" method="post">
+			<div class="radio">
+				<label for="id_order_state">
+					<select id="id_order_state" name="id_order_state">
+{foreach from=$order_statuses item=order_status_name key=id_order_state}
+						<option value="{$id_order_state|intval}">{$order_status_name|escape}</option>
+{/foreach}
+					</select>
+				</label>
+			</div>
+{foreach $POST as $key => $value}
+	{if is_array($value)}
+		{foreach $value as $val}
+			<input type="hidden" name="{$key|escape:'html':'UTF-8'}[]" value="{$val|escape:'html':'UTF-8'}" />
+		{/foreach}
+	{elseif strtolower($key) != 'id_order_state'}
+			<input type="hidden" name="{$key|escape:'html':'UTF-8'}" value="{$value|escape:'html':'UTF-8'}" />
+
+	{/if}
+{/foreach}
+			<div class="panel-footer">
+				<button type="submit" name="cancel" class="btn btn-default">
+					<i class="icon-remove"></i>
+					{l s='Cancel' d='Admin.Actions'}
+				</button>
+				<button type="submit" class="btn btn-default" name="submitUpdateOrderStatus">
+					<i class="icon-check"></i>
+					{l s='Update Order Status' d='Admin.Orderscustomers.Feature'}
+				</button>
+			</div>
+		</form>
+	</div>
+{/if}
+{/block}

iadmin/themes/default/template/controllers/orders/helpers/view/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../../');
+exit;

iadmin/themes/default/template/controllers/orders/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;