From cc333ce1b42d32c5113ed57f70bc5ca5a16560a2 Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 23 Jul 2025 14:21:10 +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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/erp24/api2/controllers/ClientController.php b/erp24/api2/controllers/ClientController.php index 26aa51e3..742f42fe 100644 --- a/erp24/api2/controllers/ClientController.php +++ b/erp24/api2/controllers/ClientController.php @@ -751,13 +751,13 @@ class ClientController extends BaseController $userBonus = new UsersBonus(); $userBonus->phone = $phone; $userBonus->name = $comment ?? sprintf( - 'Спиcание бонусов %s%% по чеку %s от %s. Сумма чека %s', - $salePercent, + 'Спиcание бонусов %s по онлайн заказу #%s от %s. Сумма чека %s', + $pointsToUse, $orderId, date('d.m.Y H:i:s', strtotime($date)), $price ); - $userBonus->date = date('Y-m-d H:i:s'); + $userBonus->date = date('Y-m-d H:i:s', strtotime($date)); $userBonus->site_id = 1; $userBonus->setka_id = 1; $userBonus->tip = 'minus'; @@ -766,7 +766,7 @@ class ClientController extends BaseController $userBonus->price = $price; $userBonus->bonus = $pointsToUse; $userBonus->date_start = date('Y-m-d H:i:s', $date); - $userBonus->date_end = date('Y-m-d H:i:s', strtotime('+365 day', strtotime($date))); + $userBonus->date_end = date('Y-m-d H:i:s', $date); try { if (!$userBonus->save()) { @@ -834,7 +834,8 @@ class ClientController extends BaseController $userBonus = new UsersBonus(); $userBonus->phone = $phone; $userBonus->name = sprintf( - 'Возврат с онлайн покупки. Чек %s от %s. Сумма чека %s', + 'Начисление бонусов %s с онлайн покупки #%s от %s. Сумма чека %s', + $pointsToAdd, $orderId, date('d.m.Y H:i:s', strtotime($date)), $price -- 2.39.5