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

// change image for partial and standard refund

Browse Source 
[-] BO : fixed bug on updating of document table when adding a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11859 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-28 15:40:03 +00:00
parent 8e36d7d247
commit 5a8ad9cb1d
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+4 -2
View File
@@ -25,9 +25,9 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
.double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
/*BUTTON*/
.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
.button[disabled=disabled]{color:#8C8C8C}
.button.bt-icon { display:inline-block; margin-bottom:7px;}
@@ -194,6 +194,8 @@ a.module_toggle_all{color: #268CCD;}
.toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);}
.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url(process-icon-export-csv.png);}
.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
.toolbarBox .process-icon-partialRefund{ background-image: url(process-icon-partial-refund.png);}
.toolbarBox .process-icon-standardRefund{ background-image: url(process-icon-standard-refund.png);}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
admin-dev/themes/template/orders/_documents.tpl
+2 -2
View File
@@ -75,7 +75,7 @@
{if !isset($document->is_delivery)}
<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
<td colspan="5">
<form action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
<form action="{$currentIndex}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
<p>
<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
<input type="hidden" name="id_order_invoice" value="{$document->id}" />
@@ -94,7 +94,7 @@
<tr>
<td colspan="5" class="center">
<h3>{l s='No document is available'}</h3>
<p><a class="button" href="{$currentIndex}&viewOrder&submitGenerateInvoice&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
<p><a class="button" href="{$currentIndex}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
</td>
</tr>
{/foreach}
admin-dev/themes/template/orders/_shipping.tpl
+1 -1
View File
@@ -1,6 +1,6 @@
<table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
<colgroup>
<col width="10%"></col>
<col width="15%"></col>
<col width="15%"></col>
<col width=""></col>
<col width="10%"></col>
admin-dev/themes/template/orders/view.tpl
+7 -9
View File
@@ -78,20 +78,20 @@
</div>
<div class="metadata-command">
<dl>
<dt>{l s='Date'}: </dt>
<dt>{l s='Date:'} </dt>
<dd>{dateFormat date=$order->date_add full=true}</dd>
|</dl>
<dl>
<dt>{if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if}: </dt>
<dt>{l s='Message:'}</dt>
<dd>{sizeof($messages)}</dd>
|</dl>
<dl>
<dt>{if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if}: </dt>
<dd>{sizeof($products)}</dd>
<dt>{l s='Product:'}</dt>
<dd id="product_number">{sizeof($products)}</dd>
|</dl>
<dl>
<dt>{l s='Total'}: </dt>
<dd>{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
<dt>{l s='Total:'}</dt>
<dd class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
</dl>
<div class="clear"></div>
</div>
@@ -228,14 +228,12 @@
<form id="formAddPayment" method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table" width="100%" cellspacing="0" cellpadding="0">
<colgroup>
<col width="10%"></col>
<col width="15%"></col>
<col width=""></col>
<col width="20%"></col>
<col width="10%"></col>
<col width="10%"></col>
<col width="1%"></col>
</colgroup>
<thead>
<tr>
controllers/admin/AdminOrdersController.php
+3 -3
View File
@@ -119,13 +119,13 @@ class AdminOrdersControllerCore extends AdminController
'short' => 'Create',
'href' => '',
'desc' => $type,
'class' => 'process-icon-new standard_refund'
'class' => 'process-icon-standardRefund'
);
$this->toolbar_btn['partial_refund'] = array(
'short' => 'Create',
'href' => '',
'desc' => $this->l('Partial refund'),
'class' => 'process-icon-new partial_refund'
'class' => 'process-icon-partialRefund'
);
}
return parent::initToolbar();
@@ -1379,7 +1379,7 @@ class AdminOrdersControllerCore extends AdminController
'invoices_collection' => $invoice_collection,
'current_id_lang' => Context::getContext()->language->id,
'link' => Context::getContext()->link,
'current_index' => self::$currentIndex
'currentIndex' => self::$currentIndex
));
die(Tools::jsonEncode(array(