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

Merge branch 'evo-AdminPrivateSaleSales' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-03-21 14:40:02 +01:00
commit 2e3d56135e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/ajax_vp.php
View File

@ -53,6 +53,7 @@ if (isset($_GET['getSales'])){
<th>Commercial</th>
<th>FR</th>
<th>ES</th>
<th align='center'>Delay</th>
<th>Shipping</th>
<th>Position</th>
<th>Actions</th>
@ -83,6 +84,7 @@ if (isset($_GET['getSales'])){
echo '<td>'.((int) $sale->id_employee != 0? $employees[(int) $sale->id_employee]: '--').'</td>
<td class="text-center '.(in_array('fr', $sale->versions) ? 'green' : 'rose').'">FR</td>
<td class="text-center '.(in_array('es', $sale->versions) ? 'green' : 'rose').'">ES</td>
<td align="center">'.$delay.'</td>
<td align="center">'.(isset($sale_shipping[(int) $sale->id])? ($sale_shipping[(int) $sale->id] == 1? 'Philea': ''): '').'</td>
<td align="center" class="position">';
if($key != 0){

4
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -2,6 +2,7 @@
include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
require_once(_PS_ROOT_DIR_.'/modules/privatesales_delay/saledelay.php');
require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
require_once('../modules/privatesales_delay/saledelay.php');
class AdminPrivateSalesSales extends AdminTab {
@ -944,6 +945,7 @@ class AdminPrivateSalesSales extends AdminTab {
<th>'.$this->l('Employee').'</th>
<th>'.$this->l('FR').'</th>
<th>'.$this->l('ES').'</th>
<th>'.$this->l('Delay').'</th>
<th>'.$this->l('Shipping').'</th>
<th>'.$this->l('News').'</th>
<th>'.$this->l('Position').'</th>
@ -983,7 +985,7 @@ class AdminPrivateSalesSales extends AdminTab {
echo '<td>'.((int) $sale->id_employee != 0? $employees[(int) $sale->id_employee]: '--').'</td>
<td class="text-center '.(in_array('fr', $sale->versions) ? 'green' : 'rose').'">FR</td>
<td class="text-center '.(in_array('es', $sale->versions) ? 'green' : 'rose').'">ES</td>
<td align="center">'.$delay.'</td>
<td align="center">'.(isset($sale_shipping[(int) $sale->id])? ($sale_shipping[(int) $sale->id] == 1? 'Philea': ''): '').'</td>
<td align="center">'. $sale->forward_news .'</td>