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

// orders cleanup

Browse Source
This commit is contained in:
Kevin Granger committed 2013-09-19 20:12:05 +02:00
1 parent 660bb870cc
commit 724ab12122
2 files changed
+73 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+71 -60
View File
@@ -114,10 +114,13 @@
</div> </div>
<div class="container-command"> <div class="container-command">
<!-- Left column --> <div class="panel">
<div> <h3>
<i class="icon-time"></i>
{l s='Status'}
</h3>
<!-- Change status form --> <!-- Change status form -->
<form class="panel" action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post"> <form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
<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}
<option value="{$state['id_order_state']}"{if $state['id_order_state'] == $currentState->id} selected="selected" disabled="disabled"{/if}>{$state['name']|stripslashes}</option> <option value="{$state['id_order_state']}"{if $state['id_order_state'] == $currentState->id} selected="selected" disabled="disabled"{/if}>{$state['name']|stripslashes}</option>
@@ -127,29 +130,29 @@
<input type="submit" name="submitState" value="{l s='Add'}" class="btn btn-default" /> <input type="submit" name="submitState" value="{l s='Add'}" class="btn btn-default" />
</form> </form>
<!-- History of status --> <!-- History of status -->
<div class="panel"> <table class="table history-status">
<table class="table history-status"> <tbody>
<tbody> {foreach from=$history item=row key=key}
{foreach from=$history item=row key=key} {if ($key == 0)}
{if ($key == 0)} <tr class="highlighted">
<tr class="highlighted"> <td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
<td><img src="../img/os/{$row['id_order_state']}.gif" /></td> <td><span class="title_box ">{$row['ostate_name']|stripslashes}</span></td>
<td><span class="title_box ">{$row['ostate_name']|stripslashes}</span></td> <td><span class="title_box ">{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</span></td>
<td><span class="title_box ">{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</span></td> <td><span class="title_box ">{dateFormat date=$row['date_add'] full=true}</span></td>
<td><span class="title_box ">{dateFormat date=$row['date_add'] full=true}</span></td> </tr>
</tr> {else}
{else} <tr>
<tr> <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> {/if}
{/if} {/foreach}
{/foreach} </tbody>
</tbody> </table>
</table> </div>
</div>
{if $customer->id} {if $customer->id}
<!-- Customer informations --> <!-- Customer informations -->
<fieldset> <fieldset>
@@ -166,7 +169,9 @@
{if (!Customer::customerExists($customer->email))} {if (!Customer::customerExists($customer->email))}
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}"> <form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$order->id_lang}" /> <input type="hidden" name="id_lang" value="{$order->id_lang}" />
<p class="center"><input class="btn btn-default" type="submit" name="submitGuestToCustomer" value="{l s='Transform a guest into a customer'}" /></p> <p class="center">
<input class="btn btn-default" type="submit" name="submitGuestToCustomer" value="{l s='Transform a guest into a customer'}" />
</p>
{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}
@@ -204,15 +209,22 @@
<!-- Admin order hook --> <!-- Admin order hook -->
{hook h="displayAdminOrder" id_order=$order->id} {hook h="displayAdminOrder" id_order=$order->id}
</div>
<!-- END Left column -->
<!-- Right column -->
<div>
<div class="button-command-prev-next panel"> <div class="button-command-prev-next panel">
<b>{l s='Orders'}</b> : <b>{l s='Orders'}</b> :
{if $previousOrder}<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if} {if $previousOrder}
{if $nextOrder}<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if} <a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">
<i class="icon-chevron-left"></i>
{l s='Prev'}
</a>
{/if}
{if $nextOrder}
<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">
<i class="icon-chevron-right"></i>
{l s='Next'}
</a>
{/if}
</div> </div>
<!-- linked orders block --> <!-- linked orders block -->
@@ -381,7 +393,8 @@
{foreachelse} {foreachelse}
<tr> <tr>
<td colspan="6" class="center"> <td colspan="6" class="center">
<h3>{l s='No payments are available'}</h3> <i class="icon-warning-sign"></i>
{l s='No payments are available'}
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
@@ -510,8 +523,6 @@
{/if} {/if}
</fieldset> </fieldset>
{/if} {/if}
</div>
<!-- END Right column -->
</div> </div>
<div class="container-command container-command-top-spacing"> <div class="container-command container-command-top-spacing">
@@ -526,22 +537,23 @@
</h3> </h3>
{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> <select name="id_address">
<p> {foreach from=$customer_addresses item=address}
<select name="id_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>
{foreach from=$customer_addresses item=address} {/foreach}
<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> </select>
{/foreach} <input class="btn btn-default" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
</select>
<input class="btn btn-default" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
</p>
</div>
</form> </form>
{/if} {/if}
<div> <div>
<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 class="btn btn-default" 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}">
<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> <i class="icon-pencil"></i>
{l s='Edit'}
</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> </div>
{displayAddressDetail address=$addresses.delivery newLine='<br />'} {displayAddressDetail address=$addresses.delivery newLine='<br />'}
@@ -559,21 +571,20 @@
{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> <select name="id_address">
<p> {foreach from=$customer_addresses item=address}
<select name="id_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>
{foreach from=$customer_addresses item=address} {/foreach}
<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> </select>
{/foreach} <input class="btn btn-default" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
</select>
<input class="btn btn-default" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
</p>
</div>
</form> </form>
{/if} {/if}
<div> <div>
<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> <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> </div>
{displayAddressDetail address=$addresses.invoice newLine='<br />'} {displayAddressDetail address=$addresses.invoice newLine='<br />'}
@@ -612,7 +623,7 @@
<table class="table" id="orderProducts"> <table class="table" id="orderProducts">
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th></th>
<th><span class="title_box ">{l s='Product'}</span></th> <th><span class="title_box ">{l s='Product'}</span></th>
<th><span class="title_box ">{l s='Unit Price'} <sup>*</sup></span></th> <th><span class="title_box ">{l s='Unit Price'} <sup>*</sup></span></th>
<th><span class="title_box ">{l s='Qty'}</th> <th><span class="title_box ">{l s='Qty'}</th>
controllers/admin/AdminCustomerThreadsController.php
+2 -2
View File
@@ -612,8 +612,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
protected function displayButton($content) protected function displayButton($content)
{ {
return ' return '
<div style="margin-bottom:10px;border:1px solid #005500;width:200px;height:130px;padding:10px;background:#EFE"> <div>
<p style="text-align:center;font-size:15px;font-weight:bold"> <p>
'.$content.' '.$content.'
</p> </p>
</div>'; </div>';