From fe491a5f8c8dd7fa9b7c2a81811e8a54321e7ef7 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 5 Apr 2012 16:00:06 +0000 Subject: [PATCH] // Fix function name git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14508 b9a71923-0436-4b27-9f14-aed3839534dd --- .../default/template/controllers/orders/helpers/view/view.tpl | 4 ++-- js/admin.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index e2acf399e..904157053 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -659,8 +659,8 @@  
{/if} {if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} -  
-  
+  
+  
{/if} {if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))} diff --git a/js/admin.js b/js/admin.js index 0f8397e8a..69b29a6bd 100644 --- a/js/admin.js +++ b/js/admin.js @@ -517,7 +517,7 @@ function selectCheckbox(obj) $(obj).parent().parent().find('td.cancelCheck input[type=checkbox]').attr("checked", true); } -function toogleShippingCost(obj) +function toggleShippingCost(obj) { generateDiscount = $(obj).parent().find('#generateDiscount').attr("checked"); generateCreditSlip = $(obj).parent().find('#generateCreditSlip').attr("checked");