RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-11 21:21:00 +00:00
Code Issues Projects Releases Wiki Activity

Changing the verification to update the properties of the loyalty program order

Browse source
This commit is contained in:
Ivan Chaplygin 2023-01-13 11:57:47 +03:00
parent 1d5bb5b061
commit 552f5c602f
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View file

@ -1185,8 +1185,6 @@ class RetailCrmHistory
}
}
EventsHandlers::$disableSaleHandler = true;
$newOrder->setField('PRICE', $orderSumm);
self::orderSave($newOrder);
@ -1224,8 +1222,6 @@ class RetailCrmHistory
self::orderSave($newOrder);
}
EventsHandlers::$disableSaleHandler = false;
if (!empty($deleteBasketInfo)) {
$orderLoyaltyDataService->deleteLoyaltyInfoFromHl($deleteBasketInfo);
}

21
intaro.retailcrm/lib/component/handlers/eventshandlers.php
View file

@ -127,11 +127,18 @@ class EventsHandlers
*/
public function OnSaleOrderSavedHandler(Event $event): void
{
if (self::$disableSaleHandler === true) {
return;
}
try {
$isBonusInput = (
!empty($_POST['bonus-input'])
&& !empty($_POST['available-bonuses'])
);
$isDataForLoyaltyDiscount = isset($_POST['calculate-items-input'], $_POST['loyalty-discount-input']);
if (self::$disableSaleHandler === true || !($isDataForLoyaltyDiscount || $isBonusInput) ) {
return;
}
/* @var LoyaltyService $loyaltyService */
$loyaltyService = ServiceLocator::get(LoyaltyService::class);
@ -144,17 +151,11 @@ class EventsHandlers
$saveResult = RetailCrmEvent::orderSave($order);
Utils::handleApiErrors($saveResult);
$isBonusInput = (
!empty($_POST['bonus-input'])
&& !empty($_POST['available-bonuses'])
);
$bonusFloat = (float) $_POST['bonus-input'];
/** @var bool $isNewOrder */
$isNewOrder = $event->getParameter('IS_NEW');
$isLoyaltyOn = ConfigProvider::getLoyaltyProgramStatus() === 'Y';
$isDataForLoyaltyDiscount = isset($_POST['calculate-items-input'], $_POST['loyalty-discount-input']);
$isBonusesIssetAndAvailable = $isBonusInput && (float) $_POST['available-bonuses'] >= $bonusFloat;
/** @var array $calculateItemsInput */