From e17eafacb20617483e62be1537a75e2d8cd9debe Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Sun, 10 Nov 2024 18:15:04 +0100 Subject: [PATCH 1/3] FIX select variant by attribute. (#31759) DISTINCT needs order field in select. Solved by removing DISTINCT --- .../class/ProductAttributeValue.class.php | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php index b3a2cb71b38..dde942c1bcf 100644 --- a/htdocs/variants/class/ProductAttributeValue.class.php +++ b/htdocs/variants/class/ProductAttributeValue.class.php @@ -287,43 +287,37 @@ class ProductAttributeValue extends CommonObjectLine { $return = array(); - $sql = "SELECT "; - - if ($only_used) { - $sql .= "DISTINCT "; - } - - $sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM " . MAIN_DB_PREFIX . "product_attribute_value v "; - - if ($only_used) { - $sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid "; - $sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination c ON c.rowid = c2v.fk_prod_combination "; - $sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = c.fk_product_child "; - } + $sql = "SELECT v.fk_product_attribute, v.rowid, v.ref, v.value FROM " . MAIN_DB_PREFIX . "product_attribute_value v "; $sql .= "WHERE v.fk_product_attribute = " . ((int) $prodattr_id); if ($only_used) { - $sql .= " AND c2v.rowid IS NOT NULL AND p.tosell = 1"; + $sql .= " AND EXISTS (SELECT c2v.fk_prod_attr_val "; + $sql .= "FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v "; + $sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination c ON c.rowid = c2v.fk_prod_combination "; + $sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = c.fk_product_child"; + $sql .= " WHERE c2v.rowid IS NOT NULL AND p.tosell = 1 AND c2v.fk_prod_attr_val = v.rowid)"; } $sql .= " ORDER BY v.position ASC"; $query = $this->db->query($sql); - while ($result = $this->db->fetch_object($query)) { - if (empty($returnonlydata)) { - $tmp = new ProductAttributeValue($this->db); - } else { - $tmp = new stdClass(); + if ($query) { + while ($result = $this->db->fetch_object($query)) { + if (empty($returnonlydata)) { + $tmp = new ProductAttributeValue($this->db); + } else { + $tmp = new stdClass(); + } + + $tmp->fk_product_attribute = $result->fk_product_attribute; + $tmp->id = $result->rowid; + $tmp->ref = $result->ref; + $tmp->value = $result->value; + + $return[] = $tmp; } - - $tmp->fk_product_attribute = $result->fk_product_attribute; - $tmp->id = $result->rowid; - $tmp->ref = $result->ref; - $tmp->value = $result->value; - - $return[] = $tmp; } return $return; From 940324f76d63fb5f143f85bd64558a3a1eb807c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 10 Nov 2024 18:15:57 +0100 Subject: [PATCH 2/3] fix dol_time_plus_duree with unit egal mn instead i (#31746) * fix dol_time_plus_duree with unit egal mn instead i * Update date.lib.php --- htdocs/core/lib/date.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 01686786fb4..f985bcd9637 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -130,7 +130,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforend if ($duration_unit == 's') { return $time + ($duration_value); } - if ($duration_unit == 'i') { + if ($duration_unit == 'i' || $duration_unit == 'mn') { return $time + (60 * $duration_value); } if ($duration_unit == 'h') { @@ -338,7 +338,7 @@ function convertDurationtoHour($duration_value, $duration_unit) if ($duration_unit == 's') { $result = $duration_value / 3600; } - if ($duration_unit == 'i') { + if ($duration_unit == 'i' || $duration_unit == 'mn') { $result = $duration_value / 60; } if ($duration_unit == 'h') { From 4d29fd4beb7c967c04214e86fba088bc6b9549a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Nov 2024 18:23:17 +0100 Subject: [PATCH 3/3] More complete fix for #31746 --- htdocs/core/lib/date.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index f985bcd9637..3b46db66d5e 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -130,7 +130,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforend if ($duration_unit == 's') { return $time + ($duration_value); } - if ($duration_unit == 'i' || $duration_unit == 'mn') { + if ($duration_unit == 'i' || $duration_unit == 'mn' || $duration_unit == 'min') { return $time + (60 * $duration_value); } if ($duration_unit == 'h') { @@ -338,7 +338,7 @@ function convertDurationtoHour($duration_value, $duration_unit) if ($duration_unit == 's') { $result = $duration_value / 3600; } - if ($duration_unit == 'i' || $duration_unit == 'mn') { + if ($duration_unit == 'i' || $duration_unit == 'mn' || $duration_unit == 'min') { $result = $duration_value / 60; } if ($duration_unit == 'h') {