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

Fix wrong tax when duplicating product in BO with several taxes (multishop) #14308

Merged
merged 7 commits into from Jul 9, 2019
Merged

Fix wrong tax when duplicating product in BO with several taxes (multishop) #14308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0587df3
#14302 : Add duplicate taxes
202-ecommerce Jun 20, 2019
570a855
#14302 : Duplicate taxes
202-ecommerce Jun 20, 2019
c5a964c
Update Product.php
202-ecommerce Jun 25, 2019
f75b245
Update Product.php for PrettyCI
202-ecommerce Jun 25, 2019
04d5a9c
return false if taxes duplication fails
202-ecommerce Jun 26, 2019
af31107
delete duplicated product if duplication failed
202-ecommerce Jun 26, 2019
fdc8ad8
Delete duplicated product in case of error only if it exists
202-ecommerce Jul 4, 2019
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
24 changes: 24 additions & 0 deletions classes/Product.php
View file
Open in desktop
Expand Up @@ -4444,6 +4444,30 @@ public static function duplicateTags($id_product_old, $id_product_new)
return Db::getInstance()->insert('product_tag', $data);
}

public static function duplicateTaxes($id_product_old, $id_product_new)
{
$query = new DbQuery();
$query->select('id_tax_rules_group, id_shop');
$query->from('product_shop');
$query->where('`id_product` = ' . (int) $id_product_old);

$results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query->build());

if (!empty($results)) {
foreach ($results as $result) {
if (!Db::getInstance()->update(
'product_shop',
array('id_tax_rules_group' => (int) $result['id_tax_rules_group']),
'id_product=' . (int) $id_product_new . ' AND id_shop = ' . (int) $result['id_shop']
)) {
return false;
}
}
}

return true;
}

public static function duplicateDownload($id_product_old, $id_product_new)
{
$sql = 'SELECT `display_filename`, `filename`, `date_add`, `date_expiration`, `nb_days_accessible`, `nb_downloadable`, `active`, `is_shareable`
Expand Down
4 changes: 4 additions & 0 deletions src/Adapter/Product/AdminProductDataUpdater.php
View file
Open in desktop
Expand Up @@ -216,6 +216,7 @@ public function duplicateProduct($productId, $namePattern = 'copy of %s')
&& Pack::duplicate($id_product_old, $product->id)
&& Product::duplicateCustomizationFields($id_product_old, $product->id)
&& Product::duplicateTags($id_product_old, $product->id)
&& Product::duplicateTaxes($id_product_old, $product->id)
&& Product::duplicateDownload($id_product_old, $product->id)) {
if ($product->hasAttributes()) {
Product::updateDefaultAttribute($product->id);
Expand All @@ -232,6 +233,9 @@ public function duplicateProduct($productId, $namePattern = 'copy of %s')
return $product->id;
}
} else {
if ($product->id !== null) {
$product->delete();
}
throw new \Exception('An error occurred while creating an object.', 5009);
}
}
Expand Down