From: Alexander Smirnov <fredeom@mail.ru>
Date: Sat, 18 May 2024 14:47:53 +0000 (+0300)
Subject: fix
X-Git-Tag: 1.1~23^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=dcf4b173824b0276fbaf5fe3432eaf9cc31f65a9;p=erp24_rep%2Fyii-erp24%2F.git

fix
---

diff --git a/erp24/scripts/tasks/task_31_for_5000_give_1000.php b/erp24/scripts/tasks/task_31_for_5000_give_1000.php
index a1ad788f..d766adcb 100644
--- a/erp24/scripts/tasks/task_31_for_5000_give_1000.php
+++ b/erp24/scripts/tasks/task_31_for_5000_give_1000.php
@@ -29,7 +29,7 @@ $result = 0;
 
 $enable = true;
 $start = false;
-$force = false;
+$force = true;
 
 $minuetTimeInTask = date('i', $time);
 $fullTimeInTask = date('Y-m-d H:i:s', $time);
@@ -57,15 +57,10 @@ try {
         //////////////////////////////////////////////
         $sales = Sales::find()->where(['>', 'date', '2024-04-30 00:00:00'])->andWhere(['<=', 'date', '2024-05-02 23:59:59'])
             ->andWhere(['operation' => 'Продажа'])->andWhere(['>=', 'summ', '5000'])->orderBy(['date' => SORT_ASC])->all();
-        $returns = Sales::find()->where(['>', 'date', '2024-04-30 00:00:00'])->andWhere(['<=', 'date', '2024-05-02 23:59:59'])
-            ->andWhere(['operation' => 'Возврат'])->all();
-
-        $returnCheckIds = [];
-        foreach ($returns as $return) {
-            $returnCheckIds[] = $return->id;
-        }
-
         $salesIds = ArrayHelper::getColumn($sales, 'id');
+        $returns = Sales::find()->where(['sales_check' => $salesIds])->andWhere(['operation' => 'Возврат'])->all();
+
+        $returnCheckIds = ArrayHelper::getColumn($returns, 'sales_check');
         $userBonuses = UsersBonus::find()->where(['check_id' => $salesIds, 'tip_sale' => '1000per5000'])->all();
         $userBonusPerCheckId = [];
         foreach($userBonuses as $ub) {