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

diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php
index bde53c3aa47660bb934bed2cdd1487dfe47ce1db..ce3e7777448975c2393181f0515726a9c054c98f 100644 (file)
--- 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
+                'Ð\92озвÑ\80аÑ\82 Ñ\81 онлайн покÑ\83пки. Чек %s оÑ\82 %s. СÑ\83мма Ñ\87ека %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()) {