From: marina <m.zozirova@gmail.com>
Date: Wed, 19 Mar 2025 12:43:25 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/develop' into feature_zozirova_erp-355_lptrackin... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=6e9911756378198399752dee721d8157956aefaa;p=erp24_rep%2Fyii-erp24%2F.git

Merge remote-tracking branch 'origin/develop' into feature_zozirova_erp-355_lptracking_api

# Conflicts:
#	erp24/commands/CronController.php
---

6e9911756378198399752dee721d8157956aefaa
diff --cc erp24/commands/CronController.php
index e6821904,2721cf00..b70df857
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@@ -11,15 -12,8 +12,14 @@@ use yii\console\Controller
  use yii\console\ExitCode;
  use yii\db\Expression;
  use yii\helpers\BaseConsole;
- use yii\helpers\Console;
  use yii_app\helpers\ClientHelper;
  use yii_app\records\BonusLevels;
 +use yii_app\records\EqualizationRemains;
 +use yii_app\records\LPTrackerApi;
 +use yii_app\records\Product1cReplacement;
 +use yii_app\records\Products1c;
 +use yii_app\records\ReplacementInvoice;
 +use yii_app\records\ReplacementInvoiceProducts;
  use yii_app\records\Sales;
  use yii_app\records\SentKogort;
  use yii_app\records\Users;
@@@ -742,10 -892,10 +905,10 @@@ class CronController extends Controlle
              $this->stdout("Некорректный формат времени\n", BaseConsole::FG_RED);
              return ExitCode::DATAERR;
          }
 -        $currentDate =  $this->time ? date('Y-m-d', (int)$this->time) : date('Y-m-d');
 +        $currentDate = $this->time ? date('Y-m-d', (int)$this->time) : date('Y-m-d');
          $stepsBack = $this->stepsBack ?? 0;
          $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2;
- 
+         $testActive = $messagesSettings ? (bool)($messagesSettings->test_phones_active) : false;
          for ($i = $stepsBack; $i >= 0; $i--) {
              $kogortDate = date('Y-m-d', strtotime("-$i days", strtotime($currentDate)));
              $targetDate = date('Y-m-d', strtotime("+$step3 days", strtotime($kogortDate)));