From d99a1eba24ddea86b702395dd06dab334f4275ba Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 18 Jul 2013 12:12:05 +0200 Subject: [PATCH 1/5] [-] BO : Bad return value for AdminCountries::processStatus() --- controllers/admin/AdminCountriesController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index 6d5638b31..dcd4f7c0a 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -433,10 +433,10 @@ class AdminCountriesControllerCore extends AdminController public function processStatus() { - $return = parent::processStatus(); + parent::processStatus(); if (Validate::isLoadedObject($object = $this->loadObject()) && $object->active == 1) - $return &= Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array()); - return $return; + return Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array()); + return false; } public function processBulkStatusSelection($way) From d879fb15a99fd540d7bf77acd0524b33a27837a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= Date: Thu, 18 Jul 2013 18:10:29 +0200 Subject: [PATCH 2/5] [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products --- classes/Manufacturer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index 285f802e1..bcf465787 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -198,6 +198,7 @@ class ManufacturerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`) WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer']. ($active ? ' AND product_shop.`active` = 1 ' : ''). + ' AND p.visibility IN (\'none\')'. ($all_group ? '' : ' AND p.`id_product` IN ( SELECT cp.`id_product` FROM `'._DB_PREFIX_.'category_group` cg From caf321e691d79dac2d5d1ce126960c82be02d26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= Date: Thu, 18 Jul 2013 18:16:57 +0200 Subject: [PATCH 3/5] [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden --- classes/Manufacturer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index bcf465787..763b37b52 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -198,7 +198,7 @@ class ManufacturerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`) WHERE m.`id_manufacturer` = '.(int)$manufacturer['id_manufacturer']. ($active ? ' AND product_shop.`active` = 1 ' : ''). - ' AND p.visibility IN (\'none\')'. + ' AND p.visibility NOT IN (\'none\')'. ($all_group ? '' : ' AND p.`id_product` IN ( SELECT cp.`id_product` FROM `'._DB_PREFIX_.'category_group` cg From a71a5d7c18215ef5b4524b05759e2f02f5042ed7 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 18 Jul 2013 18:18:57 +0200 Subject: [PATCH 4/5] [-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2 --- modules/referralprogram/referralprogram.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php index 697824fa7..0d497e619 100644 --- a/modules/referralprogram/referralprogram.php +++ b/modules/referralprogram/referralprogram.php @@ -649,8 +649,7 @@ class ReferralProgram extends Module { $cartRule = new CartRule((int)$referralprogram->id_cart_rule_sponsor); $currency = new Currency((int)$order->id_currency); - $discount_display = ReferralProgram::displayDiscount($cartRule->reduction_percent ? $cartRule->reduction_percent : $cartRule->reduction_amount, $cartRule->reduction_percent ? 1 : 2, $currency); - $data = array('{sponsored_firstname}' => $customer->firstname, '{sponsored_lastname}' => $customer->lastname, '{discount_display}' => $discount_display, '{discount_name}' => $cartRule->code); + $discount_display = ReferralProgram::displayDiscount( (float) $cartRule->reduction_percent ? (float) $cartRule->reduction_percent : (int) $cartRule->reduction_amount, (float) $cartRule->reduction_percent ? 1 : 2, $currency); $data = array('{sponsored_firstname}' => $customer->firstname, '{sponsored_lastname}' => $customer->lastname, '{discount_display}' => $discount_display, '{discount_name}' => $cartRule->code); Mail::Send((int)$order->id_lang, 'referralprogram-congratulations', Mail::l('Congratulations!', (int)$order->id_lang), $data, $sponsor->email, $sponsor->firstname.' '.$sponsor->lastname, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/'); return true; } From c70fe92daceccac18bf247b84dc37c469f89cc71 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Thu, 18 Jul 2013 18:22:36 +0200 Subject: [PATCH 5/5] // Validate::isGenericName now allow "#" #PSCFV-6530 --- classes/Validate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Validate.php b/classes/Validate.php index cee80bd01..04b53c7fa 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -380,7 +380,7 @@ class ValidateCore */ public static function isGenericName($name) { - return empty($name) || preg_match('/^[^<>=#{}]*$/u', $name); + return empty($name) || preg_match('/^[^<>={}]*$/u', $name); } /**