From fb866fb386e1e60a3566b81523a7a9a34cfe14f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= <bimbej@icloud.com>
Date: Sat, 30 Aug 2025 13:20:14 +0200
Subject: [PATCH] delivery date in sale fix

---
 modules/EcmSales/javascript/EcmSales6.js |  4 ++--
 modules/EcmSales/javascript/helper.php   | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/EcmSales/javascript/EcmSales6.js b/modules/EcmSales/javascript/EcmSales6.js
index 973d69fa..ae9c84eb 100644
--- a/modules/EcmSales/javascript/EcmSales6.js
+++ b/modules/EcmSales/javascript/EcmSales6.js
@@ -27,7 +27,7 @@ $(document).ready(
 			});
 
 			$("#delivery_date").on('inputchange', function() {
-				calculateDate($("#delivery_date").val());
+                calculateDate($("#delivery_date").val());
 			});
 			if ($("#type").val() == 'interval_order') {
 				addToValidate('EditView', 'sale_date_interval', 'id', 'true',
@@ -109,7 +109,7 @@ $(document).ready(
 					SetTab('ITEMS');
 				}
 			};
-
+            calculateDate($("#delivery_date").val());
 		});
 // handle save
 var check_form_ = check_form;
diff --git a/modules/EcmSales/javascript/helper.php b/modules/EcmSales/javascript/helper.php
index 37ffdbf3..21f5d423 100644
--- a/modules/EcmSales/javascript/helper.php
+++ b/modules/EcmSales/javascript/helper.php
@@ -20,11 +20,18 @@ switch ($_POST['job']) {
 }
 
 function calculateDate($date){
-	$date = new Datetime($date);
-	$date->modify('-1 day');
-	$tmp['date']=$date->format("d.m.Y");
-	echo json_encode($tmp);
-	return '';
+    $date = new Datetime($date);
+    $date->modify('-1 day');
+    $tmp['date']=$date->format("d.m.Y");
+    $tmp['date_day']=date('N', strtotime($tmp['date']));
+    if($tmp['date_day']==7){
+        $date->modify('-2 day');
+    } else if($tmp['date_day']==6){
+        $date->modify('-1 day');
+    }
+    $tmp['date']=$date->format("d.m.Y");
+    echo json_encode($tmp);
+    return '';
 }
 function validateDate($date,$date2){
 	$date = new Datetime($date);