Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Combination issue while trying to change size on a product page #9390

Merged
merged 6 commits into from Aug 3, 2018
Merged

Combination issue while trying to change size on a product page #9390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5df0e39
Catch exception PrestaShopObjectNotFoundException
PierreRambaud Jul 30, 2018
5282976
Add log
PierreRambaud Jul 31, 2018
2e3d559
Improve log message
PierreRambaud Jul 31, 2018
23c945f
Merge branch 'develop' of github.com:PrestaShop/PrestaShop into fix/b…
PierreRambaud Jul 31, 2018
b82310a
Always find the best combination
PierreRambaud Jul 31, 2018
6e4da0e
Refactoring
PierreRambaud Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 24 additions & 18 deletions classes/Product.php
View file
Open in desktop
Expand Up @@ -5668,7 +5668,7 @@ public function setWsCategories($category_ids)
} elseif (array_key_exists((int)$id, $max_position_lookup)) {
$pos = (int)$max_position_lookup[(int) $id] + 1;
}

$sql_values[] = '('.(int)$id.', '.(int)$this->id.', '.$pos.')';
}

Expand Down Expand Up @@ -6111,21 +6111,27 @@ public static function getIdProductAttributeByIdAttributes($idProduct, $idAttrib
}

if (!is_array($idAttributes) || empty($idAttributes)) {
throw new PrestaShopException(sprintf('Invalid parameter $idAttributes with value: "%s"', print_r($idAttributes, true)));
throw new PrestaShopException(
sprintf(
'Invalid parameter $idAttributes with value: "%s"',
print_r($idAttributes, true)
)
);
}

$idAttributesImploded = implode(',', array_map('intval', $idAttributes));
$idProductAttribute = Db::getInstance()->getValue('
SELECT
SELECT
pac.`id_product_attribute`
FROM
FROM
`' . _DB_PREFIX_ . 'product_attribute_combination` pac
INNER JOIN `' . _DB_PREFIX_ . 'product_attribute` pa ON pa.id_product_attribute = pac.id_product_attribute
WHERE
WHERE
pa.id_product = ' . $idProduct . '
AND pac.id_attribute IN (' . $idAttributesImploded . ')
GROUP BY
GROUP BY
pac.`id_product_attribute`
HAVING
HAVING
COUNT(pa.id_product) = ' . count($idAttributes)
);

Expand All @@ -6134,14 +6140,14 @@ public static function getIdProductAttributeByIdAttributes($idProduct, $idAttrib
//first we order $idAttributes by the group position
$orderred = array();
$result = Db::getInstance()->executeS('
SELECT
SELECT
a.`id_attribute`
FROM
FROM
`'._DB_PREFIX_.'attribute` a
INNER JOIN `'._DB_PREFIX_.'attribute_group` g ON a.`id_attribute_group` = g.`id_attribute_group`
WHERE
WHERE
a.`id_attribute` IN (' . $idAttributesImploded . ')
ORDER BY
ORDER BY
g.`position` ASC'
);

Expand All @@ -6152,17 +6158,17 @@ public static function getIdProductAttributeByIdAttributes($idProduct, $idAttrib
while ($idProductAttribute === false && count($orderred) > 0) {
array_pop($orderred);
$idProductAttribute = Db::getInstance()->getValue('
SELECT
SELECT
pac.`id_product_attribute`
FROM
FROM
`'._DB_PREFIX_.'product_attribute_combination` pac
INNER JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.id_product_attribute = pac.id_product_attribute
WHERE
WHERE
pa.id_product = '.(int)$idProduct.'
AND pac.id_attribute IN ('.implode(',', array_map('intval', $orderred)).')
GROUP BY
GROUP BY
pac.id_product_attribute
HAVING
HAVING
COUNT(pa.id_product) = '.count($orderred)
);
}
Expand Down Expand Up @@ -6720,7 +6726,7 @@ public function getRedirectType()
public function getUsedCustomizationFieldsIds()
{
return Db::getInstance()->executeS(
'SELECT cd.`index` FROM `' . _DB_PREFIX_ . 'customized_data` cd
'SELECT cd.`index` FROM `' . _DB_PREFIX_ . 'customized_data` cd
LEFT JOIN `' . _DB_PREFIX_ . 'customization_field` cf ON cf.`id_customization_field` = cd.`index`
WHERE cf.`id_product` = ' . (int)$this->id
);
Expand Down Expand Up @@ -6765,7 +6771,7 @@ public function softDeleteCustomizationFields($customizationIds)
$updateQuery = 'UPDATE `' . _DB_PREFIX_ . 'customization_field` cf
SET cf.`is_deleted` = 1
WHERE
cf.`id_product` = ' . (int)$this->id . '
cf.`id_product` = ' . (int)$this->id . '
AND cf.`is_deleted` = 0 ';

if (is_array($customizationIds) && !empty($customizationIds)) {
Expand Down
2 changes: 1 addition & 1 deletion controllers/front/CartController.php
View file
Open in desktop
Expand Up @@ -363,7 +363,7 @@ protected function processChangeProductInCart()
$ErrorKey = ('update' === $mode) ? 'updateOperationError' : 'errors';

if (Tools::getIsset('group')) {
$this->id_product_attribute = (int)Product::getIdProductAttributesByIdAttributes(
$this->id_product_attribute = (int)Product::getIdProductAttributeByIdAttributes(
$this->id_product,
Tools::getValue('group')
);
Expand Down
5 changes: 3 additions & 2 deletions controllers/front/ProductController.php
View file
Open in desktop
Expand Up @@ -954,9 +954,10 @@ private function getIdProductAttribute($useGroups = false)
$groups = Tools::getValue('group');

if (!empty($groups)) {
$requestedIdProductAttribute = (int) Product::getIdProductAttributesByIdAttributes(
$requestedIdProductAttribute = (int) Product::getIdProductAttributeByIdAttributes(
$this->product->id,
$groups
$groups,
true
);
}
}
Expand Down