From f70c1d0f7e7929a13ff9b96337a2b50a4826df38 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Mon, 19 Apr 2021 12:43:45 +0200
Subject: [PATCH] Modif pour RAZ les autres choix de mode de livraison, autres
 que le choix en cours.

---
 .../default/order-delivery-extra.html         | 15 ++++++++++
 .../default/order-delivery-extra.html         | 28 +++++++------------
 .../default/order-delivery-extra.html         | 16 +++++++++++
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/local/modules/ClickAndCollect/templates/frontOffice/default/order-delivery-extra.html b/local/modules/ClickAndCollect/templates/frontOffice/default/order-delivery-extra.html
index a5dece6e..91d48535 100644
--- a/local/modules/ClickAndCollect/templates/frontOffice/default/order-delivery-extra.html
+++ b/local/modules/ClickAndCollect/templates/frontOffice/default/order-delivery-extra.html
@@ -109,5 +109,20 @@
         initMapCnc();
     });
 
+    $("#form-cart-delivery").off('submit').submit(function(ev) {
+        if ($('[delivery-mode=cnc]').is(':checked')) {
+
+            // On RAZ les éventuelles sélections préalables.
+            if (typeof $('input[name=pdr-choosen-day]:checked').val() != 'undefined')
+                $('input[name=pdr-choosen-day]:checked').prop("checked", false);
+            if (typeof $('input[name=lps-choosen-day]:checked').val() != 'undefined')
+                $('input[name=lps-choosen-day]:checked').prop("checked", false);
+
+            if ($('input[name=cnc-choosen-day]:checked').length === 0) {
+                alert("Veuillez choisir un point Click and Collect.");
+                ev.preventDefault();
+            }
+         }
+    });
 
 </script>
diff --git a/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html b/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html
index 65d97ea5..e9552526 100644
--- a/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html
+++ b/local/modules/LivraisonParSecteurs/templates/frontOffice/default/order-delivery-extra.html
@@ -85,27 +85,19 @@
     });
 
     $("#form-cart-delivery").off('submit').submit(function(ev) {
-        if ($('[delivery-mode=lps]').is(':checked')
-            &&
-            $('input[name=lps-choosen-day]:checked').length === 0) {
-            alert("Veuillez choisir un jour de livraison.");
-            ev.preventDefault();
-        }
+        if ($('[delivery-mode=lps]').is(':checked')) {
 
-        if ($('[delivery-mode=pdr]').is(':checked')
-            &&
-            $('input[name=pdr-choosen-day]:checked').length === 0) {
-            alert("Veuillez choisir un point de retrait.");
-            ev.preventDefault();
-        }
+            // On RAZ les éventuelles sélections préalables.
+            if (typeof $('input[name=cnc-choosen-day]:checked').val() != 'undefined')
+                $('input[name=cnc-choosen-day]:checked').prop("checked", false);
+            if (typeof $('input[name=pdr-choosen-day]:checked').val() != 'undefined')
+                $('input[name=pdr-choosen-day]:checked').prop("checked", false);
 
-        if ($('[delivery-mode=cnc]').is(':checked')
-            &&
-            $('input[name=cnc-choosen-day]:checked').length === 0) {
-            alert("Veuillez choisir un point Click and Collect.");
-            ev.preventDefault();
+            if ($('input[name=lps-choosen-day]:checked').length === 0) {
+                alert("Veuillez choisir un jour de livraison.");
+                ev.preventDefault();
+            }
         }
     });
 
-
 </script>
diff --git a/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html b/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html
index c80eda78..039306f7 100644
--- a/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html
+++ b/local/modules/PointRetrait/templates/frontOffice/default/order-delivery-extra.html
@@ -215,4 +215,20 @@
         initMaps();
     }
 
+    $("#form-cart-delivery").off('submit').submit(function(ev) {
+        if ($('[delivery-mode=pdr]').is(':checked')) {
+
+            // On RAZ les éventuelles sélections préalables.
+            if (typeof $('input[name=cnc-choosen-day]:checked').val() != 'undefined')
+                $('input[name=cnc-choosen-day]:checked').prop("checked", false);
+            if (typeof $('input[name=lps-choosen-day]:checked').val() != 'undefined')
+                $('input[name=lps-choosen-day]:checked').prop("checked", false);
+
+            if ($('input[name=pdr-choosen-day]:checked').length === 0) {
+                alert("Veuillez choisir un point de retrait.");
+                ev.preventDefault();
+            }
+        }
+    });
+
 </script>
\ No newline at end of file