From 9edcc64a8233920979a4a042bc19dd7382bfa101 Mon Sep 17 00:00:00 2001
From: Marion Muszynski <marion@antadis.com>
Date: Fri, 14 Oct 2016 13:10:56 +0200
Subject: [PATCH 1/3] modification of delivery mode selection

---
 adm/ajax_vp.php                               |   2 +-
 .../privatesales/AdminPrivateSalesSales.php   | 157 ++++++++++++++----
 2 files changed, 128 insertions(+), 31 deletions(-)

diff --git a/adm/ajax_vp.php b/adm/ajax_vp.php
index c0285292..ce054392 100644
--- a/adm/ajax_vp.php
+++ b/adm/ajax_vp.php
@@ -55,7 +55,7 @@ if (isset($_GET['getSales'])){
 				<td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic">'.$extrafields[$sale->id][1].'</span></td>
 				<td>'.$sale->date_start.'</td>
 				<td>'.$sale->date_end.'</td>
-				<td>'.($sale->enabled? 'Oui':'Non').'</td>';
+				<td>'.($sale->enabled? '<img src="../img/admin/module_install.png"/>':'<img src="../img/admin/module_notinstall.png"/>').'</td>';
 
 					if($sale->new == 0){
 						echo "<td>Non</td>";
diff --git a/modules/privatesales/AdminPrivateSalesSales.php b/modules/privatesales/AdminPrivateSalesSales.php
index 5dc4321b..339f47ca 100755
--- a/modules/privatesales/AdminPrivateSalesSales.php
+++ b/modules/privatesales/AdminPrivateSalesSales.php
@@ -133,8 +133,78 @@ class AdminPrivateSalesSales extends AdminTab {
         .red {
             background : #f29b9b;
         }
-        .sale_0 {
-            background : #fbfbdb;
+        fieldset.bg-grey{
+            background: #F1F1F1;
+            border: 1px solid #565485;
+        }
+        fieldset.bg-grey legend{
+            background: rgba(86,84,133,0.9);
+            border: 1px solid #565485;
+            color: #fff;
+            font-weight: 300;
+        }
+        table {
+            background: #fff;
+            padding: 20px;
+            -moz-box-shadow: 2px 2px 5px #cccccc;
+            -webkit-box-shadow: 2px 2px 5px #CCC;
+            -ms-box-shadow: 2px 2px 5px #cccccc;
+            -o-box-shadow: 2px 2px 5px #cccccc;
+            box-shadow: 2px 2px 5px #CCC;
+            border-collapse: collapse;
+            border-spacing: 0;
+        }
+        .table {
+            border: 1px solid #565485;
+        }
+        .table tr th{
+            background: rgba(86,84,133,0.9);
+            color: #fff;
+            font-weight: 300;
+        }
+        .table tr td {
+            border-bottom: 1px solid #DEDEDE;
+            color: #000;
+            padding: 0 4px 0 6px;
+        }
+        .table tr td:nth-child(6),
+        .table tr td:nth-child(7),
+        .table tr td:nth-child(11),
+        .table tr td:nth-child(12){
+            text-align:center;
+        }
+        .table tr:nth-child(odd){
+            background : #F3F3F3;
+        }
+        .button.purple {
+            background-color: rgba(86,84,133,0.7);
+            border: 1px solid #565485;
+            border-left: 1px solid rgba(86,84,133,0.6);
+            border-top: 1px solid rgba(86,84,133,0.6);
+            color: rgba(255,255,255,0.9);
+            padding: 3px;
+        }
+        .button.purple:hover {
+            background-color: #565485;
+            border: 1px solid rgba(86,84,133,0.6);
+            border-left: 1px solid #565485;
+            border-top: 1px solid #565485;
+            color: #fff;
+            padding: 3px;
+        }
+        .button.purple:focus{
+            background-color: rgba(86,84,133,1.6);
+        }
+        #delivery_mode{
+            margin-bottom:5px;
+        }
+        .carriers_info{
+            background:#fff;
+            padding:10px;
+            border: 1px solid #ccc;
+        }
+        .carriers_hidden{
+            display:none;
         }
         </style>
         <form action="'.$currentIndex.'&token='.Tools::getAdminTokenLite('AdminPrivateSalesSales').'" method="post" enctype="multipart/form-data">
@@ -393,34 +463,61 @@ class AdminPrivateSalesSales extends AdminTab {
                 WHERE c.`deleted` != 1
             ');
 
-            $carriers_default = array(22, 87, 88, 89); // prod
-            // $carriers_default = array(22, 46, 47, 48); // dev
+            // $carriers_default = array(22, 87, 88, 89); // prod
+            $carriers_default = array(22, 45, 47, 48); // dev
 
             echo '<label>'.$this->l('Carriers:').'</label>
                   <div class="margin-form">
                     <div id="carriers" style="float: left;">
-                        <select id="m_carriers" name="m_groups[]" multiple="multiple" size="5">
-                            <option value=""></option>
-                            <optgroup label="'.$this->l('Select one or more carriers:').'">';
-                            if( Tools::getIsset('edit')) {
-                                foreach($carriers as $carrier) {
-                                    echo '<option value="'.$carrier['id_carrier'].'"'.(isset($carrier['id_sale']) && $carrier['id_sale'] !== NULL?' selected="selected"':'').'>'.$carrier['name'].'</option>';
-                                }
-                            } else{
-                                foreach($carriers as $carrier) {
-                                    echo '<option value="'.$carrier['id_carrier'].'"'.(in_array($carrier['id_carrier'], $carriers_default) ? ' selected="selected"':'').'>'.$carrier['name'].'</option>';
-                                }
+                         <select id="delivery_mode" name="delivery_mode" >
+                            <option value="0">'.$this->l('Select Expedition').'</option>
+                            <option value="1">'.$this->l('Expédition classique').'</option>
+                            <option value="2">'.$this->l('Expédition domicile uniquement').'</option>
+                            <option value="3">'.$this->l('Expédition gratuite').'</option>
+                            <option value="4">'.$this->l('Expédition gratuite domicile uniquement').'</option>
+                         </select>
+                         <div class="carriers_info">
+                            <h3>'.$this->l('Transporteurs selectionnés : ').'</h3>
+                            <div class="info"></div>
+                         </div>
+                         <div class="carriers_hidden">';
+                         if(Tools::getIsset('edit')) {
+                            foreach($carriers as $carrier) {
+                                echo '<input name="m_carriers[]" type="checkbox" value="'.$carrier['id_carrier'].'"'.(isset($carrier['id_sale']) && $carrier['id_sale'] !== NULL? ' checked="checked"':'').' data-carrier-name="'.$carrier['name'].'"/>';
                             }
-                echo '
-                            </optgroup>
-                        </select>
-                    </div>
+                        } else {
+                            foreach($carriers as $carrier) {
+                                echo '<input name="m_carriers[]" type="checkbox" value="'.$carrier['id_carrier'].'"'.(in_array($carrier['id_carrier'], $carriers_default) ? ' checked="checked"':'').' data-carrier-name="'.$carrier['name'].'"/>';
+                            }
+                        }
+                    echo '</div></div>
                     <script type="text/javascript">
                     $(document).ready(function() {
-                        $("#m_carriers").multiSelect({
-                            selectAllText: "'.$this->l('Select all').'",
-                            noneSelected: "&nbsp;",
-                            oneOrMoreSelected: "*"
+                        var carriers_info = "";
+                        $("input[name=\'m_carriers[]\']:checked").each(function(i, el) {
+                            carriers_info += "<p>"+$(el).data("carrier-name")+"</p>";
+                        });
+                        $(".carriers_info div.info").html(carriers_info);
+
+                        $("#delivery_mode").change(function(){
+                            carriers_info = "";
+                            $("input[name=\'m_carriers[]\']").each(function(i, el) {
+                                $(el).attr("checked",false);
+                            });
+                            var selected_carriers = [];
+                            if($(this).val() == 1 || $(this).val() == 3) {
+                                selected_carriers = ["22", "45", "47", "48"];
+                            } else if($(this).val() == 2 || $(this).val() == 4) {
+                                selected_carriers = ["22", "45"];
+                            }
+                            $("input[name=\'m_carriers[]\']").each(function(){
+                                if ($.inArray($(this).val(),selected_carriers) != -1){
+                                    $(this).attr("checked",true);
+                                    carriers_info += "<p>"+$(this).data("carrier-name")+"</p>";
+                                }
+                            });
+                            $(".carriers_info div.info").empty();
+                            $(".carriers_info div.info").html(carriers_info);
                         });
                     });
                     </script>
@@ -540,11 +637,11 @@ class AdminPrivateSalesSales extends AdminTab {
         }
 
         //ANTADIS
-        echo '<fieldset style="margin-top:15px">';
+        echo '<fieldset class="bg-grey" style="margin-top:15px">';
         echo '<legend>Tri des ventes</legend>';
-        echo '<input type="submit" value="Ventes actuelles" name="not_ended" class="tri button active" style="margin-right:10px;">';
-        echo '<input type="submit" value="Ventes terminées" name="finished" class="tri button" style="margin-right:10px;">';
-        echo '<input type="submit" value="Toutes les ventes" name="all" class="tri button">';
+        echo '<input type="submit" value="Ventes actuelles" name="not_ended" class="tri button purple active" style="margin-right:10px;">';
+        echo '<input type="submit" value="Ventes terminées" name="finished" class="tri button purple" style="margin-right:10px;">';
+        echo '<input type="submit" value="Toutes les ventes" name="all" class="tri button purple">';
         echo '</fieldset>';
 
         ?>
@@ -559,7 +656,7 @@ class AdminPrivateSalesSales extends AdminTab {
                         $(this).addClass('active');
                         $('.list_vente').empty();
 
-                        var loader = "<p class='text-align:center'><img src='../img/loader.gif' /></p>";
+                        var loader = "<p style='text-align:center'><img src='../img/loader_payment.gif' /></p>";
                         $('.list_vente').html(loader);
 
                         $.ajax({
@@ -659,7 +756,7 @@ class AdminPrivateSalesSales extends AdminTab {
         ';
 
 
-        echo '<fieldset class="space">
+        echo '<fieldset class="space bg-grey">
             <legend><img src="'.__PS_BASE_URI__.'modules/privatesales/prefs.gif" alt="" title="" /> '.$this->l('Sales list').'</legend>
             <table class="table list_vente" style="width: 100%;">
             <thead>
@@ -696,7 +793,7 @@ class AdminPrivateSalesSales extends AdminTab {
                         <td><strong>'.$sale->title[intval($cookie->id_lang)].'</strong><br/><span style="color:#666; font-style:italic">'.$extrafields[$sale->id][1].'</span></td>
                         <td>'.$sale->date_start.'</td>
                         <td>'.$sale->date_end.'</td>
-                        <td>'.($sale->enabled?$this->l('Yes'):$this->l('No')).'</td>
+                        <td>'.($sale->enabled?'<img src="../img/admin/module_install.png"/>':'<img src="../img/admin/module_notinstall.png"/>').'</td>
                         ';
 
                         if($sale->new == 0){

From 302ba040d15e268e7186ad13fe910a8facf09d59 Mon Sep 17 00:00:00 2001
From: Marion Muszynski <marion@antadis.com>
Date: Thu, 20 Oct 2016 13:48:55 +0200
Subject: [PATCH 2/3] modif expedition

---
 .../privatesales/AdminPrivateSalesSales.php   | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/modules/privatesales/AdminPrivateSalesSales.php b/modules/privatesales/AdminPrivateSalesSales.php
index 339f47ca..05a68453 100755
--- a/modules/privatesales/AdminPrivateSalesSales.php
+++ b/modules/privatesales/AdminPrivateSalesSales.php
@@ -463,8 +463,8 @@ class AdminPrivateSalesSales extends AdminTab {
                 WHERE c.`deleted` != 1
             ');
 
-            // $carriers_default = array(22, 87, 88, 89); // prod
-            $carriers_default = array(22, 45, 47, 48); // dev
+            // $carriers_default = array(87, 88, 89); // prod
+            $carriers_default = array(45, 47, 48); // dev
 
             echo '<label>'.$this->l('Carriers:').'</label>
                   <div class="margin-form">
@@ -473,10 +473,9 @@ class AdminPrivateSalesSales extends AdminTab {
                             <option value="0">'.$this->l('Select Expedition').'</option>
                             <option value="1">'.$this->l('Expédition classique').'</option>
                             <option value="2">'.$this->l('Expédition domicile uniquement').'</option>
-                            <option value="3">'.$this->l('Expédition gratuite').'</option>
-                            <option value="4">'.$this->l('Expédition gratuite domicile uniquement').'</option>
+                            <option value="3">'.$this->l('Expédition dropshipping').'</option>
                          </select>
-                         <div class="carriers_info">
+                         <div class="carriers_info" '.(($cookie->id_employee == 1)?'':'style="display:none;"').'>
                             <h3>'.$this->l('Transporteurs selectionnés : ').'</h3>
                             <div class="info"></div>
                          </div>
@@ -493,11 +492,20 @@ class AdminPrivateSalesSales extends AdminTab {
                     echo '</div></div>
                     <script type="text/javascript">
                     $(document).ready(function() {
+                        var carriers_selected = [];
                         var carriers_info = "";
                         $("input[name=\'m_carriers[]\']:checked").each(function(i, el) {
                             carriers_info += "<p>"+$(el).data("carrier-name")+"</p>";
+                            carriers_selected.push($(el).val());
                         });
                         $(".carriers_info div.info").html(carriers_info);
+                        if (carriers_selected.indexOf("45") && carriers_selected.indexOf("47") && carriers_selected.indexOf("48")) {
+                            $("#delivery_mode option[val=\'1\']").attr("selected", "selected");
+                        } else if (carriers_selected.indexOf("45")) {
+                            $("#delivery_mode option[val=\'2\']").attr("selected", "selected");
+                        } else if (carriers_selected.indexOf("22")) {
+                            ("#delivery_mode option[val=\'3\']").attr("selected", "selected");
+                        }
 
                         $("#delivery_mode").change(function(){
                             carriers_info = "";
@@ -505,10 +513,12 @@ class AdminPrivateSalesSales extends AdminTab {
                                 $(el).attr("checked",false);
                             });
                             var selected_carriers = [];
-                            if($(this).val() == 1 || $(this).val() == 3) {
-                                selected_carriers = ["22", "45", "47", "48"];
-                            } else if($(this).val() == 2 || $(this).val() == 4) {
-                                selected_carriers = ["22", "45"];
+                            if($(this).val() == 1) {
+                                selected_carriers = ["45", "47", "48"];
+                            } else if($(this).val() == 2) {
+                                selected_carriers = ["45"];
+                            } else if($(this).val() == 3) {
+                                selected_carriers = ["22"];
                             }
                             $("input[name=\'m_carriers[]\']").each(function(){
                                 if ($.inArray($(this).val(),selected_carriers) != -1){

From 37d7422d089c02b0bf9a1ff5e0cb411e8f9438bd Mon Sep 17 00:00:00 2001
From: Marion Muszynski <marion@antadis.com>
Date: Thu, 20 Oct 2016 14:03:15 +0200
Subject: [PATCH 3/3] fix js

---
 modules/privatesales/AdminPrivateSalesSales.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/privatesales/AdminPrivateSalesSales.php b/modules/privatesales/AdminPrivateSalesSales.php
index 05a68453..1195b166 100755
--- a/modules/privatesales/AdminPrivateSalesSales.php
+++ b/modules/privatesales/AdminPrivateSalesSales.php
@@ -499,12 +499,14 @@ class AdminPrivateSalesSales extends AdminTab {
                             carriers_selected.push($(el).val());
                         });
                         $(".carriers_info div.info").html(carriers_info);
-                        if (carriers_selected.indexOf("45") && carriers_selected.indexOf("47") && carriers_selected.indexOf("48")) {
-                            $("#delivery_mode option[val=\'1\']").attr("selected", "selected");
-                        } else if (carriers_selected.indexOf("45")) {
-                            $("#delivery_mode option[val=\'2\']").attr("selected", "selected");
-                        } else if (carriers_selected.indexOf("22")) {
-                            ("#delivery_mode option[val=\'3\']").attr("selected", "selected");
+                        console.log($.inArray("45",carriers_selected));
+                        if ($.inArray("45",carriers_selected)!= -1 && $.inArray("47",carriers_selected)!= -1 && $.inArray("48",carriers_selected)!= -1) {
+                            $("#delivery_mode option[value=\'1\']").attr("selected","selected");
+                        } else if ($.inArray("45",carriers_selected)!= -1) {
+                            console.log("test");
+                            $("#delivery_mode option[value=\'2\']").attr("selected","selected");
+                        } else if ($.inArray("22",carriers_selected)!= -1) {
+                            $("#delivery_mode option[value=\'3\']").attr("selected","selected");
                         }
 
                         $("#delivery_mode").change(function(){