dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : BugFix : #PSCFV-2242 :CSV Import - Issues with products

Browse Source
This commit is contained in:
vChabot
2012-05-10 08:59:21 +00:00
parent 2933d699f4
commit 4b416eff28
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+1 -1
View File
@@ -46,7 +46,7 @@
function activeClueTip() function activeClueTip()
{ {
$('.info').cluetip({ $('.info_import').cluetip({
splitTitle: '|', splitTitle: '|',
showTitle: false showTitle: false
}); });
controllers/admin/AdminImportController.php
+4 -2
View File
@@ -671,16 +671,18 @@ class AdminImportControllerCore extends AdminController
{ {
$i = 0; $i = 0;
$fields = array(); $fields = array();
$keys = array_keys($this->available_fields);
array_shift($keys);
foreach ($this->available_fields as $k => $field) foreach ($this->available_fields as $k => $field)
{ {
if ($k === 'no') if ($k === 'no')
continue; continue;
if ($k === 'price_tin') if ($k === 'price_tin')
$fields[$i - 1]['label'] = $fields[$i - 1]['label'].' '.$this->l('or').' '.$field['label']; $fields[$i - 1] = '<div>'.$this->available_fields[$keys[$i - 1]]['label'].' '.$this->l('or').' '.$field['label'].'<span style="margin-left:16px"></span></div>';
else else
{ {
if (isset($field['help'])) if (isset($field['help']))
$html = '&nbsp;<a href="#" class="info" title="'.$this->l('Info').'|'.$field['help'].'"><img src="'._PS_ADMIN_IMG_.'information.png"></a>'; $html = '&nbsp;<a href="#" class="info_import" title="'.$this->l('Info').'|'.$field['help'].'"><img src="'._PS_ADMIN_IMG_.'information.png"></a>';
else else
$html = '<span style="margin-left:16px"></span>'; $html = '<span style="margin-left:16px"></span>';
$fields[] = '<div>'.$field['label'].$html.'</div>'; $fields[] = '<div>'.$field['label'].$html.'</div>';