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

// BO orders

Browse Source
This commit is contained in:
Kevin Granger
2013-09-16 15:20:30 +02:00
parent f9334b029b
commit 7f6255156e
8 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/filters.tpl
+2 -2
View File
@@ -62,11 +62,11 @@
</select>
</span> -->
<!-- <span class="pull-right">
<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<button class="btn btn-default " type="submit" name="resetFilterModules">
<i class="icon-eraser"></i>
{l s='Reset'}
</button>
<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
<button class="btn btn-default " name="filterModules" id="filterModulesButton" type="submit">
<i class="icon-filter"></i>
{l s='Filter'}
</button>
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+3 -3
View File
@@ -83,7 +83,7 @@
{/if}
{elseif get_class($document) eq 'OrderSlip'}
#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
{/if} <span class="btn btn-default btn-small">
{/if} <span class="btn btn-default">
<i class="icon-search"></i>
{l s='See the document'}
</span>
@@ -113,12 +113,12 @@
{if get_class($document) eq 'OrderInvoice'}
{if !isset($document->is_delivery)}
{if $document->getRestPaid()}
<a href="#" class="js-set-payment btn btn-default btn-small" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
<a href="#" class="js-set-payment btn btn-default" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
<i class="icon-pencil"></i>
{l s='Set payment form'}
</a>
{/if}
<a href="#" class="btn btn-default btn-small" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
<a href="#" class="btn btn-default" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
{if $document->note eq ''}
<i class="icon-plus-sign-alt"></i>
{l s='Add note'}
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+9 -9
View File
@@ -24,19 +24,19 @@
*}
{* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;">
<span>
{if ($order_state->invoice || $order->invoice_number)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
{else}
-
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
<i class="icon-file-text"></i>
</a>
{/if}
</span>
{* Generate HTML code for printing Delivery Icon with link *}
<span style="width:20px;">
<span>
{if ($order_state->delivery || $order->delivery_number)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
{else}
-
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
<i class="icon-truck"></i>
</a>
{/if}
</span>
</span>
admin-dev/themes/default/template/controllers/products/features.tpl
+1 -1
View File
@@ -62,7 +62,7 @@
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
<span>{l s='N/A'} -
<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
class="confirm_leave btn btn-link btn-small"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
class="confirm_leave btn btn-link"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
</span>
{/if}
</td>