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

// replace all uses of "combinaison" by "combination"

Browse Source
This commit is contained in:
tDidierjean
2012-02-17 15:03:56 +00:00
parent c309ff14e5
commit 2a1a47b5f6
11 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminManufacturersController.php
+12 -12
View File
@@ -575,18 +575,18 @@ class AdminManufacturersControllerCore extends AdminController
for ($i = 0; $i < $total_product; $i++)
{
$products[$i] = new Product($products[$i]['id_product'], false, $this->context->language->id);
/* Build attributes combinaisons */
$combinaisons = $products[$i]->getAttributeCombinations($this->context->language->id);
foreach ($combinaisons as $k => $combinaison)
/* Build attributes combinations */
$combinations = $products[$i]->getAttributeCombinations($this->context->language->id);
foreach ($combinations as $k => $combination)
{
$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'];
$comb_array[$combinaison['id_product_attribute']]['quantity'] = $combinaison['quantity'];
$comb_array[$combinaison['id_product_attribute']]['attributes'][] = array(
$combinaison['group_name'],
$combinaison['attribute_name'],
$combinaison['id_attribute']
$comb_array[$combination['id_product_attribute']]['reference'] = $combination['reference'];
$comb_array[$combination['id_product_attribute']]['ean13'] = $combination['ean13'];
$comb_array[$combination['id_product_attribute']]['upc'] = $combination['upc'];
$comb_array[$combination['id_product_attribute']]['quantity'] = $combination['quantity'];
$comb_array[$combination['id_product_attribute']]['attributes'][] = array(
$combination['group_name'],
$combination['attribute_name'],
$combination['id_attribute']
);
}
@@ -599,7 +599,7 @@ class AdminManufacturersControllerCore extends AdminController
$list .= $attribute[0].' - '.$attribute[1].', ';
$comb_array[$key]['attributes'] = rtrim($list, ', ');
}
isset($comb_array) ? $products[$i]->combinaison = $comb_array : '';
isset($comb_array) ? $products[$i]->combination = $comb_array : '';
unset($comb_array);
}
}
controllers/admin/AdminProductsController.php
+4 -5
View File
@@ -559,7 +559,7 @@ class AdminProductsControllerCore extends AdminController
{
if (!Tools::getIsset('attribute_price') || Tools::getIsset('attribute_price') == null)
$this->errors[] = Tools::displayError('Attribute price required.');
if (!Tools::getIsset('attribute_combinaison_list') || Tools::isEmpty(Tools::getValue('attribute_combinaison_list')))
if (!Tools::getIsset('attribute_combination_list') || Tools::isEmpty(Tools::getValue('attribute_combination_list')))
$this->errors[] = Tools::displayError('You must add at least one attribute.');
if (!count($this->errors))
@@ -575,7 +575,7 @@ class AdminProductsControllerCore extends AdminController
{
if ($this->tabAccess['edit'] === '1')
{
if ($product->productAttributeExists(Tools::getValue('attribute_combinaison_list'), (int)$id_product_attribute))
if ($product->productAttributeExists(Tools::getValue('attribute_combination_list'), (int)$id_product_attribute))
$this->errors[] = Tools::displayError('This attribute already exists.');
else
{
@@ -611,7 +611,7 @@ class AdminProductsControllerCore extends AdminController
{
if ($this->tabAccess['add'] === '1')
{
if ($product->productAttributeExists(Tools::getValue('attribute_combinaison_list')))
if ($product->productAttributeExists(Tools::getValue('attribute_combination_list')))
$this->errors[] = Tools::displayError('This combination already exists.');
else
$id_product_attribute = $product->addCombinationEntity(
@@ -636,7 +636,7 @@ class AdminProductsControllerCore extends AdminController
if (!count($this->errors))
{
$combination = new Combination((int)$id_product_attribute);
$combination->setAttributes(Tools::getValue('attribute_combinaison_list'));
$combination->setAttributes(Tools::getValue('attribute_combination_list'));
$product->checkDefaultAttributes();
}
if (!count($this->errors))
@@ -3307,7 +3307,6 @@ class AdminProductsControllerCore extends AdminController
{
$price = Tools::displayPrice($combination['price'], $currency);
$comb_array[$combination['id_product_attribute']]['id_combinaison_attribute'] = $product->id.'||'.$combination['id_product_attribute'];
$comb_array[$combination['id_product_attribute']]['id_product_attribute'] = $combination['id_product_attribute'];
$comb_array[$combination['id_product_attribute']]['attributes'][] = array($combination['group_name'], $combination['attribute_name'], $combination['id_attribute']);
$comb_array[$combination['id_product_attribute']]['wholesale_price'] = $combination['wholesale_price'];
controllers/admin/AdminSuppliersController.php
+15 -15
View File
@@ -262,23 +262,23 @@ class AdminSuppliersControllerCore extends AdminController
for ($i = 0; $i < $total_product; $i++)
{
$products[$i] = new Product($products[$i]['id_product'], false, $this->context->language->id);
// Build attributes combinaisons
$combinaisons = $products[$i]->getAttributeCombinations($this->context->language->id);
foreach ($combinaisons as $k => $combinaison)
// Build attributes combinations
$combinations = $products[$i]->getAttributeCombinations($this->context->language->id);
foreach ($combinations as $k => $combination)
{
$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'];
$comb_array[$combinaison['id_product_attribute']]['quantity'] = $combinaison['quantity'];
$comb_array[$combinaison['id_product_attribute']]['attributes'][] = array(
$combinaison['group_name'],
$combinaison['attribute_name'],
$combinaison['id_attribute']
$combination['id_product_attribute']);
$comb_array[$combination['id_product_attribute']]['product_supplier_reference'] = $comb_infos['product_supplier_reference'];
$comb_array[$combination['id_product_attribute']]['product_supplier_price_te'] = Tools::displayPrice($comb_infos['product_supplier_price_te'], new Currency($comb_infos['id_currency']));
$comb_array[$combination['id_product_attribute']]['reference'] = $combination['reference'];
$comb_array[$combination['id_product_attribute']]['ean13'] = $combination['ean13'];
$comb_array[$combination['id_product_attribute']]['upc'] = $combination['upc'];
$comb_array[$combination['id_product_attribute']]['quantity'] = $combination['quantity'];
$comb_array[$combination['id_product_attribute']]['attributes'][] = array(
$combination['group_name'],
$combination['attribute_name'],
$combination['id_attribute']
);
}
@@ -291,7 +291,7 @@ class AdminSuppliersControllerCore extends AdminController
$list .= $attribute[0].' - '.$attribute[1].', ';
$comb_array[$key]['attributes'] = rtrim($list, ', ');
}
isset($comb_array) ? $products[$i]->combinaison = $comb_array : '';
isset($comb_array) ? $products[$i]->combination = $comb_array : '';
unset($comb_array);
}
else