diff --git a/src/dca/tl_content.php b/src/dca/tl_content.php
index a0bd904..3ffc8bc 100644
--- a/src/dca/tl_content.php
+++ b/src/dca/tl_content.php
@@ -17,7 +17,7 @@
if (Input::get('do') == 'products')
{
$GLOBALS['TL_DCA']['tl_content']['config']['ptable'] = 'tl_product';
- $GLOBALS['TL_DCA']['tl_content']['list']['sorting']['headerFields'] = array('title', 'brand','model','code','sku', 'published');
+ $GLOBALS['TL_DCA']['tl_content']['list']['sorting']['headerFields'] = array('title', 'brand','model','global_ID','sku', 'published');
}
@@ -59,7 +59,7 @@
'label' => &$GLOBALS['TL_LANG']['tl_module']['product_metaFields'],
'exclude' => true,
'inputType' => 'checkbox',
- 'options' => array('date','code','brand','model','sku','buy'),
+ 'options' => array('date','global_ID','brand','model','sku','buy'),
'reference' => &$GLOBALS['TL_LANG']['MSC'],
'eval' => array('multiple'=>true,'tl_class'=>'clr'),
'sql' => "varchar(255) NOT NULL default ''"
diff --git a/src/dca/tl_module.php b/src/dca/tl_module.php
index 0857061..7b80168 100644
--- a/src/dca/tl_module.php
+++ b/src/dca/tl_module.php
@@ -78,7 +78,7 @@
'default' => array(''),
'exclude' => true,
'inputType' => 'checkbox',
- 'options' => array('date','price','availability','brand','model','sku','barcode','buy'),
+ 'options' => array('date','price','availability','brand','model','sku','global_ID','buy'),
'reference' => &$GLOBALS['TL_LANG']['MSC'],
'eval' => array('multiple'=>true),
'sql' => "varchar(255) NOT NULL default ''"
diff --git a/src/dca/tl_product.php b/src/dca/tl_product.php
index 403550d..fa09e37 100644
--- a/src/dca/tl_product.php
+++ b/src/dca/tl_product.php
@@ -120,7 +120,7 @@
'palettes' => array
(
'__selector__' => array('addEnclosure','overwriteMeta'),
- 'default' => '{title_legend},title,alias,featured;{meta_legend},pageTitle,date,description;{offer_legend:hide},price,availability;{rating_legend},rating_value,rating_count;{product_legend},brand,model,sku,barcode;{image_legend},singleSRC,overwriteMeta;{related_legend},related;{link_legend:hide},url,target,titleText,linkTitle;{enclosure_legend:hide},addEnclosure;{publish_legend},published,start,stop',
+ 'default' => '{title_legend},title,alias,featured;{meta_legend},pageTitle,date,description;{offer_legend:hide},price,availability;{rating_legend},rating_value,rating_count;{product_legend},brand,model,sku,global_ID;{image_legend},singleSRC,overwriteMeta;{related_legend},related;{link_legend:hide},url,target,titleText,linkTitle;{enclosure_legend:hide},addEnclosure;{publish_legend},published,start,stop',
),
// Subpalettes
@@ -204,9 +204,9 @@
'eval' => array('maxlength'=>128, 'tl_class'=>'w50'),
'sql' => "varchar(128) NOT NULL default ''"
),
- 'barcode' => array
+ 'global_ID' => array
(
- 'label' => &$GLOBALS['TL_LANG']['tl_product']['barcode'],
+ 'label' => &$GLOBALS['TL_LANG']['tl_product']['global_ID'],
'exclude' => true,
'search' => true,
'sorting' => true,
@@ -695,8 +695,8 @@ public function getProducts(DataContainer $dc)
$arrItems[$objItems->id] .= ' [model: ' . $objItems->model .']';
}
- if ($objItems->code) {
- $arrItems[$objItems->id] .= ' (code: ' . $objItems->code .')';
+ if ($objItems->sku) {
+ $arrItems[$objItems->id] .= ' (sku: ' . $objItems->sku .')';
}
}
diff --git a/src/languages/en/default.php b/src/languages/en/default.php
index 370365a..5c529b5 100644
--- a/src/languages/en/default.php
+++ b/src/languages/en/default.php
@@ -21,7 +21,7 @@
$GLOBALS['TL_LANG']['MSC']['price'] = 'Price';
$GLOBALS['TL_LANG']['MSC']['availability'] = 'Availability';
$GLOBALS['TL_LANG']['MSC']['model'] = 'Model';
-$GLOBALS['TL_LANG']['MSC']['barcode'] = 'EAN/UPC';
+$GLOBALS['TL_LANG']['MSC']['global_ID'] = 'EAN/UPC';
$GLOBALS['TL_LANG']['MSC']['brand'] = 'Brand';
$GLOBALS['TL_LANG']['MSC']['sku'] = 'SKU';
$GLOBALS['TL_LANG']['MSC']['buy'] = 'Buy link';
@@ -51,7 +51,7 @@
$GLOBALS['TL_LANG']['MSC']['price_text'] = 'Price';
$GLOBALS['TL_LANG']['MSC']['model_text'] = 'Model';
-$GLOBALS['TL_LANG']['MSC']['barcode_text'] = 'EAN/UPC';
+$GLOBALS['TL_LANG']['MSC']['global_ID_text'] = 'EAN/UPC';
$GLOBALS['TL_LANG']['MSC']['brand_text'] = 'Brand';
$GLOBALS['TL_LANG']['MSC']['sku_text'] = 'SKU';
$GLOBALS['TL_LANG']['MSC']['status_text'] = 'Status';
diff --git a/src/languages/en/tl_product.php b/src/languages/en/tl_product.php
index 765a687..b0710a6 100644
--- a/src/languages/en/tl_product.php
+++ b/src/languages/en/tl_product.php
@@ -24,7 +24,7 @@
$GLOBALS['TL_LANG']['tl_product']['rating_count'] = array('Rating count','');
$GLOBALS['TL_LANG']['tl_product']['brand'] = array('Brand','Please enter the product brand.');
$GLOBALS['TL_LANG']['tl_product']['model'] = array('Model','Please enter the product model.');
-$GLOBALS['TL_LANG']['tl_product']['barcode'] = array('EAN/UPC','Please enter the product EAN/UPC.');
+$GLOBALS['TL_LANG']['tl_product']['global_ID'] = array('EAN/UPC','Please enter the product EAN/UPC.');
$GLOBALS['TL_LANG']['tl_product']['sku'] = array('SKU','Please enter the product SKU (Stock Keeping Unit).');
$GLOBALS['TL_LANG']['tl_product']['date'] = array('Date','Please enter the date according to the global date format.');
$GLOBALS['TL_LANG']['tl_product']['url'] = array('Link target','Please enter a web address (http://…), an e-mail address (mailto:…) or an insert tag.');
diff --git a/src/languages/fa/default.php b/src/languages/fa/default.php
index 384204f..d04c1ef 100644
--- a/src/languages/fa/default.php
+++ b/src/languages/fa/default.php
@@ -13,7 +13,7 @@
$GLOBALS['TL_LANG']['MSC']['brand_text'] = 'برند';
$GLOBALS['TL_LANG']['MSC']['status_text'] = 'وضعیت';
-$GLOBALS['TL_LANG']['MSC']['barcode_text'] = 'کد';
+$GLOBALS['TL_LANG']['MSC']['global_ID_text'] = 'کد';
$GLOBALS['TL_LANG']['MSC']['emptyCatalog'] = 'محصولی وجود ندارد!';
$GLOBALS['TL_LANG']['MSC']['features'] = 'ویژگیها';
$GLOBALS['TL_LANG']['MSC']['model_text'] = 'مدل';
diff --git a/src/languages/fa/tl_product.php b/src/languages/fa/tl_product.php
index 7a00757..e1bdb74 100644
--- a/src/languages/fa/tl_product.php
+++ b/src/languages/fa/tl_product.php
@@ -18,8 +18,8 @@
$GLOBALS['TL_LANG']['tl_product']['alt']['0'] = 'متن جایگزین';
$GLOBALS['TL_LANG']['tl_product']['brand']['0'] = 'برند';
$GLOBALS['TL_LANG']['tl_product']['brand']['1'] = 'لطفا برند یا مارک محصول را وارد نمایید.';
-$GLOBALS['TL_LANG']['tl_product']['code']['0'] = 'کد محصول';
-$GLOBALS['TL_LANG']['tl_product']['code']['1'] = 'لطفا کد محصول را وارد نمایید.';
+$GLOBALS['TL_LANG']['tl_product']['global_ID']['0'] = 'کد محصول';
+$GLOBALS['TL_LANG']['tl_product']['global_ID']['1'] = 'لطفا کد محصول را وارد نمایید.';
$GLOBALS['TL_LANG']['tl_product']['config_legend'] = 'تاریخ و مشخصات';
$GLOBALS['TL_LANG']['tl_product']['copy']['0'] = 'تکثیر محصول';
$GLOBALS['TL_LANG']['tl_product']['copy']['1'] = 'تکثیر محصول شناسهی %s';
diff --git a/src/library/Frontend/Element/ContentProduct.php b/src/library/Frontend/Element/ContentProduct.php
index b849b9a..0143682 100644
--- a/src/library/Frontend/Element/ContentProduct.php
+++ b/src/library/Frontend/Element/ContentProduct.php
@@ -111,13 +111,13 @@ public function parseProduct($objProduct, $blnAddCategory=false, $strClass='', $
$objTemplate->date = $arrMeta['date'];
$objTemplate->meta_brand = $arrMeta['brand'];
$objTemplate->meta_model = $arrMeta['model'];
- $objTemplate->meta_code = $arrMeta['code'];
+ $objTemplate->meta_global_ID = $arrMeta['global_ID'];
$objTemplate->meta_sku = $arrMeta['sku'];
$objTemplate->meta_buy = $arrMeta['buy'];
$objTemplate->meta_brand_txt = $GLOBALS['TL_LANG']['MSC']['brand_text'];
$objTemplate->meta_model_txt = $GLOBALS['TL_LANG']['MSC']['model_text'];
- $objTemplate->meta_code_txt = $GLOBALS['TL_LANG']['MSC']['code_text'];
+ $objTemplate->meta_global_ID_txt = $GLOBALS['TL_LANG']['MSC']['global_ID_text'];
$objTemplate->meta_sku_txt = $GLOBALS['TL_LANG']['MSC']['sku_text'];
$objTemplate->hasMetaFields = !empty($arrMeta);
@@ -300,9 +300,9 @@ protected function getMetaFields($objProduct)
$return['date'] = \Date::parse($objPage->datimFormat, $objProduct->date);
break;
- case 'code':
- if ($objProduct->code)
- $return['code'] = $objProduct->code;
+ case 'global_ID':
+ if ($objProduct->global_ID)
+ $return['global_ID'] = $objProduct->global_ID;
break;
case 'model':
@@ -356,7 +356,7 @@ protected function parseRelated($objProduct, $blnAddCategory=false, $strClass=''
$objTemplate->date = $arrMeta['date'];
$objTemplate->meta_brand = $arrMeta['brand'];
$objTemplate->meta_model = $arrMeta['model'];
- $objTemplate->meta_code = $arrMeta['code'];
+ $objTemplate->meta_global_ID = $arrMeta['global_ID'];
$objTemplate->meta_sku = $arrMeta['sku'];
$objTemplate->meta_buy = $arrMeta['buy'];
diff --git a/src/library/Frontend/Module/ModuleProduct.php b/src/library/Frontend/Module/ModuleProduct.php
index ecc88d2..c925bcd 100644
--- a/src/library/Frontend/Module/ModuleProduct.php
+++ b/src/library/Frontend/Module/ModuleProduct.php
@@ -114,14 +114,14 @@ public function parseProduct($objProduct, $blnAddCategory=false, $strClass='', $
$objTemplate->meta_availability = $arrMeta['availability'];
$objTemplate->meta_availability_txt = $GLOBALS['TL_LANG']['MSC'][$objProduct->availability];
$objTemplate->meta_model = $arrMeta['model'];
- $objTemplate->meta_barcode = $arrMeta['barcode'];
+ $objTemplate->meta_global_ID = $arrMeta['global_ID'];
$objTemplate->meta_sku = $arrMeta['sku'];
$objTemplate->meta_buy = $arrMeta['buy'];
$objTemplate->meta_price_txt = $GLOBALS['TL_LANG']['MSC']['price_text'];
$objTemplate->meta_brand_txt = $GLOBALS['TL_LANG']['MSC']['brand_text'];
$objTemplate->meta_model_txt = $GLOBALS['TL_LANG']['MSC']['model_text'];
- $objTemplate->meta_barcode_txt = $GLOBALS['TL_LANG']['MSC']['barcode_text'];
+ $objTemplate->meta_global_ID_txt = $GLOBALS['TL_LANG']['MSC']['global_ID_text'];
$objTemplate->meta_sku_txt = $GLOBALS['TL_LANG']['MSC']['sku_text'];
$objTemplate->meta_status_txt = $GLOBALS['TL_LANG']['MSC']['status_text'];
@@ -317,9 +317,9 @@ protected function getMetaFields($objProduct)
$return['availability'] = $objProduct->availability;
break;
- case 'barcode':
- if ($objProduct->barcode)
- $return['barcode'] = \StringUtil::deserialize($objProduct->barcode);
+ case 'global_ID':
+ if ($objProduct->global_ID)
+ $return['global_ID'] = \StringUtil::deserialize($objProduct->global_ID);
break;
case 'model':
@@ -373,13 +373,13 @@ protected function parseRelated($objProduct, $blnAddCategory=false, $strClass=''
$objTemplate->date = $arrMeta['date'];
$objTemplate->meta_brand = $arrMeta['brand'];
$objTemplate->meta_model = $arrMeta['model'];
- $objTemplate->meta_code = $arrMeta['code'];
+ $objTemplate->meta_global_ID = $arrMeta['global_ID'];
$objTemplate->meta_sku = $arrMeta['sku'];
$objTemplate->meta_buy = $arrMeta['buy'];
$objTemplate->meta_brand_txt = $GLOBALS['TL_LANG']['MSC']['brand_text'];
$objTemplate->meta_model_txt = $GLOBALS['TL_LANG']['MSC']['model_text'];
- $objTemplate->meta_code_txt = $GLOBALS['TL_LANG']['MSC']['code_text'];
+ $objTemplate->meta_global_ID_txt = $GLOBALS['TL_LANG']['MSC']['global_ID_text'];
$objTemplate->meta_sku_txt = $GLOBALS['TL_LANG']['MSC']['sku_text'];
$objTemplate->hasMetaFields = !empty($arrMeta);
diff --git a/src/templates/product/product_full.html5 b/src/templates/product/product_full.html5
index a497b95..11754da 100644
--- a/src/templates/product/product_full.html5
+++ b/src/templates/product/product_full.html5
@@ -18,8 +18,8 @@
meta_sku): ?>
= $this->meta_sku_txt; ?>: = $this->meta_sku; ?>
- meta_barcode): ?>
- = $this->meta_barcode_txt; ?>: = $this->meta_barcode[value]; ?>
+ meta_global_ID): ?>
+ = $this->meta_global_ID_txt; ?>: = $this->meta_global_ID[value]; ?>
diff --git a/src/templates/product/product_short.html5 b/src/templates/product/product_short.html5
index c7a085e..d6404cd 100644
--- a/src/templates/product/product_short.html5
+++ b/src/templates/product/product_short.html5
@@ -23,7 +23,7 @@
meta_brand): ?>= $this->meta_brand_txt; ?>: = $this->meta_brand; ?>
meta_model): ?>= $this->meta_model_txt; ?>: = $this->meta_model; ?>
- meta_barcode): ?>= $this->meta_barcode_txt; ?>: = $this->meta_barcode; ?>
+ meta_global_ID): ?>= $this->meta_global_ID_txt; ?>: = $this->meta_global_ID; ?>
meta_sku): ?>= $this->meta_sku_txt; ?>: = $this->meta_sku; ?>