From a4757546c72628ca48a3a737fe875ba409c52d27 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 18 Dec 2024 21:24:55 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?=
 =?utf8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B0=D1=82=D1=81=D0=B0=D0=BF?=
 =?utf8?q?=D0=B0=20=D0=B8=20=D0=B7=D0=B2=D0=BE=D0=BD=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Users.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 749ebb99..dc20ca7e 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -321,12 +321,32 @@ class Users extends \yii\db\ActiveRecord
             //          ->andWhere() //заглушка на проверку что он уже участвовал в
             ->andWhere(['phone' => $usersArray]);
 
+        $messagesSettings = UsersMessageManagement::find()
+            ->where(['active' => 1])
+            ->one();
+
         if ($type === 'whatsapp') {
+
+
+                $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10;
+                $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
+
+            $excludeSalesPhone = Sales::find()
+                ->where(['>=', 'date', date('Y-m-d', strtotime("$startDate -$step1 days"))])
+                ->andWhere(['<=', 'date', date('Y-m-d', strtotime("$startDate -$step2 days"))])
+                ->distinct('phone')
+                ->select('phone')
+                ->column();
+            $query->andWhere(['not in', 'phone', $excludeSalesPhone]);
             $query->andWhere(['telegram_is_subscribed' => 0]);
         } elseif ($type === 'call') {
+
+            $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
+            $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2;
+
             $excludeSalesPhone = Sales::find()
-                ->where(['>=', 'date', date('Y-m-d', strtotime("$startDate -7 days"))])
-                ->andWhere(['<=', 'date', date('Y-m-d', strtotime("$startDate -2 days"))])
+                ->where(['>=', 'date', date('Y-m-d', strtotime("$startDate -$step2 days"))])
+                ->andWhere(['<=', 'date', date('Y-m-d', strtotime("$startDate -$step3 days"))])
                 ->distinct('phone')
                 ->select('phone')
                 ->column();
-- 
2.39.5