From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 26 Jun 2024 08:54:57 +0000 (+0300)
Subject: Поправка не определённого ключа
X-Git-Tag: 1.3~44^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=2ed17a65230ec4db6839487aa889dce2c8a862e9;p=erp24_rep%2Fyii-erp24%2F.git

Поправка не определённого ключа
---

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>";