From dde6cb386210bc48f8d673a306bf49ce3c5943df Mon Sep 17 00:00:00 2001 From: Konstantin Shevsky Date: Fri, 13 Nov 2020 11:31:52 +0500 Subject: [PATCH 1/2] Bug fix: incorrect combine shipping dimensions features. --- lib/classes/shopShipping.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/classes/shopShipping.class.php b/lib/classes/shopShipping.class.php index 326bb16e7..03268b1a4 100644 --- a/lib/classes/shopShipping.class.php +++ b/lib/classes/shopShipping.class.php @@ -264,10 +264,12 @@ public static function extendItems(&$items, $units = array()) if ($dimensions = self::getShopSettings('shipping_dimensions')) { $dimensions = preg_split('@\D+@', $dimensions); - $features = $feature_model->getByField((count($dimensions) == 1) ? 'parent_id' : 'id', $dimensions, true); + $features = $feature_model->getByField((count($dimensions) == 1) ? 'parent_id' : 'id', $dimensions, 'id'); if (count($features) == 3) { - $map += array_combine($dimension_fields, array_values($features)); + foreach($dimension_fields as $dimension_field_key => $dimension_field) { + $map[$dimension_field] = $features[$dimension_field] = $features[$dimensions[$dimension_field_key]]; + } if (isset($units['dimensions'])) { foreach ($dimension_fields as $field) { $units[$field] = $units['dimensions']; From 1e309c751129a22d2900fa37e6219206d852430a Mon Sep 17 00:00:00 2001 From: Konstantin Shevsky Date: Fri, 13 Nov 2020 11:39:00 +0500 Subject: [PATCH 2/2] Bug fix: incorrect combine shipping dimensions features. --- lib/classes/shopShipping.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/shopShipping.class.php b/lib/classes/shopShipping.class.php index 03268b1a4..ef345f68c 100644 --- a/lib/classes/shopShipping.class.php +++ b/lib/classes/shopShipping.class.php @@ -268,7 +268,7 @@ public static function extendItems(&$items, $units = array()) if (count($features) == 3) { foreach($dimension_fields as $dimension_field_key => $dimension_field) { - $map[$dimension_field] = $features[$dimension_field] = $features[$dimensions[$dimension_field_key]]; + $map[$dimension_field] = $features[$dimensions[$dimension_field_key]]; } if (isset($units['dimensions'])) { foreach ($dimension_fields as $field) {