2025-04-06 14:53:38 +03:00
56 changed files with 950 additions and 1363 deletions
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@ -2,7 +2,7 @@ FROM php:7.1-apache

 RUN apt-get update

-RUN apt-get install -y netcat zlib1g-dev libpq-dev git libicu-dev libxml2-dev libpng-dev libjpeg-dev libmcrypt-dev libxslt-dev libfreetype6-dev unzip \
+RUN apt-get install -y netcat zlib1g-dev libpq-dev git libicu-dev libxml2-dev libpng-dev libjpeg-dev libmcrypt-dev libxslt-dev libfreetype6-dev \
    && docker-php-ext-configure intl \
    && docker-php-ext-install intl \
    && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
--- a/.env-dist
+++ b/.env-dist
@ -14,5 +14,5 @@ OC_EMAIL=you@example.com
 SERVER_PORT=8080
 SERVER_URL=http://localhost

-TEST_SUITE=3
+TEST_SUITE=3.0
 OPENCART=3.0.2.0
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,202 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches:
-      - '**'
-    tags-ignore:
-      - '*.*'
-  pull_request:
-
-env:
-  OC_DB_HOSTNAME: 127.0.0.1
-  OC_DB_USERNAME: root
-  OC_DB_PASSWORD: root
-  OC_DB_DATABASE: tests_opencart
-  OC_DB_DRIVER: mysqli
-  OC_USERNAME: admin
-  OC_PASSWORD: admin
-  OC_EMAIL: test@test.com
-  SERVER_PORT: 80
-  SERVER_URL: http://localhost
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.1.1'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.1.2'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.2.0'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.0'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.1'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.2'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.3'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.4'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.5'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.6'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.7'
-          - php-version: '7.3'
-            test-suite: '3'
-            oc: '3.0.3.8'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.1.1'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.1.2'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.2.0'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.0'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.1'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.2'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.3'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.4'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.5'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.6'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.7'
-          - php-version: '7.4'
-            test-suite: '3'
-            oc: '3.0.3.8'
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQL_ROOT_PASSWORD: ${{ env.OC_DB_PASSWORD }}
-          MYSQL_DATABASE: ${{ env.OC_DB_DATABASE }}
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup PHP ${{ matrix.php-version }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          coverage: xdebug
-          tools: composer:v1
-          extensions: gd, mbstring, mysqli, zip, mcrypt, mysql, pdo_mysql, dom
-      - name: Install Opencart
-        env:
-          TEST_SUITE: ${{ matrix.test-suite }}
-          OPENCART: ${{ matrix.oc }}
-        run: make before_script
-      - name: Run tests
-        env:
-          TEST_SUITE: ${{ matrix.test-suite }}
-          OPENCART: ${{ matrix.oc }}
-        run: composer test
-      - name: Coverage
-        env:
-          COVERAGE: ${{ matrix.coverage }}
-        if: env.COVERAGE == 1
-        run: |
-          make coverage
-          bash <(curl -s https://codecov.io/bash)
-  phpcs:
-    needs: ['test']
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup PHP 7.2
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.2'
-          tools: composer:v1
-      - name: Install dependencies
-        run: composer install
-      - name: Check compatibility
-        run: make phpcomp
-  deploy:
-    needs: ['phpcs']
-    if: success() && github.event_name == 'push' && github.repository_owner == 'retailcrm' && github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup PHP 7.2
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.2'
-          tools: composer:v1
-      - name: Build release
-        run: |
-          git fetch origin --unshallow --tags
-          export LAST_TAG=`git describe --abbrev=0 --tags`
-          export VERSION=`cat VERSION`
-          export ARCHIVE_NAME=retailcrm-$VERSION.ocmod.zip
-          export ARCHIVE_PATH="/tmp/$ARCHIVE_NAME"
-          export RELEASE_TAG=v$VERSION
-          export LAST_COMMIT=`git log --oneline --format=%B -n 1 HEAD | head -n 1`
-          echo RELEASE_TAG=$RELEASE_TAG >> $GITHUB_ENV
-          echo LAST_TAG=$LAST_TAG >> $GITHUB_ENV
-          echo LAST_COMMIT=$LAST_COMMIT >> $GITHUB_ENV
-          echo ARCHIVE_PATH=$ARCHIVE_PATH >> $GITHUB_ENV
-          echo ARCHIVE_NAME=$ARCHIVE_NAME >> $GITHUB_ENV
-          make build_archive
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        if: env.LAST_TAG != env.RELEASE_TAG
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.RELEASE_TAG }}
-          release_name: ${{ env.RELEASE_TAG }}
-          body: ${{ env.LAST_COMMIT }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset
-        if: env.LAST_TAG != env.RELEASE_TAG
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.ARCHIVE_PATH }}
-          asset_name: ${{ env.ARCHIVE_NAME }}
-          asset_content_type: application/zip
-      - name: Cleanup
-        if: env.LAST_TAG != env.RELEASE_TAG
-        run: make delete_archive
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,145 @@
+os: linux
+language: php
+dist: trusty
+
+if: tag IS blank
+
+env:
+  global:
+    - OC_DB_HOSTNAME=localhost
+    - OC_DB_USERNAME=root
+    - OC_DB_PASSWORD=root
+    - OC_DB_DATABASE=tests_opencart
+    - OC_DB_DRIVER=mysqli
+    - OC_USERNAME=admin
+    - OC_PASSWORD=admin
+    - OC_EMAIL=test@test.com
+    - SERVER_PORT=80
+    - SERVER_URL=http://localhost
+
+stages:
+  - test
+  - phpcs
+  - deploy
+
+before_install:
+  - export LAST_TAG=`git describe --abbrev=0 --tags`
+  - export CURRENT_VERSION=v`cat VERSION`
+
+before_script: make before_script
+
+script: composer test
+
+after_success:
+  - make coverage
+  - bash <(curl -s https://codecov.io/bash)
+
+jobs:
+  include:
+    - php: 7.0
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.0
+    - php: 7.0
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.1
+    - php: 7.0
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.2
+    - php: 7.1
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.0
+    - php: 7.1
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.1
+    - php: 7.1
+      env: TEST_SUITE=2.3 OPENCART=2.3.0.2
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.0
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.2
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.0
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.1
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.2
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.2.0
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.0
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.1
+    - php: 7.0
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.2
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.0
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.2
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.0
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.1
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.2
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.2.0
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.0
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.1
+    - php: 7.1
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.2
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.0
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.2
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.0
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.1
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.2
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.2.0
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.0
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.1
+    - php: 7.2
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.2
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.0
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.0.2
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.0
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.1
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.1.2
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.2.0
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.0
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.1
+    - php: 7.3
+      env: TEST_SUITE=3.0 OPENCART=3.0.3.2
+    - stage: phpcs
+      before_script: composer install
+      script: make phpcomp
+      after_success: skip
+    - stage: deploy
+      before_script: skip
+      script: make build_archive
+      before_deploy:
+        - export VERSION=`cat VERSION`
+        - export ARCHIVE_NAME=/tmp/retailcrm-$VERSION.ocmod.zip
+        - git config --local user.name "retailCRM"
+        - git config --local user.email "support@retailcrm.ru"
+        - export TRAVIS_TAG=v$VERSION
+        - git tag $TRAVIS_TAG
+      deploy:
+        provider: releases
+        token: $GITHUB_OAUTH_TOKEN
+        cleanup: false
+        file: $ARCHIVE_NAME
+        on:
+          condition: "$LAST_TAG != $CURRENT_VERSION"
+      if: branch = master AND type = push AND fork = false
+      after_deploy: make delete_archive
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,182 +1,125 @@
-## v4.1.19
-* Added option to round order amount
-
-## v4.1.18
-* Fixed constant with version of module.
-
-## v4.1.17
-* Added additional parameters to GET requests.
-
-## v4.1.16
-* Support for services in ICML
-
-## v4.1.15
-* Display module version
-
-## v4.1.14
-* Added currency validation when configuring the module
-
-## v4.1.13
-* Changed the logic of customer subscriptions to promotional newsletters
-
-## v4.1.12
-* Added escaping for db query in method for getting zone
-
-## v4.1.11
-* Fixed the transfer of the weight offers
-
-## v4.1.10
-* Types of deliveries and payments are displayed only active status and available stores
-
-## v4.1.9
-* Optimization of the history processing algorithm
-
-## v4.1.8
-* Fixed customer externalId when creating a customer and sending it to RetailCRM
-
-## v4.1.7
-* Fixed notices in ICML generation and while setting delivery type
-* Fixed incorrect data check before setting payment data
-* Some other minor improvements
-
-## v4.1.6
-* Fix for typo in the history routine
-* Fix for incorrect protocol in the ICML product image links
-
-## v4.1.5
-* Send discount details into the system
-* Prefix for payment external ID (to ensure that it's unique)
-* Make payment sum optional
-* Weight calculation based on product options
-
-## v.4.1.4
-* Create payment only when the payment type is specified
-* Checking the availability of promotional price for the product when uploading the order
-
-## v.4.1.3
-* Removed the ability to specify the API version
-
 ## v.4.1.2
-* Added accounting for a gift certificate price when creating an order and sending it to RetailCRM
+* Добавлен учет стоимости подарочного сертификата при формировании заказа и передаче его в retailCRM

 ## v.4.1.1
-* Updated the mechanics of processing customer addresses
+* Обновлена механика обработки адресов покупателей

 ## v.4.1.0
-* Added the ability to connect Online Consultant
+* Добавлена возможность подключения Online Consultant

 ## v.4.0.1
-* Fixed the transfer of coupon discounts
-* Fixed console commands
+* Исправлена передача скидки по купону
+* Исправлены консольные команды

 ## v.4.0.0
-* Added support for corporate customers
-* Added support for changing the customer in the order
+* Поддержка корпоративных клиентов
+* Поддержка изменения покупателя в заказе

 ## v.3.3.9
-* Fixed prices in ICML
+* Исправлены цены в ICML

 ## v.3.3.8
-* Fixed warnings output when generating ICML
+* Исправлен вывод предупреждений при генерации ICML

 ## v.3.3.7
-* Changed the configuration of travis-ci for build
+* Изменена конфигурация travis-ci для сборки

 ## v.3.3.6
-* Minor bug fixes
+* Небольшие фиксы

 ## v.3.3.5
-* Added generation of dimensions in the catalog
+* Добавлена генерация габаритов в каталоге

 ## v.3.3.4
-* Fixed a bug with incorrect uploading of promotional prices for products with characteristics
+* Исправлен баг с некорректной выгрузкой акционных цен для товаров с характеристиками

 ## v.3.3.3
-* Added removal of product's price type for unidentified promotional prices
+* Добавлено удаление типа цены товара для неустановленных акционных цен

 ## v.3.3.2
-* Added the return of leftover product stocks when the order is canceled
+* Добавлен возврат остатка товара при отмене заказа

 ## v.3.3.1
-* Fixed a bug with sending order data to RetailCRM when receiving the history of changes from RetailCRM
+* Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM

 ## v.3.3.0
-* Added setting for recording the history of order changes in Opencart
-* Fixed a bug with calling the order editing event when uploading the history of changes from RetailCRM
-* Added transfer of the price type when creating or editing an order
+* Добавена настройка записи истории изменения заказов в Opencart
+* Устранен баг с вызовом события редактирования заказа при выгрузке истории изменений из retailCRM
+* Добавлена передача типа цены при создании и редактировании заказа

 ## v.3.2.4
-* Added the ability to transfer promotional prices for multiple user groups
-* Added the ability to transfer zero price for unspecified promotional prices
-* Removed the retailcrm base price from the price types conformity settings
+* Добавлена возможность передачи акционных цен для нескольких групп пользователей
+* Добавлена передача нулевой цены для  неустановленных акционных цен
+* Убрана базовая цена retailcrm из настроек соответствия типов цен

 ## v.3.2.2
-* Removed generation of the customer's externalId when order was created without registeration on the website.
+* Убрана генерация externalId покупателя при заказе без регистрации на сайте.

 ## v.3.2.1
-* Changed the logic for transferring data for orders and customers. Contact information for delivery is transferred to the order's card, and the payer's contact information is transferred to the customer's card.
+* Изменена логика передачи данных по заказам и клиентам. Контактные данные по доставке передаются в карточку заказа, контактные данные плательщика в карточку клиента.

 ## v.3.2.0
-* Added uploading images for categories in ICML
-* Added setting for selecting the currency in which the price will be uploaded in ICML
+* Добавлена выгрузка картинок для категорий в ICML
+* Добавлена настройка для выбора валюты, в которой будет выгружаться цена в ICML

 ## v.3.1.6
-* Fixed getting events from the database for OC 3.0
+* Исправлено получение событий из БД для OC 3.0

 ## v.3.1.5
-* Bug fixes
+* Исправление ошибок

 ## v.3.1.4
-* Fixed incorrect combining of delivery types
+* Исправлена некорректная склейка типов доставки

 ## v.3.1.3
-* Added module activation in the RetailCRM marketplace
+* Добавлена активация модуля в маркетплейсе retailCRM

 ## v.3.1.2
-* Added Spanish translation
-* Reworked English translation
+* Добавлен перевод на испанский язык
+* Переделан перевод на английский язык

 ## v.3.1.1
-* Added customer creation when manually uploading an order from admin panel
+* Добавлено создание клиента при ручной выгрузке заказа из админки

 ## v.3.1.0
-* Redesigned the twig template
-* Added a setting for transmitting the order number to RetailCRM
-* Improved mechanics of delivery type transfer to RetailCRM
-* Fixed an error when uploading a single order in admin panel
+* Переработан дизайн шаблона twig
+* Добавлена настройка передачи номера заказа в retailCRM
+* Улучшена механика передачи типа доставки в retailCRM
+* Исправлена ошибка при выгрузке единичного заказа в админ панели

 ## v.3.0.5
-* Fixed errors in the twig template
-* Added processing of the history of changes when saving settings for setting the current sinceId, if the history in RetailCRM is empty
+* Исправлены ошибки в шаблоне twig
+* Добавлена обработка истории изменений при сохранении настроек для установки текущего sinceId, если история в retailCRM пустая

 ## v.3.0.4
-* Added checking the user group in the order when editing
-* Added transfer of discount for bonus points
+* Добавлена проверка группы пользователя в заказе при редактировании
+* Добавлена передача скидки по бонусным баллам

 ## v.3.0.3
-* Fixed a bug with changing the user's password
+* Исправлена ошибка с изменением пароля пользователя

 ## v.3.0.2
-* Improved the mechanics of uploading changes from RetailCRM to the site
-* Improved the mechanics of selecting delivery types on the site
-* Added the ability to periodically upload promotional prices for products
-* Improved compatibility with Opencart 3.0
+* Улучшена механика выгрузки изменений из RetailCRM на сайт
+* Улучшена механика выборки типов доставки на сайте
+* Добавлена возможность периодической выгрузки акционных цен для товаров
+* Улучшена совместимость с Opencart 3.0

 ## v.2.4.3
-* Minor bug fixes, added error output when uploading individual orders
+* Устранены некоторые баги, добавлен вывод ошибок при выгрузке единичных заказов

 ## v.2.4.2
-* Improved synchronization of custom fields
-* Added settings for default delivery and payment types
-* Improved Daemon Collector configuration
-* Improved the twig template for compatibility with Opencart 3.0
+* Улучшена синхронизация кастомных полей
+* Добавлены настройки дефолтных способов доставки и оплаты
+* Улучшена настройка Daemon Collector
+* Доработан шаблон twig для совместимости с Opencart 3.0

 ## v.2.4.1
-* Fixed history of changes (improved address processing, added order processing with empty fields, improved customer history)
-* History is now synced by sinceId
-* Checking available API versions using the /api/versions method
-* Added the ability to map custom fields (for API V5)
+* Исправлена работа истории (доработана обработка адресов, добавлена обработка заказов с пустыми полями, доработана история по клиентам)
+* История теперь синхронизируется по sinceId
+* Проверка доступных версий API через метод /api/versions
+* Добавлена возможность сопоставления кастомных полей(для API v5)

 ## v.2.4.0
-* Added the ability to work on 3 API versions (v3, v4, v5)
-* Added compatibility with Opencart 3.0
+* Добавлена возможность работы на 3 версиях API (v3, v4, v5)
+* Добавлена совместимость с Opencart 3.0
+
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2015-2021 RetailDriver LLC
+Copyright (c) 2015 RetailDriver LLC

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/16
+++ b/16
@ -1,5 +1,5 @@
-ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-VERSION = `cat $(ROOT_DIR)/VERSION`
+FILE = $(TRAVIS_BUILD_DIR)/VERSION
+VERSION = `cat $(FILE)`
 ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.ocmod.zip'

 .PHONY: coverage
@ -17,8 +17,11 @@ delete_archive:

 before_script:
 	mkdir coverage
-	composer require --dev beyondit/opencart-test-suite:~$(TEST_SUITE)
-	composer opencart:install
+	# Change MySQL root password
+	echo "USE mysql;\nUPDATE user SET password=PASSWORD('root') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
+	composer require --dev beyondit/opencart-test-suite ~$(TEST_SUITE)
+	composer require --dev opencart/opencart $(OPENCART)
+	composer setup
 	bin/robo --load-from tests/RoboFile.php project:deploy
 	(php -S localhost:80 -t www &) 2> /dev/null > /dev/null
 	sleep 2
@ -31,7 +34,8 @@ robo_deploy:

 run:
 	composer require --dev beyondit/opencart-test-suite ~$(TEST_SUITE)
-	composer opencart:install
+	composer require --dev opencart/opencart $(OPENCART)
+	composer setup
 	bin/robo --load-from tests/RoboFile.php project:deploy

 run_test: run
@ -46,4 +50,4 @@ phpcs-config:
 	bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility

 phpcomp: phpcs-config
-	@bin/phpcs -s -p ./src --standard=PHPCompatibility --runtime-set testVersion 7.3-7.4
+	@bin/phpcs -s -p ./src --standard=PHPCompatibility --runtime-set testVersion 5.4-7.3
--- a/README.md
+++ b/README.md
@ -1,12 +1,12 @@
-[![Build Status](https://github.com/retailcrm/opencart-module/workflows/ci/badge.svg)](https://github.com/retailcrm/opencart-module/actions)
-[![Coverage](https://img.shields.io/codecov/c/gh/retailcrm/opencart-module/master.svg?logo=codecov&logoColor=white)](https://codecov.io/gh/retailcrm/opencart-module)
-[![GitHub release](https://img.shields.io/github/release/retailcrm/opencart-module.svg?logo=github&logoColor=white)](https://github.com/retailcrm/opencart-module/releases)
-[![PHP version](https://img.shields.io/badge/PHP->=5.4-blue.svg?logo=php&logoColor=white)](https://php.net/)
+[![Build Status](https://img.shields.io/travis/retailcrm/opencart-module/master.svg?style=flat-square)](https://travis-ci.org/retailcrm/opencart-module)
+[![Coverage](https://img.shields.io/codecov/c/gh/retailcrm/opencart-module/master.svg?style=flat-square)](https://codecov.io/gh/retailcrm/opencart-module)
+[![GitHub release](https://img.shields.io/github/release/retailcrm/opencart-module.svg?style=flat-square)](https://github.com/retailcrm/opencart-module/releases)
+[![PHP version](https://img.shields.io/badge/PHP->=5.4-blue.svg?style=flat-square)](https://php.net/)

 Opencart module
 ===============

-This module allows to integrate CMS Opencart >= 2.3 with [RetailCRM](https://retailcrm.pro).
+Module allows integrate CMS Opencart >= 2.3 with [retailCRM](http://retailcrm.pro)

 ### Previous versions:

@ -16,59 +16,51 @@ This module allows to integrate CMS Opencart >= 2.3 with [RetailCRM](https://ret

 #### Features:

-* Export orders to RetailCRM & receive changes from RetailCRM.
-* Export product catalog to the [ICML](https://help.retailcrm.pro/Developers/ICML) format.
+* Export orders to retailCRM & fetch changes back
+* Export product catalog into [ICML](http://www.retailcrm.pro/docs/Developers/ICML) format

 #### Install

-**Note:** `/path/to/your/site` is just a placeholder. You should replace it with the actual path to your site root in the examples below. The module won't work if you'll use those examples without changing the path placeholder.
-
-Copy module files to the site root (replace `/path/to/your/site` with the actual path to your site):
+Copy files to the site root

 ```
 unzip master.zip
-cp -r opencart-module/src/* /path/to/your/site
+cp -r opencart-module/* /path/to/site/root
 ```

 #### Setup

-* Go to Admin -> Extensions -> Modules -> RetailCRM
-* Fill you API URL & API key
+* Go to Admin -> Extensions -> Modules -> retailCRM
+* Fill you api url & api key
 * Specify directories matching

 #### Migrating to 4.* from early modules versions

-It's necessary to remove the `/path/to/your/site/system/library/retailcrm` before copying current module into your site.
+Before you copy the files of module you will to remove the directory `path/to/opencart/system/library/retailcrm`

 #### Getting changes in orders

-Add to cron (replace `/path/to/your/site` with the actual path to your site):
+Add to cron:

 ```
-*/5 * * * * /usr/bin/php /path/to/your/site/system/library/retailcrm/cron/history.php >> /path/to/your/site/system/storage/logs/cronjob_history.log 2>&1
+*/5 * * * * /usr/bin/php /path/to/opencart/system/library/retailcrm/cron/history.php >> /path/to/opencart/system/storage/logs/cronjob_history.log 2>&1
 ```

 #### Setting product catalog export

-Add to cron (replace `/path/to/your/site` with the actual path to your site):
+Add to cron:

 ```
-* */4 * * * /usr/bin/php /path/to/your/site/system/library/retailcrm/cron/icml.php >> /path/to/your/site/system/storage/logs/cronjob_icml.log 2>&1
+* */4 * * * /usr/bin/php /path/to/opencart/system/library/retailcrm/cron/icml.php >> /path/to/opencart/system/storage/logs/cronjob_icml.log 2>&1
 ```

-Your export file should be available by following url:
+Your export file will be available by following url

 ```
 http://youropencartsite.com/retailcrm.xml
 ```

-Replace `youropencartsite.com` with your site domain and `http` with your site scheme.
-
 #### Export existing orders and customers

-Run this command (replace `/path/to/your/site` with the actual path to your site):
-```sh
-/usr/bin/php /path/to/your/site/system/library/retailcrm/cron/export.php
-```
-
-You should run this command only once.
+You want to run this command onecly:
+/usr/bin/php /path/to/opencart/system/library/retailcrm/cron/export.php
--- a/README.ru.md
+++ b/README.ru.md
@ -0,0 +1,79 @@
+Opencart module
+===============
+
+Модуль интеграции CMS Opencart >= 2.3 c [retailCRM](https://retailcrm.ru)
+
+Информация о [кастомизации](https://github.com/retailcrm/opencart-module/wiki/%D0%9A%D0%B0%D1%81%D1%82%D0%BE%D0%BC%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F-%D0%B8%D0%BD%D1%82%D0%B5%D0%B3%D1%80%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D0%BE%D0%B3%D0%BE-%D0%BF%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D0%B0)
+
+### Предыдущие версии:
+
+[v1.x](https://github.com/retailcrm/opencart-module/tree/v1.x)
+
+[v2.x (2.0, 2.1, 2.2)](https://github.com/retailcrm/opencart-module/tree/v2.2)
+
+#### Модуль позволяет:
+
+* Экспортировать в retailCRM данные о заказах и клиентах и получать обратно изменения по этим данным
+* Синхронизировать справочники (способы доставки и оплаты, статусы заказов и т.п.)
+* Выгружать каталог товаров в формате [ICML](http://www.retailcrm.ru/docs/Developers/ICML)
+
+#### Установка
+
+Установите модуль скопировав необходимые файлы в корень сайта
+
+```
+unzip master.zip
+cp -r opencart-module/* /path/to/site/root
+```
+
+#### Обновление до 4.* с более ранних версий модуля
+
+Перед копированием файлов модуля необходимо удалить директорию `path/to/opencart/system/library/retailcrm`
+
+#### Активируйте модуль
+
+В списке модулей нажмите "Установить"
+
+#### Настройте параметры интеграции
+
+На странице настроек модуля укажите URL retailCRM и ключ авторизации, после сохранения этих данных укажите соответствия справочников типов доставок, оплат и статусов заказа.
+
+#### Получение изменений из retailCRM
+
+Для получения изменений и новых данных добавьте в cron следующую запись:
+
+```
+*/5 * * * * /usr/bin/php /path/to/opencart/system/library/retailcrm/cron/history.php >> /path/to/opencart/system/storage/logs/cronjob_history.log 2>&1
+```
+
+#### Настройка экспорта каталога
+
+Для периодической выгрузки каталога добавьте в cron следующую запись:
+
+```
+* */4 * * * /usr/bin/php /path/to/opencart/system/library/retailcrm/cron/icml.php >> /path/to/opencart/system/storage/logs/cronjob_icml.log 2>&1
+```
+
+В настройках retailCRM установите путь к файлу выгрузки
+
+```
+http://youropencartsite.com/retailcrm.xml
+```
+#### Настройка выгрузки акционных цен
+
+Для периодической выгрузки акционных цен в CRM в настройках модуля укажите тип цены, в который необходимо выгружать акционные цены, в крон добавьте следующую запись
+
+```
+0 0 * * * /usr/bin/php /path/to/opencart/system/library/retailcrm/cron/prices.php >> /path/to/opencart/system/storage/logs/cronjob_prices.log 2>&1
+```
+
+#### Выгрузка существующих заказов и покупателей
+
+Запустите команду единожды:
+/usr/bin/php /path/to/opencart/system/library/retailcrm/cron/export.php
+
+#### Кастомизация моделей
+
+Для создания кастомных классов скопируйте файл модели в директорию custom, в новом файле измените название класса с "ModelExtensionRetailcrmFilename" на "ModelExtensionRetailcrmCustomFilename", где "Filename" - название файла с заглавной буквы. После этого модуль будет использовать методы кастомного класса.
+
+[Wiki](https://github.com/retailcrm/opencart-module/wiki/%D0%9A%D0%B0%D1%81%D1%82%D0%BE%D0%BC%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F-%D0%B8%D0%BD%D1%82%D0%B5%D0%B3%D1%80%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D0%BE%D0%B3%D0%BE-%D0%BF%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D0%B0)
--- a/2
+++ b/2
@ -1 +1 @@
-4.1.19
+4.1.3
--- a/composer.json
+++ b/composer.json
@ -1,12 +1,12 @@
 {
    "name": "retailcrm/opencart-module",
-    "description": "Integration module for Opencart & RetailCRM",
+    "description": "Integration module for Opencart & retailCRM",
    "license": "GPL-3.0",
    "type": "project",
    "authors": [
        {
            "name": "RetailDriverLLC",
-            "email": "support@retailcrm.pro"
+            "email": "integration@retailcrm.ru"
        }
    ],
    "config": {
@ -25,14 +25,13 @@
        "@test-catalog",
        "@test-system"
      ],
-      "opencart:install" : "bin/robo --load-from tests/RoboFile.php opencart:install"
+      "setup" : "bin/robo --load-from tests/RoboFile.php opencart:setup"
    },
    "require": {
      "ext-json": "*"
    },
    "require-dev": {
      "consolidation/robo": "~1.0",
-      "phpcompatibility/php-compatibility": "^9.3",
-      "beyondit/opencart-test-suite": "~3.0"
+      "phpcompatibility/php-compatibility": "^9.3"
    }
 }
--- a/doc/Update
+++ b/doc/Update
@ -1,6 +0,0 @@
-### Обновление версии модуля
-
-Для обновления версии модуля необходимо обновить следующие файлы:
-* VERSION
-* CHANGELOG.md
-* src/upload/admin/controller/extension/module/retailcrm.php
--- a/src/upload/admin/controller/extension/module/retailcrm.php
+++ b/src/upload/admin/controller/extension/module/retailcrm.php
@ -1,10 +1,17 @@
 <?php

-use retailcrm\Retailcrm;
-
+/**
+ * Class ControllerModule
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class ControllerExtensionModuleRetailcrm extends Controller
 {
-    private $_error = [];
+    private $_error = array();
    protected $log, $statuses, $payments, $deliveryTypes, $retailcrmApiClient, $moduleTitle, $tokenTitle;
    public $children, $template;

@ -27,10 +34,10 @@ class ControllerExtensionModuleRetailcrm extends Controller

        $this->model_setting_setting->editSetting(
            $this->moduleTitle,
-            [
+            array(
                $this->moduleTitle . '_status' => 1,
-                $this->moduleTitle . '_country' => [$this->config->get('config_country_id')]
-            ]
+                $this->moduleTitle . '_country' => array($this->config->get('config_country_id'))
+            )
        );

        $this->addEvents();
@ -61,7 +68,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
            $this->uninstall_collector();
            $this->model_setting_setting->editSetting(
                $this->moduleTitle,
-                [$this->moduleTitle . '_status' => 0]
+                array($this->moduleTitle . '_status' => 0)
            );
        }

@ -81,7 +88,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $this->loadModels();
        $this->load->model('setting/setting');
        $this->{'model_' . $this->modelExtension}->install('analytics', 'daemon_collector');
-        $this->model_setting_setting->editSetting($collector, [$collector . '_status' => 1]);
+        $this->model_setting_setting->editSetting($collector, array($collector . '_status' => 1));
    }

    /**
@ -94,7 +101,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $collector = $this->getCollectorTitle();
        $this->loadModels();
        $this->load->model('setting/setting');
-        $this->model_setting_setting->editSetting($collector, [$collector . '_status' => 0]);
+        $this->model_setting_setting->editSetting($collector, array($collector . '_status' => 0));
        $this->{'model_' . $this->modelExtension}->uninstall('analytics', 'daemon_collector');
    }

@ -109,7 +116,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $this->loadModels();
        $this->load->model('setting/setting');
        $this->{'model_' . $this->modelExtension}->install('analytics', 'online_consultant');
-        $this->model_setting_setting->editSetting($consultant, [$consultant . '_status' => 1]);
+        $this->model_setting_setting->editSetting($consultant, array($consultant . '_status' => 1));
    }

    /**
@ -122,7 +129,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $consultant = $this->getConsultantTitle();
        $this->loadModels();
        $this->load->model('setting/setting');
-        $this->model_setting_setting->editSetting($consultant, [$consultant . '_status' => 0]);
+        $this->model_setting_setting->editSetting($consultant, array($consultant . '_status' => 0));
        $this->{'model_' . $this->modelExtension}->uninstall('analytics', 'online_consultant');
    }

@ -188,21 +195,42 @@ class ControllerExtensionModuleRetailcrm extends Controller
                $this->request->post
            );

-            if (
-                !isset($history_setting['retailcrm_history_orders'])
-                && !isset($history_setting['retailcrm_history_customers'])
-            ) {
+            if (!isset($history_setting['retailcrm_history_orders']) && !isset($history_setting['retailcrm_history_customers'])) {
                $api = $this->retailcrm->getApiClient(
                    $this->request->post[$this->moduleTitle . '_url'],
                    $this->request->post[$this->moduleTitle . '_apikey']
                );

+                $ordersHistory = $api->ordersHistory();
+
+                if ($ordersHistory && $ordersHistory->isSuccessful() && !empty($ordersHistory['history'])) {
+                    $ordersHistory = $api->ordersHistory(array(), $ordersHistory['pagination']['totalPageCount']);
+
+                    if ($ordersHistory && $ordersHistory->isSuccessful()) {
+                        $ordersHistoryArr = $ordersHistory['history'];
+                        $lastChangeOrders = end($ordersHistoryArr);
+                        $sinceIdOrders = $lastChangeOrders['id'];
+                    }
+                }
+
+                $customersHistory = $api->customersHistory();
+
+                if ($customersHistory && $customersHistory->isSuccessful() && !empty($customersHistory['history'])) {
+                    $customersHistory = $api->customersHistory(array(), $customersHistory['pagination']['totalPageCount']);
+
+                    if ($customersHistory && $customersHistory->isSuccessful()) {
+                        $customersHistoryArr = $customersHistory['history'];
+                        $lastChangeCustomers = end($customersHistoryArr);
+                        $sinceIdCustomers = $lastChangeCustomers['id'];
+                    }
+                }
+
                $this->model_setting_setting->editSetting(
                    'retailcrm_history',
-                    [
-                        'retailcrm_history_orders' => $this->getHistorySinceId($api, 'ordersHistory'),
-                        'retailcrm_history_customers' => $this->getHistorySinceId($api, 'customersHistory'),
-                    ]
+                    array(
+                        'retailcrm_history_orders' => isset($sinceIdOrders) ? $sinceIdOrders : 1,
+                        'retailcrm_history_customers' => isset($sinceIdCustomers) ? $sinceIdCustomers : 1
+                    )
                );
            }

@ -223,12 +251,12 @@ class ControllerExtensionModuleRetailcrm extends Controller
                if ($result === true) {
                    $this->model_setting_setting->editSetting(
                        'retailcrm_setting',
-                        [
+                        array(
                            'retailcrm_setting_active_in_crm' => true,
                            'retailcrm_setting_client_id' => $clientId,
                            'retailcrm_setting_url' => $this->request->post[$this->moduleTitle . '_url'],
                            'retailcrm_setting_key' => $this->request->post[$this->moduleTitle . '_apikey']
-                        ]
+                        )
                    );
                }
            }
@ -242,7 +270,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
            $this->response->redirect($redirect);
        }

-        $text_strings = [
+        $text_strings = array(
            'heading_title',
            'text_enabled',
            'text_disabled',
@ -301,11 +329,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
            'special_price',
            'order_number',
            'text_order_number',
-            'summ_around',
-            'text_summ_around',
-            'icml_settings',
-            'icml_service_enabled_label',
-            'icml_service_description',
+            'text_currency',
            'text_currency_label',
            'status_changes',
            'text_status_changes',
@ -313,44 +337,35 @@ class ControllerExtensionModuleRetailcrm extends Controller
            'text_lenght_label',
            'corporate_enabled_label',
            'entry_code',
-            'entry_status',
-            'text_retailcrm_discount',
-            'text_retailcrm_label_discount',
-            'default_retailcrm_label_discount',
-            'sum_payment',
-            'text_sum_payment',
-        ];
+            'entry_status'
+        );

        $_data = &$data;

-        $_data['module_version'] = Retailcrm::VERSION_MODULE;
-
        foreach ($text_strings as $text) {
            $_data[$text] = $this->language->get($text);
        }

        $_data['currencies'] = $this->model_localisation_currency->getCurrencies(0);
-        $_data['retailcrm_errors'] = [];
+        $_data['retailcrm_errors'] = array();
        $_data['saved_settings'] = $this->model_setting_setting
            ->getSetting($this->moduleTitle);

-        $url = $_data['saved_settings'][$this->moduleTitle . '_url'] ?? null;
-        $key = $_data['saved_settings'][$this->moduleTitle . '_apikey'] ?? null;
+        $url = isset($_data['saved_settings'][$this->moduleTitle . '_url'])
+            ? $_data['saved_settings'][$this->moduleTitle . '_url']
+            : null;
+        $key = isset($_data['saved_settings'][$this->moduleTitle . '_apikey'])
+            ? $_data['saved_settings'][$this->moduleTitle . '_apikey']
+            : null;

        if (!empty($url) && !empty($key)) {
-            $this->validate($url, $key);

-            $site = $this->model_extension_retailcrm_references->getApiSite();
-            $_data['delivery'] = $this->getAvailableTypes(
-                $site,
-                $this->model_extension_retailcrm_references->getDeliveryTypes()
-            );
-            $_data['payments'] = $this->getAvailableTypes(
-                $site,
-                $this->model_extension_retailcrm_references->getPaymentTypes()
-            );
+            $_data['delivery'] = $this->model_extension_retailcrm_references
+                ->getDeliveryTypes();
            $_data['statuses'] = $this->model_extension_retailcrm_references
                ->getOrderStatuses();
+            $_data['payments'] = $this->model_extension_retailcrm_references
+                ->getPaymentTypes();
            $_data['customFields'] = $this->model_extension_retailcrm_references
                ->getCustomFields();

@ -360,7 +375,9 @@ class ControllerExtensionModuleRetailcrm extends Controller
            $_data['customerGroups'] = $this->model_customer_customer_group->getCustomerGroups();
        }

-        $config_data = [$this->moduleTitle . '_status'];
+        $config_data = array(
+            $this->moduleTitle . '_status'
+        );

        foreach ($config_data as $conf) {
            if (isset($this->request->post[$conf])) {
@ -370,35 +387,40 @@ class ControllerExtensionModuleRetailcrm extends Controller
            }
        }

-        $_data['error_warning'] = $this->_error['warning'] ?? '';
-        $_data['breadcrumbs'] = [];
+        if (isset($this->_error['warning'])) {
+            $_data['error_warning'] = $this->_error['warning'];
+        } else {
+            $_data['error_warning'] = '';
+        }

-        $_data['breadcrumbs'][] = [
+        $_data['breadcrumbs'] = array();
+
+        $_data['breadcrumbs'][] = array(
            'text'      => $this->language->get('text_home'),
            'href'      => $this->url->link(
                'common/dashboard',
                $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
            ),
            'separator' => false
-        ];
+        );

-        $_data['breadcrumbs'][] = [
+        $_data['breadcrumbs'][] = array(
            'text'      => $this->language->get('text_module'),
            'href'      => $this->url->link(
                'extension/extension',
                $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
            ),
            'separator' => ' :: '
-        ];
+        );

-        $_data['breadcrumbs'][] = [
+        $_data['breadcrumbs'][] = array(
            'text'      => $this->language->get('retailcrm_title'),
            'href'      => $this->url->link(
                'extension/module/retailcrm',
                $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
            ),
            'separator' => ' :: '
-        ];
+        );

        $_data['action'] = $this->url->link(
            'extension/module/retailcrm',
@ -410,7 +432,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
            $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
        );

-        $_data['modules'] = [];
+        $_data['modules'] = array();

        if (isset($this->request->post['retailcrm_module'])) {
            $_data['modules'] = $this->request->post['retailcrm_module'];
@ -434,11 +456,11 @@ class ControllerExtensionModuleRetailcrm extends Controller
            $_data['export_file'] = true;
        }

-        $collectorFields = [
+        $collectorFields = array(
            'name' => $this->language->get('field_name'),
            'email' => $this->language->get('field_email'),
            'phone' => $this->language->get('field_phone')
-        ];
+        );

        $_data['collectorFields'] = $collectorFields;

@ -557,12 +579,20 @@ class ControllerExtensionModuleRetailcrm extends Controller

                    $this->response->setOutput(
                        json_encode(
-                            ['status_code' => $response->getStatusCode(), 'error_msg' => $error],
-                            JSON_THROW_ON_ERROR
+                            array(
+                                'status_code' => $response->getStatusCode(),
+                                'error_msg' => $error
+                            )
                        )
                    );
                } else {
-                    $this->response->setOutput(json_encode(['status_code' => $response->getStatusCode()]));
+                    $this->response->setOutput(
+                        json_encode(
+                            array(
+                                'status_code' => $response->getStatusCode()
+                            )
+                        )
+                    );
                }
            }
        }
@ -582,7 +612,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $this->model_extension_retailcrm_customer->uploadToCrm($customers, $this->retailcrm->getApiClient());
        $orders = $this->model_sale_order->getOrders();

-        $fullOrders = [];
+        $fullOrders = array();

        foreach ($orders as $order) {
            $fullOrder = $this->model_sale_order->getOrder($order['order_id']);
@ -625,57 +655,39 @@ class ControllerExtensionModuleRetailcrm extends Controller
     *
     * @return bool
     */
-    private function validate($apiUrl = null, $apiKey = null)
+    private function validate()
    {
-        $warningMessage = '';
-
-        $apiUrl = $this->request->post[$this->moduleTitle . '_url'] ?? $apiUrl;
-        $apiKey = $this->request->post[$this->moduleTitle . '_apikey'] ?? $apiKey;
-
-        try {
-            if ( !empty($apiUrl) && !empty($apiKey)) {
-                $apiClient = $this->retailcrm->getApiClient($apiUrl, $apiKey);
-                $response = $apiClient->sitesList();
-
-                if (empty($response['sites']) || !$response->isSuccessful()) {
-                    $warningMessage = 'text_error_api_key';
-                } elseif (count($response['sites']) > 1)  {
-                    $warningMessage = 'text_error_api_key_site';
-                } else {
-                    $site = current($response['sites']);
-
-                    if ($this->config->get('config_currency') !== $site['currency']) {
-                        $warningMessage = 'text_error_api_key_currency';
-                    }
-                }
-
-                if (!$this->user->hasPermission('modify', 'extension/module/retailcrm')) {
-                    $this->_error['warning'] = $this->language->get('error_permission');
-                }
-
-                if (isset($this->request->post[$this->moduleTitle . '_collector']['custom']) &&
-                    $this->request->post[$this->moduleTitle . '_collector']['custom_form'] == 1) {
-                    $customField = $this->request->post[$this->moduleTitle . '_collector']['custom'];
-
-                    if (empty($customField['name']) && empty($customField['email']) && empty($customField['phone'])) {
-                        $this->_error['fields'] = $this->language->get('text_error_collector_fields');
-                    }
-                }
-            } else {
-                $warningMessage = 'text_error_api_empty';
-            }
-        } catch (Throwable $exception) {
-            $warningMessage = sprintf(
-                'An error has occurred! In file: %s, on line: %s. Error message: %s',
-                $exception->getFile(), $exception->getLine(), $exception->getMessage()
+        if (!empty($this->request->post[$this->moduleTitle . '_url']) && !empty($this->request->post[$this->moduleTitle . '_apikey'])) {
+            $apiClient = $this->retailcrm->getApiClient(
+                $this->request->post[$this->moduleTitle . '_url'],
+                $this->request->post[$this->moduleTitle . '_apikey']
            );
        }

-        if ('' !== $warningMessage) {
-            $this->_error['warning'] = $this->language->get($warningMessage);
+        $response = $apiClient->apiVersions();
+
+        if (!$response || !$response->isSuccessful()) {
+            $this->_error['warning'] = $this->language->get('text_error_api');
        }

-        return empty($this->_error);
+        if (!$this->user->hasPermission('modify', 'extension/module/retailcrm')) {
+            $this->_error['warning'] = $this->language->get('error_permission');
+        }
+
+        if (isset($this->request->post[$this->moduleTitle . '_collector']['custom']) &&
+            $this->request->post[$this->moduleTitle . '_collector']['custom_form'] == 1) {
+            $customField = $this->request->post[$this->moduleTitle . '_collector']['custom'];
+
+            if (empty($customField['name']) && empty($customField['email']) && empty($customField['phone'])) {
+                $this->_error['fields'] = $this->language->get('text_error_collector_fields');
+            }
+        }
+
+        if (!$this->_error) {
+            return true;
+        } else {
+            return false;
+        }
    }

    /**
@ -831,13 +843,6 @@ class ControllerExtensionModuleRetailcrm extends Controller
                'extension/module/retailcrm/customer_edit'
            );

-        $this->{'model_' . $this->modelEvent}
-            ->addEvent(
-                $this->moduleTitle,
-                'catalog/model/account/customer/editNewsletter/after',
-                'extension/module/retailcrm/customer_edit_newsletter'
-            );
-
        $this->{'model_' . $this->modelEvent}
            ->addEvent(
                $this->moduleTitle,
@ -895,7 +900,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
    }

    /**
-     * Activate/deactivate module in marketplace RetailCRM
+     * Activate/deactivate module in marketplace retailCRM
     *
     * @param \RetailcrmProxy $apiClient
     * @param string $clientId
@ -911,15 +916,15 @@ class ControllerExtensionModuleRetailcrm extends Controller
        $name = 'Opencart';
        $accountUrl = $scheme . $this->request->server['HTTP_HOST'] . '/admin';

-        $configuration = [
+        $configuration = array(
            'clientId' => $clientId,
            'code' => $integrationCode . '-' . $clientId,
            'integrationCode' => $integrationCode,
            'active' => $active,
            'name' => $name,
            'logo' => $logo,
-            'accountUrl' => $accountUrl,
-        ];
+            'accountUrl' => $accountUrl
+        );

        $response = $apiClient->integrationModulesEdit($configuration);

@ -933,57 +938,4 @@ class ControllerExtensionModuleRetailcrm extends Controller

        return false;
    }
-
-    private function getHistorySinceId($api, $method)
-    {
-        $lastSinceId = 0;
-        $startDate = new DateTime('-1 days');
-        $historyResponse = $api->$method(['startDate' => $startDate->format('Y-m-d H:i:s')]);
-
-        if (
-            !$historyResponse instanceof ApiResponse
-            || !$historyResponse->isSuccessful()
-            || empty($historyResponse['history'])
-            || empty($historyResponse['pagination'])
-        ) {
-            return $lastSinceId;
-        }
-
-        $startPage = $historyResponse['pagination']['currentPage'];
-        $lastPage = $historyResponse['pagination']['totalPageCount'];
-
-        for ($startPage; $startPage <= $lastPage; ++$startPage) {
-            if ($historyResponse instanceof ApiResponse && !empty($historyResponse['history'])) {
-                $history = $historyResponse['history'];
-                $lastSinceId = end($history)['id'];
-                $historyResponse = $api->$method(['sinceId' => $lastSinceId]);
-            }
-        }
-
-        return $lastSinceId;
-    }
-
-    private function getAvailableTypes($availableSite, $types)
-    {
-        $result['opencart'] = $types['opencart'];
-        $result['retailcrm'] = [];
-
-        if (empty($availableSite)) {
-            return $result;
-        }
-
-        foreach ($types['retailcrm'] as $codeKey => $type) {
-            if ($type['active'] !== true) {
-                continue;
-            }
-
-            if (!empty($type['sites']) && !in_array($availableSite['code'], $type['sites'])) {
-                continue;
-            }
-
-            $result['retailcrm'][$codeKey] = $type;
-        }
-
-        return $result;
-    }
 }
--- a/src/upload/admin/language/en-gb/extension/module/retailcrm.php
+++ b/src/upload/admin/language/en-gb/extension/module/retailcrm.php
@ -1,8 +1,8 @@
 <?php

 // Heading Goes here:
-$_['heading_title']              = 'RetailCRM';
-$_['retailcrm_title']            = 'RetailCRM';
+$_['heading_title']              = 'retailCRM';
+$_['retailcrm_title']            = 'retailCRM';

 // Text
 $_['text_module']                = 'Modules';
@ -20,8 +20,8 @@ $_['collector_tab_text']         = 'Daemon Collector';
 $_['logs_tab_text']              = 'Logs';
 $_['collector_custom_text']      = 'Configuration of form fields';
 $_['custom_fields_tab_text']     = 'Custom fields';
-$_['retailcrm_url']              = 'URL of RetailCRM';
-$_['retailcrm_apikey']           = 'API key of RetailCRM';
+$_['retailcrm_url']              = 'URL of retailCRM';
+$_['retailcrm_apikey']           = 'API key of retailCRM';
 $_['corporate_enabled_label']    = 'Corporate customers support';
 $_['collector_site_key']         = 'Site key';
 $_['special_price_settings']     = 'Setting of uploading promotion price';
@ -50,14 +50,11 @@ $_['text_payment']               = 'Payment';
 $_['text_shipping']              = 'Delivery';
 $_['text_orders_custom_fields']  = 'Custom fields of orders';
 $_['text_customers_custom_fields'] = 'Custom fields of customers';
-$_['text_error_collector_fields'] = 'Fill in the names of fields of Demon Collector form';
-$_['text_error_api_empty']        = 'The "RetailCRM URL" and "RetailCRM API key" fields cannot be empty, enter the correct value';
-$_['text_error_api_key']         = 'Invalid API key';
-$_['text_error_api_key_site']    = 'API key with one-shop access required';
-$_['text_error_api_key_currency'] = 'The currency of the site differs from the currency of the store in CRM. For the integration to work correctly, the currencies in CRM and CMS must match';
-$_['text_error_custom_field']    = 'Create custom fields on a customer page in Opencart and RetailCRM in order to set up their transfer';
+$_['text_error_collector_fields']= 'Fill in the names of fields of Demon Collector form';
+$_['text_error_api']             = 'The selected API version is not available.';
+$_['text_error_custom_field']    = 'Create custom fields on a customer page in Opencart and retailCRM in order to set up their transfer';
 $_['text_error_cf_opencart']     = 'There are no custom fields in Opencart';
-$_['text_error_cf_retailcrm']    = 'There are no custom fields in RetailCRM';
+$_['text_error_cf_retailcrm']    = 'There are no custom fields in retailCRM';
 $_['text_error_save']            = 'Error when saving settings';
 $_['text_error_log']             = 'Log size is more than 2MB';
 $_['text_error_delivery']        = 'Delivery types are not found';
@ -71,28 +68,17 @@ $_['retailcrm_dict_default']     = 'By default';
 $_['retailcrm_missing_status']   = 'Status of lost orders';

 $_['order_number']               = 'Order number';
-$_['text_order_number']          = 'Upload the order number to RetailCRM';
-$_['summ_around']               = 'Around total summ';
-$_['text_summ_around']          = 'Around the order total summ';
-$_['icml_settings']              = 'ICML settings';
-$_['icml_service_enabled_label'] = 'Upload services in ICML';
-$_['icml_service_description']   = 'When the option is enabled, all products for which delivery is disabled will be considered as services and uploaded to CRM as services';
-$_['text_currency_label']        = 'Currency of goods';
+$_['text_order_number']          = 'Upload the order number to retailCRM';
+$_['text_currency']              = 'Currency setting';
+$_['text_currency_label']        = 'Currency in ICML';
 $_['text_lenght']                = 'Setting of the unit of measurement';
-$_['text_lenght_label']          = 'Unit of measurement of goods';
+$_['text_lenght_label']          = 'Unit of measurement in ICML';
 $_['status_changes']             = 'History of changes';
 $_['text_status_changes']        = 'Record changes to the order history of Opencart';

 $_['column_total']               = 'Total';
 $_['product_summ']               = 'Sum';

-$_['text_retailcrm_discount']    = 'RetailCRM discount';
-$_['text_retailcrm_label_discount']   = 'Label of RetailCRM discount in section total of order';
-$_['default_retailcrm_label_discount']  = 'Discount in RetailCRM';
-
-$_['sum_payment']                = 'Sum payment';
-$_['text_sum_payment']           = 'Do not upload the sum payment to RetailCRM';
-
 $_['article']                    = 'Article';
 $_['color']                      = 'Color';
 $_['weight']                     = 'Weight';
--- a/src/upload/admin/language/es-es/extension/module/retailcrm.php
+++ b/src/upload/admin/language/es-es/extension/module/retailcrm.php
@ -1,8 +1,8 @@
 <?php

 // Heading Goes here:
-$_['heading_title']              = 'RetailCRM';
-$_['retailcrm_title']            = 'RetailCRM';
+$_['heading_title']              = 'retailCRM';
+$_['retailcrm_title']            = 'retailCRM';

 // Text
 $_['text_module']                = 'Módulos';
@ -20,8 +20,8 @@ $_['collector_tab_text']         = 'Daemon Collector';
 $_['logs_tab_text']              = 'Registro';
 $_['collector_custom_text']      = 'Configurar campos de formulario';
 $_['custom_fields_tab_text']     = 'Campos personalizados';
-$_['retailcrm_url']              = 'Dirección del RetailCRM';
-$_['retailcrm_apikey']           = 'Clave de la API del RetailCRM';
+$_['retailcrm_url']              = 'Dirección del retailCRM';
+$_['retailcrm_apikey']           = 'Clave de la API del retailCRM';
 $_['corporate_enabled_label']    = 'Corporate customers support';
 $_['collector_site_key']         = 'Clave de la página web';
 $_['special_price_settings']     = 'Ajuste de la descarga del precio promocional';
@ -51,13 +51,10 @@ $_['text_shipping']              = 'Envío';
 $_['text_orders_custom_fields']  = 'Los campos de pedidos personalizados';
 $_['text_customers_custom_fields'] = 'Los campos de clientes personalizados';
 $_['text_error_collector_fields']= 'Rellene los nombres de los campos del formulario Daemon Collector';
-$_['text_error_api_empty']        = 'Los campos "URL de RetailCRM" y "Clave de API de RetailCRM" no pueden estar vacíos, ingrese el valor correcto';
-$_['text_error_api_key']         = 'Clave API del CRM no válida';
-$_['text_error_api_key_site']    = 'Se requiere clave API con acceso a una tienda';
-$_['text_error_api_key_currency'] = 'La moneda del sitio web es distinto a la tienda del CRM. Para el funcionamiento correcto de la integración, las monedas del CMS y CRM deben coincid';
-$_['text_error_custom_field']    = 'Cree campos personalizados en la ficha del cliente en Opencart y RetailCRM para configurar sus transmisión.';
+$_['text_error_api']             = 'La versión seleccionada de la API no está disponible.';
+$_['text_error_custom_field']    = 'Cree campos personalizados en la ficha del cliente en Opencart y retailCRM para configurar sus transmisión.';
 $_['text_error_cf_opencart']     = 'Faltan campos personalizados en Opencart';
-$_['text_error_cf_retailcrm']    = 'Faltan campos personalizados en RetailCRM';
+$_['text_error_cf_retailcrm']    = 'Faltan campos personalizados en retailCRM';
 $_['text_error_save']            = 'Error al guardar la configuración';
 $_['text_error_log']             = 'El Tamaño del registro es más de 2MB';
 $_['text_error_delivery']        = 'No se encontraron los métodos de envío';
@ -71,29 +68,17 @@ $_['retailcrm_dict_default']     = 'Por defecto';
 $_['retailcrm_missing_status']   = 'Estado de pedidos perdidos';

 $_['order_number']               = 'Número de pedido';
-$_['text_order_number']          = 'Transferir número de pedido a RetailCRM';
-$_['summ_around']               = 'Redondeo del costo del pedido';
-$_['text_summ_around']          = 'Redondear los costos del pedido a RetailCRM';
-$_['icml_settings']              = 'Ajustes de ICML';
-$_['icml_service_enabled_label'] = 'Subir servicios de ICML';
-$_['icml_service_description']   = 'Si habilita la opción, todos los productos para los que la entrega está desactivada se tratarán como servicios y se cargarán en CRM como servicios';
-
-$_['text_currency_label']        = 'Moneda de bienes';
+$_['text_order_number']          = 'Transferir número de pedido a retailCRM';
+$_['text_currency']              = 'Ajustes de moneda';
+$_['text_currency_label']        = 'Moneda en ICML';
 $_['text_lenght']                = 'Ajustar unidad de medida';
-$_['text_lenght_label']          = 'Unidad de medida de bienes';
+$_['text_lenght_label']          = 'Unidad de medida en ICML';
 $_['status_changes']             = 'Historial de cambios';
 $_['text_status_changes']        = 'Registrar los cambios en el historial de pedidos de Opencart';

 $_['column_total']               = 'Total';
 $_['product_summ']               = 'Importe';

-$_['text_retailcrm_discount']    = 'RetailCRM descuento';
-$_['text_retailcrm_label_discount']   = 'Etiqueta de descuento de RetailCRM en la sección total del pedido';
-$_['default_retailcrm_label_discount']  = 'Descuento en RetailCRM';
-
-$_['sum_payment']                = 'Suma de pago';
-$_['text_sum_payment']           = 'No transferir suma de pago a RetailCRM';
-
 $_['article']                    = 'Artículo';
 $_['color']                      = 'Color';
 $_['weight']                     = 'Peso';
--- a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php
+++ b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php
@ -1,8 +1,8 @@
 <?php

 // Heading Goes here:
-$_['heading_title']              = 'RetailCRM';
-$_['retailcrm_title']            = 'RetailCRM';
+$_['heading_title']              = 'retailCRM';
+$_['retailcrm_title']            = 'retailCRM';

 // Text
 $_['text_module']                = 'Модули';
@ -50,11 +50,8 @@ $_['text_payment']               = 'Оплата';
 $_['text_shipping']              = 'Доставка';
 $_['text_orders_custom_fields']  = 'Кастомные поля заказов';
 $_['text_customers_custom_fields'] = 'Кастомные поля клиентов';
-$_['text_error_collector_fields'] = 'Заполните названия полей формы Демон Collector';
-$_['text_error_api_empty']        = 'Поля "URL RetailCRM" и "Ключ API RetailCRM" не могут быть пустыми, введите корректное значение';
-$_['text_error_api_key']         = 'Неверный API ключ';
-$_['text_error_api_key_site']    = 'Требуется API ключ с доступом к одному магазину';
-$_['text_error_api_key_currency'] = 'Валюта сайта отличается от валюты магазина в CRM. Для корректной работы интеграции, валюты в CRM и CMS должны совпадать';
+$_['text_error_collector_fields']= 'Заполните названия полей формы Демон Collector';
+$_['text_error_api']             = 'Недоступна выбранная версия API.';
 $_['text_error_custom_field']    = 'Создайте пользовательские поля в карточке клиента в Opencart и RetailCRM, чтобы настроить их передачу';
 $_['text_error_cf_opencart']     = 'Отсутствуют пользовательские поля в Opencart';
 $_['text_error_cf_retailcrm']    = 'Отсутствуют пользовательские поля в RetailCRM';
@ -71,28 +68,17 @@ $_['retailcrm_dict_default']     = 'По умолчанию';
 $_['retailcrm_missing_status']   = 'Статус пропавших заказов';

 $_['order_number']               = 'Номер заказа';
-$_['text_order_number']          = 'Передавать номер заказа в RetailCRM';
-$_['summ_around']               = 'Округление суммы заказа';
-$_['text_summ_around']          = 'Округлять сумму заказа';
-$_['icml_settings']              = 'Настройки ICML';
-$_['icml_service_enabled_label'] = 'Выгружать услуги в ICML';
-$_['icml_service_description']   = 'При включении опции все товары, для которых отключена доставка, будут рассматриваться как услуги и загружаться в CRM как услуги';
-$_['text_currency_label']        = 'Валюта товаров';
+$_['text_order_number']          = 'Передавать номер заказа в retailCRM';
+$_['text_currency']              = 'Настройка валюты';
+$_['text_currency_label']        = 'Валюта в ICML';
 $_['text_lenght']                = 'Настройка единицы измерения';
-$_['text_lenght_label']          = 'Единица измерения товаров';
+$_['text_lenght_label']          = 'Единица измерения в ICML';
 $_['status_changes']             = 'История изменений';
 $_['text_status_changes']        = 'Фиксировать изменения в истории заказа Opencart';

 $_['column_total']               = 'Итого';
 $_['product_summ']               = 'Сумма';

-$_['text_retailcrm_discount']    = 'Скидка RetailCRM';
-$_['text_retailcrm_label_discount']   = 'Подпись для скидки, установленной в RetailCRM, в итоговой секции заказа';
-$_['default_retailcrm_label_discount']  = 'Скидка в RetailCRM';
-
-$_['sum_payment']                = 'Сумма платежа';
-$_['text_sum_payment']           = 'Не передавать сумму платежа в RetailCRM';
-
 $_['article']                    = 'Артикул';
 $_['color']                      = 'Цвет';
 $_['weight']                     = 'Вес';
--- a/src/upload/admin/model/extension/retailcrm/history.php
+++ b/src/upload/admin/model/extension/retailcrm/history.php
@ -72,10 +72,15 @@ class ModelExtensionRetailcrmHistory extends Model {
            return false;
        }

-        $sinceIdOrders = $history['retailcrm_history_orders'] ?? 0;
-        $sinceIdCustomers = $history['retailcrm_history_customers'] ?? 0;
-        $packsOrders = $retailcrmApiClient->ordersHistory(['sinceId' => $sinceIdOrders]);
-        $packsCustomers = $retailcrmApiClient->customersHistory(['sinceId' => $sinceIdCustomers]);
+        $sinceIdOrders = $history['retailcrm_history_orders'] ? $history['retailcrm_history_orders'] : null;
+        $sinceIdCustomers = $history['retailcrm_history_customers'] ? $history['retailcrm_history_customers'] : null;
+
+        $packsOrders = $retailcrmApiClient->ordersHistory(array(
+            'sinceId' => $sinceIdOrders ? $sinceIdOrders : 0
+        ), 1, 100);
+        $packsCustomers = $retailcrmApiClient->customersHistory(array(
+            'sinceId' => $sinceIdCustomers ? $sinceIdCustomers : 0
+        ), 1, 100);

        if (!$packsOrders->isSuccessful() && count($packsOrders->history) <= 0
            && !$packsCustomers->isSuccessful() && count($packsCustomers->history) <= 0
@ -83,28 +88,30 @@ class ModelExtensionRetailcrmHistory extends Model {
            return false;
        }

+        $orders = RetailcrmHistoryHelper::assemblyOrder($packsOrders->history);
+        $customers = RetailcrmHistoryHelper::assemblyCustomer($packsCustomers->history);
+
        $ordersHistory = $packsOrders->history;
        $customersHistory = $packsCustomers->history;
+
        $lastChangeOrders = $ordersHistory ? end($ordersHistory) : null;
        $lastChangeCustomers = $customersHistory ? end($customersHistory) : null;

-        if ($lastChangeOrders !== null && $lastChangeCustomers !== null) {
-            $this->model_setting_setting->editSetting(
-                'retailcrm_history',
-                [
-                    'retailcrm_history_orders' => $lastChangeOrders['id'],
-                    'retailcrm_history_customers' => $lastChangeCustomers['id']
-                ]
-            );
+        if ($lastChangeOrders !== null) {
+            $sinceIdOrders = $lastChangeOrders['id'];
+        }
+
+        if ($lastChangeCustomers !== null) {
+            $sinceIdCustomers = $lastChangeCustomers['id'];
        }

-        $orders = RetailcrmHistoryHelper::assemblyOrder($ordersHistory);
-        $customers = RetailcrmHistoryHelper::assemblyCustomer($customersHistory);
-        $newOrders = [];
-        $updatedOrders = [];
        $this->settings = $settings;
+
        $this->status = array_flip($settings[$this->moduleTitle . '_status']);

+        $updatedOrders = array();
+        $newOrders = array();
+
        foreach ($orders as $order) {
            if (isset($order['deleted'])) {
                continue;
@ -119,7 +126,7 @@ class ModelExtensionRetailcrmHistory extends Model {

        unset($orders);

-        $updateCustomers = [];
+        $updateCustomers = array();

        foreach ($customers as $customer) {
            if (isset($customer['deleted'])) {
@ -134,27 +141,34 @@ class ModelExtensionRetailcrmHistory extends Model {
        unset($customers);

        if (!empty($updateCustomers)) {
-            $customers = $retailcrmApiClient->customersList(['ids' => $updateCustomers]);
+            $customers = $retailcrmApiClient->customersList(array('ids' => $updateCustomers));
            if ($customers) {
                $this->updateCustomers($customers['customers']);
            }
        }

        if (!empty($newOrders)) {
-            $orders = $retailcrmApiClient->ordersList(['ids' => $newOrders]);
+            $orders = $retailcrmApiClient->ordersList(array('ids' => $newOrders));
            if ($orders) {
                $this->createResult = $this->createOrders($orders['orders'], $retailcrmApiClient);
            }
        }

        if (!empty($updatedOrders)) {
-            $orders = $retailcrmApiClient->ordersList(['ids' => $updatedOrders]);
-
+            $orders = $retailcrmApiClient->ordersList(array('ids' => $updatedOrders));
            if ($orders) {
                $this->updateOrders($orders['orders'], $retailcrmApiClient);
            }
        }

+        $this->model_setting_setting->editSetting(
+            'retailcrm_history',
+            array(
+                'retailcrm_history_orders' => $sinceIdOrders,
+                'retailcrm_history_customers' => $sinceIdCustomers
+            )
+        );
+
        if (!empty($this->createResult['customers'])) {
            $retailcrmApiClient->customersFixExternalIds($this->createResult['customers']);
        }
@ -301,17 +315,10 @@ class ModelExtensionRetailcrmHistory extends Model {
            $this->customers_history->handleCustomer($customer_data, $customer);
            $this->customers_history->handleCustomFields($customer_data, $customer);

-            if (empty($customer_data['address_id'])) {
-                $address = $this->customers_history->handleAddress($customer, array());
-                $addresses = $this->model_customer_customer->getAddresses($customer_id);
-                $addresses[] = $address;
-                $customer_data['address'] = $addresses;
-            } else {
-                $updateAddress = $this->customers_history->handleAddress($customer, array(), $customer_data['address_id']);
-                $addresses = $this->model_customer_customer->getAddresses($customer_id);
-                $addresses[$customer_data['address_id']] = $updateAddress;
-                $customer_data['address'] = $addresses;
-            }
+            $updateAddress = $this->customers_history->handleAddress($customer, array(), $customer_data['address_id']);
+            $addresses = $this->model_customer_customer->getAddresses($customer_id);
+            $addresses[$customer_data['address_id']] = $updateAddress;
+            $customer_data['address'] = $addresses;

            $this->model_customer_customer->editCustomer($customer_id, $customer_data);
        }
--- a/src/upload/admin/model/extension/retailcrm/icml.php
+++ b/src/upload/admin/model/extension/retailcrm/icml.php
@ -15,14 +15,13 @@ class ModelExtensionRetailcrmIcml extends Model

    /**
     * Constructor
-     *
+     * 
     * @param Registry $registry
     */
    public function __construct($registry)
    {
        parent::__construct($registry);
        $this->load->library('retailcrm/retailcrm');
-        $this->load->model('localisation/weight_class');
    }

    public function generateICML()
@ -78,7 +77,7 @@ class ModelExtensionRetailcrmIcml extends Model
     */
    private function addCategories()
    {
-        $categories = $this->model_catalog_category->getCategories([]);
+        $categories = $this->model_catalog_category->getCategories(array());
        foreach ($categories as $category) {
            $category = $this->model_catalog_category->getCategory($category['category_id']);

@ -103,18 +102,11 @@ class ModelExtensionRetailcrmIcml extends Model
    }

    private function addOffers() {
-        $offerManufacturers = [];
-        $servicesForIcml = $this->retailcrm->useServicesForIcml();
+        $offerManufacturers = array();
        $currencyForIcml = $this->retailcrm->getCurrencyForIcml();
        $defaultCurrency = $this->getDefaultCurrency();
        $settingLenght = $this->retailcrm->getLenghtForIcml();
        $leghtsArray = $this->model_localisation_length_class->getLengthClasses();
-        $weightClassesMas = $this->model_localisation_weight_class->getWeightClasses();
-        $weightClasses = [];
-
-        foreach ($weightClassesMas as $weightClass) {
-            $weightClasses[$weightClass['weight_class_id']]['value'] = $weightClass['value'];
-        }

        foreach ($leghtsArray as $lenght) {
            if ($lenght['value'] == 1) {
@ -123,20 +115,20 @@ class ModelExtensionRetailcrmIcml extends Model
        }

        $manufacturers = $this->model_catalog_manufacturer
-            ->getManufacturers([]);
+            ->getManufacturers(array());

        foreach ($manufacturers as $manufacturer) {
            $offerManufacturers[$manufacturer['manufacturer_id']] = $manufacturer['name'];
        }

-        $products = $this->model_catalog_product->getProducts([]);
+        $products = $this->model_catalog_product->getProducts(array());

        foreach ($products as $product) {
            $offers = $this->retailcrm->getOffers($product);

            foreach ($offers as $optionsString => $optionsValues) {
                $optionsString = explode('_', $optionsString);
-                $options = [];
+                $options = array();

                foreach($optionsString as $optionString) {
                    $option = explode('-', $optionString);
@ -148,46 +140,37 @@ class ModelExtensionRetailcrmIcml extends Model
                            $options[$optionIds[0]] = array(
                                'name' => $optionData['optionName'],
                                'value' => $optionData['optionValue'],
-                                'value_id' => $option[1],
-                                'option_id' => $optionIds[1]
+                                'value_id' => $option[1]
                            );
-                        }
+                        }                     
                    }
                }

                ksort($options);

-                $offerId = [];
+                $offerId = array();

                foreach($options as $optionKey => $optionData) {
                    $offerId[] = $optionKey.'-'.$optionData['value_id'];
                }

                $offerId = implode('_', $offerId);
-                $catalog = $this->eOffers->appendChild($this->dd->createElement('offer'));
+                $e = $this->eOffers->appendChild($this->dd->createElement('offer'));

                if (!empty($offerId)) {
-                    $catalog->setAttribute('id', $product['product_id'] . '#' . $offerId);
-                    $catalog->setAttribute('productId', $product['product_id']);
-                    $catalog->setAttribute('quantity', $optionsValues['qty']);
+                    $e->setAttribute('id', $product['product_id'] . '#' . $offerId);
+                    $e->setAttribute('productId', $product['product_id']);
+                    $e->setAttribute('quantity', $optionsValues['qty']);
                } else {
-                    $catalog->setAttribute('id', $product['product_id']);
-                    $catalog->setAttribute('productId', $product['product_id']);
-                    $catalog->setAttribute('quantity', $product['quantity']);
+                    $e->setAttribute('id', $product['product_id']);
+                    $e->setAttribute('productId', $product['product_id']);
+                    $e->setAttribute('quantity', $product['quantity']);
                }
-
-                /**
-                 * Set type for offers
-                 */
-                $useServices = $servicesForIcml && isset($product['shipping']) && $product['shipping'] == 0;
-
-                $catalog->setAttribute('type', $useServices ? 'service' : 'product');
-
                /**
                 * Offer activity
                 */
                $activity = $product['status'] == 1 ? 'Y' : 'N';
-                $catalog->appendChild(
+                $e->appendChild(
                    $this->dd->createElement('productActivity')
                )->appendChild(
                    $this->dd->createTextNode($activity)
@ -199,7 +182,7 @@ class ModelExtensionRetailcrmIcml extends Model
                    ->getProductCategories($product['product_id']);
                if (!empty($categories)) {
                    foreach ($categories as $category) {
-                        $catalog->appendChild($this->dd->createElement('categoryId'))
+                        $e->appendChild($this->dd->createElement('categoryId'))
                            ->appendChild(
                                $this->dd->createTextNode($category)
                            );
@ -208,18 +191,18 @@ class ModelExtensionRetailcrmIcml extends Model
                /**
                 * Name & price
                 */
-                $catalog->appendChild($this->dd->createElement('productName'))
+                $e->appendChild($this->dd->createElement('productName'))
                    ->appendChild($this->dd->createTextNode($product['name']));
                if (!empty($options)) {
-                    $optionsString = [];
+                    $optionsString = array();
                    foreach($options as $option) {
                        $optionsString[] = $option['name'].': '.$option['value'];
                    }
                    $optionsString = ' ('.implode(', ', $optionsString).')';
-                    $catalog->appendChild($this->dd->createElement('name'))
+                    $e->appendChild($this->dd->createElement('name'))
                        ->appendChild($this->dd->createTextNode($product['name'].$optionsString));
                } else {
-                    $catalog->appendChild($this->dd->createElement('name'))
+                    $e->appendChild($this->dd->createElement('name'))
                        ->appendChild($this->dd->createTextNode($product['name']));
                }

@ -233,13 +216,13 @@ class ModelExtensionRetailcrmIcml extends Model
                    $price = $product['price'] + $optionsValues['price'];
                }

-                $catalog->appendChild($this->dd->createElement('price'))
+                $e->appendChild($this->dd->createElement('price'))
                    ->appendChild($this->dd->createTextNode($price));
                /**
                 * Vendor
                 */
                if ($product['manufacturer_id'] != 0) {
-                    $catalog->appendChild($this->dd->createElement('vendor'))
+                    $e->appendChild($this->dd->createElement('vendor'))
                        ->appendChild(
                            $this->dd->createTextNode(
                                $offerManufacturers[$product['manufacturer_id']]
@ -280,7 +263,7 @@ class ModelExtensionRetailcrmIcml extends Model
                        $productHeight
                    );

-                    $catalog->appendChild($this->dd->createElement('dimensions'))
+                    $e->appendChild($this->dd->createElement('dimensions'))
                        ->appendChild($this->dd->createTextNode($dimensions));
                }

@ -289,32 +272,34 @@ class ModelExtensionRetailcrmIcml extends Model
                 */
                if ($product['image']) {
                    $image = $this->generateImage($product['image']);
-                    $catalog->appendChild($this->dd->createElement('picture'))
+                    $e->appendChild($this->dd->createElement('picture'))
                        ->appendChild($this->dd->createTextNode($image));
                }
                /**
                 * Url
                 */
-                $this->url = new Url(HTTP_CATALOG, HTTPS_CATALOG);
-                $catalog->appendChild($this->dd->createElement('url'))
+                $this->url = new Url(
+                    HTTP_CATALOG,
+                    $this->config->get('config_secure')
+                        ? HTTP_CATALOG
+                        : HTTPS_CATALOG
+                );
+                $e->appendChild($this->dd->createElement('url'))
                    ->appendChild(
                        $this->dd->createTextNode(
                            $this->url->link(
-                                'product/product&product_id=' . $product['product_id'],
-                                '',
-                                (bool) $this->config->get('config_secure')
+                                'product/product&product_id=' . $product['product_id']
                            )
                        )
                    );
-
                // Options
                if (!empty($options)) {
                    foreach($options as $optionKey => $optionData) {
                        $param = $this->dd->createElement('param');
-                        $param->setAttribute('code', $optionData['option_id']);
+                        $param->setAttribute('code', $optionKey);
                        $param->setAttribute('name', $optionData['name']);
                        $param->appendChild($this->dd->createTextNode($optionData['value']));
-                        $catalog->appendChild($param);
+                        $e->appendChild($param);
                    }
                }
                if ($product['sku']) {
@ -322,24 +307,18 @@ class ModelExtensionRetailcrmIcml extends Model
                    $sku->setAttribute('code', 'article');
                    $sku->setAttribute('name', $this->language->get('article'));
                    $sku->appendChild($this->dd->createTextNode($product['sku']));
-                    $catalog->appendChild($sku);
+                    $e->appendChild($sku);
                }
                if ($product['weight'] != '') {
-                    $weight = $this->dd->createElement('weight');
-                    $coeffWeight = 1;
-
-                    if (!empty($weightClasses[$product['weight_class_id']]['value'])) {
-                        $coeffWeight = $weightClasses[$product['weight_class_id']]['value'];
-                    }
-
-                    $weightValue = !empty($optionsValues['weight'])
-                        ? $product['weight'] + $optionsValues['weight']
-                        : $product['weight']
+                    $weight = $this->dd->createElement('param');
+                    $weight->setAttribute('code', 'weight');
+                    $weight->setAttribute('name', $this->language->get('weight'));
+                    $weightValue = (isset($product['weight_class']))
+                        ? round($product['weight'], 3) . ' ' . $product['weight_class']
+                        : round($product['weight'], 3)
                    ;
-                    $weightValue = round($weightValue / $coeffWeight, 6);
-
                    $weight->appendChild($this->dd->createTextNode($weightValue));
-                    $catalog->appendChild($weight);
+                    $e->appendChild($weight);
                }
            }
        }
@ -352,7 +331,7 @@ class ModelExtensionRetailcrmIcml extends Model
    private function generateImage($image)
    {
        $this->load->model('tool/image');
-
+ 
        $currentTheme = $this->config->get('config_theme');
        $width = $this->config->get($currentTheme . '_image_related_width') ? $this->config->get($currentTheme . '_image_related_width') : 200;
        $height = $this->config->get($currentTheme . '_image_related_height') ? $this->config->get($currentTheme . '_image_related_height') : 200;
--- a/src/upload/admin/model/extension/retailcrm/prices.php
+++ b/src/upload/admin/model/extension/retailcrm/prices.php
@ -171,13 +171,13 @@ class ModelExtensionRetailcrmPrices extends Model
                    ) {
                        $productPrice[$special['customer_group_id']]['price'] = $special['price'];
                        $productPrice[$special['customer_group_id']]['remove'] = false;
-                        $groupId = $special['customer_group_id'];
                        $priority = $special['priority'];
+                        $groupId = $special['customer_group_id'];
                    }
                } else {
                    $productPrice[$special['customer_group_id']]['price'] = $special['price'];
-                    $productPrice[$special['customer_group_id']]['remove'] = false;
                    $groupId = $special['customer_group_id'];
+                    $productPrice[$special['customer_group_id']]['remove'] = false;
                }
            }
        }
--- a/src/upload/admin/model/extension/retailcrm/references.php
+++ b/src/upload/admin/model/extension/retailcrm/references.php
@ -158,22 +158,6 @@ class ModelExtensionRetailcrmReferences extends Model
        return (!$response->isSuccessful()) ? array() : $response->deliveryTypes;
    }

-    /**
-     * Get RetailCRM available sites list
-     */
-    public function getApiSite()
-    {
-        $response = $this->retailcrmApiClient->sitesList();
-
-        if (!$response || !$response->isSuccessful()) {
-            return [];
-        }
-
-        $sites = $response->sites;
-
-        return end($sites);
-    }
-
    /**
     * Get RetailCRM order statuses
     *
--- a/src/upload/admin/view/stylesheet/retailcrm.css
+++ b/src/upload/admin/view/stylesheet/retailcrm.css
@ -1,11 +1,5 @@
 .retailcrm_unit {margin-bottom: 10px;}
-.retailcrm_disable_border {border: none !important;}
 .retailcrm_unit input {width: 30%;}
 .checkbox input{width: auto;}
 .retailcrm_unit input[type=checkbox] {width: 13px;}
-.retailcrm_unit select {max-width: 500px;}
-
-.question-mark {
-    cursor: help;
-    position: relative;
-}
+.retailcrm_unit select {max-width: 500px;}
--- a/src/upload/admin/view/template/extension/module/retailcrm.tpl
+++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl
@ -97,22 +97,7 @@
                </div>
              </fieldset>
              <fieldset>
-                <legend><?php echo $icml_settings; ?></legend>
-                <div class="form-group retailcrm_unit">
-                  <label class="col-sm-2 control-label question-mark" for="retailcrm_icml_service_enabled" title="When the option is enabled, all products for which delivery is disabled will be considered as services and uploaded to CRM as services"><?php echo $icml_service_enabled_label; ?></label>
-                  <div class="col-sm-10">
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_icml_service_enabled value="1"
-                      <?php if(isset($saved_settings['retailcrm_icml_service_enabled']) && $saved_settings['retailcrm_icml_service_enabled'] == 1): echo 'checked'; endif;?>/>
-                      <?php echo $text_yes; ?>
-                    </label>
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_icml_service_enabled" value="0"
-                      <?php if(!isset($saved_settings['retailcrm_icml_service_enabled']) || $saved_settings['retailcrm_icml_service_enabled'] == 0): echo 'checked'; endif;?>/>
-                      <?php echo $text_no; ?>
-                    </label>
-                  </div>
-                </div
+                <legend><?php echo $text_currency; ?></legend>
                <div class="form-group retailcrm_unit">
                  <label class="col-sm-2 control-label"><?php echo $text_currency; ?></label>
                  <div class="col-md-4 col-sm-10">
@ -127,6 +112,9 @@
                    </select>
                  </div>
                </div>
+              </fieldset>
+              <fieldset>
+                <legend><?php echo $text_lenght; ?></legend>
                <div class="form-group retailcrm_unit">
                  <label class="col-sm-2 control-label"><?php echo $text_lenght_label; ?></label>
                  <div class="col-md-4 col-sm-10">
@ -225,55 +213,6 @@
                  </div>
                </div>
              </fieldset>
-              <fieldset>
-                <legend><?php echo $summ_around; ?></legend>
-                <div class="form-group">
-                  <label class="col-sm-2 control-label" for="retailcrm_summ_around"><?php echo $text_summ_around; ?></label>
-                  <div class="col-sm-10">
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_summ_around" value="1" <?php if (isset($saved_settings['retailcrm_summ_around']) &&
-                      $saved_settings['retailcrm_summ_around'] == 1) :
-                      echo 'checked'; endif; ?> />
-                      <?php echo $text_yes; ?>
-                    </label>
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_summ_around" value="0" <?php if (!isset($saved_settings['retailcrm_summ_around']) ||
-                      $saved_settings['retailcrm_summ_around'] == 0) :
-                      echo 'checked'; endif; ?> />
-                      <?php echo $text_no; ?>
-                    </label>
-                  </div>
-                </div>
-              </fieldset>
-              <fieldset>
-                <legend><?php echo $text_retailcrm_discount; ?></legend>
-                <div class="form-group">
-                  <label class="col-sm-2 control-label" for="label_discount"><?php echo $text_retailcrm_label_discount ?></label>
-                  <div class="col-lg-4 col-md-6 col-sm-10">
-                    <input name="retailcrm_label_discount" id="label_discount" class="form-control" value="<?php if (isset($saved_settings['retailcrm_label_discount'])): echo $saved_settings['retailcrm_label_discount']; else: echo $default_retailcrm_label_discount; endif ;?>">
-                  </div>
-                </div>
-              </fieldset>
-              <fieldset>
-                <legend><?php echo $sum_payment; ?></legend>
-                <div class="form-group">
-                  <label class="col-sm-2 control-label" for="retailcrm_sum_payment"><?php echo $text_sum_payment?></label>
-                  <div class="col-sm-10">
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_sum_payment" value="1" <?php if (isset($saved_settings['retailcrm_sum_payment']) &&
-                      $saved_settings['retailcrm_sum_payment'] == 1) :
-                      echo 'checked'; endif;?> />
-                      <?php echo $text_yes; ?>
-                    </label>
-                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_sum_payment" value="0" <?php if (!isset($saved_settings['retailcrm_sum_payment']) ||
-                      $saved_settings['retailcrm_sum_payment'] == 0) :
-                      echo 'checked'; endif;?> />
-                      <?php echo $text_no; ?>
-                    </label>
-                  </div>
-                </div>
-              </fieldset>
            </div>
            <div class="tab-pane" id="tab-references">
              <fieldset>
@ -525,8 +464,8 @@
                <div class="form-group">
                  <label class="col-sm-2 control-label" for="input-code"><?php echo $entry_code;?></label>
                  <div class="col-sm-10">
-                    <textarea name="retailcrm_online_consultant_code" rows="5" placeholder="<?php echo $entry_code;?>" id="retailcrm_entry_code" class="form-control">
-                    <?php if (isset($saved_settings['retailcrm_online_consultant_code'])): echo $saved_settings['retailcrm_online_consultant_code']; endif;?>
+                    <textarea name="module_retailcrm_online_consultant_code" rows="5" placeholder="<?php echo $entry_code;?>" id="retailcrm_entry_code" class="form-control">
+                    <?php if (isset($saved_settings['module_retailcrm_online_consultant_code'])): echo $saved_settings['module_retailcrm_online_consultant_code']; endif;?>
                    </textarea>
                  </div>
                </div>
@ -534,14 +473,14 @@
                  <label class="col-sm-2 control-label" for="retailcrm_online_consultant_active"><?php echo $entry_status; ?></label>
                  <div class="col-sm-10">
                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_online_consultant_active" value="1" <?php if (isset($saved_settings['retailcrm_online_consultant_active']) &&
-                      $saved_settings['retailcrm_online_consultant_active'] == 1) :
+                      <input type="radio" name="module_retailcrm_online_consultant_active" value="1" <?php if (isset($saved_settings['module_retailcrm_online_consultant_active']) &&
+                      $saved_settings['module_retailcrm_online_consultant_active'] == 1) :
                      echo 'checked'; endif; ?> />
                      <?php echo $text_yes; ?>
                    </label>
                    <label class="radio-inline">
-                      <input type="radio" name="retailcrm_online_consultant_active" value="0" <?php if (!isset($saved_settings['retailcrm_online_consultant_active']) ||
-                      $saved_settings['retailcrm_online_consultant_active'] == 0) :
+                      <input type="radio" name="module_retailcrm_online_consultant_active" value="0" <?php if (!isset($saved_settings['module_retailcrm_online_consultant_active']) ||
+                      $saved_settings['module_retailcrm_online_consultant_active'] == 0) :
                      echo 'checked'; endif; ?> />
                      <?php echo $text_no; ?>
                    </label>
@ -638,7 +577,7 @@
            </div>
            <div class="tab-pane" id="tab-logs">
              <fieldset style="margin-bottom: 30px;">
-                <legend>RetailCRM API error log</legend>
+                <legend>retailCRM API error log</legend>
                <div class="retailcrm_unit">
                  <a onclick="confirm('<?php echo $text_confirm_log; ?>') ? location.href='<?php echo $clear_retailcrm; ?>' : false;" data-toggle="tooltip" title="<?php echo $button_clear; ?>" class="btn btn-danger"><i class="fa fa-eraser"></i> <span class="hidden-xs"><?php echo $button_clear; ?></span></a>
                </div>
--- a/src/upload/admin/view/template/extension/module/retailcrm.twig
+++ b/src/upload/admin/view/template/extension/module/retailcrm.twig
@ -9,7 +9,7 @@
                <button type="button" id="icml" data-toggle="tooltip" title="{{ text_button_catalog }}" class="btn btn-success"><i class="fa fa-file-text-o"></i></button>
                <button type="submit" form="form-module" data-toggle="tooltip" title="{{ button_save }}" class="btn btn-primary"><i class="fa fa-save"></i></button>
                <a href="{{ cancel }}" data-toggle="tooltip" title="{{ button_cancel }}" class="btn btn-default"><i class="fa fa-reply"></i></a></div>
-            <h1>{{ heading_title }} {{ module_version }}</h1>
+            <h1>{{ heading_title }}</h1>
            <ul class="breadcrumb">
                {% for breadcrumb in breadcrumbs %}
                    <li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
@ -55,7 +55,7 @@
                                        <input class="form-control" id="retailcrm_url" type="text" name="module_retailcrm_url" value="{% if saved_settings.module_retailcrm_url is defined %}{{ saved_settings.module_retailcrm_url }}{% endif %}">
                                    </div>
                                </div>
-                                <div class="form-group retailcrm_unit retailcrm_disable_border">
+                                <div class="form-group retailcrm_unit">
                                    <label class="col-sm-2 control-label" for="retailcrm_apikey">{{ retailcrm_apikey }}</label>
                                    <div class="col-lg-4 col-md-6 col-sm-10">
                                        <input class="form-control" id="retailcrm_apikey" type="text" name="module_retailcrm_apikey" value="{% if saved_settings.module_retailcrm_apikey is defined %}{{ saved_settings.module_retailcrm_apikey }}{% endif %}">
@ -100,27 +100,8 @@
                                </div>
                            </fieldset>
                            <fieldset>
-                                <legend>{{ icml_settings }}</legend>
-                                <div class="form-group retailcrm_unit retailcrm_disable_border">
-                                    <label class="col-sm-2 control-label question-mark" for="module_retailcrm_icml_service_enabled" title="{{ icml_service_description }}">{{ icml_service_enabled_label }}</label>
-                                    <div class="col-sm-10">
-                                        <label class="radio-inline">
-                                            <input type="radio" name="module_retailcrm_icml_service_enabled" value="1"
-                                                    {% if saved_settings.module_retailcrm_icml_service_enabled is defined and saved_settings.module_retailcrm_icml_service_enabled == 1 %}
-                                                        checked
-                                                    {% endif %} />
-                                            {{ text_yes }}
-                                        </label>
-                                        <label class="radio-inline">
-                                            <input type="radio" name="module_retailcrm_icml_service_enabled" value="0"
-                                                    {% if saved_settings.module_retailcrm_icml_service_enabled is not defined or saved_settings.module_retailcrm_icml_service_enabled == 0 %}
-                                                        checked
-                                                    {% endif %} />
-                                            {{ text_no }}
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="form-group retailcrm_unit retailcrm_disable_border">
+                                <legend>{{ text_currency }}</legend>
+                                <div class="form-group retailcrm_unit">
                                    <label class="col-sm-2 control-label">{{ text_currency_label }}</label>
                                    <div class="col-md-4 col-sm-10">
                                        <select id="module_retailcrm_currency" name="module_retailcrm_currency" class="form-control">
@ -134,14 +115,17 @@
                                        </select>
                                    </div>
                                </div>
-                                <div class="form-group retailcrm_unit retailcrm_disable_border">
+                            </fieldset>
+                            <fieldset>
+                                <legend>{{ text_lenght }}</legend>
+                                <div class="form-group retailcrm_unit">
                                    <label class="col-sm-2 control-label">{{ text_lenght_label }}</label>
                                    <div class="col-md-4 col-sm-10">
                                        <select id="module_retailcrm_lenght" name="module_retailcrm_lenght" class="form-control">
                                            {% for lenght in lenghts %}
-                                                <option value="{{ lenght.length_class_id }}" {% if saved_settings.module_retailcrm_lenght is defined and saved_settings.module_retailcrm_lenght == lenght.length_class_id %} selected="selected" {% endif %}>
-                                                    {{ lenght.title }}
-                                                </option>
+                                                    <option value="{{ lenght.length_class_id }}" {% if saved_settings.module_retailcrm_lenght is defined and saved_settings.module_retailcrm_lenght == lenght.length_class_id %} selected="selected" {% endif %}>
+                                                        {{ lenght.title }}
+                                                    </option>
                                            {% endfor %}
                                        </select>
                                    </div>
@ -236,59 +220,6 @@
                                    </div>
                                </div>
                            </fieldset>
-                            <fieldset>
-                                <legend>{{ summ_around }}</legend>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" class="col-sm-2 control-label" for="module_retailcrm_summ_around">{{ text_summ_around }}</label>
-                                    <div class="col-sm-10">
-                                        <label class="control-label" class="radio-inline">
-                                            <input type="radio" name="module_retailcrm_summ_around" value="1"
-                                                    {% if saved_settings.module_retailcrm_summ_around is defined and saved_settings.module_retailcrm_summ_around == 1 %}
-                                                        checked
-                                                    {% endif %} />
-                                            {{ text_yes }}
-                                        </label>
-                                        <label class="control-label" class="radio-inline">
-                                            <input type="radio" name="module_retailcrm_summ_around" value="0"
-                                                    {% if saved_settings.module_retailcrm_summ_around is not defined or saved_settings.module_retailcrm_summ_around == 0 %}
-                                                        checked
-                                                    {% endif %} />
-                                            {{ text_no }}
-                                        </label>
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <legend>{{ text_retailcrm_discount }}</legend>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="label_discount">{{ text_retailcrm_label_discount }}</label>
-                                    <div class="col-lg-4 col-md-6 col-sm-10">
-                                        <input name="module_retailcrm_label_discount" id="label_discount" class="form-control" value="{% if saved_settings.module_retailcrm_label_discount is defined %}{{ saved_settings.module_retailcrm_label_discount }}{% else %}{{ default_retailcrm_label_discount }}{% endif %}">
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <legend>{{ sum_payment }}</legend>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="module_retailcrm_sum_payment">{{ text_sum_payment }}</label>
-                                    <div class="col-sm-10">
-                                        <label class="control-label radio-inline">
-                                            <input type="radio" name="module_retailcrm_sum_payment" value="1"
-                                                    {% if saved_settings.module_retailcrm_sum_payment is defined and saved_settings.module_retailcrm_sum_payment == 1 %}
-                                                        checked
-                                                    {% endif %} >
-                                            {{ text_yes }}
-                                        </label>
-                                        <label class="control-label radio-inline">
-                                            <input type="radio" name="module_retailcrm_sum_payment" value="0"
-                                                    {% if saved_settings.module_retailcrm_sum_payment is not defined or saved_settings.module_retailcrm_sum_payment == 0 %}
-                                                        checked
-                                                    {% endif %} >
-                                            {{ text_no }}
-                                        </label>
-                                    </div>
-                                </div>
-                            </fieldset>
                        </div>
                        <div class="tab-pane" id="tab-references">
                            <fieldset>
--- a/src/upload/catalog/controller/api/retailcrm.php
+++ b/src/upload/catalog/controller/api/retailcrm.php
@ -77,8 +77,8 @@ class ControllerApiRetailcrm extends Controller
            $address = array(
                'country_id' => $country_id,
                'zone_id' => $zone['zone_id'],
-                'iso_code_2' => $country['iso_code_2'] ?? '',
-                'iso_code_3' => $country['iso_code_3'] ?? '',
+                'iso_code_2' => $country['iso_code_2'],
+                'iso_code_3' => $country['iso_code_3'],
                'zone_code' => $zone['code'],
                'postcode' => '',
                'city' => ''
--- a/src/upload/catalog/controller/extension/analytics/daemon_collector.php
+++ b/src/upload/catalog/controller/extension/analytics/daemon_collector.php
@ -1,5 +1,4 @@
 <?php
-
 class ControllerExtensionAnalyticsDaemonCollector extends Controller {
    public function index() {
        $this->load->model('setting/setting');
--- a/src/upload/catalog/controller/extension/analytics/online_consultant.php
+++ b/src/upload/catalog/controller/extension/analytics/online_consultant.php
@ -1,5 +1,14 @@
 <?php

+/**
+ * Class ControllerExtensionAnalyticsOnlineConsultant
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class ControllerExtensionAnalyticsOnlineConsultant extends Controller {
    /**
     * @return string
--- a/src/upload/catalog/controller/extension/module/retailcrm.php
+++ b/src/upload/catalog/controller/extension/module/retailcrm.php
@ -1,5 +1,14 @@
 <?php

+/**
+ * Class ControllerModule
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class ControllerExtensionModuleRetailcrm extends Controller {

    private $retailcrmApiClient;
@ -138,20 +147,6 @@ class ControllerExtensionModuleRetailcrm extends Controller {
        }
    }

-    public function customer_edit_newsletter($parameter1, $parameter2, $parameter3)
-    {
-        $customerId = $this->customer->getId();
-        $customer = $this->model_account_customer->getCustomer($customerId);
-
-        if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/customer.php')) {
-            $this->load->model('extension/retailcrm/custom/customer');
-            $this->model_extension_retailcrm_custom_customer->changeInCrm($customer, $this->retailcrmApiClient);
-        } else {
-            $customer_manager = $this->retailcrm->getCustomerManager();
-            $customer_manager->editCustomerNewsLetter($customer);
-        }
-    }
-
    /**
     * Update customer on event
     *
--- a/src/upload/catalog/model/extension/retailcrm/order.php
+++ b/src/upload/catalog/model/extension/retailcrm/order.php
@ -136,12 +136,6 @@ class ModelExtensionRetailcrmOrder extends Model {
            $order['number'] = $order_data['order_id'];
        }

-        if (isset($this->settings[$this->moduleTitle . '_summ_around'])
-            && $this->settings[$this->moduleTitle . '_summ_around'] == 1
-        ) {
-            $order['applyRound'] = true;
-        }
-
        $order['externalId'] = $order_id;
        $order['firstName'] = $order_data['shipping_firstname'];
        $order['lastName'] = $order_data['shipping_lastname'];
@ -271,41 +265,34 @@ class ModelExtensionRetailcrmOrder extends Model {
            if (isset($properties)) $item['properties'] = $properties;

            $order['items'][] = $item;
-        }

-        
-        if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
-            $order['status'] = $this->settings[$this->moduleTitle . '_status'][$order_data['order_status_id']];
-        } elseif (isset($order_data['order_status_id']) && $order_data['order_status_id'] == 0) {
-            $order['status'] = $this->settings[$this->moduleTitle . '_missing_status'];
-        }
+            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
+                $order['status'] = $this->settings[$this->moduleTitle . '_status'][$order_data['order_status_id']];
+            } elseif (isset($order_data['order_status_id']) && $order_data['order_status_id'] == 0) {
+                $order['status'] = $this->settings[$this->moduleTitle . '_missing_status'];
+            }

-        if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
-            $customFields = $order_data['custom_field'];
+            if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
+                $customFields = $order_data['custom_field'];

-            foreach ($customFields as $key => $value) {
-                if (isset($this->settings[$this->moduleTitle . '_custom_field']['o_' . $key])) {
-                    $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['o_' . $key]] = $value;
+                foreach ($customFields as $key => $value) {
+                    if (isset($this->settings[$this->moduleTitle . '_custom_field']['o_' . $key])) {
+                        $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['o_' . $key]] = $value;
+                    }
+                }
+
+                if (isset($customFieldsToCrm)) {
+                    $order['customFields'] = $customFieldsToCrm;
                }
            }
-
-            if (isset($customFieldsToCrm)) {
-                $order['customFields'] = $customFieldsToCrm;
-            }
        }
-        
+
        $payment = array(
            'externalId' => $order_id,
            'type' => $payment_code,
            'amount' => $totals['total']
        );

-        if (isset($this->settings[$this->moduleTitle . '_sum_payment']) &&
-            $this->settings[$this->moduleTitle . '_sum_payment'] == 1
-        ) {
-            unset($payment['amount']);
-        }
-
        if (!$create) {
            $payment['order'] = array(
                'externalId' => $order_id
@ -426,7 +413,6 @@ class ModelExtensionRetailcrmOrder extends Model {
            'lastName' => $data['lastname'],
            'email' => $data['email'],
            'createdAt' => $data['date_added'],
-            'externalId' => $data['customer_id'],
            'address' => array(
                'countryIso' => $data['payment_iso_code_2'],
                'index' => $data['payment_postcode'],
--- a/src/upload/catalog/model/extension/total/retailcrm_discount.php
+++ b/src/upload/catalog/model/extension/total/retailcrm_discount.php
@ -1,11 +0,0 @@
-<?php
-
-/**
- * Class ModelExtensionTotalRetailcrmDiscount
- *
- * This class is unused in this module but used inside opencart as stub in file "catalog/model/checkout/order.php"
- * in method addOrderHistory()
- */
-class ModelExtensionTotalRetailcrmDiscount extends Model
-{
-}
--- a/src/upload/system/library/retailcrm/lib/api/CurlException.php
+++ b/src/upload/system/library/retailcrm/lib/api/CurlException.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * Class CurlException
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class CurlException extends RuntimeException
 {
 }
--- a/src/upload/system/library/retailcrm/lib/api/InvalidJsonException.php
+++ b/src/upload/system/library/retailcrm/lib/api/InvalidJsonException.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * Class InvalidJsonException
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class InvalidJsonException extends DomainException
 {
 }
--- a/src/upload/system/library/retailcrm/lib/api/OpencartApiClient.php
+++ b/src/upload/system/library/retailcrm/lib/api/OpencartApiClient.php
@ -31,7 +31,7 @@ class OpencartApiClient {

        $cookies = array();
        foreach ($cookieFile as $line) {
-            if (empty($line) OR $line[0] == '#') {
+            if (empty($line) OR $line{0} == '#') {
                continue;
            }

--- a/src/upload/system/library/retailcrm/lib/api/RetailcrmApiClient5.php
+++ b/src/upload/system/library/retailcrm/lib/api/RetailcrmApiClient5.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * API client class
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class RetailcrmApiClient5
 {
    const VERSION = 'v5';
@ -584,18 +594,30 @@ class RetailcrmApiClient5

    /**
     * Get orders history
-     *
     * @param array $filter
-     * @param int|null $limit
+     * @param null $page
+     * @param null $limit
     *
     * @return ApiResponse
     */
-    public function ordersHistory(array $filter = [], ?int $limit = 100)
+    public function ordersHistory(array $filter = array(), $page = null, $limit = null)
    {
+        $parameters = array();
+
+        if (count($filter)) {
+            $parameters['filter'] = $filter;
+        }
+        if (null !== $page) {
+            $parameters['page'] = (int) $page;
+        }
+        if (null !== $limit) {
+            $parameters['limit'] = (int) $limit;
+        }
+
        return $this->client->makeRequest(
            '/orders/history',
            RetailcrmHttpClient::METHOD_GET,
-            ['filter' => $filter, 'limit' => $limit]
+            $parameters
        );
    }

@ -896,18 +918,30 @@ class RetailcrmApiClient5

    /**
     * Get customers history
-     *
     * @param array $filter
-     * @param int|null $limit
+     * @param null $page
+     * @param null $limit
     *
     * @return ApiResponse
     */
-    public function customersHistory(array $filter = [], ?int $limit = 100)
+    public function customersHistory(array $filter = array(), $page = null, $limit = null)
    {
+        $parameters = array();
+
+        if (count($filter)) {
+            $parameters['filter'] = $filter;
+        }
+        if (null !== $page) {
+            $parameters['page'] = (int) $page;
+        }
+        if (null !== $limit) {
+            $parameters['limit'] = (int) $limit;
+        }
+
        return $this->client->makeRequest(
            '/customers/history',
            RetailcrmHttpClient::METHOD_GET,
-            ['filter' => $filter, 'limit' => $limit]
+            $parameters
        );
    }

@ -1084,17 +1118,34 @@ class RetailcrmApiClient5
    /**
     * Get orders assembly history
     *
-     * @param array $filter
-     * @param int|null $limit
+     * @param array $filter (default: array())
+     * @param int   $page   (default: null)
+     * @param int   $limit  (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \RetailCrm\Exception\CurlException
+     * @throws \RetailCrm\Exception\InvalidJsonException
     *
     * @return ApiResponse
     */
-    public function ordersPacksHistory(array $filter = [], ?int $limit = 100)
+    public function ordersPacksHistory(array $filter = array(), $page = null, $limit = null)
    {
+        $parameters = array();
+
+        if (count($filter)) {
+            $parameters['filter'] = $filter;
+        }
+        if (null !== $page) {
+            $parameters['page'] = (int) $page;
+        }
+        if (null !== $limit) {
+            $parameters['limit'] = (int) $limit;
+        }
+
        return $this->client->makeRequest(
            '/orders/packs/history',
            RetailcrmHttpClient::METHOD_GET,
-            ['filter' => $filter, 'limit' => $limit]
+            $parameters
        );
    }

@ -2411,18 +2462,30 @@ class RetailcrmApiClient5

    /**
     * Get corporate customers history
-     *
     * @param array $filter
-     * @param int|null $limit
+     * @param null $page
+     * @param null $limit
     *
-     * @return ApiResponse
+     * @return \ApiResponse
     */
-    public function customersCorporateHistory(array $filter = [], ?int $limit = 100)
+    public function customersCorporateHistory(array $filter = [], $page = null, $limit = null)
    {
+        $parameters = [];
+
+        if (count($filter)) {
+            $parameters['filter'] = $filter;
+        }
+        if (null !== $page) {
+            $parameters['page'] = (int) $page;
+        }
+        if (null !== $limit) {
+            $parameters['limit'] = (int) $limit;
+        }
+
        return $this->client->makeRequest(
            '/customers-corporate/history',
            RetailcrmHttpClient::METHOD_GET,
-            ['filter' => $filter, 'limit' => $limit]
+            $parameters
        );
    }

--- a/src/upload/system/library/retailcrm/lib/api/RetailcrmApiResponse.php
+++ b/src/upload/system/library/retailcrm/lib/api/RetailcrmApiResponse.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * Response from retailCRM API
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class RetailcrmApiResponse implements ArrayAccess
 {
    // HTTP response status code
--- a/src/upload/system/library/retailcrm/lib/api/RetailcrmHttpClient.php
+++ b/src/upload/system/library/retailcrm/lib/api/RetailcrmHttpClient.php
@ -1,7 +1,15 @@
 <?php
-
-use retailcrm\Retailcrm;
-
+/**
+ * PHP version 5.3
+ *
+ * HTTP client
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion5
+ */
 class RetailcrmHttpClient
 {
    const METHOD_GET = 'GET';
@ -48,9 +56,9 @@ class RetailcrmHttpClient
    public function makeRequest(
        $path,
        $method,
-        array $parameters = []
+        array $parameters = array()
    ) {
-        $allowedMethods = [self::METHOD_GET, self::METHOD_POST];
+        $allowedMethods = array(self::METHOD_GET, self::METHOD_POST);

        if (!in_array($method, $allowedMethods, false)) {
            throw new \InvalidArgumentException(
@ -62,16 +70,7 @@ class RetailcrmHttpClient
            );
        }

-    
-        $parameters = self::METHOD_GET === $method
-            ? array_merge($this->defaultParameters, $parameters, [
-                'cms_source' => 'OpenCart',
-                'cms_version' => VERSION,
-                'php_version' => function_exists('phpversion') ? phpversion() : '',
-                'module_version' => Retailcrm::VERSION_MODULE,
-            ])
-            : $parameters = array_merge($this->defaultParameters, $parameters);
-        
+        $parameters = array_merge($this->defaultParameters, $parameters);

        $url = $this->url . $path;

--- a/src/upload/system/library/retailcrm/lib/api/RetailcrmProxy.php
+++ b/src/upload/system/library/retailcrm/lib/api/RetailcrmProxy.php
@ -2,11 +2,12 @@

 /**
 * Class RequestProxy
+ * @package RetailCrm\Component
 *
 * @method ordersCreate($order, $site = null)
 * @method ordersEdit($order, $by = 'externalId', $site = null)
 * @method ordersGet($order, $by = 'externalId', $site = null)
- * @method ordersList(array $filter = [], $page = null, $limit = null)
+ * @method ordersList($filter, $page, $limit)
 * @method customersCreate($customer, $site = null)
 * @method customersEdit($customer, $by = 'externalId', $site = null)
 * @method customersList(array $filter = [], $page = null, $limit = null)
@ -27,16 +28,16 @@ class RetailcrmProxy {

    public function __construct($url, $key) {
        $this->api = new RetailcrmApiClient5($url, $key);
+
        $this->log = new \Log('retailcrm.log');
    }

    public function __call($method, $arguments) {
        try {
-            $response = call_user_func_array([$this->api, $method], $arguments);
+            $response = call_user_func_array(array($this->api, $method), $arguments);

            if (!$response->isSuccessful()) {
                $this->log->write(sprintf("[%s] %s", $method, $response->getErrorMsg()));
-
                if (isset($response['errors'])) {
                    $error = implode("\n", $response['errors']);
                    $this->log->write($error . "\n");
--- a/src/upload/system/library/retailcrm/lib/history/Customer.php
+++ b/src/upload/system/library/retailcrm/lib/history/Customer.php
@ -38,14 +38,10 @@ class Customer {
        }

        $customer_data['firstname'] = $customer['firstName'];
-        $customer_data['lastname'] = $customer['lastName'] ?? '';
+        $customer_data['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
        $customer_data['email'] = $customer['email'];
        $customer_data['telephone'] = $customer['phones'] ? $customer['phones'][0]['number'] : '';

-        if (!empty($customer['emailMarketingUnsubscribedAt'])) {
-            $customer_data['newsletter'] = 0;
-        }
-
        $customer_data['affiliate'] = false;
    }

@ -57,9 +53,7 @@ class Customer {
        if ($address_id) {
            $customer_address = $this->customer_repository->getAddress($address_id);
        } else {
-            $customer_address = array(
-                'address_id' => ''
-            );
+            $customer_address = array();
        }

        if (isset($customer['address']['countryIso'])) {
@ -113,7 +107,7 @@ class Customer {
                }
            }

-            $customer_data['custom_field'] = $custom_fields ?? [];
+            $customer_data['custom_field'] = isset($custom_fields) ? $custom_fields : '';
        }
    }
 }
--- a/src/upload/system/library/retailcrm/lib/history/Order.php
+++ b/src/upload/system/library/retailcrm/lib/history/Order.php
@ -5,7 +5,6 @@ namespace retailcrm\history;
 use retailcrm\repository\DataRepository;
 use retailcrm\repository\OrderRepository;
 use retailcrm\repository\ProductsRepository;
-use retailcrm\Retailcrm;
 use retailcrm\service\SettingsManager;

 class Order {
@ -44,7 +43,7 @@ class Order {

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     */
    public function handleBaseOrderData(&$data, $order) {
        $mail = !empty($order['email']) ? $order['email'] : $order['customer']['email'];
@ -89,7 +88,7 @@ class Order {

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     * @param array $corporateAddress
     */
    public function handlePayment(&$data, $order, $corporateAddress = array()) {
@ -157,7 +156,7 @@ class Order {

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     */
    public function handleShipping(&$data, $order) {
        $default_shipping_country = !empty($data['shipping_country']) ? $data['shipping_country'] : '';
@ -209,7 +208,7 @@ class Order {
                    $shipping = explode('.', $data['shipping_code']);
                    $shippingModule = $shipping[0];

-                    if (isset($this->oc_delivery[$shippingModule][$data['shipping_code']]['title'])) {
+                    if (isset($this->ocDelivery[$shippingModule][$data['shipping_code']]['title'])) {
                        $data['shipping_method'] = $this->oc_delivery[$shippingModule][$data['shipping_code']]['title'];
                    } else {
                        $data['shipping_method'] = $this->oc_delivery[$shippingModule]['title'];
@ -221,7 +220,7 @@ class Order {

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     */
    public function handleProducts(&$data, $order) {
        $data['order_product'] = array();
@ -278,7 +277,7 @@ class Order {

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     */
    public function handleTotals(&$data, $order) {
        $delivery_cost = !empty($order['delivery']['cost']) ? $order['delivery']['cost'] : 0;
@ -286,15 +285,6 @@ class Order {
        $subtotal_settings = $this->settings_manager->getSettingByKey($this->data_repository->totalTitles() . 'sub_total');
        $total_settings = $this->settings_manager->getSettingByKey($this->data_repository->totalTitles() . 'total');
        $shipping_settings = $this->settings_manager->getSettingByKey($this->data_repository->totalTitles() . 'shipping');
-        $retailcrm_label_discount = $this->settings_manager->getSetting('label_discount')
-            ?: $this->data_repository->getLanguage('default_retailcrm_label_discount');
-
-        $totalDiscount = 0;
-        foreach ($order['items'] as $item) {
-            if ($item['discountTotal'] !==  0) {
-                $totalDiscount += $item['discountTotal'] * $item['quantity'];
-            }
-        }

        $data['total'] = $order['totalSumm'];
        $data['order_total'] = array(
@ -324,47 +314,21 @@ class Order {
            )
        );

-        //TODO подкорректировать логику добавления скидки из RetailCRM
-        //Если заказ создали со скидкой в RetailCRM, то добавить скидку
-        if (!empty($totalDiscount)) {
-            $data['order_total'][] = array(
-                'order_total_id' => '',
-                'code' => Retailcrm::RETAILCRM_DISCOUNT,
-                'title' => $retailcrm_label_discount,
-                'value' => -$totalDiscount,
-                'sort_order' =>  Retailcrm::RETAILCRM_DISCOUNT_SORT_ORDER,
-            );
-        }
-
        if (!empty($order['externalId'])) {
            $orderTotals = $this->order_repository->getOrderTotals($order['externalId']);
-
            foreach ($orderTotals as $orderTotal) {
                if ($orderTotal['code'] == 'coupon'
                    || $orderTotal['code'] == 'reward'
-                    || $orderTotal['code'] == 'voucher'
                ) {
                    $data['order_total'][] = $orderTotal;
-                    $totalDiscount -= abs($orderTotal['value']);
                }
            }
-
-            //TODO подкорректировать логику добавления скидки из RetailCRM
-            $keyRetailCrmDiscount = array_search(Retailcrm::RETAILCRM_DISCOUNT, array_map(function ($item) {
-                return $item['code'];
-            }, $data['order_total']));
-
-            if ($totalDiscount > 0 && false !== $keyRetailCrmDiscount) {
-                $data['order_total'][$keyRetailCrmDiscount]['value'] = -$totalDiscount;
-            } elseif ($totalDiscount <= 0  && false !== $keyRetailCrmDiscount) {
-                unset($data['order_total'][$keyRetailCrmDiscount]);
-            }
        }
    }

    /**
     * @param array $data opencart order
-     * @param array $order RetailCRM order
+     * @param array $order retailCRM order
     */
    public function handleCustomFields(&$data, $order) {
        $settings = $this->settings_manager->getSetting('custom_field');
--- a/src/upload/system/library/retailcrm/lib/repository/DataRepository.php
+++ b/src/upload/system/library/retailcrm/lib/repository/DataRepository.php
@ -124,7 +124,6 @@ class DataRepository extends \retailcrm\Base {
     * @return array
     */
    public function getZoneByName($name) {
-        $name = $this->db->escape($name);
        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE name = '" . $name . "'");

        return $query->row;
--- a/src/upload/system/library/retailcrm/lib/service/CustomerManager.php
+++ b/src/upload/system/library/retailcrm/lib/service/CustomerManager.php
@ -2,6 +2,9 @@

 namespace retailcrm\service;

+/**
+ * Class CustomerManager
+ */
 class CustomerManager {
    protected $api;
    protected $customer_converter;
@ -12,7 +15,7 @@ class CustomerManager {
    }

    public function createCustomer($customer_data, $address) {
-        $customer = $this->prepareCustomer($customer_data, $address, !empty($customer_data['newsletter']));
+        $customer = $this->prepareCustomer($customer_data, $address);

        $this->api->customersCreate($customer);
    }
@ -23,22 +26,13 @@ class CustomerManager {
        $this->api->customersEdit($customer);
    }

-    public function editCustomerNewsLetter($customer_data) {
-        $this->api->customersEdit(
-            [
-                'externalId' => $customer_data['customer_id'],
-                'subscribed' => !empty($customer_data['newsletter']),
-            ]
-        );
-    }
-
    public function uploadCustomers($customers) {
        $this->api->customersUpload($customers);
    }

-    public function prepareCustomer($customer_data, $address, $isSubscribed = null) {
+    public function prepareCustomer($customer_data, $address) {
        return $this->customer_converter
-            ->initCustomerData($customer_data, $address, $isSubscribed)
+            ->initCustomerData($customer_data, $address)
            ->setCustomerData()
            ->setAddress()
            ->setCustomFields()
--- a/src/upload/system/library/retailcrm/lib/service/OrderManager.php
+++ b/src/upload/system/library/retailcrm/lib/service/OrderManager.php
@ -2,6 +2,9 @@

 namespace retailcrm\service;

+/**
+ * Class OrderManager
+ */
 class OrderManager {
    protected $api;
    protected $customer_manager;
@ -39,10 +42,7 @@ class OrderManager {
    public function createOrder($order_data, $order_products, $order_totals) {
        $order = $this->prepareOrder($order_data, $order_products, $order_totals);

-        if (!isset($order['customer'])
-            || (isset($order['customer']['externalId'])
-                && !$this->checkExistCustomer($order['customer']['externalId']))
-        ) {
+        if (!isset($order['customer'])) {
            $customer = $this->customer_manager->getCustomerForOrder($order_data);
            if (!empty($customer)) {
                $order['customer'] = $customer;
@ -155,7 +155,7 @@ class OrderManager {
        }

        foreach ($order_info['payments'] as $payment_data) {
-            if (isset($payment_data['externalId'])) {
+            if (isset($payment_data['externalId']) && $payment_data['externalId'] == $orderId) {
                $payment = $payment_data;
            }
        }
@ -170,15 +170,4 @@ class OrderManager {
            $this->api->ordersPaymentEdit($order_payment);
        }
    }
-
-    /**
-     * @param string $customerExternalId Customer's external id
-     *
-     * @return bool
-     */
-    private function checkExistCustomer($customerExternalId) {
-        $result = $this->api->customersGet($customerExternalId);
-
-        return $result && $result->isSuccessful() && $result->offsetExists('customer');
-    }
 }
--- a/src/upload/system/library/retailcrm/lib/service/RetailcrmCustomerConverter.php
+++ b/src/upload/system/library/retailcrm/lib/service/RetailcrmCustomerConverter.php
@ -4,9 +4,9 @@ namespace retailcrm\service;

 class RetailcrmCustomerConverter {
    protected $data;
-    protected $customer_data = [];
-    protected $address = [];
-    protected $isSubscribed;
+    protected $customer_data = array();
+    protected $address = array();
+
    protected $settingsManager;

    public function __construct(
@ -19,11 +19,10 @@ class RetailcrmCustomerConverter {
        return $this->data;
    }

-    public function initCustomerData($customer_data, $address, $isSubscribed) {
-        $this->data = [];
+    public function initCustomerData($customer_data, $address) {
+        $this->data = array();
        $this->customer_data = $customer_data;
        $this->address = $address;
-        $this->isSubscribed = $isSubscribed;

        return $this;
    }
@ -35,12 +34,12 @@ class RetailcrmCustomerConverter {
        $this->data['email'] = $this->customer_data['email'];
        $this->data['createdAt'] = $this->customer_data['date_added'];

-        if ($this->isSubscribed !== null) {
-            $this->data['subscribed'] = $this->isSubscribed;
-        }
-
        if (!empty($this->customer_data['telephone'])) {
-            $this->data['phones'] = [['number' => $this->customer_data['telephone']]];
+            $this->data['phones'] = array(
+                array(
+                    'number' => $this->customer_data['telephone']
+                )
+            );
        }

        return $this;
@ -48,13 +47,13 @@ class RetailcrmCustomerConverter {

    public function setAddress() {
        if (!empty($this->address)) {
-            $this->data['address'] = [
+            $this->data['address'] = array(
                'index' => $this->address['postcode'],
                'countryIso' => $this->address['iso_code_2'],
                'region' => $this->address['zone'],
                'city' => $this->address['city'],
                'text' => $this->address['address_1'] . ' ' . $this->address['address_2']
-            ];
+            );
        }

        return $this;
--- a/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php
+++ b/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php
@ -43,14 +43,12 @@ class RetailcrmOrderConverter {
            $this->data['countryIso'] = $this->order_data['shipping_iso_code_2'];
        }

-        if ($this->settingsManager->getSetting('order_number') == 1) {
+        if ($this->settingsManager->getSetting('order_number')
+            && $this->settingsManager->getSetting('order_number') == 1
+        ) {
            $this->data['number'] = $this->order_data['order_id'];
        }

-        if ($this->settingsManager->getSetting('summ_around') == 1) {
-            $this->data['applyRound'] = true;
-        }
-
        $this->data['externalId'] = $this->order_data['order_id'];
        $this->data['firstName'] = $this->order_data['shipping_firstname'];
        $this->data['lastName'] = $this->order_data['shipping_lastname'];
@ -81,7 +79,6 @@ class RetailcrmOrderConverter {
        $totalCoupon = $this->getTotal('coupon');
        $totalReward = $this->getTotal('reward');
        $totalVoucher = $this->getTotal('voucher');
-        $retailcrmDiscount = $this->getTotal(\retailcrm\Retailcrm::RETAILCRM_DISCOUNT);

        if (!empty($totalCoupon)) {
            $discount += abs($totalCoupon);
@ -95,12 +92,10 @@ class RetailcrmOrderConverter {
            $discount += abs($totalVoucher);
        }

-        if (!empty($retailcrmDiscount)) {
-            $discount += abs($retailcrmDiscount);
+        if ($discount > 0) {
+            $this->data['discountManualAmount'] = $discount;
        }

-        $this->data['discountManualAmount'] = $discount;
-
        return $this;
    }

@ -111,15 +106,10 @@ class RetailcrmOrderConverter {
        }

        $payment = array(
-            'externalId' => uniqid($this->order_data['order_id'] . "-"),
+            'externalId' => sprintf("opencart_%d", $this->order_data['order_id']),
            'amount' => $this->getTotal('total')
        );

-        if ($this->settingsManager->getSetting('sum_payment') &&
-            $this->settingsManager->getSetting('sum_payment') == 1) {
-            unset($payment['amount']);
-        }
-
        if (!empty($payment_type)) {
            $payment['type'] = $payment_type;
        }
@ -130,9 +120,7 @@ class RetailcrmOrderConverter {
            );
        }

-        if (!empty($payment['type'])) {
-            $this->data['payments'][] = $payment;
-        }
+        $this->data['payments'][] = $payment;

        return $this;
    }
@ -244,29 +232,19 @@ class RetailcrmOrderConverter {
                'quantity' => $product['quantity']
            );

-            $date = date('Y-m-d');
-            $always = '0000-00-00';
            $specials = $this->productsRepository->getProductSpecials($product['product_id']);

            if (!empty($specials)) {
                $customer = $this->customerRepository->getCustomer($this->order_data['customer_id']);

                foreach ($specials as $special) {
-                    if (($special['date_start'] == $always && $special['date_end'] == $always)
-                        || ($special['date_start'] <= $date && $special['date_end'] >= $date)
-                    ) {
-                        if ((isset($priority) && $priority > $special['priority'])
-                            || !isset($priority)) {
-                            if (empty($customer['customer_group_id'])) {
-                                continue;
-                            }
+                    if (empty($customer['customer_group_id'])) {
+                        continue;
+                    }

-                            $specialSetting = $this->settingsManager->getSetting('special_' . $customer['customer_group_id']);
-                            if ($special['customer_group_id'] == $customer['customer_group_id'] && !empty($specialSetting)) {
-                                $item['priceType']['code'] = $specialSetting;
-                                $priority = $special['priority'];
-                            }
-                        }
+                    $specialSetting = $this->settingsManager->getSetting('special_' . $customer['customer_group_id']);
+                    if ($special['customer_group_id'] == $customer['customer_group_id'] && !empty($specialSetting)) {
+                        $item['priceType']['code'] = $specialSetting;
                    }
                }
            }
--- a/src/upload/system/library/retailcrm/objects.xml
+++ b/src/upload/system/library/retailcrm/objects.xml
@ -14,7 +14,6 @@
        <field id="cumulative_discount" group="customer">cumulativeDiscount</field>
        <field id="personal_discount" group="customer">personalDiscount</field>
        <field id="discount_card_number" group="customer">discountCardNumber</field>
-        <field id="email_marketing_unsubscribed_at" group="customer">emailMarketingUnsubscribedAt</field>
        
        <field id="address.index" group="customerAddress">index</field>
        <field id="address.country" group="customerAddress">country</field>
--- a/src/upload/system/library/retailcrm/retailcrm.php
+++ b/src/upload/system/library/retailcrm/retailcrm.php
@ -10,21 +10,14 @@ use retailcrm\factory\OrderConverterFactory;
 use retailcrm\factory\CustomerConverterFactory;
 use retailcrm\service\SettingsManager;

-require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
+require_once 'bootstrap.php';

 class Retailcrm {
-
-    const RETAILCRM_DISCOUNT = 'retailcrm_discount';
-    const RETAILCRM_DISCOUNT_SORT_ORDER = 8;
-    const VERSION_MODULE = '4.1.19';
-
    protected $registry;

    /** @var bool  */
    public static $history_run = false;

-
-
    public function __construct(\Registry $registry) {
        $this->registry = $registry;

@ -128,12 +121,12 @@ class Retailcrm {
    }

    public function getOffers($product) {
-        // Build offers by available options
+        // Формируем офферы отнсительно доступных опций
        $options = $this->model_catalog_product->getProductOptions($product['product_id']);
        $offerOptions = array('select', 'radio');
        $requiredOptions = array();
        $notRequiredOptions = array();
-        // Handle & sort mandatory options
+        // Оставляем опции связанные с вариациями товаров, сортируем по параметру обязательный или нет
        foreach($options as $option) {
            if(in_array($option['type'], $offerOptions)) {
                if($option['required']) {
@ -145,14 +138,14 @@ class Retailcrm {
        }

        $offers = array();
-        
+        // Сначала совмещаем все обязательные опции
        foreach($requiredOptions as $requiredOption) {
+            // Если первая итерация
            if(empty($offers)) {
                foreach($requiredOption['product_option_value'] as $optionValue) {
                    $offers[$requiredOption['product_option_id'].':'.$requiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
                        'price' => (float)$this->getOptionPrice($optionValue),
-                        'qty' => $optionValue['quantity'],
-                        'weight' => round($this->getWeightOption($optionValue), 3)
+                        'qty' => $optionValue['quantity']
                    );
                }
            } else {
@ -162,22 +155,22 @@ class Retailcrm {
                        $offers[$optionKey.'_'.$requiredOption['product_option_id'].':'.$requiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
                            'price' => $optionAttr['price'] + (float)$this->getOptionPrice($optionValue),
                            'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
-                                $optionValue['quantity'] : $optionAttr['qty'],
-                            'weight' => round($optionAttr['weight'] + $this->getWeightOption($optionValue), 3)
+                                $optionValue['quantity'] : $optionAttr['qty']
                        );
                    }
                }
            }
        }

+        // Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть.
        foreach($notRequiredOptions as $notRequiredOption) {
+            // Если обязательных опцией не оказалось и первая итерация
            if(empty($offers)) {
-                $offers['0:0-0'] = 0; // Add empty option for mandatory data
+                $offers['0:0-0'] = 0; // В случае работы с необязательными опциями мы должны учитывать товарное предложение без опций, поэтому создадим "пустую" опцию
                foreach($notRequiredOption['product_option_value'] as $optionValue) {
                    $offers[$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
                        'price' => (float)$this->getOptionPrice($optionValue),
-                        'qty' => $optionValue['quantity'],
-                        'weight' => round($this->getWeightOption($optionValue), 3)
+                        'qty' => $optionValue['quantity']
                    );
                }
            } else {
@ -186,8 +179,7 @@ class Retailcrm {
                        $offers[$optionKey.'_'.$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
                            'price' => $optionAttr['price'] + (float)$this->getOptionPrice($optionValue),
                            'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
-                                $optionValue['quantity'] : $optionAttr['qty'],
-                            'weight' => round($optionAttr['weight'] + $this->getWeightOption($optionValue), 3)
+                                $optionValue['quantity'] : $optionAttr['qty']
                        );
                    }
                }
@ -201,19 +193,6 @@ class Retailcrm {
        return $offers;
    }

-    /**
-     * @param array $option
-     *
-     * @return  float
-     */
-    private function getWeightOption($option) {
-        if ($option['weight_prefix'] === '-') {
-            return $option['weight'] * -1;
-        }
-
-        return $option['weight'];
-    }
-
    /**
     * @param array $optionValue
     * @return float|int|mixed
@ -243,15 +222,6 @@ class Retailcrm {
        return false;
    }

-    public function useServicesForIcml()
-    {
-        $this->load->model('setting/setting');
-
-        $setting = $this->model_setting_setting->getSetting($this->getModuleTitle());
-
-        return $setting['module_retailcrm_icml_service_enabled'] ?? false;
-    }
-
    /**
     * @return mixed
     */
--- a/tests/2.3/TestCase.php
+++ b/tests/2.3/TestCase.php
@ -0,0 +1,54 @@
+<?php
+
+class TestCase extends OpenCartTest {
+    public function setUp() {
+        parent::setUp();
+
+        $this->load->library('retailcrm/retailcrm');
+
+        $this->setSetting(
+            $this->retailcrm->getModuleTitle(),
+            array(
+                $this->retailcrm->getModuleTitle() . '_apiversion' => 'v5',
+                $this->retailcrm->getModuleTitle() . '_order_number' => 1,
+                $this->retailcrm->getModuleTitle() . '_status' => array(
+                    1 => 'new'
+                ),
+                $this->retailcrm->getModuleTitle() . '_delivery' => array(
+                    'flat.flat' => 'flat'
+                ),
+                $this->retailcrm->getModuleTitle() . '_payment' => array(
+                    'cod' => 'cod'
+                ),
+                $this->retailcrm->getModuleTitle() . '_special_1' => 'special1',
+                $this->retailcrm->getModuleTitle() . '_special_2' => 'special2',
+                $this->retailcrm->getModuleTitle() . '_special_3' => 'special3',
+                $this->retailcrm->getModuleTitle() . '_collector' => array(
+                    'site_key' => 'RC-XXXXXXXXXX-X',
+                    'custom_form' => 1,
+                    'custom' => array(
+                        'name' => 'Name',
+                        'email' => 'Email',
+                        'phone' => 'Phone',
+                    ),
+                    'form_capture' => 1,
+                    'period' => 1
+                )
+            )
+        );
+    }
+
+    protected function setSetting($code, $data, $store_id = 0) {
+        $this->db->query("DELETE FROM `" . DB_PREFIX . "setting` WHERE store_id = '" . (int)$store_id . "' AND `code` = '" . $this->db->escape($code) . "'");
+
+        foreach ($data as $key => $value) {
+            if (substr($key, 0, strlen($code)) == $code) {
+                if (!is_array($value)) {
+                    $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape($value) . "'");
+                } else {
+                    $this->db->query("INSERT INTO " . DB_PREFIX . "setting SET store_id = '" . (int)$store_id . "', `code` = '" . $this->db->escape($code) . "', `key` = '" . $this->db->escape($key) . "', `value` = '" . $this->db->escape(json_encode($value, true)) . "', serialized = '1'");
+                }
+            }
+        }
+    }
+}
--- a/tests/3.0/TestCase.php
+++ b/tests/3.0/TestCase.php
--- a/tests/RoboFile.php
+++ b/tests/RoboFile.php
@ -7,16 +7,6 @@ class RoboFile extends \Robo\Tasks
    use \Robo\Task\Development\loadTasks;
    use \Robo\Common\TaskIO;

-    const OPENCART_DOWNLOAD_URL = [
-        '3.0.1.2' => 'https://github.com/opencart/opencart/releases/download/3.0.1.2/3.0.1.2-opencart.zip',
-        '3.0.2.0' => 'https://github.com/opencart/opencart/releases/download/3.0.2.0/3.0.2.0-OpenCart.zip',
-        '3.0.3.4' => 'https://github.com/opencart/opencart/releases/download/3.0.3.4/opencart-3.0.3.4-core-pre.zip'
-    ];
-
-    const OPENCART_ROOT_DIR = [
-        '3.0.3.4' => 'opencart-3.0.3.4/upload'
-    ];
-
    /**
     * @var array
     */
@ -77,21 +67,19 @@ class RoboFile extends \Robo\Tasks
        }
    }

-    public function opencartInstall()
+    public function opencartSetup()
    {
-        $startUp = 'admin/controller/startup/test_startup.php';
-        $startUpTo = 'admin/controller/startup/test_startup.php';
-        $version = getenv('OPENCART');
-        $ocZip = sprintf('/tmp/opencart-%s.zip', $version);
+        $startUp = getenv('TEST_SUITE') === '2.3'
+            ? 'catalog/controller/startup/test_startup.php'
+            : 'admin/controller/startup/test_startup.php';
+        $startUpTo = getenv('TEST_SUITE') === '2.3'
+            ? 'catalog/controller/startup/test_startup.php'
+            : 'admin/controller/startup/test_startup.php';

        $this->taskDeleteDir($this->root_dir . 'www')->run();
-
-        file_put_contents($ocZip, file_get_contents($this->getOpencartDownloadUrl($version)));
-
-        $this->_exec(sprintf('unzip %s -d /tmp/opencart', $ocZip));
        $this->taskFileSystemStack()
            ->mirror(
-                $this->getOpencartRootDir($version),
+                $this->root_dir . 'vendor/opencart/opencart/upload',
                $this->root_dir . 'www'
            )
            ->copy(
@ -105,31 +93,13 @@ class RoboFile extends \Robo\Tasks
            ->chmod($this->root_dir . 'www', 0777, 0000, true)
            ->run();

-        if (getenv('TEST_SUITE') === '3') {
+        if (getenv('TEST_SUITE') === '3.0') {
            $this->taskFileSystemStack()->copy(
                $this->root_dir . 'vendor/beyondit/opencart-test-suite/src/upload/system/library/session/test.php',
                $this->root_dir . 'www/system/library/session/test.php'
            )->run();
        }

-        // Openbay was removed in 3.0.3.6
-        // Unfortunately, those configs from test suite still require it.
-        if (
-            '3.0.3.4' === getenv('OPENCART') ||
-            version_compare(getenv('OPENCART'), '3.0.3.6', '>=')
-        ) {
-            $testConfigFile = $this->root_dir . 'www/system/config/test-config.php';
-            $testStartupFile = $this->root_dir . 'www/' . $startUpTo;
-            $testConfig = file_get_contents($testConfigFile);
-            $testStartup = file_get_contents($testStartupFile);
-
-            $testConfig = str_ireplace("'openbay'", '', $testConfig);
-            $testStartup = str_ireplace('$this->registry->set(\'openbay\', new Openbay($this->registry));', '', $testStartup);
-
-            file_put_contents($testConfigFile, $testConfig);
-            file_put_contents($testStartupFile, $testStartup);
-        }
-
        // Create new database, drop if exists already
        try {
            $conn = new PDO("mysql:host=".$this->opencart_config['db_hostname'], $this->opencart_config['db_username'], $this->opencart_config['db_password']);
@ -139,8 +109,7 @@ class RoboFile extends \Robo\Tasks
        }
        catch(PDOException $e)
        {
-            $this->printTaskError($e->getMessage());
-            $this->printTaskError("<error> Could not connect to database...");
+            $this->printTaskError("<error> Could not connect ot database...");
        }

        if (version_compare(getenv('OPENCART'), '3.0.2.0', '<=')) {
@ -222,31 +191,13 @@ EOF;
        $zip->close();
    }

-    private function getOpencartDownloadUrl(string $version): string
-    {
-        if (version_compare($version, '3.0.1.1', '<=')) {
-            return sprintf('https://github.com/opencart/opencart/releases/download/%s/%s-compiled.zip', $version, $version);
-        }
-
-        if (array_key_exists($version, self::OPENCART_DOWNLOAD_URL)) {
-            return self::OPENCART_DOWNLOAD_URL[$version];
-        }
-
-        return sprintf('https://github.com/opencart/opencart/releases/download/%s/opencart-%s.zip', $version, $version);
-    }
-
-    private function getOpencartRootDir(string $version): string
-    {
-        if (array_key_exists($version, self::OPENCART_ROOT_DIR)) {
-            return '/tmp/opencart/' . self::OPENCART_ROOT_DIR[$version];
-        }
-
-        return '/tmp/opencart/upload';
-    }
-
    private function restoreSampleData($conn)
    {
-        $sql = file_get_contents($this->root_dir . 'tests/opencart_sample_data_3.sql');
+        if (getenv('TEST_SUITE') === '2.3') {
+            $sql = file_get_contents($this->root_dir . 'tests/opencart_sample_data.sql');
+        } else {
+            $sql = file_get_contents($this->root_dir . 'tests/opencart_sample_data_3.sql');
+        }

        $conn->exec("USE " . $this->opencart_config['db_database']);

--- a/tests/admin/ControllerRetailcrmAdminTest.php
+++ b/tests/admin/ControllerRetailcrmAdminTest.php
@ -41,63 +41,4 @@ class ControllerRetailcrmAdminTest extends TestCase
        $response = $this->dispatchAction('extension/module/retailcrm/uninstall_collector');
        $this->assertRegExp('/Connection settings/', $response->getOutput());
    }
-
-    public function testGetAvailableTypes()
-    {
-        $data = $this->getDataForTestAvailableTypes();
-        $sites = end($data['site']);
-        $types = $data['types'];
-
-        $retailCrm = new ControllerExtensionModuleRetailcrm(self::$registry);
-        $class = new ReflectionClass($retailCrm);
-        $method = $class->getMethod('getAvailableTypes');
-        $method->setAccessible(true);
-
-        $result = $method->invokeArgs($retailCrm, [$sites, $types]);
-
-        $this->assertNotEmpty($result['opencart']);
-        $this->assertNotEmpty($result['retailcrm']);
-        $this->assertCount(2, $result['retailcrm']);
-        $this->assertNotEmpty($result['retailcrm']['test1']['code']);
-        $this->assertNotEmpty($result['retailcrm']['test4']['code']);
-    }
-
-    private function getDataForTestAvailableTypes(): array
-    {
-        return [
-            'site' => [
-                'opencart' => [
-                    'code' => 'opencart',
-                    'name' => 'OpenCart'
-                ]
-            ],
-            'types' => [
-                'opencart' => [
-                    'test'
-                ],
-                'retailcrm' => [
-                    'test1' => [
-                        'active' => true,
-                        'sites' => [],
-                        'code' => 'test1'
-                    ],
-                    'test2' => [
-                        'active' => false,
-                        'sites' => [],
-                        'code' => 'test2'
-                    ],
-                    'test3' => [
-                        'active' => true,
-                        'sites' => ['otherSite'],
-                        'code' => 'test3'
-                    ],
-                    'test4' => [
-                        'active' => true,
-                        'sites' => ['cms1', 'cms2', 'opencart'],
-                        'code' => 'test4'
-                    ]
-                ]
-            ]
-        ];
-    }
 }
--- a/tests/admin/ModelRetailcrmEventAdminTest.php
+++ b/tests/admin/ModelRetailcrmEventAdminTest.php
@ -10,7 +10,12 @@ class ModelRetailcrmEventAdminTest extends TestCase
    {
        parent::setUp();

-        $eventModel = $this->loadModel('setting/event');
+        if (getenv('TEST_SUITE') === '3.0') {
+            $eventModel = $this->loadModel('setting/event');
+        } else {
+            $eventModel = $this->loadModel('extension/event');
+        }
+
        $eventModel->addEvent(self::CODE, 'test', 'test');
    }

--- a/tests/opencart_sample_data.sql
+++ b/tests/opencart_sample_data.sql
@ -0,0 +1,58 @@
+TRUNCATE TABLE `oc_customer`;
+INSERT INTO `oc_customer` (`customer_id`, `customer_group_id`, `store_id`, `language_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `password`, `salt`, `cart`, `wishlist`, `newsletter`, `address_id`, `custom_field`, `ip`, `status`, `approved`, `safe`, `token`, `code`, `date_added`) VALUES ('1', '1', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', 'ed3798da75d6cdd695e99e87a60d587a10aa95ff', '51TalnrgH', '', '', '0', '1', '', '172.21.0.1', '1', '1', '0', '', '', '2018-06-07 13:50:08');
+
+TRUNCATE TABLE `oc_address`;
+INSERT INTO `oc_address` (`address_id`, `customer_id`, `firstname`, `lastname`, `company`, `address_1`, `address_2`, `city`, `postcode`, `country_id`, `zone_id`, `custom_field`) values (1, 1, 'Test', 'Test', '', 'Address 1', '', 'City', '111111', '176', '99', '');
+
+TRUNCATE TABLE `oc_customer_activity`;
+TRUNCATE TABLE `oc_customer_group`;
+INSERT INTO `oc_customer_group` (`customer_group_id`, `approval`, `sort_order`) VALUES ('1', '0', '1');
+INSERT INTO `oc_customer_group` (`customer_group_id`, `approval`, `sort_order`) VALUES ('2', '0', '1');
+INSERT INTO `oc_customer_group` (`customer_group_id`, `approval`, `sort_order`) VALUES ('3', '0', '0');
+
+TRUNCATE TABLE `oc_customer_group_description`;
+INSERT INTO `oc_customer_group_description` (`customer_group_id`, `language_id`, `name`, `description`) VALUES ('1', '1', 'Default', 'test');
+INSERT INTO `oc_customer_group_description` (`customer_group_id`, `language_id`, `name`, `description`) VALUES ('2', '1', 'Test2', 'test2');
+INSERT INTO `oc_customer_group_description` (`customer_group_id`, `language_id`, `name`, `description`) VALUES ('3', '1', 'test3', 'test3');
+
+TRUNCATE TABLE `oc_customer_history`;
+TRUNCATE TABLE `oc_customer_ip`;
+INSERT INTO `oc_customer_ip` (`customer_ip_id`, `customer_id`, `ip`, `date_added`) VALUES ('4', '1', '172.21.0.1', '2018-06-07 13:50:29');
+
+TRUNCATE TABLE `oc_customer_login`;
+TRUNCATE TABLE `oc_customer_online`;
+TRUNCATE TABLE `oc_customer_reward`;
+TRUNCATE TABLE `oc_customer_search`;
+TRUNCATE TABLE `oc_customer_transaction`;
+TRUNCATE TABLE `oc_customer_wishlist`;
+TRUNCATE TABLE `oc_order`;
+
+INSERT INTO `oc_order` (`order_id`, `invoice_no`, `invoice_prefix`, `store_id`, `store_name`, `store_url`, `customer_id`, `customer_group_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `custom_field`, `payment_firstname`, `payment_lastname`, `payment_company`, `payment_address_1`, `payment_address_2`, `payment_city`, `payment_postcode`, `payment_country`, `payment_country_id`, `payment_zone`, `payment_zone_id`, `payment_address_format`, `payment_custom_field`, `payment_method`, `payment_code`, `shipping_firstname`, `shipping_lastname`, `shipping_company`, `shipping_address_1`, `shipping_address_2`, `shipping_city`, `shipping_postcode`, `shipping_country`, `shipping_country_id`, `shipping_zone`, `shipping_zone_id`, `shipping_address_format`, `shipping_custom_field`, `shipping_method`, `shipping_code`, `comment`, `total`, `order_status_id`, `affiliate_id`, `commission`, `marketing_id`, `tracking`, `language_id`, `currency_id`, `currency_code`, `currency_value`, `ip`, `forwarded_ip`, `user_agent`, `accept_language`, `date_added`, `date_modified`) VALUES ('1', '0', 'INV-2016-00', '0', 'Opencart', 'http://localhost:8000/', '1', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', '', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Cash on delivery', 'cod', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Flat Rate', 'flat.flat', 'test comment', '106.0000', '1', '0', '0.0000', '0', '', '1', '1', 'USD', '1.00000000', '172.21.0.1', '', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36', 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7', '2018-06-07 13:51:10', '2018-06-07 13:51:23');
+INSERT INTO `oc_order` (`order_id`, `invoice_no`, `invoice_prefix`, `store_id`, `store_name`, `store_url`, `customer_id`, `customer_group_id`, `firstname`, `lastname`, `email`, `telephone`, `fax`, `custom_field`, `payment_firstname`, `payment_lastname`, `payment_company`, `payment_address_1`, `payment_address_2`, `payment_city`, `payment_postcode`, `payment_country`, `payment_country_id`, `payment_zone`, `payment_zone_id`, `payment_address_format`, `payment_custom_field`, `payment_method`, `payment_code`, `shipping_firstname`, `shipping_lastname`, `shipping_company`, `shipping_address_1`, `shipping_address_2`, `shipping_city`, `shipping_postcode`, `shipping_country`, `shipping_country_id`, `shipping_zone`, `shipping_zone_id`, `shipping_address_format`, `shipping_custom_field`, `shipping_method`, `shipping_code`, `comment`, `total`, `order_status_id`, `affiliate_id`, `commission`, `marketing_id`, `tracking`, `language_id`, `currency_id`, `currency_code`, `currency_value`, `ip`, `forwarded_ip`, `user_agent`, `accept_language`, `date_added`, `date_modified`) VALUES ('2', '0', 'INV-2016-00', '0', 'Opencart', 'http://localhost:8000/', '0', '1', 'Test', 'Test', 'test@mail.ru', '+7 (000) 000-00-00', '', '[]', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Cash on delivery', 'cod', 'Test', 'Test', '', 'Address', 'Address 2', 'Test', '111111', 'Russian Federation', '176', 'Rostov-na-Donu', '99', '', '[]', 'Flat Rate', 'flat.flat', 'test comment', '85.0000', '1', '0', '0.0000', '0', '', '1', '1', 'USD', '1.00000000', '172.21.0.1', '', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36', 'ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7', '2018-06-07 13:53:50', '2018-06-07 13:54:00');
+
+TRUNCATE TABLE `oc_order_history`;
+INSERT INTO `oc_order_history` (`order_history_id`, `order_id`, `order_status_id`, `notify`, `comment`, `date_added`) VALUES ('19', '2', '1', '0', '', '2018-06-07 13:54:00');
+INSERT INTO `oc_order_history` (`order_history_id`, `order_id`, `order_status_id`, `notify`, `comment`, `date_added`) VALUES ('18', '1', '1', '0', '', '2018-06-07 13:51:23');
+
+TRUNCATE TABLE `oc_order_option`;
+
+INSERT INTO `oc_order_option` (`order_option_id`, `order_id`, `order_product_id`, `product_option_id`, `product_option_value_id`, `name`, `value`, `type`) VALUES ('15', '2', '55', '226', '15', 'Select', 'Red', 'select');
+
+TRUNCATE TABLE `oc_order_product`;
+INSERT INTO `oc_order_product` (`order_product_id`, `order_id`, `product_id`, `name`, `model`, `quantity`, `price`, `total`, `tax`, `reward`) VALUES ('54', '1', '40', 'iPhone', 'product 11', '1', '101.0000', '101.0000', '18.0000', '20');
+INSERT INTO `oc_order_product` (`order_product_id`, `order_id`, `product_id`, `name`, `model`, `quantity`, `price`, `total`, `tax`, `reward`) VALUES ('55', '2', '30', 'Canon EOS 5D', 'Product 3', '1', '80.0000', '80.0000', '18.0000', '200');
+
+TRUNCATE TABLE `oc_order_recurring`;
+TRUNCATE TABLE `oc_order_recurring_transaction`;
+TRUNCATE TABLE `oc_order_total`;
+
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('162', '1', 'shipping', 'Flat Rate', '5.0000', '3');
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('161', '1', 'sub_total', 'Sub-Total', '101.0000', '1');
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('164', '2', 'sub_total', 'Sub-Total', '80.0000', '1');
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('165', '2', 'shipping', 'Flat Rate', '5.0000', '3');
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('163', '1', 'total', 'Total', '106.0000', '9');
+INSERT INTO `oc_order_total` (`order_total_id`, `order_id`, `code`, `title`, `value`, `sort_order`) VALUES ('166', '2', 'total', 'Total', '85.0000', '9');
+INSERT INTO `oc_product_special` (`product_id`, `customer_group_id`, `priority`, `price`,`date_start`, `date_end`) values ('42', '2', '1', '110.000', CURDATE(), ADDDATE(CURDATE(),INTERVAL 10 DAY));
+INSERT INTO `oc_product_special` (`product_id`, `customer_group_id`, `priority`, `price`,`date_start`, `date_end`) values ('40', '1', '1', '50.000', CURDATE(), ADDDATE(CURDATE(),INTERVAL 10 DAY));
+
+TRUNCATE TABLE `oc_order_voucher`;
--- a/tests/system/RetailcrmTest.php
+++ b/tests/system/RetailcrmTest.php
@ -3,7 +3,6 @@
 require_once __DIR__ . '/../' . getenv('TEST_SUITE') . '/TestCase.php';

 class RetailcrmTest extends TestCase {
-
    public function testGetOrderManager() {
        $retailcrm = new retailcrm\Retailcrm(static::$registry);

@ -16,26 +15,4 @@ class RetailcrmTest extends TestCase {

        $this->assertInstanceOf(\retailcrm\service\OrderManager::class, $manager);
    }
-
-    public function testGetWeightOption() {
-        $retailCrm = new \retailcrm\Retailcrm(self::$registry);
-
-        $reflection = new ReflectionClass($retailCrm);
-        $reflectionMethod = $reflection->getMethod('getWeightOption');
-        $reflectionMethod->setAccessible('true');
-
-        $result = $reflectionMethod->invokeArgs(
-            $retailCrm,
-            [['weight_prefix' => '+', 'weight' => 5]]
-        );
-
-        $this->assertEquals(5, $result);
-
-        $result = $reflectionMethod->invokeArgs(
-            $retailCrm,
-            [['weight_prefix' => '-', 'weight' => 5]]
-        );
-
-        $this->assertEquals(-5, $result);;
-    }
 }
--- a/tests/system/lib/repository/DataRepositoryAdminTest.php
+++ b/tests/system/lib/repository/DataRepositoryAdminTest.php
@ -19,8 +19,6 @@ class DataRepositoryAdminTest extends TestCase {

        $this->assertNotEmpty($zone);
        $this->assertNotEmpty($zone['zone_id']);
-
-        $repository->getZoneByName('Rostov-na-Do\'nu');
    }

    public function testGetCurrencyByCode() {
--- a/tests/system/lib/service/OrderManagerTest.php
+++ b/tests/system/lib/service/OrderManagerTest.php
@ -10,32 +10,11 @@ class OrderManagerTest extends TestCase {
    public function testCreateOrderWithCustomer() {
        $proxy = $this->getMockBuilder(\RetailcrmProxy::class)
            ->disableOriginalConstructor()
-            ->setMethods(['ordersCreate','customersGet'])
+            ->setMethods(['ordersCreate'])
            ->getMock();

        $proxy->expects($this->once())->method('ordersCreate');

-        $proxy->expects($this->once())
-            ->method('customersGet')
-            ->willReturn(new \RetailcrmApiResponse(
-                200,
-                json_encode(
-                    [
-                        'success' => true,
-                        'pagination' => [
-                            'limit'=> 20,
-                            'totalCount' => 0,
-                            'currentPage' => 1,
-                            'totalPageCount' => 0
-                        ],
-                        'customer' => [
-                            'id' => 1,
-                            'externalId' => 1
-                        ]
-                    ]
-                )
-            ));
-
        $order_manager = $this->getOrderManager($proxy);

        $orderCheckoutModel = $this->loadModel('checkout/order');
--- a/tests/system/lib/service/RetailcrmCustomerConverterTest.php
+++ b/tests/system/lib/service/RetailcrmCustomerConverterTest.php
@ -11,7 +11,7 @@ class RetailcrmCustomerConverterTest extends TestCase {
        $customer_data = $model->getCustomer(1);

        $customer = $converter
-            ->initCustomerData($customer_data, [], true)
+            ->initCustomerData($customer_data, array())
            ->setCustomerData()
            ->getCustomer();

@ -20,24 +20,23 @@ class RetailcrmCustomerConverterTest extends TestCase {
        $this->assertEquals($customer_data['lastname'], $customer['lastName']);
        $this->assertEquals($customer_data['email'], $customer['email']);
        $this->assertEquals($customer_data['date_added'], $customer['createdAt']);
-        $this->assertTrue($customer['subscribed']);
    }

    public function testSetAddress() {
        $converter = \retailcrm\factory\CustomerConverterFactory::create(static::$registry);
        $model = $this->loadModel('account/customer');
        $customer_data = $model->getCustomer(static::CUSTOMER_ID);
-        $address = [
+        $address = array(
            'postcode' => '111111',
            'iso_code_2' => 'EN',
            'zone' => 'Zone',
            'city' => 'City',
            'address_1' => 'Address',
            'address_2' => ''
-        ];
+        );

        $customer = $converter
-            ->initCustomerData($customer_data, $address, null)
+            ->initCustomerData($customer_data, $address)
            ->setAddress()
            ->getCustomer();

--- a/tests/system/lib/service/RetailcrmOrderConverterTest.php
+++ b/tests/system/lib/service/RetailcrmOrderConverterTest.php
@ -72,35 +72,6 @@ class RetailcrmOrderConverterTest extends TestCase {
        $this->assertEquals('cod', $order['payments'][0]['type']);
    }

-    public function testSetEmptyPayment() {
-        $order_checkout_model = $this->loadModel('checkout/order');
-        $order_account_model = $this->loadModel('account/order');
-
-        $order_data = $order_checkout_model->getOrder(static::ORDER_WITH_CUST_ID);
-        $products = $order_account_model->getOrderProducts(static::ORDER_WITH_CUST_ID);
-        $totals = $order_account_model->getOrderTotals(static::ORDER_WITH_CUST_ID);
-
-        foreach ($products as $key => $product) {
-            $productOptions = $order_account_model->getOrderOptions(static::ORDER_WITH_CUST_ID, $product['order_product_id']);
-
-            if (!empty($productOptions)) {
-                $products[$key]['option'] = $productOptions;
-            }
-        }
-
-        $converter = \retailcrm\factory\OrderConverterFactory::create(static::$registry);
-
-        unset($order_data['payment_code']);
-
-        $order = $converter->initOrderData(
-            $order_data,
-            $products,
-            $totals
-        )->setPayment()->getOrder();
-
-        $this->assertArrayNotHasKey('payments', $order);
-    }
-
    public function testSetDelivery() {
        $order_checkout_model = $this->loadModel('checkout/order');
        $order_account_model = $this->loadModel('account/order');
 @ -1 +1 @@
 .1.19
 .1.3