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

// update order tab

Browse Source
This commit is contained in:
sLorenzini committed 2013-07-23 17:54:47 +02:00
1 parent f194aec8c5
commit 5b804d3628
7 files changed
+447 -221
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+3 -2
View File
@@ -138,19 +138,20 @@
</td> </td>
<td> <td>
<div class="btn-group btn-group-action"> <div class="btn-group btn-group-action">
<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp; <span class="caret"></span>&nbsp;
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&editGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}"> <a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&editGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
<i class="icon-edit"></i> <i class="icon-pencil"></i>
{l s='Edit'} {l s='Edit'}
</a> </a>
</li> </li>
<li> <li>
<a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&deleteGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}"> <a href="{$current}&id_module={$module['instance']->id}&id_hook={$hook['id_hook']}&deleteGraft{if $display_key}&show_modules={$display_key}{/if}&token={$token}">
<i class="icon-remove"></i> <i class="icon-trash"></i>
{l s='Delete'} {l s='Delete'}
</a> </a>
</li> </li>
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
+2
View File
@@ -23,6 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if $product['customizedDatas']} {if $product['customizedDatas']}
<tbody>
<tr class="customized customized-{$product['id_order_detail']|intval}"> <tr class="customized customized-{$product['id_order_detail']|intval}">
<td align="center"> <td align="center">
<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" /> <input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
@@ -145,4 +146,5 @@
</tr> </tr>
{/foreach} {/foreach}
{/foreach} {/foreach}
</tbody>
{/if} {/if}
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+46 -24
View File
@@ -22,14 +22,22 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<table class="table" width="100%;" cellspacing="0" cellpadding="0" id="documents_table"> <table class="table table-hover" width="100%;" cellspacing="0" cellpadding="0" id="documents_table">
<thead> <thead>
<tr> <tr>
<th style="width:10%">{l s='Date'}</th> <th width="10%">
<th style="">{l s='Document'}</th> <span class="title_box ">{l s='Date'}</span>
<th style="width:20%">{l s='Number'}</th> </th>
<th style="width:10%">{l s='Amount'}</th> <th>
<th style="width:1%"></th> <span class="title_box ">{l s='Document'}</span>
</th>
<th width="20%">
<span class="title_box ">{l s='Number'}</span>
</th>
<th width="20%">
<span class="title_box ">{l s='Amount'}</span>
</th>
<th width="1%"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -37,16 +45,16 @@
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
<tr class="invoice_line" id="delivery_{$document->id}"> <tr id="delivery_{$document->id}">
{else} {else}
<tr class="invoice_line" id="invoice_{$document->id}"> <tr id="invoice_{$document->id}">
{/if} {/if}
{elseif get_class($document) eq 'OrderSlip'} {elseif get_class($document) eq 'OrderSlip'}
<tr class="invoice_line" id="orderslip_{$document->id}"> <tr id="orderslip_{$document->id}">
{/if} {/if}
<td class="document_date">{dateFormat date=$document->date_add}</td> <td>{dateFormat date=$document->date_add}</td>
<td class="document_type"> <td>
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
{l s='Delivery slip'} {l s='Delivery slip'}
@@ -55,8 +63,9 @@
{/if} {/if}
{elseif get_class($document) eq 'OrderSlip'} {elseif get_class($document) eq 'OrderSlip'}
{l s='Credit Slip'} {l s='Credit Slip'}
{/if}</td> {/if}
<td class="document_number"> </td>
<td>
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}"> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
@@ -74,15 +83,17 @@
{/if} {/if}
{elseif get_class($document) eq 'OrderSlip'} {elseif get_class($document) eq 'OrderSlip'}
#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id} #{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
{/if} <img src="../img/admin/details.gif" alt="{l s='See the document'}" /></a></td> {/if} <i class="icon-search"></i>
<td class="document_amount"> </a>
</td>
<td>
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
-- --
{else} {else}
{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp; {displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
{if $document->getTotalPaid()} {if $document->getTotalPaid()}
<span style="color:red;font-weight:bold;"> <span>
{if $document->getRestPaid() > 0} {if $document->getRestPaid() > 0}
({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'}) ({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})
{else if $document->getRestPaid() < 0} {else if $document->getRestPaid() < 0}
@@ -95,20 +106,22 @@
{displayPrice price=$document->amount currency=$currency->id} {displayPrice price=$document->amount currency=$currency->id}
{/if} {/if}
</td> </td>
<td class="right document_action"> <td>
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if !isset($document->is_delivery)} {if !isset($document->is_delivery)}
{if $document->getRestPaid()} {if $document->getRestPaid()}
<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a> <a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
{/if} {/if}
<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a> <a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
<i class="icon-pencil"></i>
</a>
{/if} {/if}
{/if} {/if}
</td> </td>
</tr> </tr>
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if !isset($document->is_delivery)} {if !isset($document->is_delivery)}
<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit"> <tr id="invoiceNote{$document->id}" style="display:none">
<td colspan="5"> <td colspan="5">
<form action="{$current_index}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post"> <form action="{$current_index}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
<p> <p>
@@ -116,9 +129,15 @@
<input type="hidden" name="id_order_invoice" value="{$document->id}" /> <input type="hidden" name="id_order_invoice" value="{$document->id}" />
<textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea> <textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
</p> </p>
<p class="right"> <p>
<input type="submit" name="submitEditNote" value="{l s='Save'}" class="button" />&nbsp; <button type="submit" name="submitEditNote" class="btn btn-default">
<a href="#" id="cancelNote" onclick="$('#invoiceNote{$document->id}').hide();return false;">{l s='Cancel'}</a> <i class="icon-save"></i>
{l s='Save'}
</button>
<a class="btn btn-default" href="#" id="cancelNote" onclick="$('#invoiceNote{$document->id}').hide();return false;">
<i class="icon-remove"></i>
{l s='Cancel'}
</a>
</p> </p>
</form> </form>
</td> </td>
@@ -128,9 +147,12 @@
{foreachelse} {foreachelse}
<tr> <tr>
<td colspan="5" class="center"> <td colspan="5" class="center">
<h3>{l s='No documents are available'}</h3> <h4>{l s='No documents are available'}</h4>
{if isset($invoice_management_active) && $invoice_management_active} {if isset($invoice_management_active) && $invoice_management_active}
<p><a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p> <a class="btn btn-default" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<i class="icon-repeat"></i>
{l s='Generate invoice'}
</a>
{/if} {/if}
</td> </td>
</tr> </tr>
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+2
View File
@@ -22,6 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<tbody>
<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6"> <tr id="new_product" height="52" style="display:none;background-color:#e9f1f6">
<td style="display:none;" colspan="2"> <td style="display:none;" colspan="2">
<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" /> <input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
@@ -75,3 +76,4 @@
</div> </div>
</td> </td>
</tr> </tr>
</tbody>
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+2
View File
@@ -31,6 +31,7 @@
{/if} {/if}
{if ($product['product_quantity'] > $product['customizationQuantityTotal'])} {if ($product['product_quantity'] > $product['customizationQuantityTotal'])}
<tbody>
<tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}> <tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}>
<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td> <td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
<td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}"> <td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
@@ -150,4 +151,5 @@
</td> </td>
{/if} {/if}
</tr> </tr>
</tbody>
{/if} {/if}
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+33 -14
View File
@@ -22,22 +22,34 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table"> <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
<colgroup> <colgroup>
<col width="15%"> <col width="15%">
<col width="15%"> <col width="15%">
<col width=""> <col width="">
<col width="10%">
<col width="20%"> <col width="20%">
<col width="1%">
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>{l s='Date'}</th> <th>
<th>{l s='Type'}</th> <span class="title_box ">{l s='Date'}</span>
<th>{l s='Carrier'}</th> </th>
<th>{l s='Weight'}</th> <th>
<th>{l s='Shipping cost'}</th> <span class="title_box ">{l s='Type'}</span>
<th>{l s='Tracking number'}</th> </th>
<th>
<span class="title_box ">{l s='Carrier'}</span>
</th>
<th>
<span class="title_box ">{l s='Weight'}</span>
</th>
<th>
<span class="title_box ">{l s='Shipping cost'}</span>
</th>
<th>
<span class="title_box ">{l s='Tracking number'}</span>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -47,24 +59,31 @@
<td>{$line.type}</td> <td>{$line.type}</td>
<td>{$line.carrier_name}</td> <td>{$line.carrier_name}</td>
<td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td> <td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
<td> <td class="center">
{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC} {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id} {displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}
{else} {else}
{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id} {displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}
{/if} {/if}
</td> </td>
<td> <td class="right">
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span> <span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
{if $line.can_edit} {if $line.can_edit}
<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
<span class="shipping_number_edit" style="display:none;"> <span class="shipping_number_edit" style="display:none;">
<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" /> <input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" /> <input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" /> <button type="submit" class="btn btn-small" name="submitShippingNumber">
<i class="icon-refresh"></i>
{l s='Update'}
</button>
</span> </span>
<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a> <a href="#" class="edit_shipping_number_link">
<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a> <i class="icon-search"></i>
</a>
<a href="#" class="cancel_shipping_number_link" style="display: none;">
<i class="icon-remove"></i>
</a>
</form> </form>
{/if} {/if}
</td> </td>
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+359 -181
View File
@@ -63,6 +63,7 @@
{/if} {/if}
<div class="row"> <div class="row">
<!-- Global informations -->
<div class="col-lg-12"> <div class="col-lg-12">
<div class="well"> <div class="well">
<span> <span>
@@ -107,17 +108,31 @@
</div> </div>
</div> </div>
<!-- Breadcrumb -->
<div class="col-lg-12"> <div class="col-lg-12">
<div class="breadcrumb pull-right"> <div class="breadcrumb pull-right">
<b>{l s='Orders'}</b> : <span><strong>{l s='Orders'}</strong></span> :
{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if} {if $previousOrder}
{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if} <a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">
{l s='< Prev'}
</a>
{/if}
{if $nextOrder}
<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">
{l s='Next >'}
</a>
{/if}
</div> </div>
</div> </div>
<!-- Status -->
<div class="col-lg-12"> <div class="col-lg-12">
<!-- Change status form --> <!-- Change status form -->
<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post"> <form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
<label class="control-label col-lg-1 text-right">
{l s='Status:'}
</label>
<div class="col-lg-10">
<select id="id_order_state" name="id_order_state"> <select id="id_order_state" name="id_order_state">
{foreach from=$states item=state} {foreach from=$states item=state}
{if $state['id_order_state'] != $currentState->id} {if $state['id_order_state'] != $currentState->id}
@@ -125,11 +140,14 @@
{/if} {/if}
{/foreach} {/foreach}
</select> </select>
</div>
<input type="hidden" name="id_order" value="{$order->id}" /> <input type="hidden" name="id_order" value="{$order->id}" />
<input type="submit" name="submitState" value="{l s='Add'}" class="button" /> <button type="submit" name="submitState" class="btn btn-default">
{l s='Add'}
</button>
</form> </form>
<!-- History of status --> <!-- History of status -->
<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;"> <table cellspacing="0" cellpadding="0" class="table table-hover">
<colgroup> <colgroup>
<col width="1%"> <col width="1%">
<col width=""> <col width="">
@@ -138,31 +156,41 @@
</colgroup> </colgroup>
{foreach from=$history item=row key=key} {foreach from=$history item=row key=key}
{if ($key == 0)} {if ($key == 0)}
<thead>
<tr> <tr>
<th><img src="../img/os/{$row['id_order_state']}.gif" /></th> <th>
<th>{$row['ostate_name']|stripslashes}</th> <img src="../img/os/{$row['id_order_state']}.gif" />
<th>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</th> </th>
<th>{dateFormat date=$row['date_add'] full=true}</th> <th>
<span class="title_box ">{$row['ostate_name']|stripslashes}</span>
</th>
<th>
<span class="title_box ">{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</span>
</th>
<th>
<span class="title_box ">{dateFormat date=$row['date_add'] full=true}</span>
</th>
</tr> </tr>
</thead>
{else} {else}
<tbody>
<tr class="{if ($key % 2)}alt_row{/if}"> <tr class="{if ($key % 2)}alt_row{/if}">
<td><img src="../img/os/{$row['id_order_state']}.gif" /></td> <td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
<td>{$row['ostate_name']|stripslashes}</td> <td>{$row['ostate_name']|stripslashes}</td>
<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td> <td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
<td>{dateFormat date=$row['date_add'] full=true}</td> <td>{dateFormat date=$row['date_add'] full=true}</td>
</tr> </tr>
</tbody>
{/if} {/if}
{/foreach} {/foreach}
</table> </table>
{if $customer->id} {if $customer->id}
</div> </div>
<!-- Left column -->
<!-- Customer informations --> <!-- Customer informations -->
<div class="col-lg-6"> <div class="col-lg-6">
<form action="" method="post"> <form action="" method="">
<fieldset class="well"> <fieldset class="well">
<legend> <legend>
<i class="icon-user"></i> <i class="icon-user"></i>
@@ -179,12 +207,12 @@
{l s='This feature will generate a random password and send an email to the customer.'} {l s='This feature will generate a random password and send an email to the customer.'}
</form> </form>
{else} {else}
<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</b></div> <div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</strong></div>
{/if} {/if}
{else} {else}
{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br /> {l s='Account registered:'} <strong>{dateFormat date=$customer->date_add full=true}</strong><br />
{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br /> {l s='Valid orders placed:'} <strong>{$customerStats['nb_orders']}</strong><br />
{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br /> {l s='Total spent since registration:'} <strong>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</strong><br />
</fieldset> </fieldset>
{/if} {/if}
{/if} {/if}
@@ -200,9 +228,9 @@
{foreach from=$sources item=source} {foreach from=$sources item=source}
<li> <li>
{dateFormat date=$source['date_add'] full=true}<br /> {dateFormat date=$source['date_add'] full=true}<br />
<b>{l s='From'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br /> <strong>{l s='From'}</strong>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
<b>{l s='To'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br /> <strong>{l s='To'}</strong> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
{if $source['keywords']}<b>{l s='Keywords'}</b> {$source['keywords']}<br />{/if}<br /> {if $source['keywords']}<strong>{l s='Keywords'}</strong> {$source['keywords']}<br />{/if}<br />
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
@@ -214,6 +242,7 @@
</form> </form>
</div> </div>
<!-- New message -->
<div class="col-lg-6"> <div class="col-lg-6">
<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');"> <form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
<fieldset class="well"> <fieldset class="well">
@@ -221,21 +250,27 @@
<i class="icon-envelope"></i> <i class="icon-envelope"></i>
{l s='New message'} {l s='New message'}
</legend> </legend>
<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};"> <p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if};">
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"> <a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
<b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'} <strong>{l s='Click here'}</strong> {l s='to add a comment or send a message to the customer.'}
</a> </a>
</div> </p>
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a> <p>
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
<strong>{l s='Click here'}</strong> {l s='to see all messages.'}
</a>
</p>
<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}"> <div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
<p>
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')"> <select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option> <option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
{foreach from=$orderMessages item=orderMessage} {foreach from=$orderMessages item=orderMessage}
<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option> <option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
{/foreach} {/foreach}
</select> </select>
</p>
<div class="row"> <div class="row">
<label class="control-label col-lg-4 text-right">{l s='Display to customer?'}</label> <label class="control-label col-lg-4">{l s='Display to customer?'}</label>
<div class="col-lg-8"> <div class="col-lg-8">
<label for="visibility" class="radio-inline"> <label for="visibility" class="radio-inline">
<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'} <input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
@@ -256,105 +291,151 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
{if (sizeof($messages))} {if (sizeof($messages))}
<fieldset> <form action="" method="">
<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend> <fieldset class="well">
<legend>
<i class="icon-envelope"></i>
{l s='Messages'}
</legend>
{foreach from=$messages item=message} {foreach from=$messages item=message}
<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}> <div {if $message['is_new_for_me']}class="new_message"{/if}>
{if ($message['is_new_for_me'])} {if ($message['is_new_for_me'])}
<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a> <a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}">
<i class="icon-ok"></i>
{l s='Mark this message as \'viewed\''}
</a>
{/if} {/if}
{l s='At'} <i>{dateFormat date=$message['date_add']} <p>
</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b> {l s='At'}
{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if} <i>{dateFormat date=$message['date_add']}</i>
{l s='from'}
<strong>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</strong>
</p>
{if ($message['private'] == 1)}<span>{l s='Private'}</span>{/if}
<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p> <p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
</div> </div>
<br />
{/foreach} {/foreach}
</fieldset> </fieldset>
</form>
{/if} {/if}
</div> </div>
<div class="col-lg-12"> <div class="col-lg-12"></div>
<!-- Addresses -->
{if !$order->isVirtual()}
<div>
<!-- Shipping address -->
<fieldset>
<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
<!-- Addresses -->
<div class="col-lg-6">
{if !$order->isVirtual()}
<form action="" method="">
<!-- Shipping address -->
<fieldset class="well">
<legend>
<i class="icon-truck"></i>
{l s='Shipping address'}
</legend>
{if $can_edit} {if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;"> <div class="col-lg-10">
<p>
<select name="id_address"> <select name="id_address">
{foreach from=$customer_addresses item=address} {foreach from=$customer_addresses item=address}
<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option> <option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_delivery} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
{/foreach} {/foreach}
</select> </select>
<input class="button" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
</p>
</div> </div>
<button class="btn btn-default" type="submit" name="submitAddressShipping">
{l s='Change'}
</button>
</form> </form>
{/if} {/if}
<hr/>
<div style="float: right"> <div class="col-lg-6">
<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}"><img src="../img/admin/edit.gif" /></a>
<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank"><img src="../img/admin/google.gif" alt="" class="middle" /></a>
</div>
{displayAddressDetail address=$addresses.delivery newLine='<br />'} {displayAddressDetail address=$addresses.delivery newLine='<br />'}
{if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if} {if $addresses.delivery->other}<hr />{$addresses.delivery->other}<br />{/if}
</fieldset>
</div> </div>
<div class="col-lg-6 btn-group btn-group-action">
<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
<li>
<a href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}">
<i class="icon-pencil"></i>
{l s='Edit'}
</a>
</li>
<li>
<a href="http://maps.google.com/maps?f=q&hl={$iso_code_lang}&geocode=&q={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}" target="_blank">
<i class="icon-map-marker"></i>
{l s='Map'}
</a>
</li>
</ul>
</div>
</fieldset>
</form>
{/if} {/if}
<div> </div>
<!-- Invoice address -->
<fieldset>
<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
<!-- Invoice address -->
<div class="col-lg-6">
<form action="" method="">
<fieldset class="well">
<legend>
<i class="icon-file"></i>
{l s='Invoice address'}
</legend>
{if $can_edit} {if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;"> <div class="col-lg-10">
<p>
<select name="id_address"> <select name="id_address">
{foreach from=$customer_addresses item=address} {foreach from=$customer_addresses item=address}
<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option> <option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
{/foreach} {/foreach}
</select> </select>
<input class="button" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
</p>
</div> </div>
<button class="btn btn-default" type="submit" name="submitAddressInvoice">
{l s='Change'}
</button>
</form> </form>
{/if} {/if}
<hr/>
<div style="float: right"> <div class="col-lg-6">
<a href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}"><img src="../img/admin/edit.gif" /></a>
</div>
{displayAddressDetail address=$addresses.invoice newLine='<br />'} {displayAddressDetail address=$addresses.invoice newLine='<br />'}
{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if} {if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
</div>
<div class="col-lg-6">
<a class="btn btn-default" href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}">
<i class="icon-pencil"></i>
{l s='Edit'}
</a>
</div>
</fieldset> </fieldset>
</form>
</div> </div>
</div>
<div class="col-lg-12"></div>
<!-- linked orders block --> <!-- linked orders block -->
{if count($order->getBrother()) > 0} {if count($order->getBrother()) > 0}
<div class="col-lg-6"> <div class="col-lg-6">
<fieldset> <form action="" method="">
<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend> <fieldset class="well">
<table class="table" width="100%;" cellspacing="0" cellpadding="0"> <legend>
<i class="icon-shopping-cart"></i>
{l s='Linked orders'}
</legend>
<table class="table table-hover" width="100%;" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th width="10%"> <th width="15%">
{l s='Order no. '} <span class="title_box ">{l s='Order no. '}</span>
</th> </th>
<th> <th>
{l s='Status'} <span class="title_box ">{l s='Status'}</span>
</th> </th>
<th width="10%"> <th width="10%">
{l s='Amount'} <span class="title_box ">{l s='Amount'}</span>
</th> </th>
<th width="5%"> <th width="5%">
</th> </th>
@@ -380,28 +461,37 @@
</tbody> </tbody>
</table> </table>
</fieldset> </fieldset>
</form>
</div> </div>
{/if} {/if}
<div class="col-lg-6">
<!-- Documents block --> <!-- Documents block -->
<fieldset> <div class="col-lg-6">
<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend> <form action="" method="">
<fieldset class="well">
<legend>
<i class="icon-file-text"></i>
{l s='Documents'}
</legend>
{* Include document template *} {* Include document template *}
{include file='controllers/orders/_documents.tpl'} {include file='controllers/orders/_documents.tpl'}
</fieldset> </fieldset>
</form>
</div> </div>
<div class="col-lg-6">
<!-- Payments block --> <!-- Payments block -->
<fieldset> <div class="col-lg-6">
<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend> <form action="" method="">
<fieldset class="well">
<legend>
<i class="icon-money"></i>
{l s='Payment'}
</legend>
{if (!$order->valid && sizeof($currencies) > 1)} {if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"> <form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p> <p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label> <div class="col-lg-10">
<select name="new_currency"> <select name="new_currency">
{foreach from=$currencies item=currency_change} {foreach from=$currencies item=currency_change}
{if $currency_change['id_currency'] != $order->id_currency} {if $currency_change['id_currency'] != $order->id_currency}
@@ -409,16 +499,17 @@
{/if} {/if}
{/foreach} {/foreach}
</select> </select>
<input type="submit" class="button" name="submitChangeCurrency" value="{l s='Change'}" /> </div>
<button type="submit" class="btn btn-default" name="submitChangeCurrency">
{l s='Change'}
</button>
</form> </form>
<hr class="clear"/> <hr/>
{/if} {/if}
{if count($order->getOrderPayments()) > 0} {if count($order->getOrderPayments()) > 0}
<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}"> <p class="alert alert-block" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} <strong>{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</strong>
{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
{foreach $order->getBrother() as $brother_order} {foreach $order->getBrother() as $brother_order}
{if $brother_order@first} {if $brother_order@first}
{if count($order->getBrother()) == 1} {if count($order->getBrother()) == 1}
@@ -431,24 +522,33 @@
{/foreach} {/foreach}
</p> </p>
{/if} {/if}
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"> <form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table" width="100%" cellspacing="0" cellpadding="0"> <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
<colgroup> <colgroup>
<col width="15%"> <col width="15%">
<col width=""> <col width="39%">
<col width="20%"> <col width="20%">
<col width="10%"> <col width="15%">
<col width="10%"> <col width="10%">
<col width="1%"> <col width="1%">
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>{l s='Date'}</th> <th>
<th>{l s='Payment method'}</th> <span class="title_box ">{l s='Date'}</span>
<th>{l s='Transaction ID'}</th> </th>
<th>{l s='Amount'}</th> <th>
<th>{l s='Invoice'}</th> <span class="title_box ">{l s='Payment method'}</span>
</th>
<th>
<span class="title_box ">{l s='Transaction ID'}</span>
</th>
<th>
<span class="title_box ">{l s='Amount'}</span>
</th>
<th>
<span class="title_box ">{l s='Invoice'}</span>
</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
</thead> </thead>
@@ -467,13 +567,15 @@
{/if} {/if}
</td> </td>
<td class="right"> <td class="right">
<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment information'}" alt="{l s='See payment information'}" /></a> <a href="#" class="open_payment_information">
<i class="icon-search"></i>
</a>
</td> </td>
</tr> </tr>
<tr class="payment_information" style="display: none;"> <tr class="payment_information" style="display: none;">
<td colspan="6"> <td colspan="6">
<p> <p>
<b>{l s='Card Number'}</b>&nbsp; <strong>{l s='Card Number'}</strong>&nbsp;
{if $payment->card_number} {if $payment->card_number}
{$payment->card_number} {$payment->card_number}
{else} {else}
@@ -482,7 +584,7 @@
</p> </p>
<p> <p>
<b>{l s='Card Brand'}</b>&nbsp; <strong>{l s='Card Brand'}</strong>&nbsp;
{if $payment->card_brand} {if $payment->card_brand}
{$payment->card_brand} {$payment->card_brand}
{else} {else}
@@ -491,7 +593,7 @@
</p> </p>
<p> <p>
<b>{l s='Card Expiration'}</b>&nbsp; <strong>{l s='Card Expiration'}</strong>&nbsp;
{if $payment->card_expiration} {if $payment->card_expiration}
{$payment->card_expiration} {$payment->card_expiration}
{else} {else}
@@ -500,7 +602,7 @@
</p> </p>
<p> <p>
<b>{l s='Card Holder'}</b>&nbsp; <strong>{l s='Card Holder'}</strong>&nbsp;
{if $payment->card_holder} {if $payment->card_holder}
{$payment->card_holder} {$payment->card_holder}
{else} {else}
@@ -512,12 +614,14 @@
{foreachelse} {foreachelse}
<tr> <tr>
<td colspan="6" class="center"> <td colspan="6" class="center">
<h3>{l s='No payments are available'}</h3> <h4>{l s='No payments are available'}</h4>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
<tr class="current-edit"> <tr>
<td><input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" /></td> <td>
<input type="text" name="payment_date" class="datepicker" size="17" value="{date('Y-m-d H:i:s')}" />
</td>
<td> <td>
<select name="payment_method" class="payment_method"> <select name="payment_method" class="payment_method">
{foreach from=$payment_methods item=payment_method} {foreach from=$payment_methods item=payment_method}
@@ -545,42 +649,68 @@
</select> </select>
</td> </td>
{/if} {/if}
<td><input class="button" type="submit" name="submitAddPayment" value="{l s='Add'}" /></td> <td>
<button class="btn btn-default" type="submit" name="submitAddPayment">
{l s='Add'}
</button>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</form> </form>
</fieldset> </fieldset>
</form>
</div> </div>
<!-- Shipping block -->
{if !$order->isVirtual()} {if !$order->isVirtual()}
<!-- Shipping block -->
<div class="col-lg-6"> <div class="col-lg-6">
<fieldset> <form action="" method="">
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend> <fieldset class="well">
<legend>
<div class="clear" style="float: left; margin-right: 10px;"> <i class="icon-truck"></i>
<span>{l s='Recycled packaging'}</span> {l s='Shipping'}
</legend>
{if $order->recyclable} {if $order->recyclable}
<img src="../img/admin/enabled.gif" /> <p>
<span class="label label-success">
<i class="icon-ok"></i>
{l s='Recycled packaging'}
</span>
</p>
{else} {else}
<img src="../img/admin/disabled.gif" /> <p>
<span class="label label-danger">
<i class="icon-remove"></i>
{l s='Recycled packaging'}
</span>
</p>
{/if} {/if}
</div>
<div style="float: left;">
<span>{l s='Gift wrapping'}</span>
{if $order->gift} {if $order->gift}
<img src="../img/admin/enabled.gif" /> <p>
</div> <span class="label label-success">
<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;"> <i class="icon-ok"></i>
{l s='Gift wrapping'}
</span>
{if $order->gift_message} {if $order->gift_message}
<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message'}</b><br />{$order->gift_message|nl2br}</div> <div class="alert alert-block">
{/if} <p>
{else} <strong>{l s='Message'}</strong>
<img src="../img/admin/disabled.gif" /> </p>
{/if} <p>
{$order->gift_message|nl2br}
</p>
</div> </div>
<div class="clear" style="margin-bottom: 10px;"></div> {/if}
</p>
{else}
<p>
<span class="label label-danger">
<i class="icon-remove"></i>
{l s='Gift wrapping'}
</span>
</p>
{/if}
{include file='controllers/orders/_shipping.tpl'} {include file='controllers/orders/_shipping.tpl'}
@@ -588,20 +718,34 @@
{$carrierModuleCall} {$carrierModuleCall}
{/if} {/if}
</fieldset> </fieldset>
</form>
</div> </div>
<div class="col-lg-6">
<!-- Return block --> <!-- Return block -->
<fieldset> <div class="col-lg-6">
<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend> <form action="" method="">
<fieldset class="well">
<legend>
<i class="icon-suitcase"></i>
{l s='Merchandise returns'}
</legend>
{if $order->getReturn()|count > 0} {if $order->getReturn()|count > 0}
<table class="table" width="100%" cellspacing="0" cellpadding="0"> <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<th style="width:30%">Date</th> <th width="30%">
<th>Type</th> <span class="title_box ">{l s='Date'}</span>
<th style="width:20%">Carrier</th> </th>
<th style="width:30%">Tracking number</th> <th>
<span class="title_box ">{l s='Type'}</span>
</th>
<th width="20%">
<span class="title_box ">{l s='Carrier'}</span>
</th>
<th width="30%">
<span class="title_box ">{l s='Tracking number'}</span>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -611,15 +755,23 @@
<td>{$line.type}</td> <td>{$line.type}</td>
<td>{$line.state_name}</td> <td>{$line.state_name}</td>
<td> <td>
<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span> <span id="shipping_number_show">
{if isset($line.url) && isset($line.tracking_number)}
<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>
{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}
</span>
{if $line.can_edit} {if $line.can_edit}
<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<span class="shipping_number_edit" style="display:none;"> <span class="shipping_number_edit" style="display:none;">
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" /> <input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" /> <input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
</span> </span>
<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a> <a href="#" class="edit_shipping_number_link">
<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a> <i class="icon-pencil"></i>
</a>
<a href="#" class="cancel_shipping_number_link" style="display: none;">
<i class="icon-remove"></i>
</a>
</form> </form>
{/if} {/if}
</td> </td>
@@ -635,59 +787,88 @@
{$carrierModuleCall} {$carrierModuleCall}
{/if} {/if}
</fieldset> </fieldset>
</form>
</div> </div>
{/if} {/if}
</div>
<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');"> <div class="col-lg-12">
<form class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
<input type="hidden" name="id_order" value="{$order->id}" /> <input type="hidden" name="id_order" value="{$order->id}" />
<fieldset style="width: 100%; "> <fieldset class="well">
<div style="display: none"> <div style="display: none">
<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" /> <input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
</div> </div>
<legend><img src="../img/admin/cart.gif" alt="{l s='Products:'}" />{l s='Products:'}</legend> <legend>
<div style="float:left;width: 100%;"> <i class="icon-shopping-cart"></i>
{l s='Products:'}
</legend>
{if $can_edit} {if $can_edit}
{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product button"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if} {if !$order->hasBeenDelivered()}
<div style="float: right; margin-right: 10px" id="refundForm"> <a href="#" class="add_product btn btn-default">
<!-- <i class="icon-plus-sign-alt"></i>
{l s='Add a product'}
</a>
{/if}
<!--<div style="float: right; margin-right: 10px" id="refundForm">
<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a> <a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a>
<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a> <a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a>
-->
</div> </div>-->
<br clear="left" /><br />
{/if} {/if}
<table style="width: 100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts"> <div class="col-lg-12">
<table cellspacing="0" cellpadding="0" class="table table-hover" id="orderProducts">
<thead>
<tr> <tr>
<th height="39" align="center" style="width: 7%">&nbsp;</th> <th height="39" class="center" width="7%">&nbsp;</th>
<th>{l s='Product'}</th> <th>
<th style="width: 15%; text-align: center">{l s='Unit Price'} <sup>*</sup></th> <span class="title_box ">{l s='Product'}</span>
<th style="width: 4%; text-align: center">{l s='Qty'}</th> </th>
{if ($order->hasBeenPaid())}<th style="width: 3%; text-align: center">{l s='Refunded'}</th>{/if} <th width="15%" class="center">
{if ($order->hasBeenDelivered() || $order->hasProductReturned())}<th style="width: 3%; text-align: center">{l s='Returned'}</th>{/if} <span class="title_box ">{l s='Unit Price'} <sup>*</sup></span>
{if $stock_management}<th style="width: 10%; text-align: center">{l s='Available quantity'}</th>{/if} </th>
<th style="width: 10%; text-align: center">{l s='Total'} <sup>*</sup></th> <th width="4%" class="center">
<span class="title_box ">{l s='Qty'}</span>
</th>
{if ($order->hasBeenPaid())}
<th width="3%" class="center">
<span class="title_box ">{l s='Refunded'}</span>
</th>
{/if}
{if ($order->hasBeenDelivered() || $order->hasProductReturned())}
<th width="3%" class="center">
<span class="title_box ">{l s='Returned'}</span>
</th>
{/if}
{if $stock_management}
<th width="10%" class="center">
<span class="title_box ">{l s='Available quantity'}</span>
</th>
{/if}
<th width="10%" class="center">
<span class="title_box ">{l s='Total'} <sup>*</sup></span>
</th>
<th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th> <th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
<th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th> <th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th>
<th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products:'}" /> <th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products:'}" />
{if ($order->hasBeenDelivered() || $order->hasBeenShipped())} {if ($order->hasBeenDelivered() || $order->hasBeenShipped())}
{l s='Return'} <span class="title_box ">{l s='Return'}</span>
{elseif ($order->hasBeenPaid())} {elseif ($order->hasBeenPaid())}
{l s='Refund'} <span class="title_box ">{l s='Refund'}</span>
{else} {else}
{l s='Cancel'} <span class="title_box ">{l s='Cancel'}</span>
{/if} {/if}
</th> </th>
<th style="width: 12%;text-align:right;display:none" class="partial_refund_fields"> <th widht="12%" style="display:none" class="partial_refund_fields right">
{l s='Partial refund'} <span class="title_box ">{l s='Partial refund'}</span>
</th> </th>
{if !$order->hasBeenDelivered()} {if !$order->hasBeenDelivered()}
<th style="width: 8%;text-align:center;"> <th width="8%" class="center">
{l s='Action'} <span class="title_box ">{l s='Action'}</span>
</th> </th>
{/if} {/if}
</tr> </tr>
</thead>
{foreach from=$products item=product key=k} {foreach from=$products item=product key=k}
{* Include customized datas partial *} {* Include customized datas partial *}
{include file='controllers/orders/_customized_data.tpl'} {include file='controllers/orders/_customized_data.tpl'}
@@ -699,8 +880,8 @@
{include file='controllers/orders/_new_product.tpl'} {include file='controllers/orders/_new_product.tpl'}
{/if} {/if}
</table> </table>
</div>
<div style="float:left; width:280px; margin-top:15px;"> <div class="col-lg-12">
<sup>*</sup> {l s='For this customer group, prices are displayed as:'} <sup>*</sup> {l s='For this customer group, prices are displayed as:'}
{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
{l s='tax excluded.'} {l s='tax excluded.'}
@@ -712,25 +893,25 @@
<br /><br />{l s='Merchandise returns are disabled'} <br /><br />{l s='Merchandise returns are disabled'}
{/if} {/if}
</div> </div>
<div style="float:right; margin-top: 20px;"> <div class="col-lg-7 pull-right">
<table class="table" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0"> <table class="table table-hover" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
<tr id="total_products"> <tr id="total_products">
<td width="150px;"><b>{l s='Products:'}</b></td> <td width="150px;"><strong>{l s='Products:'}</strong></td>
<td class="amount" align="right">{displayPrice price=$order->total_products_wt currency=$currency->id}</td> <td class="amount" align="right">{displayPrice price=$order->total_products_wt currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td> <td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr> </tr>
<tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}> <tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}>
<td><b>{l s='Discounts'}</b></td> <td><strong>{l s='Discounts'}</strong></td>
<td class="amount" align="right">-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}</td> <td class="amount" align="right">-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td> <td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr> </tr>
<tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}> <tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}>
<td><b>{l s='Wrapping'}</b></td> <td><strong>{l s='Wrapping'}</strong></td>
<td class="amount" align="right">{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}</td> <td class="amount" align="right">{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td> <td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr> </tr>
<tr id="total_shipping"> <tr id="total_shipping">
<td><b>{l s='Shipping'}</b></td> <td><strong>{l s='Shipping'}</strong></td>
<td class="amount" align="right">{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}</td> <td class="amount" align="right">{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">{$currency->prefix}<input type="text" size="3" name="partialRefundShippingCost" value="0" />{$currency->suffix}</td> <td class="partial_refund_fields current-edit" style="display:none;">{$currency->prefix}<input type="text" size="3" name="partialRefundShippingCost" value="0" />{$currency->suffix}</td>
</tr> </tr>
@@ -743,11 +924,10 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="clear"></div>
{if (sizeof($discounts) || $can_edit)} {if (sizeof($discounts) || $can_edit)}
<div style="float:right; width:450px; margin-top:15px;"> <div class="col-lg-7 pull-right">
<table cellspacing="0" cellpadding="0" class="table" style="width:100%;"> <table cellspacing="0" cellpadding="0" class="table table-hover" style="width:100%;">
<tr> <tr>
<th><img src="../img/admin/coupon.gif" alt="{l s='Discounts'}" />{l s='Discount name'}</th> <th><img src="../img/admin/coupon.gif" alt="{l s='Discounts'}" />{l s='Discount name'}</th>
<th align="center" style="width: 100px">{l s='Value'}</th> <th align="center" style="width: 100px">{l s='Value'}</th>
@@ -784,10 +964,8 @@
</table> </table>
</div> </div>
{/if} {/if}
</div>
<div style="clear:both; height:15px;">&nbsp;</div> <div style="display: none;" class="standard_refund_fields">
<div style="float: right; width: 160px; display: none;" class="standard_refund_fields">
{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))} {if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br /> <input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
{/if} {/if}
@@ -809,7 +987,7 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div>
<div class="clear">&nbsp;</div> </div>
<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br /> <a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
{/block} {/block}