From 9cbf9ec26055f7bfb371108b28946bcc1494c3f9 Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 23 Jul 2025 14:34:55 +0300 Subject: [PATCH] =?utf8?q?ERP-438=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B0=20=D1=8D=D0=BD=D0=B4=D0=BF=D0=BE=D0=B9=D0=BD?= =?utf8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/ClientController.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php index 8830508b..c1bd6ad6 100644 --- 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))); -- 2.39.5