From 8d08040017cd36c4d85d3e840166ba7fab692983 Mon Sep 17 00:00:00 2001
From: Marion Muszynski <marion@antadis.com>
Date: Tue, 21 Mar 2017 14:39:43 +0100
Subject: [PATCH] addition of delay in sale list

---
 adm/ajax_vp.php                                 | 4 ++++
 modules/privatesales/AdminPrivateSalesSales.php | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/adm/ajax_vp.php b/adm/ajax_vp.php
index a442eaf2..53f7647b 100644
--- a/adm/ajax_vp.php
+++ b/adm/ajax_vp.php
@@ -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');
 
 
@@ -52,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>
@@ -60,6 +62,7 @@ if (isset($_GET['getSales'])){
 
 	$export = true;
 	foreach($sales as $key => $sale) {
+		$delay = SaleDelay::getDelaySmallName($sale->delivery_delay,2);
 		echo '<tr id="item_'.$sale->id. '">
 				<td>'.$sale->id.'</td>
 				<td>'.$sale->id_category.'</td>
@@ -81,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){
diff --git a/modules/privatesales/AdminPrivateSalesSales.php b/modules/privatesales/AdminPrivateSalesSales.php
index facbd3e7..05e1c27c 100755
--- a/modules/privatesales/AdminPrivateSalesSales.php
+++ b/modules/privatesales/AdminPrivateSalesSales.php
@@ -1,6 +1,7 @@
 <?php
 include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
 require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
+require_once('../modules/privatesales_delay/saledelay.php');
 
 class AdminPrivateSalesSales extends AdminTab {
 
@@ -942,6 +943,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>
@@ -958,6 +960,7 @@ class AdminPrivateSalesSales extends AdminTab {
         $extrafields = PrivateSales_ExtraFields::getFieldsForSale($ids);
 
         foreach($sales as $key => $sale) {
+            $delay = SaleDelay::getDelaySmallName($sale->delivery_delay,2);
             echo '<tr id="item_'.$sale->id. '" class="sale_'.($key%2).'">
                         <td>'.$sale->id.'</td>
                         <td>'.$sale->id_category.'</td>
@@ -980,7 +983,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>