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

[-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-02 19:09:47 +02:00
parent 40c64b54e2
commit da12fbdd5e
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+5 -10
View File
@@ -2435,17 +2435,12 @@ class AdminImportControllerCore extends AdminController
$discount_rate = (float)$info['discount_rate']; $discount_rate = (float)$info['discount_rate'];
$tax_rate = (float)$info['tax_rate']; $tax_rate = (float)$info['tax_rate'];
// checks if one product is there only once // checks if one product/attribute is there only once
if (isset($product['id_product'])) if (isset($products[$id_product][$id_product_attribute]))
{ $this->errors[] = sprintf($this->l('Product/Attribute (%d/%d) cannot be added twice (at line %d).'), $id_product,
if ($product['id_product'] == $id_product_attribute) $id_product_attribute, $current_line + 1);
$this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
$id_product_attribute, $current_line + 1);
else
$product['id_product'] = $id_product_attribute;
}
else else
$product['id_product'] = 0; $products[$id_product][$id_product_attribute] = $quantity_expected;
// checks parameters // checks parameters
if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier))) if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))