Merge branch 'ticket-13516-removeCategoryAddButton' into develop
This commit is contained in:
Marion Muszynski
commit
5e88037ef6
@ -377,8 +377,8 @@ class AdminCategories extends AdminTab
|
||||
|
||||
$this->getList((int)($cookie->id_lang), !$cookie->__get($this->table.'Orderby') ? 'position' : NULL, !$cookie->__get($this->table.'Orderway') ? 'ASC' : NULL);
|
||||
echo '<h3>'.(!$this->_listTotal ? ($this->l('There are no subcategories')) : ($this->_listTotal.' '.($this->_listTotal > 1 ? $this->l('subcategories') : $this->l('subcategory')))).' '.$this->l('in category').' "'.stripslashes($this->_category->getName()).'"</h3>';
|
||||
if ($this->tabAccess['add'] === '1')
|
||||
echo '<a href="'.__PS_BASE_URI__.substr($_SERVER['PHP_SELF'], strlen(__PS_BASE_URI__)).'?tab=AdminCatalog&add'.$this->table.'&id_parent='.Tools::getValue('id_category', 1).'&token='.($token!=NULL ? $token : $this->token).'"><img src="../img/admin/add.gif" border="0" /> '.$this->l('Add a new subcategory').'</a>';
|
||||
// if ($this->tabAccess['add'] === '1')
|
||||
// echo '<a href="'.__PS_BASE_URI__.substr($_SERVER['PHP_SELF'], strlen(__PS_BASE_URI__)).'?tab=AdminCatalog&add'.$this->table.'&id_parent='.Tools::getValue('id_category', 1).'&token='.($token!=NULL ? $token : $this->token).'"><img src="../img/admin/add.gif" border="0" /> '.$this->l('Add a new subcategory').'</a>';
|
||||
echo '<div style="margin:10px;">';
|
||||
|
||||
/**
|
||||
|
||||
@ -329,7 +329,7 @@ class AdminAntConfigurations extends AdminTab
|
||||
WHERE c.`id_lang` = '.$cookie->id_lang.'
|
||||
AND p.`date_start` > "2017-01-01 00:00:00"
|
||||
ORDER BY p.`id_sale` DESC
|
||||
LIMIT 800
|
||||
LIMIT 1200
|
||||
') as $row) {
|
||||
$extrafields = Category::getSalesInfos(array((int) $row['id_category']));
|
||||
$id_sale_options[] = array(
|
||||
|
||||
@ -1835,6 +1835,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
fclose($f);
|
||||
$output .= '<p class="conf">'.$this->l('Export complete.').' <a onclick="window.open(this.href); return false;" href="http://'.$_SERVER['HTTP_HOST'].__PS_BASE_URI__.'modules/bulkupdate/'.$fname.'">'.$this->l('Click here to download the file').'</a></p>';
|
||||
}
|
||||
} elseif(Tools::isSubmit('submitExportProducts')) {
|
||||
HelperFormBootstrap::displayWarning($this->l('En cours de developpement...'));
|
||||
} elseif(Tools::isSubmit('submitExportPositions')) {
|
||||
set_time_limit(300);
|
||||
if($id_category = (int) Tools::getValue('category')) {
|
||||
@ -1933,6 +1935,7 @@ class AdminBulkUpdate extends AdminTab {
|
||||
WHERE l.`id_lang` = '.(int) $cookie->id_lang.'
|
||||
AND c.`id_parent` = 1
|
||||
ORDER BY id_category DESC
|
||||
'.((Tools::getIsset('nolimit') && Tools::getValue('nolimit')==1)?'':'LIMIT 1200').'
|
||||
') as $row) {
|
||||
$extrafields = Category::getSalesInfosWithDate(array((int) $row['id_category']));
|
||||
$option_sales[] = array(
|
||||
@ -1946,11 +1949,11 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$helperForm->_inputSwitch = true;
|
||||
$helperForm->_inputMask = true;
|
||||
$output = $helperForm->renderStyle();
|
||||
$output .= '<h2>Mise à jour groupée</h2>';
|
||||
|
||||
// Categories
|
||||
$output .= '<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h2>Mise à jour groupée</h2>
|
||||
<div class="panel">
|
||||
<ul class="nav nav-tabs nav-justified">
|
||||
<li role="presentation" class="active">
|
||||
@ -2302,136 +2305,169 @@ class AdminBulkUpdate extends AdminTab {
|
||||
// Sale Export
|
||||
$output .= '
|
||||
<div class="col-md-12">
|
||||
<h2>Exports</h2>
|
||||
<div class="panel">
|
||||
<div class="panel-title">
|
||||
<h2><span class="text-rose anticon anticon-upload"></span> '.$this->l('Export').'</h2>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
|
||||
<br>
|
||||
<div class="col-md-5">';
|
||||
$input = array(
|
||||
'type' => 'select2',
|
||||
'name' => 'category',
|
||||
'id' => 'category',
|
||||
'label' => $this->l('Select a category to export:'),
|
||||
'label-class' => 'col-md-12',
|
||||
'input-class' => 'col-md-12',
|
||||
'select-class' => 'col-md-12',
|
||||
'options' => $option_sales
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'</div>';
|
||||
<ul class="nav nav-tabs nav-justified">
|
||||
<li role="presentation" class="active">
|
||||
<a href="#exportSales" aria-controls="exportSales" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-upload"></span> '.$this->l('Export Ventes').'</a>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<a href="#exportDEB" aria-controls="exportDEB" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-upload"></span> '.$this->l('Export DEB').'</a>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<a href="#exportProducts" aria-controls="exportProducts" role="tab" data-toggle="tab"><span class="text-rose anticon anticon-upload"></span> '.$this->l('Export Produits').'</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
$output .='<div class="col-md-2 text-center"><span class="lateral-delimiter"></span></div>
|
||||
<div class="tab-content">
|
||||
<div role="tabpanel" class="tab-pane active" id="exportSales">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Export Ventes').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
|
||||
<br>
|
||||
<div class="col-md-5">';
|
||||
$input = array(
|
||||
'type' => 'select2',
|
||||
'name' => 'category',
|
||||
'id' => 'category',
|
||||
'label' => $this->l('Select a category to export:'),
|
||||
'label-class' => 'col-md-12',
|
||||
'input-class' => 'col-md-12',
|
||||
'select-class' => 'col-md-12',
|
||||
'options' => $option_sales
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'</div>';
|
||||
|
||||
<div class="col-md-5">';
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'Du :',
|
||||
'label-to' => 'Au :',
|
||||
'id' => 'date_start',
|
||||
'id-to' => 'date_end',
|
||||
'name' => 'date_start',
|
||||
'name-to' => 'date_end',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<p class="text-center help-block">Format : AAAA-MM-JJ</p>
|
||||
$output .='<div class="col-md-2 text-center"><span class="lateral-delimiter"></span></div>
|
||||
|
||||
<div class="col-md-5">';
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'Du :',
|
||||
'label-to' => 'Au :',
|
||||
'id' => 'date_start',
|
||||
'id-to' => 'date_end',
|
||||
'name' => 'date_start',
|
||||
'name-to' => 'date_end',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<p class="text-center help-block">Format : AAAA-MM-JJ</p>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<br>
|
||||
<div class="col-md-4 col-md-offset-4 text-center">';
|
||||
$input = array(
|
||||
'type' => 'select',
|
||||
'name' => 'id_lang',
|
||||
'id' => 'id_lang',
|
||||
'label' => $this->l('Select a language:'),
|
||||
'label-class' => 'col-md-12 text-center',
|
||||
'input-class' => 'col-md-12',
|
||||
'options' => $option_select_langs
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'</div>';
|
||||
|
||||
$output .= '
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<a class="btn btn-default" href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&nolimit=1">'.$this->l('Charger toutes les catégories').'</a>
|
||||
<button type="submit" class="btn btn-primary" name="submitExport">'.$this->l('Exporter').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<br>
|
||||
<div class="col-md-4 col-md-offset-4 text-center">';
|
||||
$input = array(
|
||||
'type' => 'select',
|
||||
'name' => 'id_lang',
|
||||
'id' => 'id_lang',
|
||||
'label' => $this->l('Select a language:'),
|
||||
'label-class' => 'col-md-12 text-center',
|
||||
'input-class' => 'col-md-12',
|
||||
'options' => $option_select_langs
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'</div>';
|
||||
|
||||
$output .= '</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExport">'.$this->l('Upload').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>';
|
||||
</div>';
|
||||
|
||||
// Export Sale DEB
|
||||
$output .= '
|
||||
<div class="col-md-12">
|
||||
<div class="panel">
|
||||
<div class="panel-title">
|
||||
<h2><span class="text-rose anticon anticon-upload"></span> '.$this->l('Export DEB').'</h2>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-5 col-md-offset-4">';
|
||||
<div role="tabpanel" class="tab-pane" id="exportDEB">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Export DEB').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-5 col-md-offset-4">';
|
||||
|
||||
$input = array(
|
||||
'type' => 'select',
|
||||
'name' => 'deb',
|
||||
'id' => 'deb',
|
||||
'label' => $this->l('Select a DEB:'),
|
||||
'label-class' => 'col-md-12',
|
||||
'input-class' => 'col-md-12',
|
||||
'options' => array(
|
||||
array(
|
||||
'value' => 1,
|
||||
'label' => 'DEB introduction'
|
||||
),
|
||||
array(
|
||||
'value' => 2,
|
||||
'label' => 'DEB expedition'
|
||||
$input = array(
|
||||
'type' => 'select',
|
||||
'name' => 'deb',
|
||||
'id' => 'deb',
|
||||
'label' => $this->l('Select a DEB:'),
|
||||
'label-class' => 'col-md-12',
|
||||
'input-class' => 'col-md-12',
|
||||
'options' => array(
|
||||
array(
|
||||
'value' => 1,
|
||||
'label' => 'DEB introduction'
|
||||
),
|
||||
array(
|
||||
'value' => 2,
|
||||
'label' => 'DEB expedition'
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<div class="clearfix"></div><br>
|
||||
<div class="col-md-12">
|
||||
<p class="text-left help-block">Introduction : Selon date des ventes</p>
|
||||
<p class="text-left help-block">Expedition : Selon date des commandes</p>
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<div class="clearfix"></div><br>
|
||||
<div class="col-md-12">
|
||||
<p class="text-left help-block">Introduction : Selon date des ventes</p>
|
||||
<p class="text-left help-block">Expedition : Selon date des commandes</p>
|
||||
</div>
|
||||
<div class="clearfix"></div><br>';
|
||||
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'Du :',
|
||||
'label-to' => 'Au :',
|
||||
'id' => 'date_start_deb',
|
||||
'id-to' => 'date_end_deb',
|
||||
'name' => 'date_start',
|
||||
'name-to' => 'date_end',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<p class="text-center help-block">Format : AAAA-MM-JJ</p>';
|
||||
|
||||
$output .= '</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExportDeb">'.$this->l('Exporter').'</button>
|
||||
</div>
|
||||
<div class="clearfix"></div><br>';
|
||||
</form>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$input = array(
|
||||
'type' => 'simpleDate',
|
||||
'period' => true,
|
||||
'class-from' => 'col-md-6',
|
||||
'class-to' => 'col-md-6',
|
||||
'label' => 'Du :',
|
||||
'label-to' => 'Au :',
|
||||
'id' => 'date_start_deb',
|
||||
'id-to' => 'date_end_deb',
|
||||
'name' => 'date_start',
|
||||
'name-to' => 'date_end',
|
||||
'before' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
'before-to' => '<span class="glyphicon glyphicon-calendar"></span>',
|
||||
);
|
||||
$output .= $helperForm->generateInput($input).
|
||||
'<p class="text-center help-block">Format : AAAA-MM-JJ</p>';
|
||||
|
||||
$output .= '</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExportDeb">'.$this->l('Upload').'</button>
|
||||
</div>
|
||||
</form>
|
||||
// Export Products
|
||||
$output .= '
|
||||
<div role="tabpanel" class="tab-pane" id="exportProducts">
|
||||
<div class="panel-content">
|
||||
<h3 class="">'.$this->l('Export Base Produit').'</h3>
|
||||
<br>
|
||||
<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
|
||||
<div class="col-md-5 col-md-offset-4">
|
||||
<p class="text-center">'.$this->l('En cours de developpement...').'</p>
|
||||
<p class="text-center">'.$this->l('Export de la base produit totale générée toutes les semaines.').'</p>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="ln_solid"></div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-primary" name="submitExportProducts">'.$this->l('Exporter').'</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user