From 92d01f4576613bf7f86414abdd16b72bb9efffe6 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 15 Jul 2024 16:55:52 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=B5=D0=BA=D1=80=D0=B0=D1=89=D0=B0?=
 =?utf8?q?=D0=B5=D0=BC=20=D0=B4=D0=B0=D1=80=D0=B8=D1=82=D1=8C=2020%=20?=
 =?utf8?q?=D0=B1=D0=BE=D0=BD=D1=83=D1=81=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE?=
 =?utf8?q?=D1=81=D1=82=D0=BE=20=D1=82=D0=B0=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/BonusController.php                    | 4 ++--
 .../tasks/task_25_delivery_bonus_add_after_half_day.php       | 2 +-
 erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index b7dcf12c..ee5d5233 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -113,7 +113,7 @@ class BonusController extends BaseController
         $userFound = Users::find()->where(['phone' => $result['phone']])->one();
         file_put_contents(self::OUT_DIR . '/get_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
         /** @var $userFound Users */
-        $salesCount = 0;
+        $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */
         if ($userFound && $userFound->telegram_created_at) {
             $salesCount = intval(Sales::find()->where(['phone' => $result['phone'], 'operation' => Sales::OPERATION_SALE])
                 ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count());
@@ -780,7 +780,7 @@ class BonusController extends BaseController
         file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
         $userFound = Users::find()->where(['phone' => $result['phone']])->one();
         /** @var $userFound Users */
-        $salesCount = 0;
+        $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */
 
         file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
         if ($userFound && $userFound->telegram_created_at) {
diff --git a/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php b/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php
index b27f32d3..2296078f 100644
--- a/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php
+++ b/erp24/scripts/tasks/task_25_delivery_bonus_add_after_half_day.php
@@ -94,7 +94,7 @@ try {
 
                 $userFound = Users::find()->where(['phone' => $phone])->one();
                 /** @var $userFound Users */
-                $salesCount = 0;
+                $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */
                 if ($userFound && $userFound->telegram_created_at) {
                     $salesCount = intval(Sales::find()->where(['phone' => $phone, 'operation' => Sales::OPERATION_SALE])
                         ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count());
diff --git a/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php b/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php
index 7b912189..b63f51f7 100644
--- a/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php
+++ b/erp24/scripts/tasks/task_26_delivery_bonus_add_after_weak.php
@@ -96,7 +96,7 @@ try {
 
                 $userFound = Users::find()->where(['phone' => $phone])->one();
                 /** @var $userFound Users */
-                $salesCount = 0;
+                $salesCount = -1; /* Из-за нулевого значения по умолчанию куча клиентов получило бонус 20% за покупку */
                 if ($userFound && $userFound->telegram_created_at) {
                     $salesCount = intval(Sales::find()->where(['phone' => $phone, 'operation' => Sales::OPERATION_SALE])
                         ->andWhere(['>=', 'date', $userFound->telegram_created_at])->count());
-- 
2.39.5