From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 4 Mar 2025 15:24:24 +0000 (+0300)
Subject: дебаг 7
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=095a96891cb14bc2e77a234fa64925f8f85a42a8;p=erp24_rep%2Fyii-erp24%2F.git

дебаг 7
---

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index 6d75f099..5825c52d 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -109,7 +109,7 @@ class BonusController extends BaseController
                 if (in_array($item["product_id"], $items_arr_no)) {
                     $summa_no = $summa_no + $item["price"] * $item["quantity"];
                     $has_actions = true;
-                } else if (in_array($item["product_id"], $items_arr_no_bonus_writeoffs)) {
+                } elseif (in_array($item["product_id"], $items_arr_no_bonus_writeoffs)) {
                     $summa_no_writeoffs = $summa_no_writeoffs + $item["price"] * $item["quantity"];
                 }
                 $all_amount += $item["price"] * $item["quantity"];
@@ -716,6 +716,14 @@ class BonusController extends BaseController
         $write_off_bonuses = intval($result["write_off_bonuses"] ?? 0); // только при продаже
 
         $user = Users::find()->where(['phone' => $result['phone']])->andWhere(['phone_true' => '1'])->one();
+        try {
+            $user->save();
+        } catch (\Exception $ex) {
+            var_dump($ex->getMessage());
+            die;
+        }
+
+
         $bonusLevels = BonusLevels::find()->where(['active' => 1])->indexBy('alias')->asArray()->all();
         $bonusLevel = $user->bonus_level ?? "silver";
         $cashback_rate = isset($bonusLevels[$bonusLevel]['cashback_rate'])
@@ -747,7 +755,7 @@ class BonusController extends BaseController
         foreach ($result['items'] as $item) {
             if (in_array($item["product_id"], $items_arr_no)) {
                 $summa_no = $summa_no + $item["price"] * $item["quantity"];
-            } if (in_array($item["product_id"], $items_arr_no_bonus_writeoffs)) {
+            } else if (in_array($item["product_id"], $items_arr_no_bonus_writeoffs)) {
                 $summa_no_writeoffs = $summa_no_writeoffs + $item["price"] * $item["quantity"];
             } else {
                 $amount_real = $amount_real + $item["price"] * $item["quantity"];
@@ -778,17 +786,6 @@ class BonusController extends BaseController
         $summa_chek = $amount_all - $write_off_bonuses;
         $baza_back = $amount_real + $summa_no_writeoffs - $write_off_bonuses;
 
-
-        try {
-            $user->save();
-        } catch (\Exception $ex) {
-            var_dump($ex->getMessage());
-            die;
-        }
-
-
-
-
         $mess = [];
 
         file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);