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

[-] BO : fix #PSTEST-1170 - broken suppliers edition in product page

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14696 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-04-17 16:00:31 +00:00
parent d07623cbc2
commit 03afca360c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+7 -4
View File
@@ -1178,16 +1178,18 @@ class ProductCore extends ObjectModel
/** /**
* Sets Supplier Reference * Sets Supplier Reference
* *
* @param int $id_supplier
* @param string $supplier_reference * @param string $supplier_reference
* @param int $id_product_attribute * @param int $id_product_attribute
* @param float $price
* @param int $id_currency * @param int $id_currency
*/ */
public function addSupplierReference($supplier_reference, $id_product_attribute = null, $id_currency = null) public function addSupplierReference($id_supplier, $supplier_reference, $id_product_attribute = null, $price, $id_currency = null)
{ {
//Try to set the default supplier reference //Try to set the default supplier reference
if ($this->id_supplier > 0 && $supplier_reference != null) if ($id_supplier > 0 && $supplier_reference != null)
{ {
$id_product_supplier = ProductSupplier::getIdByProductAndSupplier($this->id, $id_product_attribute, $this->id_supplier); $id_product_supplier = ProductSupplier::getIdByProductAndSupplier($this->id, $id_product_attribute, $id_supplier);
if (empty($id_product_supplier)) if (empty($id_product_supplier))
{ {
@@ -1195,8 +1197,9 @@ class ProductCore extends ObjectModel
$product_supplier_entity = new ProductSupplier(); $product_supplier_entity = new ProductSupplier();
$product_supplier_entity->id_product = (int)$this->id; $product_supplier_entity->id_product = (int)$this->id;
$product_supplier_entity->id_product_attribute = (int)$id_product_attribute; $product_supplier_entity->id_product_attribute = (int)$id_product_attribute;
$product_supplier_entity->id_supplier = (int)$this->id_supplier; $product_supplier_entity->id_supplier = (int)$id_supplier;
$product_supplier_entity->product_supplier_reference = pSQL($supplier_reference); $product_supplier_entity->product_supplier_reference = pSQL($supplier_reference);
$product_supplier_entity->product_supplier_price_te = (int)$price;
$product_supplier_entity->id_currency = (int)$id_currency; $product_supplier_entity->id_currency = (int)$id_currency;
$product_supplier_entity->save(); $product_supplier_entity->save();
} }
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2470,7 +2470,7 @@ class AdminProductsControllerCore extends AdminController
if ($existing_id <= 0) if ($existing_id <= 0)
{ {
$product->addSupplierReference($reference, (int)$attribute['id_product_attribute'], (int)$id_currency); $product->addSupplierReference($supplier->id_supplier, $reference, (int)$attribute['id_product_attribute'], (float)Tools::convertPrice($price, $id_currency), (int)$id_currency);
if ($product->id_supplier == $supplier->id_supplier) if ($product->id_supplier == $supplier->id_supplier)
{ {
if ((int)$attribute['id_product_attribute'] > 0) if ((int)$attribute['id_product_attribute'] > 0)