From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 6 Feb 2025 08:13:11 +0000 (+0300)
Subject: Исправлены списания
X-Git-Tag: 1.7~10^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f1dc63392c8c6022ada78002ef2229ac01692bc8;p=erp24_rep%2Fyii-erp24%2F.git

Исправлены списания
---

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index 73acb563..bda04b76 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -765,7 +765,11 @@ class BonusController extends BaseController
         if ($write_off_bonuses > $write_off_bonuses_theory) {
             $write_off_bonuses = $write_off_bonuses_theory;
         }
-
+        $user_balans = ClientHelper::getBonusBalance($phone);
+        if ($user_balans < $write_off_bonuses) {
+            $write_off_bonuses = $user_balans;
+        }
+        file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
         // сумма со скидкой
         $summa_chek = $amount_all - $write_off_bonuses;
         $baza_back = $amount_real - $write_off_bonuses;
@@ -805,9 +809,7 @@ class BonusController extends BaseController
         $ip = $_SERVER['REMOTE_ADDR'];
 
         file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
-        $user_balans = ClientHelper::getBonusBalance($phone);
 
-        file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
 
         $store_id_1c = $store_id;
         $site_id = 0;
@@ -1191,7 +1193,7 @@ class BonusController extends BaseController
         $mess["message_cashier"] = "Бонусы списаны";
         $mess["user_balans_old"] = $user_balans;
         $mess["user_balans_new"] = $user_balans_new;
-        $mess["user_balans_actual"] = $user_balans;
+        $mess["user_balans_actual"] = $user->balans;
         LogService::apiLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE));
       file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__ . ' OK ', FILE_APPEND);
         return $this->asJson($mess);