RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-18 16:41:02 +00:00
Code Issues Projects Releases Wiki Activity

fix for order submit & fix for incorrect component rendering in the constructor

Browse source
This commit is contained in:
Pavel 2021-11-09 14:23:53 +03:00
parent 08ef8baa51
commit 03a7f75a7b
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
intaro.retailcrm/classes/general/events/RetailCrmEvent.php
View file

@ -107,13 +107,13 @@ class RetailCrmEvent
* @throws \Bitrix\Main\SystemException
* @throws \Exception
*/
public function orderSave($event)
public static function orderSave($event)
{
if (!$this->checkConfig()) {
if (!static::checkConfig()) {
return null;
}
$arOrder = $this->getOrderArray($event);
$arOrder = static::getOrderArray($event);
$api = new RetailCrm\ApiClient(RetailcrmConfigProvider::getApiUrl(), RetailcrmConfigProvider::getApiKey());
//params
@ -609,7 +609,7 @@ class RetailCrmEvent
/**
* @return bool
*/
private function checkConfig(): bool
private static function checkConfig(): bool
{
if (true == $GLOBALS['ORDER_DELETE_USER_ADMIN']) {
return false;
@ -637,7 +637,7 @@ class RetailCrmEvent
*
* @throws \Bitrix\Main\SystemException
*/
private function getOrderArray($event): ?array
private static function getOrderArray($event): ?array
{
if ($event instanceof Order) {
$obOrder = $event;
@ -651,4 +651,4 @@ class RetailCrmEvent
return RetailCrmOrder::orderObjToArr($obOrder);
}
}
}

4
intaro.retailcrm/install/export/local/components/intaro/lp.score/lang/ru/.description.php
View file

@ -1,4 +1,4 @@
<?php
$MESS ['COMP_MAIN_USER_REGISTER_TITLE'] = "Регистрация в программе лояльности";
$MESS ['COMP_MAIN_USER_REGISTER_DESCR'] = "Управляемая регистрация в программе лояльности";
$MESS ['COMP_MAIN_USER_SCORE_TITLE'] = "Личный кабинет программы лояльности RetailCRM";
$MESS ['COMP_MAIN_USER_SCORE_DESCR'] = "Личный кабинет участника программы лояльности RetailCRM";
$MESS ['MAIN_USER_GROUP_NAME'] = "Пользователь";

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

@ -151,12 +151,11 @@ class EventsHandlers
/* @var OrderLoyaltyDataService $orderLoyaltyDataService */
$orderLoyaltyDataService = ServiceLocator::get(OrderLoyaltyDataService::class);
$retailCrmEvent = new RetailCrmEvent();
/** @var Order $order */
$order = $event->getParameter('ENTITY');
// TODO: Replace old call with a new one.
$saveResult = $retailCrmEvent->orderSave($order);
$saveResult = RetailCrmEvent::orderSave($order);
Utils::handleApiErrors($saveResult);

2
tests/classes/general/events/RetailCrmEventTest.php
View file

@ -134,7 +134,7 @@ class RetailCrmEventTest extends PHPUnit\Framework\TestCase
$event = $this->createMock(\Bitrix\Main\Event::class);
$result = $this->retailcrmEvent->orderSave($event);
$result = RetailCrmEvent::orderSave($event);
$this->assertEquals(false, $result);
}