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

// #PSFV-299

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12159 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-01-04 17:29:30 +00:00
parent cd6acd8a0e
commit ab2ebc3853
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminSuppliersController.php
+13
View File
@@ -261,6 +261,11 @@ class AdminSuppliersControllerCore extends AdminController
$combinaisons = $products[$i]->getAttributeCombinaisons($this->context->language->id);
foreach ($combinaisons as $k => $combinaison)
{
$comb_infos = Supplier::getProductInformationsBySupplier($this->object->id,
$products[$i]->id,
$combinaison['id_product_attribute']);
$comb_array[$combinaison['id_product_attribute']]['product_supplier_reference'] = $comb_infos['product_supplier_reference'];
$comb_array[$combinaison['id_product_attribute']]['product_supplier_price_te'] = Tools::displayPrice($comb_infos['product_supplier_price_te'], new Currency($comb_infos['id_currency']));
$comb_array[$combinaison['id_product_attribute']]['reference'] = $combinaison['reference'];
$comb_array[$combinaison['id_product_attribute']]['ean13'] = $combinaison['ean13'];
$comb_array[$combinaison['id_product_attribute']]['upc'] = $combinaison['upc'];
@@ -284,6 +289,14 @@ class AdminSuppliersControllerCore extends AdminController
isset($comb_array) ? $products[$i]->combinaison = $comb_array : '';
unset($comb_array);
}
else
{
$product_infos = Supplier::getProductInformationsBySupplier($this->object->id,
$products[$i]->id,
0);
$products[$i]->product_supplier_reference = $product_infos['product_supplier_reference'];
$products[$i]->product_supplier_price_te = Tools::displayPrice($product_infos['product_supplier_price_te'], new Currency($product_infos['id_currency']));
}
}
$this->tpl_view_vars = array(