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

// Fixed Suppliers/Products association #PSTEST-429

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12360 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-01-11 15:30:02 +00:00
parent 8b8b09452d
commit d8ff3c5b34
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+7
View File
@@ -1180,6 +1180,13 @@ class ProductCore extends ObjectModel
return $return; return $return;
} }
/**
* Sets Supplier Reference
*
* @param string $supplier_reference
* @param int $id_product_attribute
* @param int $id_currency
*/
public function addSupplierReference($supplier_reference, $id_product_attribute = null, $id_currency = null) public function addSupplierReference($supplier_reference, $id_product_attribute = null, $id_currency = null)
{ {
//Try to set the default supplier reference //Try to set the default supplier reference
controllers/admin/AdminProductsController.php
+14 -9
View File
@@ -2285,13 +2285,9 @@ class AdminProductsControllerCore extends AdminController
foreach ($attributes as $attribute) foreach ($attributes as $attribute)
foreach ($associated_suppliers as $supplier) foreach ($associated_suppliers as $supplier)
{ {
if (Tools::isSubmit('supplier_reference_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier) if (Tools::isSubmit('supplier_reference_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier) ||
|| (Tools::isSubmit('product_price_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier) &&
( Tools::isSubmit('product_price_currency_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier)))
Tools::isSubmit('product_price_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier)
&&
Tools::isSubmit('product_price_currency_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier)
))
{ {
$reference = pSQL( $reference = pSQL(
Tools::getValue( Tools::getValue(
@@ -2321,6 +2317,7 @@ class AdminProductsControllerCore extends AdminController
// Save product-supplier data // Save product-supplier data
$existing_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier); $existing_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier);
if ($existing_id <= 0) if ($existing_id <= 0)
{ {
$product->addSupplierReference($reference, (int)$attribute['id_product_attribute'], (int)$id_currency); $product->addSupplierReference($reference, (int)$attribute['id_product_attribute'], (int)$id_currency);
@@ -2339,12 +2336,20 @@ class AdminProductsControllerCore extends AdminController
} }
else else
{ {
$product->wholesale_price = Tools::convertPrice($price, $id_currency); //converted in the default currency $product->wholesale_price = (float)Tools::convertPrice($price, $id_currency); //converted in the default currency
$product->supplier_reference = $reference; $product->supplier_reference = pSQL($reference);
$update_product = true; $update_product = true;
} }
} }
} }
else
{
$product_supplier = new ProductSupplier($existing_id);
$product_supplier->product_supplier_price_te = (float)Tools::convertPrice($price, $id_currency); //converted in the default currency
$product_supplier->product_supplier_reference = pSQL($reference);
$product_supplier->update();
}
} }
else if (Tools::isSubmit('supplier_reference_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier)) else if (Tools::isSubmit('supplier_reference_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier))
{ {