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
admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
+1 -1
View File
@@ -93,7 +93,7 @@
<th width="80">{l s='UPC'}</th>
{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right" width="150">{l s='Available Quantity'}</th>{/if}
</tr>
{foreach $product->combinaison AS $id_product_attribute => $product_attribute}
{foreach $product->combination AS $id_product_attribute => $product_attribute}
<tr {if $id_product_attribute %2}class="alt_row"{/if} >
<td>{$product_attribute.attributes}</td>
<td>{$product_attribute.reference}</td>
admin-dev/themes/default/template/controllers/products/combinations.tpl
+1 -1
View File
@@ -93,7 +93,7 @@
<input style="width: 140px; margin-bottom: 10px;" type="button" value="{l s='Add'}" class="button" onclick="add_attr();"/><br />
<input style="width: 140px;" type="button" value="{l s='Delete'}" class="button" onclick="del_attr()"/></td>
<td align="left">
<select id="product_att_list" name="attribute_combinaison_list[]" multiple="multiple" size="4" style="width: 320px;"></select>
<select id="product_att_list" name="attribute_combination_list[]" multiple="multiple" size="4" style="width: 320px;"></select>
</td>
</tr>
<tr>
admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
+1 -1
View File
@@ -66,7 +66,7 @@
<th>{l s='UPC'}</th>
{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
</tr>
{foreach $product->combinaison AS $id_product_attribute => $product_attribute}
{foreach $product->combination AS $id_product_attribute => $product_attribute}
<tr {if $id_product_attribute %2}class="alt_row"{/if} >
<td>{$product_attribute.attributes}</td>
<td>{$product_attribute.product_supplier_reference}</td>
classes/Attribute.php
+2 -2
View File
@@ -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
*/
classes/Product.php
+8 -8
View File
@@ -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()
{
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
js/admin-products.js
+1 -1
View File
@@ -184,7 +184,7 @@ function editProductAttribute(url, parent)
$("#attribute_wholesale_price_full").hide();
$("#attribute_wholesale_price_blank").show();
}
fillCombinaison(
fillCombination(
wholesale_price,
price,
weight,
js/attributesBack.js
+1 -1
View File
@@ -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)
modules/statsproduct/statsproduct.php
+3 -3
View File
@@ -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 = '';