Поправка правого борта выборки

diff --git a/erp24/modul/orders/collation.php b/erp24/modul/orders/collation.php
index 0b24e7785367a3f30229aac875497f2214935be4..71e7c36b7b80bbd056d0e16f25c54b7f2fe19a4f 100644 (file)
--- 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=";