From aacc184cb9b035b33b41fab0f717e5e44625397e Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 14 Jun 2024 14:43:00 +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=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/actions/bonus/AddBonusIfWrittenOffAction.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/erp24/actions/bonus/AddBonusIfWrittenOffAction.php b/erp24/actions/bonus/AddBonusIfWrittenOffAction.php
index c8cde4e9..0c2ceb58 100644
--- a/erp24/actions/bonus/AddBonusIfWrittenOffAction.php
+++ b/erp24/actions/bonus/AddBonusIfWrittenOffAction.php
@@ -4,6 +4,7 @@ namespace yii_app\actions\bonus;
 
 use Yii;
 use yii\base\Action;
+use yii\db\Expression;
 use yii\helpers\ArrayHelper;
 use yii_app\helpers\ClientHelper;
 use yii_app\records\Sales;
@@ -18,7 +19,9 @@ class AddBonusIfWrittenOffAction extends Action
         if ($action == 'showPlus') {
             $sales = Sales::find()->where(['operation' => Sales::OPERATION_SALE])
                 ->andWhere(['>=', 'date', '2024-05-30 21:28:00'])
-                ->andWhere(['<=', 'date', '2024-06-04 17:24:00'])->all();
+                ->andWhere(['<=', 'date', '2024-06-04 17:24:00'])
+                ->andWhere(['!=', 'phone', '0'])
+                ->all();
             $salesIds = ArrayHelper::getColumn($sales, 'id');
             $returns = Sales::find()->select(['id', 'sales_check'])->where(['operation' => Sales::OPERATION_RETURN, 'sales_check' => $salesIds])->all();
             $returnsIds = ArrayHelper::getColumn($returns, 'sales_check');
@@ -40,7 +43,9 @@ class AddBonusIfWrittenOffAction extends Action
         if ($action == 'applyPlus') {
             $sales = Sales::find()->where(['operation' => Sales::OPERATION_SALE])
                 ->andWhere(['>=', 'date', '2024-05-30 21:28:00'])
-                ->andWhere(['<=', 'date', '2024-06-04 17:24:00'])->all();
+                ->andWhere(['<=', 'date', '2024-06-04 17:24:00'])
+                ->andWhere(['!=', 'phone', '0'])
+                ->all();
             $salesIds = ArrayHelper::getColumn($sales, 'id');
             $returns = Sales::find()->select(['id', 'sales_check'])->where(['operation' => Sales::OPERATION_RETURN, 'sales_check' => $salesIds])->all();
             $returnsIds = ArrayHelper::getColumn($returns, 'sales_check');
@@ -53,8 +58,9 @@ class AddBonusIfWrittenOffAction extends Action
                             $usersBonusPlus = UsersBonus::find()->where(['tip' => 'plus', 'check_id' => $sale->id])->one();
                             if (!$usersBonusPlus) {
                                 $userBonus = new UsersBonus;
-                                $userBonus->phone = "" . $sale->phone;
-                                $userBonus->name = "Возврат с покупки 10%. Чек " . $sale->number . " от " . date("d.m.Y H:i:s", strtotime($sale->date)) . ". Сумма чека " . $sale->summ;
+                                $userBonus->phone = strval($sale->phone);
+                                $userBonus->name = "Возврат с покупки 10%. Чек " . $sale->number . " от "
+                                    . date("d.m.Y H:i:s", strtotime($sale->date)) . ". Сумма чека " . $sale->summ;
                                 $userBonus->date = date('Y-m-d H:i:s');
                                 $userBonus->site_id = 1;
                                 $userBonus->setka_id = 1;
-- 
2.39.5