ERP-438 Доработка эндпойнтов

diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php
index 8830508b86ee1cfb81863c3e6b09a9c8598b4608..c1bd6ad60a7687a441470b06f3771644d11931a2 100644 (file)
--- a/erp24/api2/controllers/ClientController.php
+++ b/erp24/api2/controllers/ClientController.php
@@ -727,7 +727,7 @@ class ClientController extends BaseController
         if (UsersBonus::find()
             ->andFilterWhere(['phone' => $phone])
             ->andFilterWhere(['user_id' => $clientId])
-            ->andFilterWhere(['phone' => $phone])
+            ->andFilterWhere(['check_id' => $orderId])
             ->andFilterWhere(['tip' => 'minus'])
             ->one()) {
             return $this->asJson([
@@ -739,15 +739,6 @@ class ClientController extends BaseController
             ]);
         }
 
-        $salePercent = UsersBonusLevels::find()
-            ->alias('ubl')
-            ->leftJoin('bonus_levels bl', 'bl.alias = ubl.bonus_level')
-            ->andFilterWhere(['user_id' => $clientId])
-            ->andFilterWhere(['phone' => $phone])
-            ->andFilterWhere(['ubl.active' => 1])
-            ->select('cashback_rate')
-            ->scalar();
-
         $userBonus = new UsersBonus();
         $userBonus->phone = $phone;
         $userBonus->name = $comment ?? sprintf(
@@ -764,6 +755,7 @@ class ClientController extends BaseController
         $userBonus->tip_sale = 'sale';
         $userBonus->user_id = $clientId;
         $userBonus->price = $price;
+        $userBonus->check_id = strval($orderId);
         $userBonus->bonus = $pointsToUse;
         $userBonus->date_start = date('Y-m-d H:i:s', strtotime($date));
         $userBonus->date_end = date('Y-m-d H:i:s', strtotime($date));
@@ -819,6 +811,7 @@ class ClientController extends BaseController
         if (UsersBonus::find()
             ->andFilterWhere(['phone' => $phone])
             ->andFilterWhere(['user_id' => $clientId])
+            ->andFilterWhere(['check_id' => $orderId])
             ->andFilterWhere(['tip' => 'plus'])
             ->one()
         ) {
@@ -847,6 +840,7 @@ class ClientController extends BaseController
         $userBonus->tip_sale = 'sale';
         $userBonus->user_id = $clientId;
         $userBonus->price = $price;
+        $userBonus->check_id = strval($orderId);
         $userBonus->bonus = $pointsToAdd;
         $userBonus->date_start = date('Y-m-d H:i:s', strtotime($date));
         $userBonus->date_end = date('Y-m-d H:i:s', strtotime('+365 day', strtotime($date)));