calculate delivery date fix

REST/functions.php

@@ -360,7 +360,7 @@ GROUP BY
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'invoices_2024.csv',
-            ],
+            ], // invoices 2024
             [
                 'sql'      => "
                 SELECT
@@ -400,7 +400,101 @@ GROUP BY
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'invoices_2025.csv',
-            ],
+            ], // invoices 2025
+            [
+                'sql'      => "
+SELECT
+    i.document_no,
+    i.register_date,
+    oi.document_no AS FV,
+    oi.register_date AS FV_date,
+    i.parent_name,
+    p.code,
+    p.name,
+    CASE p.group_ks
+        WHEN 1 THEN 'Towar handlowy'
+        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN 3 THEN 'Usługi'
+        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
+        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        ELSE 'Nieznane'
+        END AS group_ks,
+    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    ii.quantity_corrected AS quantity_correced,
+    ii.total_netto_corrected AS total_netto_corrected
+FROM ecminvoiceouts AS i
+         INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecminvoiceouts AS oi ON oi.id = i.ecminvoiceout_id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
+    AND cb.deleted = 0
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE i.type = 'correct' AND YEAR(i.register_date) = 2024
+GROUP BY
+    i.document_no,
+    i.register_date,
+    oi.document_no,
+    oi.register_date,
+    i.parent_name,
+    p.code,
+    p.name,
+    p.group_ks,
+    ii.quantity,
+    ii.price_netto,
+    ii.quantity_corrected,
+    ii.total_netto_corrected
+ORDER BY i.register_date DESC;   
+            ",
+                'filename' => 'correct_invoices_2024.csv',
+            ], // correct invoices 2024
+            [
+                'sql'      => "
+SELECT
+    i.document_no,
+    i.register_date,
+    oi.document_no AS FV,
+    oi.register_date AS FV_date,
+    i.parent_name,
+    p.code,
+    p.name,
+    CASE p.group_ks
+        WHEN 1 THEN 'Towar handlowy'
+        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN 3 THEN 'Usługi'
+        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
+        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        ELSE 'Nieznane'
+        END AS group_ks,
+    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    ii.quantity_corrected AS quantity_correced,
+    ii.total_netto_corrected AS total_netto_corrected
+FROM ecminvoiceouts AS i
+         INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecminvoiceouts AS oi ON oi.id = i.ecminvoiceout_id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
+    AND cb.deleted = 0
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE i.type = 'correct' AND YEAR(i.register_date) = 2025
+GROUP BY
+    i.document_no,
+    i.register_date,
+    oi.document_no,
+    oi.register_date,
+    i.parent_name,
+    p.code,
+    p.name,
+    p.group_ks,
+    ii.quantity,
+    ii.price_netto,
+    ii.quantity_corrected,
+    ii.total_netto_corrected
+ORDER BY i.register_date DESC;
+            ",
+                'filename' => 'correct_invoices_2025.csv',
+            ], // correct invoices 2025
             [
                 'sql'      => "
 SELECT
@@ -440,7 +534,7 @@ GROUP BY
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'ecommerce_invoices_2024.csv',
-            ],
+            ], // ecommerce invoices 2024
             [
                 'sql'      => "
 SELECT
@@ -480,7 +574,7 @@ GROUP BY
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'ecommerce_invoices_2025.csv',
-            ],
+            ], // ecommerce invoices 2025
             [
                 'sql'      => "
                     SELECT
@@ -492,7 +586,83 @@ ORDER BY i.register_date DESC;
                     JOIN ecmstocks AS s ON ss.stock_id = s.id
                     ORDER BY quantity + 0 DESC;",
                 'filename' => 'stocks.csv',
-            ],
+            ], // stocks
+            [
+                'sql'      => "
+SELECT
+    i.document_no,
+    i.register_date,
+    p.code,
+    p.name,
+    CASE p.group_ks
+        WHEN 1 THEN 'Towar handlowy'
+        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
+        ELSE 'Nieznane'
+        END AS group_ks,
+    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    s.name AS stock,
+    ii.quantity
+FROM ecmstockdocinsideouts AS i
+         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
+    AND cb.deleted = 0
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE YEAR(i.register_date) = 2025
+GROUP BY
+    i.document_no,
+    i.register_date,
+    p.code,
+    p.name,
+    p.group_ks,
+    s.name,
+    ii.quantity
+ORDER BY i.register_date DESC;
+            ",
+                'filename' => 'rw_2025.csv',
+            ], // rw 2025
+            [
+                'sql'      => "
+SELECT
+    i.document_no,
+    i.register_date,
+    p.code,
+    p.name,
+    CASE p.group_ks
+        WHEN 1 THEN 'Towar handlowy'
+        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
+        ELSE 'Nieznane'
+        END AS group_ks,
+    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    s.name AS stock,
+    ii.quantity
+FROM ecmstockdocinsideouts AS i
+         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
+    AND cb.deleted = 0
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE YEAR(i.register_date) = 2024
+GROUP BY
+    i.document_no,
+    i.register_date,
+    p.code,
+    p.name,
+    p.group_ks,
+    s.name,
+    ii.quantity
+ORDER BY i.register_date DESC;
+            ",
+                'filename' => 'rw_2024.csv',
+            ], // rw 2024
         ];
 
         $report = [];

modules/EcmSales/bimit_importEdiOrders.php

@@ -131,6 +131,21 @@ function importSale($file)
 
     $sale->register_date = date("d.m.Y", strtotime($xml->{'Order-Header'}->OrderDate));
     $sale->delivery_date = date("d.m.Y", strtotime($xml->{'Order-Header'}->ExpectedDeliveryDate));
+
+    $delivery_timestamp = strtotime($xml->{'Order-Header'}->ExpectedDeliveryDate);
+    $delivery_day_of_week = date('N', $delivery_timestamp); // 1 = Monday, 7 = Sunday
+    if ($delivery_day_of_week == 1) { // Monday -> send on Friday
+        $send_timestamp = strtotime('-3 days', $delivery_timestamp);
+    } else { // send one day before
+        $send_timestamp = strtotime('-1 day', $delivery_timestamp);
+    }
+    $sale->send_date = date("d.m.Y", $send_timestamp);
+
+
+    $sale->document_no = $xml->{'Order-Header'}->OrderNumber;
+    $sale->document_date = date("d.m.Y", strtotime($xml->{'Order-Header'}->OrderDate));
+    $sale->document_due_date = date("d.m.Y", strtotime($xml->{'Order-Header'}->ExpectedDeliveryDate));
+    $sale->document_currency = 'PLN';
     $date = new DateTime(date("d.m.Y", strtotime($xml->{'Order-Header'}->OrderDate)));
     if ($sale->payment_date_days != "") {
         $date->modify("+" . $sale->payment_date_days . " day");

modules/EcmSales/javascript/EcmSales3.js

@@ -15,7 +15,7 @@ $(document).ready(
         window.onbeforeunload = confirmExit;
         // prevent submit by enter press
         lockEnter();
-			// parent info
+
         $("#delivery_date").on('inputchange', function () {
             calculateDate($("#delivery_date").val());
         });
@@ -157,6 +157,7 @@ $(document).ready(
             }
         });
         AddSearchRecord();
+        calculateDate($("#delivery_date").val());
         $(".loading_panel").css("display", "none");
     });
 // handle save
@@ -187,7 +188,6 @@ check_form = function(formname,event) {
     $("#position_list").val(JSON.stringifyNoSecurity(items));
 
 
-
     if (check_form_(formname) === true) {
         return true;
     } else {
@@ -196,6 +196,7 @@ check_form = function(formname,event) {
         return false;
     }
 };
+
 function confirmExit() {
     return "";
 }

modules/EcmSales/javascript/helper.php

@@ -23,6 +23,13 @@ switch ($_POST['job']) {
 function calculateDate($date){
 	$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 '';