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

// Fix errors on product combinations edition page

Browse Source
This commit is contained in:
tDidierjean
2012-04-19 15:41:52 +00:00
parent 0c6429c586
commit e07ff43a35
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+2 -2
View File
@@ -1180,12 +1180,12 @@ class ProductCore extends ObjectModel
* Sets Supplier Reference * Sets Supplier Reference
* *
* @param int $id_supplier * @param int $id_supplier
* @param string $supplier_reference
* @param int $id_product_attribute * @param int $id_product_attribute
* @param string $supplier_reference
* @param float $price * @param float $price
* @param int $id_currency * @param int $id_currency
*/ */
public function addSupplierReference($id_supplier, $supplier_reference, $id_product_attribute = null, $price, $id_currency = null) public function addSupplierReference($id_supplier, $id_product_attribute, $supplier_reference = null, $price = null, $id_currency = null)
{ {
//Try to set the default supplier reference //Try to set the default supplier reference
if ($id_supplier > 0 && $supplier_reference != null) if ($id_supplier > 0 && $supplier_reference != null)
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2482,7 +2482,7 @@ class AdminProductsControllerCore extends AdminController
if ($existing_id <= 0) if ($existing_id <= 0)
{ {
$product->addSupplierReference($supplier->id_supplier, $reference, (int)$attribute['id_product_attribute'], (float)Tools::convertPrice($price, $id_currency), (int)$id_currency); $product->addSupplierReference($supplier->id_supplier, (int)$attribute['id_product_attribute'], $reference, (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)
js/admin-products.js
+4
View File
@@ -610,6 +610,8 @@ product_tabs['Associations'] = new function(){
this.getAccessoriesIds = function() this.getAccessoriesIds = function()
{ {
if ($('#inputAccessories').val() === undefined)
return '';
var ids = id_product + ','; var ids = id_product + ',';
ids += $('#inputAccessories').val().replace(/\\-/g,',').replace(/\\,$/,''); ids += $('#inputAccessories').val().replace(/\\-/g,',').replace(/\\,$/,'');
ids = ids.replace(/\,$/,''); ids = ids.replace(/\,$/,'');
@@ -1076,6 +1078,8 @@ product_tabs['Pack'] = new function(){
function getSelectedIds() function getSelectedIds()
{ {
if ($('#inputPackItems').val() === undefined)
return '';
var ids = ''; var ids = '';
if (typeof(id_product) != 'undefined') if (typeof(id_product) != 'undefined')
ids += id_product + ','; ids += id_product + ',';