From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 26 Dec 2024 13:41:34 +0000 (+0300)
Subject: Добавление holdActive
X-Git-Tag: 1.7~94^2~25
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=68b602e521bc72c310032200e57ae0e7cc2b1c4e;p=erp24_rep%2Fyii-erp24%2F.git

Добавление holdActive
---

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 7a7a62f0..5d0a0859 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -469,9 +469,8 @@ class Users extends \yii\db\ActiveRecord
             ->where(['active' => 1])
             ->one();
 
-        $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10;
-        $hold =  $messagesSettings ? $messagesSettings->hold : 10;
-        $holdActive =  $messagesSettings ? $messagesSettings->hold_active : 1;
+        $hold = isset($messagesSettings->hold) ? $messagesSettings->hold : 10;
+        $holdActive = isset($messagesSettings->hold_active) ? $messagesSettings->hold_active : 1;
 
         $salesPhone = Sales::find()
             ->where(new \yii\db\Expression("TO_CHAR(date, 'MM-DD') = :monthDay", [':monthDay' => $monthDay]))
@@ -487,7 +486,7 @@ class Users extends \yii\db\ActiveRecord
 
         $usersArray = array_unique(array_merge($salesPhone, $memorableDate));
 
-        if ($hold > 0) {
+        if ($hold > 0 && $holdActive == 1) {
             $phonesSent = SentKogort::find()
                 ->select('phone')
                 ->where(['between', 'kogort_date',