From 94973b34d3c9044d016a619c7411295220b37087 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 22 Oct 2025 16:10:57 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86?=
 =?utf8?q?=D0=B8=D0=B8=20=D0=BF=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?=
 =?utf8?q?=D0=BD=D0=BD=D1=8B=D0=BC=20=D1=87=D0=B5=D0=BA=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/SalesService.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php
index f31f1722..3dc0e94a 100755
--- a/erp24/services/SalesService.php
+++ b/erp24/services/SalesService.php
@@ -110,10 +110,15 @@ class SalesService
 
         if (!$salesTotal) {
             if ($salesDelivery) {
-                $query->andFilterWhere(['or',
-                    ['not in', 's.order_id', ['', '0']],
-                    ['not in', 'sc.order_id', ['', '0']]
-                ]);
+                $query->leftJoin('create_checks cc', 'CAST(cc.order_id AS TEXT) = s.order_id')
+                    ->andFilterWhere(['or',
+                        ['not in', 's.order_id', ['', '0']],
+                        ['not in', 'sc.order_id', ['', '0']]
+                    ])
+                    ->andWhere(['or',
+                        ['cc.date' => null],
+                        ['DATE(cc.date)' => new \yii\db\Expression('DATE(s.date)')]
+                    ]);
             } else {
                 $query->andWhere([
                     'and',
-- 
2.39.5