diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl index 1685ff730..a818c52d6 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl @@ -93,7 +93,7 @@ {l s='UPC'} {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{l s='Available Quantity'}{/if} - {foreach $product->combinaison AS $id_product_attribute => $product_attribute} + {foreach $product->combination AS $id_product_attribute => $product_attribute} {$product_attribute.attributes} {$product_attribute.reference} diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index 219932330..4870f806e 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -93,7 +93,7 @@
- + diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl index b8da88465..2ed0c2190 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl @@ -66,7 +66,7 @@ {l s='UPC'} {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{l s='Available Quantity'}{/if} - {foreach $product->combinaison AS $id_product_attribute => $product_attribute} + {foreach $product->combination AS $id_product_attribute => $product_attribute} {$product_attribute.attributes} {$product_attribute.product_supplier_reference} diff --git a/classes/Attribute.php b/classes/Attribute.php index e89f39e0f..92a076c9f 100644 --- a/classes/Attribute.php +++ b/classes/Attribute.php @@ -159,10 +159,10 @@ class AttributeCore extends ObjectModel } /** - * Get quantity for a given attribute combinaison + * Get quantity for a given attribute combination * Check if quantity is enough to deserve customer * - * @param integer $id_product_attribute Product attribute combinaison id + * @param integer $id_product_attribute Product attribute combination id * @param integer $qty Quantity needed * @return boolean Quantity is available or not */ diff --git a/classes/Product.php b/classes/Product.php index 9310406d3..b63289ca1 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -1500,7 +1500,7 @@ class ProductCore extends ObjectModel } /** - * Delete a product attributes combinaison + * Delete a product attributes combination * * @param integer $id_product_attribute Product attribute id * @return array Deletion result @@ -1568,7 +1568,7 @@ class ProductCore extends ObjectModel * Get all available product attributes resume * * @param integer $id_lang Language id - * @return array Product attributes combinaisons + * @return array Product attributes combinations */ public function getAttributesResume($id_lang, $attribute_value_separator = ' - ', $attribute_separator = ', ') { @@ -1606,10 +1606,10 @@ class ProductCore extends ObjectModel } /** - * Get all available product attributes combinaisons + * Get all available product attributes combinations * * @param integer $id_lang Language id - * @return array Product attributes combinaisons + * @return array Product attributes combinations */ public function getAttributeCombinations($id_lang) { @@ -1647,11 +1647,11 @@ class ProductCore extends ObjectModel } /** - * Get product attribute combinaison by id_product_attribute + * Get product attribute combination by id_product_attribute * * @param integer $id_product_attribute * @param integer $id_lang Language id - * @return array Product attribute combinaison by id_product_attribute + * @return array Product attribute combination by id_product_attribute */ public function getAttributeCombinationsById($id_product_attribute, $id_lang) { @@ -1727,9 +1727,9 @@ class ProductCore extends ObjectModel } /** - * Check if product has attributes combinaisons + * Check if product has attributes combinations * - * @return integer Attributes combinaisons number + * @return integer Attributes combinations number */ public function hasAttributes() { diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index b591c6b82..fe41645cd 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -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); } } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2bda1952a..5ec834cd3 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -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']; diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index d805bfc84..bb8426b98 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -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 diff --git a/js/admin-products.js b/js/admin-products.js index 169f9d27d..0993a0176 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -184,7 +184,7 @@ function editProductAttribute(url, parent) $("#attribute_wholesale_price_full").hide(); $("#attribute_wholesale_price_blank").show(); } - fillCombinaison( + fillCombination( wholesale_price, price, weight, diff --git a/js/attributesBack.js b/js/attributesBack.js index 6798f5530..d93f4fb9d 100644 --- a/js/attributesBack.js +++ b/js/attributesBack.js @@ -26,7 +26,7 @@ var storeUsedGroups = {}; -function fillCombinaison(wholesale_price, price_impact, weight_impact, unit_impact, reference, +function fillCombination(wholesale_price, price_impact, weight_impact, unit_impact, reference, ean, quantity, image, old_attr, id_product_attribute, default_attribute, eco_tax, upc, minimal_quantity, available_date, virtual_product_name_attribute, virtual_product_filename_attribute, virtual_product_nb_downloable, virtual_product_expiration_date_attribute, virtual_product_nb_days, is_shareable) diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 03fc826b8..193cdaa24 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -371,9 +371,9 @@ class StatsProduct extends ModuleGraph $combArray = array(); $assocNames = array(); - $combinaisons = $product->getAttributeCombinations((int)$this->getLang()); - foreach ($combinaisons as $k => $combinaison) - $combArray[$combinaison['id_product_attribute']][] = array('group' => $combinaison['group_name'], 'attr' => $combinaison['attribute_name']); + $combinations = $product->getAttributeCombinations((int)$this->getLang()); + foreach ($combinations as $k => $combination) + $combArray[$combination['id_product_attribute']][] = array('group' => $combination['group_name'], 'attr' => $combination['attribute_name']); foreach ($combArray as $id_product_attribute => $product_attribute) { $list = '';