From bf5fe1e043ac3be68c855e702715ee6fcc51e7ca Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 23 Jul 2025 13:20:02 +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 | 29 +++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php index bde53c3a..ce3e7777 100644 --- a/erp24/api2/controllers/ClientController.php +++ b/erp24/api2/controllers/ClientController.php @@ -814,6 +814,8 @@ class ClientController extends BaseController $orderId = $data['order_id'] ?? null; $phone = $data['phone'] ?? null; $pointsToAdd = $data['points_to_add'] ?? null; + $date = $data['date'] ?? null; + $price = $data['price'] ?? null; if (!$orderId || !$phone || !$pointsToAdd) { return $this->asJson(['error' => ['code' => 400, 'message' => 'Недостаточно параметров']]); @@ -825,16 +827,6 @@ class ClientController extends BaseController return $this->asJson(['error' => ['code' => 404, 'message' => 'Пользователь не найден']]); } - $sale = Sales::find() - ->andWhere(['number' => $orderId]) - ->andWhere(['phone' => $phone]) - ->andWhere(['operation' => 'Продажа']) - ->one(); - - if (!$sale) { - return $this->asJson(['error' => ['code' => 404, 'message' => 'Продажа не найдена']]); - } - if (UsersBonus::find() ->andFilterWhere(['phone' => $phone]) ->andFilterWhere(['user_id' => $clientId]) @@ -853,10 +845,10 @@ class ClientController extends BaseController $userBonus = new UsersBonus(); $userBonus->phone = $phone; $userBonus->name = sprintf( - 'Возврат с покупки. Чек %s от %s. Сумма чека %s', - $sale->number, - date('d.m.Y H:i:s', strtotime($sale->date)), - $sale->summ + 'Возврат с онлайн покупки. Чек %s от %s. Сумма чека %s', + $orderId, + date('d.m.Y H:i:s', strtotime($date)), + $price ); $userBonus->date = date('Y-m-d H:i:s'); $userBonus->site_id = 1; @@ -864,12 +856,11 @@ class ClientController extends BaseController $userBonus->tip = 'plus'; $userBonus->tip_sale = 'sale'; $userBonus->user_id = $clientId; - $userBonus->check_id = $sale->id; - $userBonus->price = $sale->summ; - $userBonus->store_id = $sale->store_id; + $userBonus->check_id = $orderId; + $userBonus->price = $price; $userBonus->bonus = $pointsToAdd; - $userBonus->date_start = $sale->date; - $userBonus->date_end = date('Y-m-d H:i:s', strtotime('+365 day', strtotime($sale->date))); + $userBonus->date_start = $date; + $userBonus->date_end = date('Y-m-d H:i:s', strtotime('+365 day', strtotime($date))); try { if (!$userBonus->save()) { -- 2.39.5