From 2ed17a65230ec4db6839487aa889dce2c8a862e9 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 26 Jun 2024 11:54:57 +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=BD=D0=B5=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?utf8?q?=D1=91=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BB=D1=8E=D1=87?=
 =?utf8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/modul/orders/collation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erp24/modul/orders/collation.php b/erp24/modul/orders/collation.php
index 0a155715..0b24e778 100644
--- a/erp24/modul/orders/collation.php
+++ b/erp24/modul/orders/collation.php
@@ -148,7 +148,7 @@ foreach($data as $row) {
 
 
 $sql = "SELECT id, operation, summ, number, date, store_id_1c, order_id FROM sales WHERE date>='" . $delivery_date
-    . "'::date - INTERVAL '20 day' AND date<='" . $delivery_date . " 23:59:59' AND operation IN ('Возврат', 'Продажа') order by date DESC";
+    . "'::date - INTERVAL '25 day' AND date<='" . $delivery_date . " 23:59:59' AND operation IN ('Возврат', 'Продажа') order by date DESC";
 
 $checkarr= $db::getRows($sql);
 //$cheks_txt=";
@@ -342,7 +342,7 @@ echo"<button class=\"btn btn-sm btn-danger btn__".$row["id"]."\" onclick=\"ajax_
 if((($store_arr[$row["store_id"]]??"")=="ул. Аэродромная 28 (к-р Москва)" or $row["store"]=="ул. Аэродромная, 28" or $row["store"]=="")
 and $yes==1 and $row["payment_type_id"]!="Оплачен в магазине") {
 
-if($check_vozvrat_cnt[$row["id"]]>=$check_sale_cnt[$row["id"]] ) { 
+if(($check_vozvrat_cnt[$row["id"]] ?? -1)>=($check_sale_cnt[$row["id"]] ?? 0) ) {
 echo"
 возвратов ".$check_vozvrat_cnt[$row["id"]]."  ".$check_vozvrat_cnt[$row["id"]]." чеков ".$check_sale_cnt[$row["id"]]."";
 //echo"<button class=\"btn btn-sm btn-warning btn__".$row["id"]."\"onclick=\"ajax_create_check('".$row["id"]."');\">пробить новый чек!</button>";
-- 
2.39.5