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

// Fixed revision 13573

Browse Source
This commit is contained in:
bMancone
2012-02-28 13:13:47 +00:00
parent 7b5ddd5039
commit 362258ede6
14 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+7 -1
View File
@@ -192,6 +192,12 @@
<!-- Right column -->
<div style="width: 49%; float:right;">
<div class="button-command-prev-next">
<b>{l s='Orders'}</b> :
{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
</div>
<div class="clear"></div>
<!-- Documents block -->
<fieldset>
<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
@@ -564,7 +570,7 @@
{l s='tax included.'}
{/if}
{if Configuration::get('PS_ORDER_RETURN')}
{if !Configuration::get('PS_ORDER_RETURN')}
<br /><br />{l s='Merchandise returns are disabled'}
{/if}
</div>
admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+12
View File
@@ -28,6 +28,18 @@
{block name="other_input"}
{if isset($supply_order) && $supply_order->id > 0 && isset($supply_order_states)}
<script>
$(document).ready(function() {
$('#id_supply_order_state option').each(function () {
if ($(this).attr('disabled') == false)
$(this).attr('selected', true);
return ($(this).attr('disabled') == true);
});
});
</script>
<input type="hidden" name="id_supply_order" id="id_supply_order" value="{$supply_order->id}">
<label>{l s='Status of the order:'}</label>