From 5a8ad9cb1dabc789adabf04d99fb29efc6367fb3 Mon Sep 17 00:00:00 2001 From: aFolletete Date: Wed, 28 Dec 2011 15:40:03 +0000 Subject: [PATCH] // change image for partial and standard refund [-] 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 --- admin-dev/themes/default/admin.css | 6 ++++-- admin-dev/themes/template/orders/_documents.tpl | 4 ++-- admin-dev/themes/template/orders/_shipping.tpl | 2 +- admin-dev/themes/template/orders/view.tpl | 16 +++++++--------- controllers/admin/AdminOrdersController.php | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 47e655569..fc57e84e9 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -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;} diff --git a/admin-dev/themes/template/orders/_documents.tpl b/admin-dev/themes/template/orders/_documents.tpl index f4a61c908..58805ea96 100644 --- a/admin-dev/themes/template/orders/_documents.tpl +++ b/admin-dev/themes/template/orders/_documents.tpl @@ -75,7 +75,7 @@ {if !isset($document->is_delivery)} -
+

@@ -94,7 +94,7 @@

{l s='No document is available'}

-

{l s='Generate invoice'}

+

{l s='Generate invoice'}

{/foreach} diff --git a/admin-dev/themes/template/orders/_shipping.tpl b/admin-dev/themes/template/orders/_shipping.tpl index 0c9dfcf7b..c25790d03 100644 --- a/admin-dev/themes/template/orders/_shipping.tpl +++ b/admin-dev/themes/template/orders/_shipping.tpl @@ -1,6 +1,6 @@ - + diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl index ae9c6a16c..013d1400a 100755 --- a/admin-dev/themes/template/orders/view.tpl +++ b/admin-dev/themes/template/orders/view.tpl @@ -78,20 +78,20 @@
-
{l s='Date'}:
+
{l s='Date:'}
{dateFormat date=$order->date_add full=true}
|
-
{if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if}:
+
{l s='Message:'}
{sizeof($messages)}
|
-
{if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if}:
-
{sizeof($products)}
+
{l s='Product:'}
+
{sizeof($products)}
|
-
{l s='Total'}:
-
{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
+
{l s='Total:'}
+
{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
@@ -228,14 +228,12 @@
- + - - diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 42ca59acc..8f05076fb 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -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(