antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-eanUpgrade' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-22 11:13:52 +02:00
commit 73a3127d3e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
adm/tabs/AdminProducts.php
View File

@ -3405,16 +3405,6 @@ class AdminProducts extends AdminTab
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="other_textarea" cols="100" rows="3" id="description_more_'.$language['id_lang'].'" name="description_more_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_more', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
<tr>
<td class="col-left">'.$this->l('Comments :').'<br /><br /></td>
<td style="padding-bottom:5px;" class="translatable">';
foreach ($this->_languages as $language)
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="other_textarea" cols="100" rows="3" id="description_comment_'.$language['id_lang'].'" name="description_comment_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_comment', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
@ -3435,6 +3425,16 @@ class AdminProducts extends AdminTab
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class=" other_textarea" cols="100" rows="5" id="description_delivery_'.$language['id_lang'].'" name="description_delivery_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_delivery', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>
<tr><td colspan="2" style="padding-bottom:5px;"><hr style="width:100%;" /></td></tr>
<tr>
<td class="col-left">'.$this->l('Comments :').'<br /><br /></td>
<td style="padding-bottom:5px;" class="translatable">';
foreach ($this->_languages as $language)
echo ' <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').';float: left;">
<textarea class="other_textarea" cols="100" rows="3" id="description_comment_'.$language['id_lang'].'" name="description_comment_'.$language['id_lang'].'">'.htmlentities(stripslashes($this->getFieldValue($obj, 'description_comment', $language['id_lang'])), ENT_COMPAT, 'UTF-8').'</textarea>
</div>';
echo ' </td>
</tr>';

1
override/classes/Product.php
View File

@ -9,6 +9,7 @@ class Product extends ProductCore
/**
* @Override
*/
protected $fieldsSize = array('reference' => 64, 'supplier_reference' => 32, 'location' => 64, 'ean13' => 13, 'upc' => 12, 'unity' => 10);
protected $fieldsValidateLang = array(
'meta_description' => 'isGenericName', 'meta_keywords' => 'isGenericName',
'meta_title' => 'isGenericName', 'link_rewrite' => 'isLinkRewrite', 'name' => 'isCatalogName',