From 8c1c4a8b281d7fe813e19f657268801ba474757b Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 26 Jun 2024 12:00:22 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= =?utf8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=BE?= =?utf8?q?=D1=80=D1=82=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/modul/orders/collation.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erp24/modul/orders/collation.php b/erp24/modul/orders/collation.php index 0b24e778..71e7c36b 100644 --- a/erp24/modul/orders/collation.php +++ b/erp24/modul/orders/collation.php @@ -143,12 +143,13 @@ foreach($data as $row) { $orders_cheking_status_array[$row["amo_id"]]=$row["status"]; -} - +} + +$delivery_date_plus = date("Y-m-d 23:59:59", strtotime("+2 day", strtotime($delivery_date))); $sql = "SELECT id, operation, summ, number, date, store_id_1c, order_id FROM sales WHERE date>='" . $delivery_date - . "'::date - INTERVAL '25 day' AND date<='" . $delivery_date . " 23:59:59' AND operation IN ('Возврат', 'Продажа') order by date DESC"; + . "'::date - INTERVAL '25 day' AND date<='" . $delivery_date_plus . "' AND operation IN ('Возврат', 'Продажа') AND order_id != '' order by date DESC"; $checkarr= $db::getRows($sql); //$cheks_txt="; -- 2.39.5