From b08a1648b6c7ff2ee377b9e5b8cfb5aa69e112d2 Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Tue, 29 Sep 2020 18:50:12 +0200 Subject: [PATCH 1/4] Update Product.php Fix PHP7.4 --- classes/Product.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Product.php b/classes/Product.php index 70f666a04..1df4135d8 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2369,6 +2369,7 @@ protected static function _getProductIdByDate($beginning, $ending, Context $cont $id_address = $context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}; $ids = Address::getCountryAndState($id_address); + $ids['id_country'] = $ids['id_country'] ?? null; $id_country = $ids['id_country'] ? (int)$ids['id_country'] : (int)Configuration::get('PS_COUNTRY_DEFAULT'); return SpecificPrice::getProductIdByDate( From 18bf1fd6f4d160452d2935450a111ed4e754ee2b Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Tue, 29 Sep 2020 22:31:39 +0200 Subject: [PATCH 2/4] Update Product.php --- classes/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 1df4135d8..e4f3ed469 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3707,7 +3707,7 @@ public static function cacheProductsFeatures($product_ids) $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_feature, id_product, id_feature_value FROM `'._DB_PREFIX_.'feature_product` - WHERE `id_product` IN ('.implode($product_implode, ',').')'); + WHERE `id_product` IN ('.implode( ',', $product_implode).')'); foreach ($result as $row) { if (!array_key_exists($row['id_product'], self::$_cacheFeatures)) { self::$_cacheFeatures[$row['id_product']] = array(); From a119b6b57c26b42695556939604687359e64dd0c Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:24:32 +0100 Subject: [PATCH 3/4] Update Product.php --- classes/Product.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index e4f3ed469..75748c5b7 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2369,7 +2369,7 @@ protected static function _getProductIdByDate($beginning, $ending, Context $cont $id_address = $context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}; $ids = Address::getCountryAndState($id_address); - $ids['id_country'] = $ids['id_country'] ?? null; + $ids['id_country'] = (int) $ids['id_country'] : (int) Configuration::get('PS_COUNTRY_DEFAULT'); $id_country = $ids['id_country'] ? (int)$ids['id_country'] : (int)Configuration::get('PS_COUNTRY_DEFAULT'); return SpecificPrice::getProductIdByDate( @@ -3462,7 +3462,7 @@ public static function getAttributesColorList(Array $products, $have_stock = tru JOIN `'._DB_PREFIX_.'attribute` a ON (a.`id_attribute` = pac.`id_attribute`) JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)$id_lang.') JOIN `'._DB_PREFIX_.'attribute_group` ag ON (a.id_attribute_group = ag.`id_attribute_group`) - WHERE pa.`id_product` IN ('.implode(array_map('intval', $products), ',').') AND ag.`is_color_group` = 1 + WHERE pa.`id_product` IN ('.implode(',', array_map('intval', $products)).') AND ag.`is_color_group` = 1 GROUP BY pa.`id_product`, a.`id_attribute`, `group_by` '.($check_stock ? 'HAVING qty > 0' : '').' ORDER BY a.`position` ASC;' @@ -3739,7 +3739,7 @@ public static function cacheFrontFeatures($product_ids, $id_lang) LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.id_feature_value = pf.id_feature_value AND fvl.id_lang = '.(int)$id_lang.') LEFT JOIN '._DB_PREFIX_.'feature f ON (f.id_feature = pf.id_feature) '.Shop::addSqlAssociation('feature', 'f').' - WHERE `id_product` IN ('.implode($product_implode, ',').') + WHERE `id_product` IN ('.implode(',', $product_implode).') ORDER BY f.position ASC'); foreach ($result as $row) { From 8e5522a7836c63e4da7a087ba68b08e0fbd4aa7f Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Thu, 29 Oct 2020 12:27:18 +0100 Subject: [PATCH 4/4] Update Product.php --- classes/Product.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 75748c5b7..ca3c683bb 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2369,8 +2369,7 @@ protected static function _getProductIdByDate($beginning, $ending, Context $cont $id_address = $context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}; $ids = Address::getCountryAndState($id_address); - $ids['id_country'] = (int) $ids['id_country'] : (int) Configuration::get('PS_COUNTRY_DEFAULT'); - $id_country = $ids['id_country'] ? (int)$ids['id_country'] : (int)Configuration::get('PS_COUNTRY_DEFAULT'); + $id_country = $ids['id_country'] ? (int) $ids['id_country'] : (int) Configuration::get('PS_COUNTRY_DEFAULT'); return SpecificPrice::getProductIdByDate( $context->shop->id,