From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 22 Oct 2025 13:10:57 +0000 (+0300)
Subject: Добавление фильтрации по созданным чекам
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=94973b34d3c9044d016a619c7411295220b37087;p=erp24_rep%2Fyii-erp24%2F.git

Добавление фильтрации по созданным чекам
---

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',