Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better performance in order template #8547

Merged
merged 1 commit into from Nov 29, 2017
Merged

Better performance in order template #8547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 12 additions & 8 deletions admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
View file
Open in desktop
Expand Up @@ -67,6 +67,10 @@
<div>{$hook_invoice}</div>
{/if}

{assign var="order_documents" value=$order->getDocuments()}
{assign var="order_shipping" value=$order->getShipping()}
{assign var="order_return" value=$order->getReturn()}

<div class="panel kpi-container">
<div class="row">
<div class="col-xs-6 col-sm-3 box-stats color3" >
Expand Down Expand Up @@ -184,7 +188,7 @@
<li>
<a href="#documents">
<i class="icon-file-text"></i>
{l s='Documents' d='Admin.Orderscustomers.Feature'} <span class="badge">{$order->getDocuments()|@count}</span>
{l s='Documents' d='Admin.Orderscustomers.Feature'} <span class="badge">{$order_documents|@count}</span>
</a>
</li>
</ul>
Expand Down Expand Up @@ -255,7 +259,7 @@
</div>
<!-- Tab documents -->
<div class="tab-pane" id="documents">
<h4 class="visible-print">{l s='Documents' d='Admin.Orderscustomers.Feature'} <span class="badge">({$order->getDocuments()|@count})</span></h4>
<h4 class="visible-print">{l s='Documents' d='Admin.Orderscustomers.Feature'} <span class="badge">({$order_documents|@count})</span></h4>
{* Include document template *}
{include file='controllers/orders/_documents.tpl'}
</div>
Expand All @@ -273,13 +277,13 @@
<li class="active">
<a href="#shipping">
<i class="icon-truck "></i>
{l s='Shipping' d='Admin.Catalog.Feature'} <span class="badge">{$order->getShipping()|@count}</span>
{l s='Shipping' d='Admin.Catalog.Feature'} <span class="badge">{$order_shipping|@count}</span>
</a>
</li>
<li>
<a href="#returns">
<i class="icon-undo"></i>
{l s='Merchandise Returns' d='Admin.Orderscustomers.Feature'} <span class="badge">{$order->getReturn()|@count}</span>
{l s='Merchandise Returns' d='Admin.Orderscustomers.Feature'} <span class="badge">{$order_return|@count}</span>
</a>
</li>
</ul>
Expand All @@ -288,7 +292,7 @@
{$HOOK_CONTENT_SHIP}
<!-- Tab shipping -->
<div class="tab-pane active" id="shipping">
<h4 class="visible-print">{l s='Shipping' d='Admin.Catalog.Feature'} <span class="badge">({$order->getShipping()|@count})</span></h4>
<h4 class="visible-print">{l s='Shipping' d='Admin.Catalog.Feature'} <span class="badge">({$order_shipping|@count})</span></h4>
<!-- Shipping block -->
{if !$order->isVirtual()}
<div class="form-horizontal">
Expand Down Expand Up @@ -321,10 +325,10 @@
</div>
<!-- Tab returns -->
<div class="tab-pane" id="returns">
<h4 class="visible-print">{l s='Merchandise Returns' d='Admin.Orderscustomers.Feature'} <span class="badge">({$order->getReturn()|@count})</span></h4>
<h4 class="visible-print">{l s='Merchandise Returns' d='Admin.Orderscustomers.Feature'} <span class="badge">({$order_return|@count})</span></h4>
{if !$order->isVirtual()}
<!-- Return block -->
{if $order->getReturn()|count > 0}
{if $order_return|count > 0}
<div class="table-responsive">
<table class="table">
<thead>
Expand All @@ -336,7 +340,7 @@
</tr>
</thead>
<tbody>
{foreach from=$order->getReturn() item=line}
{foreach from=$order_return item=line}
<tr>
<td>{$line.date_add}</td>
<td>{$line.type}</td>
Expand Down