From 0550d8ffbad5911143182554c2a1324f611ab384 Mon Sep 17 00:00:00 2001 From: roadmoore <75755696+roadmoore@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:21:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=BE=D1=8F=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=BF=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20"=D0=9F=D0=BE=D0=B4=D1=82=D0=B2=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=81=D0=BC=D1=81"=20=20(#?= =?UTF-8?q?350)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/version.php | 4 ++-- intaro.retailcrm/lib/component/handlers/eventshandlers.php | 5 +---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 451dbd6f..6fc67cef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2024-06-14 v.6.5.19 +- Исправление работы программы лояльности при использовании подтверждения списание бонусов по SMS + ## 2024-06-05 v.6.5.18 - Добавлена возможность исправления даты регистрации клиентов в CRM diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 85149670..ea1200e2 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Добавлена возможность исправления даты регистрации клиентов в CRM +- Исправление работы программы лояльности при использовании Подтверждения списание бонусов по SMS diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 6251607c..2fae9938 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.5.18', - 'VERSION_DATE' => '2024-06-05 16:30:00' + 'VERSION' => '6.5.19', + 'VERSION_DATE' => '2024-06-14 13:12:00' ]; diff --git a/intaro.retailcrm/lib/component/handlers/eventshandlers.php b/intaro.retailcrm/lib/component/handlers/eventshandlers.php index 60dbb107..f56b1741 100644 --- a/intaro.retailcrm/lib/component/handlers/eventshandlers.php +++ b/intaro.retailcrm/lib/component/handlers/eventshandlers.php @@ -181,9 +181,7 @@ class EventsHandlers //Если есть бонусы if ($isBonusesIssetAndAvailable) { - $applyBonusResponse = $loyaltyService->applyBonusesInOrder($order, $bonusFloat); - - $hlInfoBuilder->setApplyResponse($applyBonusResponse); + $hlInfoBuilder->setApplyResponse($loyaltyService->applyBonusesInOrder($order, $bonusFloat)); $loyaltyBonusMsg = $bonusFloat; $hlInfoBuilder->setBonusCountTotal($bonusFloat); } @@ -191,7 +189,6 @@ class EventsHandlers //Если бонусов нет, но скидка по ПЛ есть if ( ($isDataForLoyaltyDiscount && !$isBonusInput) - || ($applyBonusResponse instanceof OrderLoyaltyApplyResponse && !$applyBonusResponse->order) ) { $loyaltyService->saveDiscounts($order, $calculateItemsInput); }