From 39468476ab3e54ac713e8dc7fd5ee92487299a26 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 23 Sep 2013 09:50:12 +0200 Subject: [PATCH 1/6] [-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a --- classes/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 19e5917af..56eebf54e 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2469,7 +2469,7 @@ class ProductCore extends ObjectModel if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product)) die(Tools::displayError()); // Initializations - $id_group = (isset($context->customer) ? $context->customer->id_default_group : (int)Configuration::get('PS_CUSTOMER_GROUP')); + $id_group = (isset($context->customer) && $context->customer->id_default_group) ? $context->customer->id_default_group : (int)Configuration::get('PS_CUSTOMER_GROUP'); // If there is cart in context or if the specified id_cart is different from the context cart id if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart)) From a578cfb2e228de807260045ef999bd57ae18ed99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 23 Sep 2013 10:20:22 +0200 Subject: [PATCH 2/6] [-] FO: Fix #PSCFV-10461 --- classes/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 56eebf54e..e96af64b7 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2469,7 +2469,7 @@ class ProductCore extends ObjectModel if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product)) die(Tools::displayError()); // Initializations - $id_group = (isset($context->customer) && $context->customer->id_default_group) ? $context->customer->id_default_group : (int)Configuration::get('PS_CUSTOMER_GROUP'); + $id_group = (isset($context->customer) && $context->customer->id_default_group) ? $context->customer->id_default_group : (int)Group::getCurrent()->id; // If there is cart in context or if the specified id_cart is different from the context cart id if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart)) From 32a7a28567168d07475a5110c5d5cbb3f740b65c Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 23 Sep 2013 10:42:10 +0200 Subject: [PATCH 3/6] [-] MO : FixBug #PNM-1683 - Treeview problem --- modules/blocklayered/blocklayered.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 91ebe0cd2..871235ecb 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1771,7 +1771,7 @@ class BlockLayered extends Module $root_category = array('id_category' => '0', 'name' => $this->l('Root')); $helper = new Helper(); - $html .= $helper->renderCategoryTree(null, $selected_cat, 'categoryBox'); + $html .= $helper->renderCategoryTree(null, $selected_cat, 'categoryBox', false, false, array(), true); $html .= '
@@ -1930,7 +1930,8 @@ class BlockLayered extends Module $(\'label a#inline\').fancybox({ \'hideOnContentClick\': false, - \'onClosed\': function() { + \'beforeClose\': function() { + console.log("merde"); lock_treeview_hidding = false; $(\'#categories-treeview\').parent().parent().hide(); updCatCounter(); From 50bbf1a547fb3ee7451c0ce9b9c1ab677ed65a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 23 Sep 2013 10:46:41 +0200 Subject: [PATCH 4/6] // small fix --- classes/Product.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index e96af64b7..5a8600fed 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2468,8 +2468,9 @@ class ProductCore extends ObjectModel if (!Validate::isBool($usetax) || !Validate::isUnsignedId($id_product)) die(Tools::displayError()); + // Initializations - $id_group = (isset($context->customer) && $context->customer->id_default_group) ? $context->customer->id_default_group : (int)Group::getCurrent()->id; + $id_group = (int)Group::getCurrent()->id; // If there is cart in context or if the specified id_cart is different from the context cart id if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart)) From cf82157d4740d740c6a0dadeae4c3f7ba2a4eb20 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 23 Sep 2013 10:48:56 +0200 Subject: [PATCH 5/6] // oops --- modules/blocklayered/blocklayered.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 871235ecb..a629345d2 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1931,7 +1931,6 @@ class BlockLayered extends Module $(\'label a#inline\').fancybox({ \'hideOnContentClick\': false, \'beforeClose\': function() { - console.log("merde"); lock_treeview_hidding = false; $(\'#categories-treeview\').parent().parent().hide(); updCatCounter(); From 5206496f64827fc7aea8d8dff8f6897a3aee3faa Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 23 Sep 2013 11:22:51 +0200 Subject: [PATCH 6/6] [-] BO : Fix Bug For new Fancy Box events --- .../default/template/controllers/groups/helpers/form/form.tpl | 4 ++-- themes/default/js/order-opc.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 0a14884db..242ea2e22 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl @@ -48,11 +48,11 @@