TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved order management in back-office

Browse Source
This commit is contained in:
Franck Allimant
2014-01-25 19:14:57 +01:00
parent 5f883a41a4
commit 6b78a33f97
7 changed files with 219 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
templates/backOffice/default/order-edit.html
View File

@@ -28,22 +28,30 @@
{loop type="order" name="the-order" id=$order_id customer="*"}
{loop type="currency" name="order-currency" id=$CURRENCY}
{assign "orderCurrency" $SYMBOL}
{$orderCurrency=$SYMBOL}
{/loop}
{assign "orderStatusId" $STATUS}
<div class="lead clearfix">
<span class='label label-default pull-left'>{$REF}</span>
<div class="pull-right select-fixed-width">
<form id="order-update-status-form" action="{url path="/admin/order/update/$ID/status"}" method="post">
<div class="row">
<div class="col-md-7 title">
{intl l='Order %ref' ref=$REF}
</div>
<div class="col-md-5 actions">
<form class="form-horizontal" role="form" id="order-update-status-form" action="{url path="/admin/order/update/$ID/status"}" method="post">
<input class="js-current-tab" type="hidden" name="tab" value="{$oder_tab}">
<select class="js-update-order-status" name="status_id" data-toggle="selectpicker">
{loop type="order-status" name="all-status"}
{assign "orderStatusLabel" "order_$CODE"}
<option {if $ID == $orderStatusId}selected="selected" {/if} value="{$ID}" data-content="<span class='label label-{#$orderStatusLabel#}'>{$TITLE}</span>">{$TITLE}</option>
{/loop}
</select>
<div class="form-group">
<label class="col-sm-6 control-label">{intl l="Order status:"}</label>
<div class="col-sm-6">
<select class="js-update-order-status" name="status_id" data-toggle="selectpicker">
{loop type="order-status" name="all-status"}
{assign "orderStatusLabel" "order_$CODE"}
<option {if $ID == $orderStatusId}selected="selected" {/if} value="{$ID}" data-content="<span class='label label-{#$orderStatusLabel#}'>{$TITLE}</span>">{$TITLE}</option>
{/loop}
</select>
</div>
</div>
</form>
</div>
</div>
@@ -59,16 +67,16 @@
<div class="table-responsive">
<table class="table table-striped table-condensed table-left-aligned">
<caption class="clearfix">
{intl l='Cart'}
{intl l='Cart - Prices in %currency' currency=$orderCurrency}
</caption>
<thead>
<tr>
<th class="col-md-7">{intl l="Product"}</th>
<th class="col-md-1">{intl l="Unit. price"}</th>
<th class="col-md-1">{intl l="Tax"}</th>
<th class="col-md-1">{intl l="Unit taxed price"}</th>
<th class="col-md-1">{intl l="Quantity"}</th>
<th class="col-md-1">{intl l="Taxed total"}</th>
<th class="col-md-1 text-right">{intl l="Unit. price"}</th>
<th class="col-md-1 text-right">{intl l="Tax"}</th>
<th class="col-md-1 text-right">{intl l="Unit taxed price"}</th>
<th class="col-md-1 text-right">{intl l="Quantity"}</th>
<th class="col-md-1 text-right">{intl l="Taxed total"}</th>
</tr>
</thead>
@@ -95,11 +103,11 @@
</dl>
{/ifloop}
</td>
<td>{$orderCurrency} {$realPrice}</td>
<td>{$orderCurrency} {$realTax}</td>
<td>{$orderCurrency} {$realTaxedPrice}</td>
<td>{$QUANTITY}</td>
<td>{$orderCurrency} {$realTaxedPrice * $QUANTITY}</td>
<td class="text-right">{format_money number=$realPrice symbol=$orderCurrency}</td>
<td class="text-right">{format_money number=$realTax symbol=$orderCurrency}</td>
<td class="text-right">{format_money number=$realTaxedPrice symbol=$orderCurrency}</td>
<td class="text-right">{$QUANTITY}</td>
<td class="text-right">{format_money number=$realTaxedPrice * $QUANTITY symbol=$orderCurrency}</td>
</tr>
{/loop}
</tbody>
@@ -107,17 +115,17 @@
<tr class="active">
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Total without discount"}</strong></td>
<td><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT-$POSTAGE}</strong></td>
<td class="text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE symbol=$orderCurrency}</strong></td>
</tr>
<tr>
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Discount"}</strong></td>
<td><strong>{$orderCurrency} {$DISCOUNT}</strong></td>
<td class="text-right"><strong>{format_money number=$DISCOUNT symbol=$orderCurrency}</strong></td>
</tr>
<tr class="active">
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Coupon code"}</strong></td>
<td>
<td class="text-right">
{loop type="order_coupon" name="couponcode" order=$ID}
{$CODE}{if $LOOP_COUNT != $LOOP_TOTAL}, {/if}
{/loop}
@@ -129,17 +137,17 @@
<tr>
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Total including discount"}</strong></td>
<td><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT-$POSTAGE}</strong></td>
<td class="text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT-$POSTAGE symbol=$orderCurrency}</strong></td>
</tr>
<tr class="active">
<td colspan="2" class="td-unstyled"></td>
<td colspan="3"><strong>{intl l="Postage"}</strong></td>
<td><strong>{$orderCurrency} {$POSTAGE}</strong></td>
<td class="text-right"><strong>{format_money number=$POSTAGE symbol=$orderCurrency}</strong></td>
</tr>
<tr>
<td colspan="2" class="td-unstyled"></td>
<td colspan="3" class="last"><strong>{intl l="Total"}</strong></td>
<td class="last"><strong>{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</strong></td>
<td class="last text-right"><strong>{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</strong></td>
</tr>
</tbody>
</table>