From f979cbef5798f4492f5ea5cc5d1b1707eb140e70 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Thu, 3 Oct 2013 15:26:09 +0200 Subject: [PATCH 1/4] [*] BO: missing align on order for product warehouse --- .../default/template/controllers/orders/_product_line.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index 930f907be..0871df6c6 100755 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -56,7 +56,7 @@ {/if} - {if $display_warehouse}{$product.warehouse_name|escape:'htmlall':'UTF-8'}{/if} + {if $display_warehouse}{$product.warehouse_name|escape:'htmlall':'UTF-8'}{/if} {if ($order->hasBeenPaid())} {$product['product_quantity_refunded']} From e38d808a853126e546bf82e569f87b56c393f037 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Thu, 3 Oct 2013 15:51:27 +0200 Subject: [PATCH 2/4] [*] BO: wrong description on getIdOrderCarrier --- classes/order/Order.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index 42e5b42b0..93cc2c353 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1890,10 +1890,9 @@ class OrderCore extends ObjectModel } /** - * Return a unique reference like : GWJTHMZUN#2 + * Return id of carrier * - * With multishipping, order reference are the same for all orders made with the same cart - * in this case this method suffix the order reference by a # and the order number + * Get id of the carrier used in order * * @since 1.5.5.0 */ From 6a0c376a1807521a10da41827a2dbffbfe053486 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Thu, 3 Oct 2013 18:58:09 +0200 Subject: [PATCH 3/4] [-] MO : Blocklayered - Fix empty fancy box after template edit --- modules/blocklayered/blocklayered.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index a629345d2..361b39617 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1940,7 +1940,7 @@ class BlockLayered extends Module $(\'#error-treeview\').hide(); updElements(0, 0); }, - \'onComplete\': function() { + \'afterLoad\': function() { lock_treeview_hidding = true; $(\'#categories-treeview\').parent().parent().show(); if($($(\'#categories-treeview li\')[0]).attr(\'cleaned\')) @@ -1950,8 +1950,7 @@ class BlockLayered extends Module $($(\'#categories-treeview li span\')[0]).trigger(\'click\'); $($(\'#categories-treeview li\')[0]).children(\'div\').remove(); $($(\'#categories-treeview li\')[0]). - removeClass(\'collapsable lastCollapsable\'). - addClass(\'last static\'); + removeClass(\'collapsable lastCollapsable\') $(\'.hitarea\').live(\'click\', function(it) { $(this).parent().find(\'> .category_label\').click(); From 093bf9e0655b73ac759f48542d9d4d54ad0ccc6e Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 4 Oct 2013 11:51:12 +0200 Subject: [PATCH 4/4] [-] MO : Blocklayered - Fix expand/collapse tree problem --- modules/blocklayered/blocklayered.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 361b39617..ddac2554b 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1949,12 +1949,6 @@ class BlockLayered extends Module $($(\'#categories-treeview li\')[0]).removeClass(\'static\'); $($(\'#categories-treeview li span\')[0]).trigger(\'click\'); $($(\'#categories-treeview li\')[0]).children(\'div\').remove(); - $($(\'#categories-treeview li\')[0]). - removeClass(\'collapsable lastCollapsable\') - $(\'.hitarea\').live(\'click\', function(it) - { - $(this).parent().find(\'> .category_label\').click(); - }); } });