Merge branch 'evo-AdminPrivateSaleSales' into develop

This commit is contained in:
Marion Muszynski 2017-03-21 14:54:27 +01:00
commit f0850ce461
2 changed files with 10 additions and 10 deletions

View File

@ -44,7 +44,7 @@ if (isset($_GET['getSales'])){
echo "<thead><tr>
<th>ID</th>
<th>Categorie</th>
<th>Cat.</th>
<th>Titre</th>
<th>Début</th>
<th>Fin</th>
@ -54,7 +54,7 @@ if (isset($_GET['getSales'])){
<th>FR</th>
<th>ES</th>
<th align='center'>Delay</th>
<th>Shipping</th>
<th>Expe</th>
<th>Position</th>
<th>Actions</th>
</tr></thead>
@ -66,9 +66,9 @@ if (isset($_GET['getSales'])){
echo '<tr id="item_'.$sale->id. '">
<td>'.$sale->id.'</td>
<td>'.$sale->id_category.'</td>
<td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic">'.$extrafields[$sale->id][1].'</span></td>
<td style="font-size:12px;">'.$sale->date_start.'</td>
<td style="font-size:12px;">'.$sale->date_end.'</td>
<td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic; font-size:11px;">'.$extrafields[$sale->id][1].'</span></td>
<td style="font-size:11px;">'.$sale->date_start.'</td>
<td style="font-size:11px;">'.$sale->date_end.'</td>
<td align="center">'.($sale->enabled? '<span class="anticon anticon-checkmark text-green-light"></span>':'<span class="anticon anticon-cross text-rose"></span>').'</td>';
if($sale->new == 0){

View File

@ -936,7 +936,7 @@ class AdminPrivateSalesSales extends AdminTab {
<thead>
<tr>
<th>'.$this->l('ID').'</th>
<th>'.$this->l('Categorie').'</th>
<th>'.$this->l('Cat.').'</th>
<th>'.$this->l('Title').'</th>
<th>'.$this->l('Start').'</th>
<th>'.$this->l('End').'</th>
@ -946,7 +946,7 @@ class AdminPrivateSalesSales extends AdminTab {
<th>'.$this->l('FR').'</th>
<th>'.$this->l('ES').'</th>
<th>'.$this->l('Delay').'</th>
<th>'.$this->l('Shipping').'</th>
<th>'.$this->l('Expe').'</th>
<th>'.$this->l('News').'</th>
<th>'.$this->l('Position').'</th>
<th>'.$this->l('Actions').'</th>
@ -966,9 +966,9 @@ class AdminPrivateSalesSales extends AdminTab {
echo '<tr id="item_'.$sale->id. '" class="sale_'.($key%2).'">
<td>'.$sale->id.'</td>
<td>'.$sale->id_category.'</td>
<td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic">'.$extrafields[$sale->id][1].'</span></td>
<td style="font-size:12px;">'.$sale->date_start.'</td>
<td style="font-size:12px;">'.$sale->date_end.'</td>
<td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic; font-size:11px;">'.$extrafields[$sale->id][1].'</span></td>
<td style="font-size:11px;">'.$sale->date_start.'</td>
<td style="font-size:11px;">'.$sale->date_end.'</td>
<td align="center">'.($sale->enabled?'<span class="anticon anticon-checkmark text-green-light"></span>':'<span class="anticon anticon-cross text-rose"></span>').'</td>
';