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

Merge branch 'ticket-12215-showDelay' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-10 17:49:41 +01:00
commit 4767a44021
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm/ajax_vp.php
View File

@ -6,6 +6,7 @@ include(PS_ADMIN_DIR.'/../config/config.inc.php');
require_once(dirname(__FILE__).'/init.php');
require_once('../modules/privatesales/Sale.php');
require_once('../modules/privatesales_delay/SaleDelay.php');
require_once('../modules/privatesales_extrafields/privatesales_extrafields.php');
@ -42,6 +43,7 @@ if (isset($_GET['getSales'])){
<th>Commercial</th>
<th>FR</th>
<th>ES</th>
<th align='center'>Delay</th>
<th>Position</th>
<th style='width: 68px;'>Actions</th>
</tr></thead>
@ -49,6 +51,7 @@ if (isset($_GET['getSales'])){
$export = true;
foreach($sales as $key => $sale) {
$delay = SaleDelay::getDelay($sale->delivery_delay,2);
echo '<tr id="item_'.$sale->id. '">
<td>'.$sale->id.'</td>
<td>'.$sale->id_category.'</td>
@ -70,6 +73,7 @@ if (isset($_GET['getSales'])){
echo '<td>'.((int) $sale->id_employee != 0? $employees[(int) $sale->id_employee]: '--').'</td>
<td '.(in_array('fr', $sale->versions) ? 'class="green"' : 'class="red"').'>FR</td>
<td '.(in_array('es', $sale->versions) ? 'class="green"' : 'class="red"').'>ES</td>
<td>'.$delay['name'].'</td>
<td class="position">';
if($key != 0){
echo '<a href="" class="updatePosition" data-way="0" data-position='. $sale->position .'><img title="Haut" alt="Haut" src="../img/admin/up.gif"></a>';

5
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -1,5 +1,6 @@
<?php
include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
include_once(_PS_ROOT_DIR_.'/modules/privatesales_delay/SaleDelay.php');
class AdminPrivateSalesSales extends AdminTab {
@ -800,6 +801,7 @@ class AdminPrivateSalesSales extends AdminTab {
<th>'.$this->l('FR').'</th>
<th>'.$this->l('ES').'</th>
<th>'.$this->l('Shipping').'</th>
<th align="center">'.$this->l('delay').'</th>
<th>'.$this->l('News').'</th>
<th>'.$this->l('Position').'</th>
<th style="width: '.($export? '68': '55').'px;">'.$this->l('Actions').'</th>
@ -816,6 +818,7 @@ class AdminPrivateSalesSales extends AdminTab {
$extrafields = PrivateSales_ExtraFields::getFieldsForSale($ids);
foreach($sales as $key => $sale) {
$delay = SaleDelay::getDelay($sale->delivery_delay,2);
echo '<tr id="item_'.$sale->id. '" class="sale_'.($key%2).'">
<td>'.$sale->id.'</td>
<td>'.$sale->id_category.'</td>
@ -841,6 +844,8 @@ class AdminPrivateSalesSales extends AdminTab {
<td>'.(isset($sale_shipping[(int) $sale->id])? ($sale_shipping[(int) $sale->id] == 1? 'Philea': ''): '').'</td>
<td>'.$delay['name'].'</td>
<td>'. $sale->forward_news .'</td>
<td class="position">';