Loyalty feature installer (#118)

* fixes for crash during the installation
* add LP activate option

intaro.retailcrm/lang/ru/options.php

@@ -72,7 +72,6 @@ $MESS ['ORDER_TYPES_LIST_CUSTOM'] = 'Внимание! Используется
 $MESS ['ORDER_UPL_START'] = 'Начать выгрузку';
 
 $MESS ['UPLOAD_ORDERS_OPTIONS'] = 'Ручная выгрузка';
-
 $MESS ['LOYALTY_PROGRAM_TITLE'] = 'Программа лояльности';
 $MESS ['LOYALTY_PROGRAM_TOGGLE_MSG'] = 'Включить программу лояльности';
 $MESS ['OTHER_OPTIONS'] = 'Прочие настройки';

intaro.retailcrm/lib/component/apiclient/clientadapter.php

@@ -17,9 +17,6 @@ use Intaro\RetailCrm\Component\ApiClient\Traits\CustomersTrait;
 use Intaro\RetailCrm\Component\ApiClient\Traits\LoyaltyTrait;
 use Intaro\RetailCrm\Component\Json\Deserializer;
 use Intaro\RetailCrm\Model\Api\Response\Settings\CredentialsResponse;
-use Intaro\RetailCrm\Component\ApiClient\Traits\CustomersCorporateTrait;
-use Intaro\RetailCrm\Component\ApiClient\Traits\CustomersTrait;
-use Intaro\RetailCrm\Component\ApiClient\Traits\LoyaltyTrait;
 use RetailCrm\Response\ApiResponse;
 
 /**
@@ -107,11 +104,11 @@ use RetailCrm\Response\ApiResponse;
  */
 class ClientAdapter
 {
+    use BaseClientTrait;
     use CustomersTrait;
     use CustomersCorporateTrait;
     use LoyaltyTrait;
-    use CustomersTrait;
-    use CustomersCorporateTrait;
+    use OrderTrait;
 
     /** @var string */
     public const ID = 'id';

intaro.retailcrm/lib/component/apiclient/traits/customerscorporatetrait.php

@@ -33,8 +33,6 @@ use Intaro\RetailCrm\Model\Api\Response\OperationResponse;
  */
 trait CustomersCorporateTrait
 {
-    use BaseClientTrait;
-
     /**
      * Create customers corporate
      *

intaro.retailcrm/lib/component/configprovider.php

@@ -16,9 +16,6 @@ use Bitrix\Main\ArgumentNullException;
 use Bitrix\Main\ArgumentOutOfRangeException;
 use Bitrix\Main\Config\Option;
 use Intaro\RetailCrm\Service\Utils;
-use Bitrix\Main\ArgumentNullException;
-use Bitrix\Main\ArgumentOutOfRangeException;
-use Bitrix\Main\Config\Option;
 
 /**
  * Class ConfigProvider
@@ -815,7 +812,7 @@ class ConfigProvider
      *
      * @param string $value
      */
-    public function setOnlineConsultantScript($value)
+    public static function setOnlineConsultantScript($value)
     {
         static::setOption(Constants::CRM_ONLINE_CONSULTANT_SCRIPT, $value);
     }

intaro.retailcrm/lib/component/servicelocator.php

@@ -87,12 +87,12 @@ class ServiceLocator
     }
 
     /**
-     * Get or create service (instantiates service if it wasn't created earlier; $name must be FQN).
-     *
-     * @param string $name
-     *
-     * @return mixed
-     */
+         * Get or create service (instantiates service if it wasn't created earlier; $name must be FQN).
+         *
+         * @param string $name
+         *
+         * @return mixed
+         */
     public static function getOrCreate(string $name)
     {
         $service = static::$services[$name];

intaro.retailcrm/options.php

@@ -1,4 +1,12 @@
 <?php
+
+use Bitrix\Currency\CurrencyManager;
+use Bitrix\Main\Application;
+use Bitrix\Sale\Delivery\Services\Manager;
+use Intaro\RetailCrm\Component\ConfigProvider;
+use Intaro\RetailCrm\Component\Constants;
+use RetailCrm\Exception\CurlException;
+
 IncludeModuleLangFile(__FILE__);
 $mid = 'intaro.retailcrm';
 $uri = $APPLICATION->GetCurPage() . '?mid=' . htmlspecialchars($mid) . '&lang=' . LANGUAGE_ID;
@@ -249,7 +257,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $orderTypesList = RCrmActions::OrderTypesList($arResult['arSites']);
     $orderTypesArr = [];
 
-    $orderTypesArr = array();
     foreach ($orderTypesList as $orderType) {
         $orderTypesArr[$orderType['ID']] = htmlspecialchars(trim($_POST['order-type-' . $orderType['ID']]));
     }
@@ -258,7 +265,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $arResult['bitrixDeliveryTypesList'] = RCrmActions::DeliveryList();
     $deliveryTypesArr = [];
 
-    $deliveryTypesArr = array();
     foreach ($arResult['bitrixDeliveryTypesList'] as $delivery) {
         $deliveryTypesArr[$delivery['ID']] = htmlspecialchars(trim($_POST['delivery-type-' . $delivery['ID']]));
     }
@@ -267,7 +273,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $arResult['bitrixPaymentTypesList'] = RCrmActions::PaymentList();
     $paymentTypesArr = [];
 
-    $paymentTypesArr = array();
     foreach ($arResult['bitrixPaymentTypesList'] as $payment) {
         $paymentTypesArr[$payment['ID']] = htmlspecialchars(trim($_POST['payment-type-' . $payment['ID']]));
     }
@@ -277,9 +282,6 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $paymentStatusesArr = [];
     $canselOrderArr     = [];
 
-    $paymentStatusesArr = array();
-    $canselOrderArr = array();
-    //$paymentStatusesArr['YY'] = htmlspecialchars(trim($_POST['payment-status-YY']));
     foreach ($arResult['bitrixStatusesList'] as $status) {
         $paymentStatusesArr[$status['ID']] = htmlspecialchars(trim($_POST['payment-status-' . $status['ID']]));
         if (trim($_POST['order-cansel-' . $status['ID']]) === 'Y') {
@@ -339,6 +341,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     }
 
     $customFieldsArr = [];
+
     foreach ($orderTypesList as $orderType) {
         $_customFieldsArr = [];
         foreach ($arResult['customFields'] as $custom) {
@@ -349,6 +352,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
 
     //contragents type list
     $contragentTypeArr = [];
+
     foreach ($orderTypesList as $orderType) {
         $contragentTypeArr[$orderType['ID']] = htmlspecialchars(trim($_POST['contragent-type-' . $orderType['ID']]));
     }
@@ -361,6 +365,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $bitrixStoresArr          = [];
     $bitrixShopsArr           = [];
     $bitrixIblocksInventories = [];
+
     if (htmlspecialchars(trim($_POST['inventories-upload'])) === 'Y') {
         $inventoriesUpload = 'Y';
         $dateAgent         = new DateTime();
@@ -402,6 +407,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     $bitrixPricesArr     = [];
     $bitrixIblocksPrices = [];
     $bitrixPriceShopsArr = [];
+
     if (htmlspecialchars(trim($_POST['prices-upload'])) === 'Y') {
         $pricesUpload = 'Y';
 
@@ -2219,7 +2225,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                     <b>
                         <label><input class="addr" type="checkbox" name="shipment_deducted" value="Y" <?php if ($optionShipmentDeducted === 'Y') {
                                 echo "checked";
-                            } ?>><?php echo "Изменять статус отгрузки при получении соответствующего флага из crm" ?></label>
+                            } ?>><?php echo GetMessage('CHANGE_SHIPMENT_STATUS_FROM_CRM'); ?></label>
                     </b>
                 </td>
             </tr>