dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0

Browse Source
This commit is contained in:
Rémi Gaillard
2012-12-04 11:38:47 +01:00
parent 6e87020ddf
commit 69fbd79eee
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+10 -8
View File
@@ -536,13 +536,17 @@ class AdminProductsControllerCore extends AdminController
$this->errors[] = Tools::displayError('You cannot delete the product because there is physical stock left or supply orders in progress.'); $this->errors[] = Tools::displayError('You cannot delete the product because there is physical stock left or supply orders in progress.');
} }
if ($object->delete()) if (!count($this->errors))
{ {
$id_category = (int)Tools::getValue('id_category'); if ($object->delete())
$category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category; {
$this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url; $id_category = (int)Tools::getValue('id_category');
$category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category;
$this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url;
}
else
$this->errors[] = Tools::displayError('An error occurred during deletion.');
} }
$this->errors[] = Tools::displayError('An error occurred during deletion.');
} }
} }
else else
@@ -632,10 +636,8 @@ class AdminProductsControllerCore extends AdminController
$real_quantity = $stock_manager->getProductRealQuantities($product->id, 0); $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0);
if ($physical_quantity > 0 || $real_quantity > $physical_quantity) if ($physical_quantity > 0 || $real_quantity > $physical_quantity)
$this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left or supply orders in progress.'), $product->id); $this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left or supply orders in progress.'), $product->id);
else
$success &= $product->delete();
} }
else if (!count($this->errors))
$success &= $product->delete(); $success &= $product->delete();
} }
} }