Skip to content

Commit

Permalink
rename code and barcode to global_ID
Browse files Browse the repository at this point in the history
  • Loading branch information
@hamidpeywasti
hamidpeywasti committed Jun 4, 2019
1 parent 8207893 commit 76ae548
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/dca/tl_content.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

}

Expand Down Expand Up @@ -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 ''"
Expand Down
2 changes: 1 addition & 1 deletion src/dca/tl_module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''"
Expand Down
10 changes: 5 additions & 5 deletions src/dca/tl_product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 .')';
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/languages/en/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/languages/en/tl_product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
Expand Down
2 changes: 1 addition & 1 deletion src/languages/fa/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = 'مدل';
Expand Down
4 changes: 2 additions & 2 deletions src/languages/fa/tl_product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
12 changes: 6 additions & 6 deletions src/library/Frontend/Element/ContentProduct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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'];

Expand Down
14 changes: 7 additions & 7 deletions src/library/Frontend/Module/ModuleProduct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'];

Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/templates/product/product_full.html5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<?php if($this->meta_sku): ?>
<span class="sku"><?= $this->meta_sku_txt; ?>: <span itemprop="sku"><?= $this->meta_sku; ?></span></span>
<?php endif; ?>
<?php if($this->meta_barcode): ?>
<span class="barcode"><?= $this->meta_barcode_txt; ?>: <span itemprop="<?= $this->meta_barcode[unit]; ?>"><?= $this->meta_barcode[value]; ?></span></span>
<?php if($this->meta_global_ID): ?>
<span class="global_ID"><?= $this->meta_global_ID_txt; ?>: <span itemprop="<?= $this->meta_global_ID[unit]; ?>"><?= $this->meta_global_ID[value]; ?></span></span>
<?php endif; ?>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/templates/product/product_short.html5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<time datetime="<?= $this->datetime; ?>"><?= $this->date; ?></time>
<?php if($this->meta_brand): ?><span class="brand"><?= $this->meta_brand_txt; ?>: <span itemprop="brand"><?= $this->meta_brand; ?></span></span><?php endif; ?>
<?php if($this->meta_model): ?><span class="model"><?= $this->meta_model_txt; ?>: <span><?= $this->meta_model; ?></span></span><?php endif; ?>
<?php if($this->meta_barcode): ?><span class="barcode"><?= $this->meta_barcode_txt; ?>: <span><?= $this->meta_barcode; ?></span></span><?php endif; ?>
<?php if($this->meta_global_ID): ?><span class="global_ID"><?= $this->meta_global_ID_txt; ?>: <span><?= $this->meta_global_ID; ?></span></span><?php endif; ?>
<?php if($this->meta_sku): ?><span class="sku"><?= $this->meta_sku_txt; ?>: <span itemprop="sku"><?= $this->meta_sku; ?></span></span><?php endif; ?>

</div>
Expand Down

0 comments on commit 76ae548

Please sign in to comment.