codestyle fix

intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/template.php

@@ -427,4 +427,4 @@ if ($arResult["SHOW_SMS_FIELD"] == true) {
         <p><span class="starrequired">*</span><?=GetMessage("AUTH_REQ")?></p>
     
     <? endif ?>
-</div>
+</div>

intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/result_modifier.php

@@ -1,8 +1,11 @@
 <?php
 
 use Bitrix\Currency\CurrencyLangTable;
+use Bitrix\Main\ArgumentException;
 use Bitrix\Main\Loader;
 use Bitrix\Main\LoaderException;
+use Bitrix\Main\ObjectPropertyException;
+use Bitrix\Main\SystemException;
 use Intaro\RetailCrm\Component\ConfigProvider;
 use Intaro\RetailCrm\Service\LoyaltyService;
 
@@ -38,15 +41,20 @@ if ($arResult['LOYALTY_STATUS'] === 'Y' && $arResult['PERSONAL_LOYALTY_STATUS']
     }
 
     $component = $this->__component;
+    
     $component::scaleImages($arResult['JS_DATA'], $arParams['SERVICES_IMAGES_SCALING']);
     
-    $currency = CurrencyLangTable::query()
-        ->setSelect(['FORMAT_STRING'])
-        ->where([
-            ['CURRENCY', '=', RetailcrmConfigProvider::getCurrencyOrDefault()],
-            ['LID', '=', 'LANGUAGE_ID'],
-        ])
-        ->fetch();
+    try {
+        $currency = CurrencyLangTable::query()
+            ->setSelect(['FORMAT_STRING'])
+            ->where([
+                ['CURRENCY', '=', RetailcrmConfigProvider::getCurrencyOrDefault()],
+                ['LID', '=', 'LANGUAGE_ID'],
+            ])
+            ->fetch();
+    } catch (ObjectPropertyException | ArgumentException | SystemException $exception) {
+        AddMessage2Log($exception->getMessage());
+    }
     
     $arResult['BONUS_CURRENCY'] = $currency['FORMAT_STRING'];
-}
+}

intaro.retailcrm/lib/component/handlers/eventshandlers.php

@@ -173,10 +173,10 @@ class EventsHandlers
     /**
      * Регистрирует пользователя в CRM системе после регистрации на сайте
      *
-     * @param $arFields
+     * @param array $arFields
      * @return mixed
      */
-    public function OnAfterUserRegisterHandler($arFields)
+    public function OnAfterUserRegisterHandler(array $arFields): void
     {
         if (isset($arFields['USER_ID']) && $arFields['USER_ID'] > 0) {
             $user = UserRepository::getById($arFields['USER_ID']);
@@ -194,6 +194,7 @@ class EventsHandlers
             $arFields['ID']   = $arFields['USER_ID'];
             $optionsSitesList = RetailcrmConfigProvider::getSitesList();
             $api              = new ApiClient(RetailcrmConfigProvider::getApiUrl(), RetailcrmConfigProvider::getApiKey());
+            
             //TODO надо решить, что делать, если пользователь с таким externalID уже существует.
             RetailCrmUser::customerSend($arFields, $api, 'individual', true, $optionsSitesList);
 
@@ -214,4 +215,3 @@ class EventsHandlers
         }
     }
 }
-

intaro.retailcrm/lib/service/loyaltyservice.php

@@ -206,7 +206,7 @@ class LoyaltyService
                     //ДА. Отображаем сообщение "Вы зарегистрированы в Программе лояльности"
                     $regInLp['msg'] = GetMessage('REG_COMPLETE');
                 } else {
-                    //НЕТ. Акаунт не активен
+                    //НЕТ. Аккаунт не активен
                     /** @var \Intaro\RetailCrm\Service\UserAccountService $userService */
                     $userService = ServiceLocator::get(UserAccountService::class);
                     $extFields   = $userService->getExtFields($userFields['UF_EXT_REG_PL_INTARO']);
@@ -272,6 +272,7 @@ class LoyaltyService
                     $customFields   = $userFields['UF_CSTM_FLDS_INTARO'] ?? [];
                     $service        = new UserAccountService();
                     $createResponse = $service->createLoyaltyAccount($phone, $card, $customerId, $customFields);
+                    
                     $service->activateLpUserInBitrix($createResponse, $userFields['ID']);
 
                     if ($createResponse !== null
@@ -279,13 +280,15 @@ class LoyaltyService
                         && isset($createResponse->errorMsg)
                         && !empty($createResponse->errorMsg)
                     ) {
+                        $errorDetails = '';
+                        
                         if (isset($createResponse->errors) && is_array($createResponse->errors)) {
-                            $errorDetails = '';
                             
                             foreach ($createResponse->errors as $error) {
                                 $errorDetails .= $error.' ';
                             }
                         }
+                        
                         AddMessage2Log(GetMessage('REGISTER_ERROR') . ' ('.$createResponse->errorMsg.' '. $errorDetails .')');
                         
                         $regInLp['msg']  = GetMessage('REGISTER_ERROR') . ' ('.$createResponse->errorMsg.' '. $errorDetails .')';
@@ -379,18 +382,21 @@ class LoyaltyService
     private function getStandardFields(array $userFields): array
     {
         $resultFields = [];
+        
         foreach (self::STANDARD_FIELDS as $key => $value) {
             if ($value === 'text' && empty($userFields[$key])) {
                 $resultFields[$key] = [
                     'type' => $value,
                 ];
             }
+            
             if ($value === 'checkbox' && $userFields[$key] !== '1') {
                 $resultFields[$key] = [
                     'type' => $value,
                 ];
             }
         }
+        
         return $resultFields;
     }
     
@@ -400,9 +406,10 @@ class LoyaltyService
      */
     private function getFields(array $userFields): array
     {
-        $standartFields = $this->getStandardFields($userFields);
+        $standardFields = $this->getStandardFields($userFields);
         $externalFields = $this->getExternalFields();
-        return array_merge($standartFields, $externalFields);
+        
+        return array_merge($standardFields, $externalFields);
     }
     
     /**

intaro.retailcrm/lib/service/orderservice.php

@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * PHP version 7.1
  *
@@ -11,26 +10,10 @@
  * @link     http://retailcrm.ru
  * @see      http://retailcrm.ru/docs
  */
-
 namespace Intaro\RetailCrm\Service;
 
-use Bitrix\Main\ArgumentException;
-use Bitrix\Main\ObjectPropertyException;
-use Bitrix\Main\SystemException;
 use Bitrix\Main\UserTable;
 use CModule;
-use Intaro\RetailCrm\Component\Factory\ClientFactory;
-use Intaro\RetailCrm\Model\Api\Address;
-use Intaro\RetailCrm\Model\Api\Company;
-use Intaro\RetailCrm\Model\Api\Contragent;
-use Intaro\RetailCrm\Model\Api\Customer;
-use Intaro\RetailCrm\Model\Api\CustomerContact;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersCorporateAddressesCreateRequest;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersCorporateCompaniesCreateRequest;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersCorporateCompaniesRequest;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersCorporateContactsCreateRequest;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersCorporateListRequest;
-use Intaro\RetailCrm\Model\Api\Request\Customers\CustomersGetRequest;
 use RCrmActions;
 use RetailCrm\ApiClient;
 use RetailcrmConfigProvider;