Added option to round order amount (#269)

Co-authored-by: ellynoize <a.kolesnikov@retailcrm.ru>

.docker/Dockerfile

@@ -0,0 +1,58 @@
+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 \
+    && docker-php-ext-configure intl \
+    && docker-php-ext-install intl \
+    && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
+    && docker-php-ext-install mysqli pdo pdo_mysql \
+    && docker-php-ext-install zip \
+    && docker-php-ext-install xml \
+    && docker-php-ext-configure gd --with-png-dir=/usr/local/ --with-jpeg-dir=/usr/local/ --with-freetype-dir=/usr/local/ \
+    && docker-php-ext-install gd \
+    && docker-php-ext-install mcrypt \
+    && docker-php-ext-install bcmath \
+    && docker-php-ext-install soap \
+    && docker-php-ext-install xsl \
+    && docker-php-ext-install mbstring
+
+RUN apt-get install -y wget
+
+RUN wget -O /usr/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x /usr/bin/phpunit
+RUN curl --insecure https://getcomposer.org/download/1.9.3/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer
+
+# Set timezone
+RUN rm /etc/localtime && \
+    ln -s /usr/share/zoneinfo/Europe/Moscow /etc/localtime && \
+    "date"
+
+ARG TEST_SUITE
+ARG OPENCART
+ARG SERVER_PORT
+ARG OC_DB_HOSTNAME
+ARG OC_DB_USERNAME
+ARG OC_DB_PASSWORD
+ARG OC_DB_DATABASE
+ARG OC_USERNAME
+ARG OC_PASSWORD
+ARG OC_EMAIL
+
+ENV TEST_SUITE=${TEST_SUITE}
+ENV OPENCART=${OPENCART}
+ENV PORT=${SERVER_PORT}
+ENV OC_DB_HOSTNAME=${OC_DB_HOSTNAME}
+ENV OC_DB_USERNAME=${OC_DB_USERNAME}
+ENV OC_DB_PASSWORD=${OC_DB_PASSWORD}
+ENV OC_DB_DATABASE=${OC_DB_DATABASE}
+ENV OC_USERNAME=${OC_USERNAME}
+ENV OC_PASSWORD=${OC_PASSWORD}
+ENV OC_EMAIL=${OC_EMAIL}
+
+ADD .docker/entrypoint.sh /usr/local/bin/docker-php-entrypoint
+
+RUN chmod +x /usr/local/bin/docker-php-entrypoint
+
+RUN sed -i "s/80/$PORT/g" /etc/apache2/sites-enabled/000-default.conf /etc/apache2/ports.conf && \
+    sed -i 's/var\/www\/html/opencart-module\/www/g' /etc/apache2/sites-enabled/000-default.conf && \
+    sed -i 's/var\/www/opencart-module/g' /etc/apache2/apache2.conf

.docker/entrypoint.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+until nc -z -v -w30 mysql 3306
+do
+  echo "Waiting for database connection..."
+  sleep 5
+done
+
+make -C /opencart-module run
+
+mkdir -p /opencart-module/www/system/storage/session
+
+sed -i 's/\?>//g' /opencart-module/www/config.php
+sed -i 's/\?>//g' /opencart-module/www/admin/config.php
+echo '\nini_set("session.save_path", DIR_SYSTEM . "storage/session");' >> /opencart-module/www/config.php
+echo '\nini_set("session.save_path", DIR_SYSTEM . "storage/session");' >> /opencart-module/www/admin/config.php
+
+#chown -R www-data:www-data /opencart-module \
+#    && find /opencart-module -type d -exec chmod 755 {} \; \
+#    && find /opencart-module -type f -exec chmod 644 {} \;
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- apache2-foreground "$@"
+fi
+
+exec "$@"
+

.env-dist

@@ -1,8 +1,8 @@
 # OpenCart Database connection values
-OC_DB_HOSTNAME=host
-OC_DB_USERNAME=user
-OC_DB_PASSWORD=pass
-OC_DB_DATABASE=database
+OC_DB_HOSTNAME=mysql
+OC_DB_USERNAME=opencart
+OC_DB_PASSWORD=opencart
+OC_DB_DATABASE=opencart
 OC_DB_DRIVER=mysqli
 
 # OpenCart Administration user
@@ -11,5 +11,8 @@ OC_PASSWORD=admin
 OC_EMAIL=you@example.com
 
 # Server Specification
-SERVER_PORT=8000
+SERVER_PORT=8080
 SERVER_URL=http://localhost
+
+TEST_SUITE=3
+OPENCART=3.0.2.0

.github/workflows/ci.yml

@@ -0,0 +1,202 @@
+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

.travis.yml

@@ -1,140 +0,0 @@
-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
-  - 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: 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

CHANGELOG.md

@@ -1,102 +1,182 @@
+## 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
+
+## v.4.1.1
+* Updated the mechanics of processing customer addresses
+
+## v.4.1.0
+* Added the ability to connect 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
+
+## v.3.3.8
+* Fixed warnings output when generating ICML
+
 ## v.3.3.7
-* Изменена конфигурация travis-ci для сборки
+* Changed the configuration of travis-ci for build
 
 ## 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
-* Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM
+* Fixed a bug with sending order data to RetailCRM when receiving the history of changes from RetailCRM
 
 ## v.3.3.0
-* Добавена настройка записи истории изменения заказов в Opencart
-* Устранен баг с вызовом события редактирования заказа при выгрузке истории изменений из retailCRM
-* Добавлена передача типа цены при создании и редактировании заказа
+* 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
 
 ## v.3.2.4
-* Добавлена возможность передачи акционных цен для нескольких групп пользователей
-* Добавлена передача нулевой цены для  неустановленных акционных цен
-* Убрана базовая цена retailcrm из настроек соответствия типов цен
+* 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
 
 ## v.3.2.2
-* Убрана генерация externalId покупателя при заказе без регистрации на сайте.
+* Removed generation of the customer's externalId when order was created without registeration on the website.
 
 ## 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
-* Добавлена выгрузка картинок для категорий в ICML
-* Добавлена настройка для выбора валюты, в которой будет выгружаться цена в ICML
+* Added uploading images for categories in ICML
+* Added setting for selecting the currency in which the price will be uploaded in ICML
 
 ## v.3.1.6
-* Исправлено получение событий из БД для OC 3.0
+* Fixed getting events from the database for OC 3.0
 
 ## v.3.1.5
-* Исправление ошибок
+* Bug fixes
 
 ## v.3.1.4
-* Исправлена некорректная склейка типов доставки
+* Fixed incorrect combining of delivery types
 
 ## v.3.1.3
-* Добавлена активация модуля в маркетплейсе retailCRM
+* Added module activation in the RetailCRM marketplace
 
 ## 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
-* Переработан дизайн шаблона twig
-* Добавлена настройка передачи номера заказа в retailCRM
-* Улучшена механика передачи типа доставки в retailCRM
-* Исправлена ошибка при выгрузке единичного заказа в админ панели
+* 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
 
 ## v.3.0.5
-* Исправлены ошибки в шаблоне twig
-* Добавлена обработка истории изменений при сохранении настроек для установки текущего sinceId, если история в retailCRM пустая
+* 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
 
 ## 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
-* Улучшена механика выгрузки изменений из RetailCRM на сайт
-* Улучшена механика выборки типов доставки на сайте
-* Добавлена возможность периодической выгрузки акционных цен для товаров
-* Улучшена совместимость с Opencart 3.0
+* 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
 
 ## v.2.4.3
-* Устранены некоторые баги, добавлен вывод ошибок при выгрузке единичных заказов
+* Minor bug fixes, added error output when uploading individual orders
 
 ## v.2.4.2
-* Улучшена синхронизация кастомных полей
-* Добавлены настройки дефолтных способов доставки и оплаты
-* Улучшена настройка Daemon Collector
-* Доработан шаблон twig для совместимости с Opencart 3.0
+* 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
 
 ## v.2.4.1
-* Исправлена работа истории (доработана обработка адресов, добавлена обработка заказов с пустыми полями, доработана история по клиентам)
-* История теперь синхронизируется по sinceId
-* Проверка доступных версий API через метод /api/versions
-* Добавлена возможность сопоставления кастомных полей(для API v5)
+* 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)
 
 ## v.2.4.0
-* Добавлена возможность работы на 3 версиях API (v3, v4, v5)
-* Добавлена совместимость с Opencart 3.0
-
+* Added the ability to work on 3 API versions (v3, v4, v5)
+* Added compatibility with Opencart 3.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 RetailDriver LLC
+Copyright (c) 2015-2021 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

Makefile

@@ -1,7 +1,9 @@
-FILE = $(TRAVIS_BUILD_DIR)/VERSION
-VERSION = `cat $(FILE)`
+ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+VERSION = `cat $(ROOT_DIR)/VERSION`
 ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.ocmod.zip'
 
+.PHONY: coverage
+
 all: build_archive send_to_ftp delete_archive
 
 build_archive:
@@ -15,14 +17,33 @@ delete_archive:
 
 before_script:
 	mkdir coverage
-	# 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
+	composer require --dev beyondit/opencart-test-suite:~$(TEST_SUITE)
+	composer opencart:install
 	bin/robo --load-from tests/RoboFile.php project:deploy
 	(php -S localhost:80 -t www &) 2> /dev/null > /dev/null
 	sleep 2
 
 coverage:
 	wget https://phar.phpunit.de/phpcov-2.0.2.phar && php phpcov-2.0.2.phar merge coverage/ --clover coverage.xml
+
+robo_deploy:
+	bin/robo --load-from tests/RoboFile.php project:deploy
+
+run:
+	composer require --dev beyondit/opencart-test-suite ~$(TEST_SUITE)
+	composer opencart:install
+	bin/robo --load-from tests/RoboFile.php project:deploy
+
+run_test: run
+	(php -S localhost:$(SERVER_PORT) -t www &) 2> /dev/null > /dev/null
+	sleep 2
+	composer test
+
+test: robo_deploy
+	composer test
+
+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

README.md

@@ -1,12 +1,12 @@
-[![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/)
+[![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/)
 
 Opencart module
 ===============
 
-Module allows integrate CMS Opencart >= 2.3 with [retailCRM](http://retailcrm.pro)
+This module allows to integrate CMS Opencart >= 2.3 with [RetailCRM](https://retailcrm.pro).
 
 ### Previous versions:
 
@@ -16,47 +16,59 @@ Module allows integrate CMS Opencart >= 2.3 with [retailCRM](http://retailcrm.pr
 
 #### Features:
 
-* Export orders to retailCRM & fetch changes back
-* Export product catalog into [ICML](http://www.retailcrm.pro/docs/Developers/ICML) format
+* Export orders to RetailCRM & receive changes from RetailCRM.
+* Export product catalog to the [ICML](https://help.retailcrm.pro/Developers/ICML) format.
 
 #### Install
 
-Copy files to the site root
+**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):
 
 ```
 unzip master.zip
-cp -r opencart-module/* /path/to/site/root
+cp -r opencart-module/src/* /path/to/your/site
 ```
 
 #### 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.
+
 #### Getting changes in orders
 
-Add to cron:
+Add to cron (replace `/path/to/your/site` with the actual path to your site):
 
 ```
-*/5 * * * * /usr/bin/php /path/to/opencart/system/cron/history.php >> /path/to/opencart/system/storage/logs/cronjob_history.log 2>&1
+*/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
 ```
 
 #### Setting product catalog export
 
-Add to cron:
+Add to cron (replace `/path/to/your/site` with the actual path to your site):
 
 ```
-* */4 * * * /usr/bin/php /path/to/opencart/system/cron/icml.php >> /path/to/opencart/system/storage/logs/cronjob_icml.log 2>&1
+* */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
 ```
 
-Your export file will be available by following url
+Your export file should 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
 
-You want to run this command onecly:
-/usr/bin/php /path/to/opencart/system/cron/export.php
+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.

README.ru.md

@@ -1,73 +0,0 @@
-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
-```
-
-#### Активируйте модуль
-
-В списке модулей нажмите "Установить"
-
-#### Настройте параметры интеграции
-
-На странице настроек модуля укажите URL retailCRM и ключ авторизации, после сохранения этих данных укажите соответствия справочников типов доставок, оплат и статусов заказа.
-
-#### Получение измений из retailCRM
-
-Для получения изменений и новых данных добавьте в cron следующую запись:
-
-```
-*/5 * * * * /usr/bin/php /path/to/opencart/system/cron/history.php >> /path/to/opencart/system/storage/logs/cronjob_history.log 2>&1
-```
-
-#### Настройка экспорта каталога
-
-Для периодической выгрузки каталога добавьте в cron следующую запись:
-
-```
-* */4 * * * /usr/bin/php /path/to/opencart/system/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/cron/prices.php >> /path/to/opencart/system/storage/logs/cronjob_prices.log 2>&1
-```
-
-#### Выгрузка существующих заказов и покупателей
-
-Запустите команду единожды:
-/usr/bin/php /path/to/opencart/system/cron/export.php
-
-#### Кастомизация моделей
-
-Для создания кастомных классов скопируйте файл модели в директорию custom, в новом файле измените название класса с "ModelExtensionRetailcrmFilename" на "ModelExtensionRetailcrmCustomFilename", где "Filename" - название файла с заглавной буквы. После этого модуль будет использовать методы кастомного класса.

VERSION

@@ -1 +1 @@
-3.3.8
+4.1.19

composer.json

@@ -6,7 +6,7 @@
     "authors": [
         {
             "name": "RetailDriverLLC",
-            "email": "integration@retailcrm.ru"
+            "email": "support@retailcrm.pro"
         }
     ],
     "config": {
@@ -19,13 +19,20 @@
     "scripts" : {
       "test-admin": "bin/phpunit --coverage-php coverage/admin.cov --testsuite admin-tests --colors=always",
       "test-catalog": "bin/phpunit --coverage-php coverage/catalog.cov --testsuite catalog-tests --colors=always",
+      "test-system": "bin/phpunit --coverage-php coverage/system.cov --testsuite system-tests --colors=always",
       "test": [
         "@test-admin",
-        "@test-catalog"
+        "@test-catalog",
+        "@test-system"
       ],
-      "setup" : "bin/robo --load-from tests/RoboFile.php opencart:setup"
+      "opencart:install" : "bin/robo --load-from tests/RoboFile.php opencart:install"
+    },
+    "require": {
+      "ext-json": "*"
     },
     "require-dev": {
-      "consolidation/robo": "~1.0"
+      "consolidation/robo": "~1.0",
+      "phpcompatibility/php-compatibility": "^9.3",
+      "beyondit/opencart-test-suite": "~3.0"
     }
 }

doc/Update module.md

@@ -0,0 +1,6 @@
+### Обновление версии модуля
+
+Для обновления версии модуля необходимо обновить следующие файлы:
+* VERSION
+* CHANGELOG.md
+* src/upload/admin/controller/extension/module/retailcrm.php

docker-compose.yml

@@ -0,0 +1,39 @@
+version: '3'
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./.docker/Dockerfile
+      args:
+        - TEST_SUITE=${TEST_SUITE}
+        - OPENCART=${OPENCART}
+        - SERVER_PORT=${SERVER_PORT}
+        - OC_DB_HOSTNAME=${OC_DB_HOSTNAME}
+        - OC_DB_USERNAME=${OC_DB_USERNAME}
+        - OC_DB_PASSWORD=${OC_DB_PASSWORD}
+        - OC_DB_DATABASE=${OC_DB_DATABASE}
+        - OC_USERNAME=${OC_USERNAME}
+        - OC_PASSWORD=${OC_PASSWORD}
+        - OC_EMAIL=${OC_EMAIL}
+    volumes:
+      - ./:/opencart-module
+    links:
+      - "mysql"
+    ports:
+      - "${SERVER_PORT}:${SERVER_PORT}"
+    depends_on:
+      - mysql
+    env_file:
+      - .env
+    working_dir: /opencart-module
+  mysql:
+    image: mysql:5.7
+    env_file:
+      - .env
+    environment:
+      - MYSQL_DATABASE=${OC_DB_DATABASE}
+      - MYSQL_USER=${OC_DB_USERNAME}
+      - MYSQL_PASSWORD=${OC_DB_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=root
+    ports:
+      - "3306:3306"

phpunit.xml.dist

@@ -16,6 +16,9 @@
         <testsuite name="admin-tests">
             <directory suffix="AdminTest.php">./tests/admin/</directory>
         </testsuite>
+        <testsuite name="system-tests">
+            <directory suffix="Test.php">./tests/system/</directory>
+        </testsuite>
     </testsuites>
     <php>
         <env name="OC_ROOT" value="./www/" />
@@ -23,13 +26,16 @@
         <env name="TEST_CONFIG" value="test-config" />
     </php>
     <filter>
-        <whitelist>
+        <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix="retailcrm.php">./www/admin/controller</directory>
             <directory>./www/admin/model/extension/retailcrm</directory>
             <directory suffix="retailcrm.php">./www/catalog/controller</directory>
             <directory suffix="daemon_collector.php">./www/catalog/controller</directory>
             <directory>./www/catalog/model/extension/retailcrm</directory>
             <directory suffix=".php">./www/system/library/retailcrm</directory>
+            <exclude>
+                <directory suffix=".php">./www/system/library/retailcrm/lib/api</directory>
+            </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

src/upload/admin/controller/extension/module/retailcrm.php

@@ -1,17 +1,10 @@
 <?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
- */
+use retailcrm\Retailcrm;
+
 class ControllerExtensionModuleRetailcrm extends Controller
 {
-    private $_error = array();
+    private $_error = [];
     protected $log, $statuses, $payments, $deliveryTypes, $retailcrmApiClient, $moduleTitle, $tokenTitle;
     public $children, $template;
 
@@ -34,10 +27,10 @@ class ControllerExtensionModuleRetailcrm extends Controller
 
         $this->model_setting_setting->editSetting(
             $this->moduleTitle,
-            array(
+            [
                 $this->moduleTitle . '_status' => 1,
-                $this->moduleTitle . '_country' => array($this->config->get('config_country_id'))
-            )
+                $this->moduleTitle . '_country' => [$this->config->get('config_country_id')]
+            ]
         );
 
         $this->addEvents();
@@ -59,18 +52,16 @@ class ControllerExtensionModuleRetailcrm extends Controller
             $this->integrationModule(
                 $this->retailcrm->getApiClient(
                     $settings['retailcrm_setting_url'],
-                    $settings['retailcrm_setting_key'],
-                    $settings['retailcrm_setting_version']
+                    $settings['retailcrm_setting_key']
                 ),
                 $clientId,
-                $settings['retailcrm_setting_version'],
                 false
             );
 
             $this->uninstall_collector();
             $this->model_setting_setting->editSetting(
                 $this->moduleTitle,
-                array($this->moduleTitle . '_status' => 0)
+                [$this->moduleTitle . '_status' => 0]
             );
         }
 
@@ -90,7 +81,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, array($collector . '_status' => 1));
+        $this->model_setting_setting->editSetting($collector, [$collector . '_status' => 1]);
     }
 
     /**
@@ -103,10 +94,38 @@ class ControllerExtensionModuleRetailcrm extends Controller
         $collector = $this->getCollectorTitle();
         $this->loadModels();
         $this->load->model('setting/setting');
-        $this->model_setting_setting->editSetting($collector, array($collector . '_status' => 0));
+        $this->model_setting_setting->editSetting($collector, [$collector . '_status' => 0]);
         $this->{'model_' . $this->modelExtension}->uninstall('analytics', 'daemon_collector');
     }
 
+    /**
+     * Install OnlineConsultant method
+     *
+     * @return void
+     */
+    public function install_consultant()
+    {
+        $consultant = $this->getConsultantTitle();
+        $this->loadModels();
+        $this->load->model('setting/setting');
+        $this->{'model_' . $this->modelExtension}->install('analytics', 'online_consultant');
+        $this->model_setting_setting->editSetting($consultant, [$consultant . '_status' => 1]);
+    }
+
+    /**
+     * Uninstall OnlineConsultant method
+     *
+     * @return void
+     */
+    public function uninstall_consultant()
+    {
+        $consultant = $this->getConsultantTitle();
+        $this->loadModels();
+        $this->load->model('setting/setting');
+        $this->model_setting_setting->editSetting($consultant, [$consultant . '_status' => 0]);
+        $this->{'model_' . $this->modelExtension}->uninstall('analytics', 'online_consultant');
+    }
+
     /**
      * Setup page
      *
@@ -126,6 +145,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
         $this->document->addStyle('/admin/view/stylesheet/retailcrm.css');
 
         $collector = $this->getCollectorTitle();
+        $consultant = $this->getConsultantTitle();
         $history_setting = $this->model_setting_setting->getSetting('retailcrm_history');
 
         if ($this->request->server['REQUEST_METHOD'] == 'POST' && $this->validate()) {
@@ -146,6 +166,12 @@ class ControllerExtensionModuleRetailcrm extends Controller
                 $this->uninstall_collector();
             }
 
+            if ($this->request->post[$this->moduleTitle . '_online_consultant_active'] == 1) {
+                $this->install_consultant();
+            } elseif ($this->request->post[$this->moduleTitle . '_online_consultant_active'] == 0) {
+                $this->uninstall_consultant();
+            }
+
             if (parse_url($this->request->post[$this->moduleTitle . '_url'])) {
                 $crm_url = parse_url($this->request->post[$this->moduleTitle . '_url'], PHP_URL_HOST);
                 $this->request->post[$this->moduleTitle . '_url'] = 'https://' . $crm_url;
@@ -162,48 +188,22 @@ class ControllerExtensionModuleRetailcrm extends Controller
                 $this->request->post
             );
 
-            if ($this->request->post[$this->moduleTitle . '_apiversion'] != 'v3') {
-                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'],
-                        $this->request->post[$this->moduleTitle . '_apiversion']
-                    );
+            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->isSuccessful() && !empty($ordersHistory['history'])) {
-                        $ordersHistory = $api->ordersHistory(array(), $ordersHistory['pagination']['totalPageCount']);
-
-                        if ($ordersHistory->isSuccessful()) {
-                            $ordersHistoryArr = $ordersHistory['history'];
-                            $lastChangeOrders = end($ordersHistoryArr);
-                            $sinceIdOrders = $lastChangeOrders['id'];
-                            $generatedAt = $ordersHistory['generatedAt'];
-                        }
-                    }
-
-                    $customersHistory = $api->customersHistory();
-
-                    if ($customersHistory->isSuccessful() && !empty($customersHistory['history'])) {
-                        $customersHistory = $api->customersHistory(array(), $customersHistory['pagination']['totalPageCount']);
-
-                        if ($customersHistory->isSuccessful()) {
-                            $customersHistoryArr = $customersHistory['history'];
-                            $lastChangeCustomers = end($customersHistoryArr);
-                            $sinceIdCustomers = $lastChangeCustomers['id'];
-                        }
-                    }
-
-                    $this->model_setting_setting->editSetting(
-                        'retailcrm_history',
-                        array(
-                            'retailcrm_history_orders' => isset($sinceIdOrders) ? $sinceIdOrders : 1,
-                            'retailcrm_history_customers' => isset($sinceIdCustomers) ? $sinceIdCustomers : 1,
-                            'retailcrm_history_datetime' => isset($generatedAt) ? $generatedAt : date('Y-m-d H:i:s')
-                        )
-                    );
-                }
+                $this->model_setting_setting->editSetting(
+                    'retailcrm_history',
+                    [
+                        'retailcrm_history_orders' => $this->getHistorySinceId($api, 'ordersHistory'),
+                        'retailcrm_history_customers' => $this->getHistorySinceId($api, 'customersHistory'),
+                    ]
+                );
             }
 
             $retailcrm_setting = $this->model_setting_setting->getSetting('retailcrm_setting');
@@ -212,26 +212,23 @@ class ControllerExtensionModuleRetailcrm extends Controller
                 $clientId = uniqid();
                 $api = $this->retailcrm->getApiClient(
                     $this->request->post[$this->moduleTitle . '_url'],
-                    $this->request->post[$this->moduleTitle . '_apikey'],
-                    $this->request->post[$this->moduleTitle . '_apiversion']
+                    $this->request->post[$this->moduleTitle . '_apikey']
                 );
 
                 $result = $this->integrationModule(
                     $api,
-                    $clientId,
-                    $this->request->post[$this->moduleTitle . '_apiversion']
+                    $clientId
                 );
 
                 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'],
-                            'retailcrm_setting_version' => $this->request->post[$this->moduleTitle . '_apiversion']
-                        )
+                            'retailcrm_setting_key' => $this->request->post[$this->moduleTitle . '_apikey']
+                        ]
                     );
                 }
             }
@@ -245,7 +242,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
             $this->response->redirect($redirect);
         }
 
-        $text_strings = array(
+        $text_strings = [
             'heading_title',
             'text_enabled',
             'text_disabled',
@@ -253,7 +250,6 @@ class ControllerExtensionModuleRetailcrm extends Controller
             'button_cancel',
             'text_notice',
             'retailcrm_title',
-            'retailcrm_apiversion',
             'retailcrm_url',
             'retailcrm_apikey',
             'retailcrm_base_settings',
@@ -275,6 +271,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
             'general_tab_text',
             'references_tab_text',
             'collector_tab_text',
+            'consultant_tab_text',
             'logs_tab_text',
             'text_yes',
             'text_no',
@@ -304,61 +301,66 @@ class ControllerExtensionModuleRetailcrm extends Controller
             'special_price',
             'order_number',
             'text_order_number',
-            'text_currency',
+            'summ_around',
+            'text_summ_around',
+            'icml_settings',
+            'icml_service_enabled_label',
+            'icml_service_description',
             'text_currency_label',
             'status_changes',
             'text_status_changes',
             'text_lenght',
-            'text_lenght_label'
-        );
+            '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',
+        ];
 
         $_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'] = array();
+        $_data['retailcrm_errors'] = [];
         $_data['saved_settings'] = $this->model_setting_setting
             ->getSetting($this->moduleTitle);
 
-        $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;
-        $apiVersion = isset($_data['saved_settings'][$this->moduleTitle . '_apiversion'])
-            ? $_data['saved_settings'][$this->moduleTitle . '_apiversion']
-            : null;
+        $url = $_data['saved_settings'][$this->moduleTitle . '_url'] ?? null;
+        $key = $_data['saved_settings'][$this->moduleTitle . '_apikey'] ?? null;
 
         if (!empty($url) && !empty($key)) {
+            $this->validate($url, $key);
 
-            $_data['delivery'] = $this->model_extension_retailcrm_references
-                ->getDeliveryTypes();
+            $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['statuses'] = $this->model_extension_retailcrm_references
                 ->getOrderStatuses();
-            $_data['payments'] = $this->model_extension_retailcrm_references
-                ->getPaymentTypes();
-
-            if ($apiVersion == 'v5') {
-                $_data['customFields'] = $this->model_extension_retailcrm_references
-                    ->getCustomFields();
-            }
+            $_data['customFields'] = $this->model_extension_retailcrm_references
+                ->getCustomFields();
 
             $_data['lenghts'] = $this->model_localisation_length_class->getLengthClasses();
-
-            if ($apiVersion != 'v3') {
-                $_data['priceTypes'] = $this->model_extension_retailcrm_references
-                    ->getPriceTypes();
-                $_data['customerGroups'] = $this->model_customer_customer_group->getCustomerGroups();
-            }
+            $_data['priceTypes'] = $this->model_extension_retailcrm_references
+                ->getPriceTypes();
+            $_data['customerGroups'] = $this->model_customer_customer_group->getCustomerGroups();
         }
 
-        $config_data = array(
-            $this->moduleTitle . '_status'
-        );
+        $config_data = [$this->moduleTitle . '_status'];
 
         foreach ($config_data as $conf) {
             if (isset($this->request->post[$conf])) {
@@ -368,40 +370,35 @@ class ControllerExtensionModuleRetailcrm extends Controller
             }
         }
 
-        if (isset($this->_error['warning'])) {
-            $_data['error_warning'] = $this->_error['warning'];
-        } else {
-            $_data['error_warning'] = '';
-        }
+        $_data['error_warning'] = $this->_error['warning'] ?? '';
+        $_data['breadcrumbs'] = [];
 
-        $_data['breadcrumbs'] = array();
-
-        $_data['breadcrumbs'][] = array(
+        $_data['breadcrumbs'][] = [
             'text'      => $this->language->get('text_home'),
             'href'      => $this->url->link(
                 'common/dashboard',
                 $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
             ),
             'separator' => false
-        );
+        ];
 
-        $_data['breadcrumbs'][] = array(
+        $_data['breadcrumbs'][] = [
             'text'      => $this->language->get('text_module'),
             'href'      => $this->url->link(
                 'extension/extension',
                 $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
             ),
             'separator' => ' :: '
-        );
+        ];
 
-        $_data['breadcrumbs'][] = array(
+        $_data['breadcrumbs'][] = [
             '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',
@@ -413,7 +410,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
             $this->tokenTitle . '=' . $this->session->data[$this->tokenTitle], 'SSL'
         );
 
-        $_data['modules'] = array();
+        $_data['modules'] = [];
 
         if (isset($this->request->post['retailcrm_module'])) {
             $_data['modules'] = $this->request->post['retailcrm_module'];
@@ -437,15 +434,13 @@ class ControllerExtensionModuleRetailcrm extends Controller
             $_data['export_file'] = true;
         }
 
-        $collectorFields = array(
+        $collectorFields = [
             'name' => $this->language->get('field_name'),
             'email' => $this->language->get('field_email'),
             'phone' => $this->language->get('field_phone')
-        );
+        ];
 
         $_data['collectorFields'] = $collectorFields;
-        $_data['api_versions'] = array('v3', 'v4', 'v5');
-        $_data['default_apiversion'] = 'v4';
 
         $retailcrmLog = file_exists(DIR_SYSTEM . 'storage/logs/retailcrm.log') ? DIR_SYSTEM . 'storage/logs/retailcrm.log' : false;
         $ocApiLog = file_exists(DIR_SYSTEM . 'storage/logs/opencartapi.log') ? DIR_SYSTEM . 'storage/logs/opencartapi.log' : false;
@@ -479,24 +474,13 @@ class ControllerExtensionModuleRetailcrm extends Controller
     public function history()
     {
         $this->load->model('setting/setting');
-        $settings = $this->model_setting_setting->getSetting($this->moduleTitle);
 
-        if ($settings[$this->moduleTitle . '_apiversion'] == 'v3') {
-            if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/history/v3.php')) {
-                $this->load->model('extension/retailcrm/custom/history/v3');
-                $this->model_extension_retailcrm_custom_history_v3->request($this->retailcrm->getApiClient());
-            } else {
-                $this->load->model('extension/retailcrm/history/v3');
-                $this->model_extension_retailcrm_history_v3->request($this->retailcrm->getApiClient());
-            }
+        if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/history/v4_5.php')) {
+            $this->load->model('extension/retailcrm/custom/history/v4_5');
+            $this->model_extension_retailcrm_custom_history_v4_5->request($this->retailcrm->getApiClient());
         } else {
-            if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/history/v4-5.php')) {
-                $this->load->model('extension/retailcrm/custom/history/v4-5');
-                $this->model_extension_retailcrm_custom_history_v4_5->request($this->retailcrm->getApiClient());
-            } else {
-                $this->load->model('extension/retailcrm/history/v4_5');
-                $this->model_extension_retailcrm_history_v4_5->request($this->retailcrm->getApiClient());
-            }
+            $this->load->model('extension/retailcrm/history');
+            $this->model_extension_retailcrm_history->request($this->retailcrm->getApiClient());
         }
     }
 
@@ -532,27 +516,13 @@ class ControllerExtensionModuleRetailcrm extends Controller
 
         $customerId = $customer[0];
         $customer = $customer[1];
-        $addresses = $customer['address'];
         unset($customer);
 
         $customer = $this->model_customer_customer->getCustomer($customerId);
+        $address = $this->model_customer_customer->getAddress($customer['address_id']);
 
-        foreach ($addresses as $address) {
-            $country = $this->model_localisation_country->getCountry($address['country_id']);
-            $zone = $this->model_localisation_zone->getZone($address['zone_id']);
-
-            $customer['address'] = array(
-                'address_1' => $address['address_1'],
-                'address_2' => $address['address_2'],
-                'city' => $address['city'],
-                'postcode' => $address['postcode'],
-                'iso_code_2' => $country['iso_code_2'],
-                'zone' => $zone['name']
-            );
-        }
-
-        $this->load->model('extension/retailcrm/customer');
-        $this->model_extension_retailcrm_customer->changeInCrm($customer, $this->retailcrm->getApiClient());
+        $customer_manager = $this->retailcrm->getCustomerManager();
+        $customer_manager->editCustomer($customer, $address);
     }
 
     /**
@@ -560,52 +530,41 @@ class ControllerExtensionModuleRetailcrm extends Controller
      *
      * @return void
      */
-    public function exportOrder()
-    {
+    public function exportOrder() {
         $order_id = isset($this->request->get['order_id']) ? $this->request->get['order_id'] : '';
-        $this->load->model('sale/order');
-
         $data = $this->model_sale_order->getOrder($order_id);
-        $data['products'] = $this->model_sale_order->getOrderProducts($order_id);
-        $data['totals'] = $this->model_sale_order->getOrderTotals($order_id);
+        $products = $this->model_sale_order->getOrderProducts($order_id);
+        $totals = $this->model_sale_order->getOrderTotals($order_id);
 
-        foreach ($data['products'] as $key => $product) {
-            $data['products'][$key]['option'] = $this->model_sale_order->getOrderOptions($product['order_id'], $product['order_product_id']);
+        foreach ($products as $key => $product) {
+            $products[$key]['option'] = $this->model_sale_order->getOrderOptions($product['order_id'], $product['order_product_id']);
         }
 
         if (!isset($data['fromApi'])) {
-            $this->load->model('setting/setting');
             $status = $this->model_setting_setting->getSetting($this->moduleTitle);
             $data['order_status'] = $status[$this->moduleTitle . '_status'][$data['order_status_id']];
 
-            $this->load->model('extension/retailcrm/order');
-            $this->model_extension_retailcrm_order->uploadOrder($data, $this->retailcrm->getApiClient());
-            $response = ModelExtensionRetailcrmOrder::getLastResponse();
-        }
+            $order_manager = $this->retailcrm->getOrderManager();
+            $response = $order_manager->createOrder($data, $products, $totals);
 
-        if (!$response->isSuccessful()) {
-            if (isset($response['errors'])) {
-                $error = implode("\n", $response['errors']);
-            } else {
-                $error = $response->getErrorMsg();
+            if ($response) {
+                if (!$response->isSuccessful()) {
+                    if (isset($response['errors'])) {
+                        $error = implode("\n", $response['errors']);
+                    } else {
+                        $error = $response->getErrorMsg();
+                    }
+
+                    $this->response->setOutput(
+                        json_encode(
+                            ['status_code' => $response->getStatusCode(), 'error_msg' => $error],
+                            JSON_THROW_ON_ERROR
+                        )
+                    );
+                } else {
+                    $this->response->setOutput(json_encode(['status_code' => $response->getStatusCode()]));
+                }
             }
-
-            $this->response->setOutput(
-                json_encode(
-                    array(
-                        'status_code' => $response->getStatusCode(),
-                        'error_msg' => $error
-                    )
-                )
-            );
-        } else {
-            $this->response->setOutput(
-                json_encode(
-                    array(
-                        'status_code' => $response->getStatusCode()
-                    )
-                )
-            );
         }
     }
 
@@ -616,16 +575,14 @@ class ControllerExtensionModuleRetailcrm extends Controller
      */
     public function export()
     {
-        $this->load->model('customer/customer');
         $this->load->model('extension/retailcrm/customer');
         $this->load->model('extension/retailcrm/order');
-        $this->load->model('sale/order');
 
         $customers = $this->model_customer_customer->getCustomers();
         $this->model_extension_retailcrm_customer->uploadToCrm($customers, $this->retailcrm->getApiClient());
         $orders = $this->model_sale_order->getOrders();
 
-        $fullOrders = array();
+        $fullOrders = [];
 
         foreach ($orders as $order) {
             $fullOrder = $this->model_sale_order->getOrder($order['order_id']);
@@ -668,49 +625,57 @@ class ControllerExtensionModuleRetailcrm extends Controller
      *
      * @return bool
      */
-    private function validate()
+    private function validate($apiUrl = null, $apiKey = null)
     {
-        $versionsMap = array(
-            'v3' => '3.0',
-            'v4' => '4.0',
-            'v5' => '5.0'
-        );
+        $warningMessage = '';
 
-        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']
+        $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()
             );
         }
 
-        $response = $apiClient->apiVersions();
-
-        if ($response && $response->isSuccessful()) {
-            if (!in_array($versionsMap[$this->request->post[$this->moduleTitle . '_apiversion']], $response['versions'])) {
-                $this->_error['warning'] = $this->language->get('text_error_api');
-            }
-        } else {
-            $this->_error['warning'] = $this->language->get('text_error_save');
+        if ('' !== $warningMessage) {
+            $this->_error['warning'] = $this->language->get($warningMessage);
         }
 
-        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;
-        }
+        return empty($this->_error);
     }
 
     /**
@@ -791,6 +756,22 @@ class ControllerExtensionModuleRetailcrm extends Controller
         return $title;
     }
 
+    /**
+     * Get consultant module name
+     *
+     * @return string
+     */
+    private function getConsultantTitle()
+    {
+        if (version_compare(VERSION, '3.0', '<')) {
+            $title = 'online_consultant';
+        } else {
+            $title = 'analytics_online_consultant';
+        }
+
+        return $title;
+    }
+
     /**
      * Check file size
      *
@@ -850,6 +831,13 @@ 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,
@@ -907,16 +895,15 @@ class ControllerExtensionModuleRetailcrm extends Controller
     }
 
     /**
-     * Activate/deactivate module in marketplace retailCRM
+     * Activate/deactivate module in marketplace RetailCRM
      *
      * @param \RetailcrmProxy $apiClient
      * @param string $clientId
-     * @param string $api_version
      * @param boolean $active
      *
      * @return boolean
      */
-    private function integrationModule($apiClient, $clientId, $api_version, $active = true)
+    private function integrationModule($apiClient, $clientId, $active = true)
     {
         $scheme = isset($this->request->server['HTTPS']) ? 'https://' : 'http://';
         $logo = 'https://s3.eu-central-1.amazonaws.com/retailcrm-billing/images/5af48736c6a0c-opencart-seeklogo.com.svg';
@@ -924,29 +911,17 @@ class ControllerExtensionModuleRetailcrm extends Controller
         $name = 'Opencart';
         $accountUrl = $scheme . $this->request->server['HTTP_HOST'] . '/admin';
 
-        if ($api_version == 'v4') {
-            $configuration = array(
-                'name' => $name,
-                'code' => $integrationCode . '-' . $clientId,
-                'logo' => $logo,
-                'configurationUrl' => $accountUrl,
-                'active' => $active
-            );
+        $configuration = [
+            'clientId' => $clientId,
+            'code' => $integrationCode . '-' . $clientId,
+            'integrationCode' => $integrationCode,
+            'active' => $active,
+            'name' => $name,
+            'logo' => $logo,
+            'accountUrl' => $accountUrl,
+        ];
 
-            $response = $apiClient->marketplaceSettingsEdit($configuration);
-        } else {
-            $configuration = array(
-                'clientId' => $clientId,
-                'code' => $integrationCode . '-' . $clientId,
-                'integrationCode' => $integrationCode,
-                'active' => $active,
-                'name' => $name,
-                'logo' => $logo,
-                'accountUrl' => $accountUrl
-            );
-
-            $response = $apiClient->integrationModulesEdit($configuration);
-        }
+        $response = $apiClient->integrationModulesEdit($configuration);
 
         if (!$response) {
             return false;
@@ -958,4 +933,57 @@ 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;
+    }
 }

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';
@@ -13,15 +13,16 @@ $_['retailcrm_dict_settings']    = 'Configuration of directories correspondence'
 $_['retailcrm_countries_settings'] = 'Setting of trade zones';
 $_['retailcrm_upload_order']     = 'Uploading one order';
 $_['daemon_collector']           = 'Daemon Collector';
+$_['consultant_tab_text']         = 'Online Consultant';
 $_['general_tab_text']           = 'Main';
 $_['references_tab_text']        = 'Directories';
 $_['collector_tab_text']         = 'Daemon Collector';
 $_['logs_tab_text']              = 'Logs';
 $_['collector_custom_text']      = 'Configuration of form fields';
 $_['custom_fields_tab_text']     = 'Custom fields';
-$_['retailcrm_apiversion']       = 'API Version';
-$_['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';
 $_['special_price']              = 'Price type to which the promotion price will be uploaded';
@@ -49,11 +50,14 @@ $_['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']             = '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_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_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';
@@ -67,17 +71,28 @@ $_['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';
-$_['text_currency']              = 'Currency setting';
-$_['text_currency_label']        = 'Currency in ICML';
+$_['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_lenght']                = 'Setting of the unit of measurement';
-$_['text_lenght_label']          = 'Unit of measurement in ICML';
+$_['text_lenght_label']          = 'Unit of measurement of goods';
 $_['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';
@@ -85,5 +100,8 @@ $_['size']                       = 'Size';
 
 $_['text_yes']                   = 'Yes';
 $_['text_no']                    = 'No';
+
+$_['entry_code']                 = 'Online consultant code';
+$_['entry_status']               = 'Use code for online consultant';
 // Errors
 $_['error_permission']           = 'You do not have rights for changing the module settings';

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';
@@ -13,15 +13,16 @@ $_['retailcrm_dict_settings']    = 'Ajustes de coincidencia de directorios';
 $_['retailcrm_countries_settings'] = 'Configurar zonas comerciales';
 $_['retailcrm_upload_order']     = 'Exportación de un pedido';
 $_['daemon_collector']           = 'Daemon Collector';
+$_['consultant_tab_text']         = 'Online Consultant';
 $_['general_tab_text']           = 'Inicio';
 $_['references_tab_text']        = 'Directorios';
 $_['collector_tab_text']         = 'Daemon Collector';
 $_['logs_tab_text']              = 'Registro';
 $_['collector_custom_text']      = 'Configurar campos de formulario';
 $_['custom_fields_tab_text']     = 'Campos personalizados';
-$_['retailcrm_apiversion']       = 'Versión de la API';
-$_['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';
 $_['special_price']              = 'Tipo de precio en el que se cargará el precio de promoción';
@@ -50,10 +51,13 @@ $_['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']             = '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_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_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';
@@ -67,17 +71,29 @@ $_['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';
-$_['text_currency']              = 'Ajustes de moneda';
-$_['text_currency_label']        = 'Moneda en ICML';
+$_['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_lenght']                = 'Ajustar unidad de medida';
-$_['text_lenght_label']          = 'Unidad de medida en ICML';
+$_['text_lenght_label']          = 'Unidad de medida de bienes';
 $_['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';
@@ -85,5 +101,8 @@ $_['size']                       = 'Tamaño';
 
 $_['text_yes']                   = 'Sí';
 $_['text_no']                    = 'No';
+
+$_['entry_code']                 = 'Código para online consultant';
+$_['entry_status']               = 'Usar código para online consultant';
 // Errors
 $_['error_permission']           = 'No tiene suficientes permisos para cambiar la configuración del módulo';

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']                = 'Модули';
@@ -16,12 +16,13 @@ $_['daemon_collector']           = 'Демон Collector';
 $_['general_tab_text']           = 'Главная';
 $_['references_tab_text']        = 'Справочники';
 $_['collector_tab_text']         = 'Daemon Collector';
+$_['consultant_tab_text']         = 'Online Consultant';
 $_['logs_tab_text']              = 'Логи';
 $_['collector_custom_text']      = 'Настройка полей формы';
 $_['custom_fields_tab_text']     = 'Пользовательские поля';
-$_['retailcrm_apiversion']       = 'Версия API';
 $_['retailcrm_url']              = 'Адрес RetailCRM';
 $_['retailcrm_apikey']           = 'Api ключ RetailCRM';
+$_['corporate_enabled_label']    = 'Поддержка корпоративных клиентов';
 $_['collector_site_key']         = 'Ключ сайта';
 $_['special_price_settings']     = 'Настройка выгрузки акционной цены';
 $_['special_price']              = 'Тип цены, в который будет выгружаться цена по акции';
@@ -49,8 +50,11 @@ $_['text_payment']               = 'Оплата';
 $_['text_shipping']              = 'Доставка';
 $_['text_orders_custom_fields']  = 'Кастомные поля заказов';
 $_['text_customers_custom_fields'] = 'Кастомные поля клиентов';
-$_['text_error_collector_fields']= 'Заполните названия полей формы Демон Collector';
-$_['text_error_api']             = 'Недоступна выбранная версия API.';
+$_['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_custom_field']    = 'Создайте пользовательские поля в карточке клиента в Opencart и RetailCRM, чтобы настроить их передачу';
 $_['text_error_cf_opencart']     = 'Отсутствуют пользовательские поля в Opencart';
 $_['text_error_cf_retailcrm']    = 'Отсутствуют пользовательские поля в RetailCRM';
@@ -67,17 +71,28 @@ $_['retailcrm_dict_default']     = 'По умолчанию';
 $_['retailcrm_missing_status']   = 'Статус пропавших заказов';
 
 $_['order_number']               = 'Номер заказа';
-$_['text_order_number']          = 'Передавать номер заказа в retailCRM';
-$_['text_currency']              = 'Настройка валюты';
-$_['text_currency_label']        = 'Валюта в ICML';
+$_['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_lenght']                = 'Настройка единицы измерения';
-$_['text_lenght_label']          = 'Единица измерения в ICML';
+$_['text_lenght_label']          = 'Единица измерения товаров';
 $_['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']                     = 'Вес';
@@ -87,3 +102,8 @@ $_['text_yes']                   = 'Да';
 $_['text_no']                    = 'Нет';
 // Errors
 $_['error_permission']           = 'У вас недостаточно прав на изменение настроек модуля';
+
+//online consultant
+$_['entry_code']                 = 'Код для online consultant';
+$_['entry_status']               = 'Использовать код для  online consultant';
+

src/upload/admin/model/extension/retailcrm/customer.php

@@ -1,137 +1,29 @@
 <?php
 
 class ModelExtensionRetailcrmCustomer extends Model {
-    protected $settings;
-    protected $moduleTitle;
-    protected $retailcrmApiClient;
-
-    public function __construct($registry)
-    {
-        parent::__construct($registry);
-        $this->load->model('setting/setting');
-        $this->load->library('retailcrm/retailcrm');
-
-        $this->moduleTitle = $this->retailcrm->getModuleTitle();
-        $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
-    }
-
     /**
      * Upload customers
-     * 
+     *
      * @param array $customers
-     * @param \RetailcrmProxy $retailcrmApiClient
      *
      * @return mixed
      */
-    public function uploadToCrm($customers, $retailcrmApiClient)
+    public function uploadToCrm($customers)
     {
-        if ($retailcrmApiClient === false || empty($customers)) {
-            return false;
-        }
-
         $customersToCrm = array();
+        /** @var CustomerManager $customer_manager */
+        $customer_manager = $this->retailcrm->getCustomerManager();
 
         foreach($customers as $customer) {
-            $customersToCrm[] = $this->process($customer);
+            $customersToCrm[] = $customer_manager->prepareCustomer($customer, array());
         }
 
         $chunkedCustomers = array_chunk($customersToCrm, 50);
 
         foreach($chunkedCustomers as $customersPart) {
-            $retailcrmApiClient->customersUpload($customersPart);
+            $customer_manager->uploadCustomers($customersPart);
         }
 
         return $chunkedCustomers;
     }
-
-    /**
-     * Edit customer
-     * 
-     * @param array $customer
-     * @param \RetailcrmProxy $retailcrmApiClient
-     *
-     * @return mixed
-     */
-    public function changeInCrm($customer, $retailcrmApiClient)
-    {
-        if ($retailcrmApiClient === false || empty($customer)) {
-            return false;
-        }
-
-        $customerToCrm = $this->process($customer);
-
-        $retailcrmApiClient->customersEdit($customerToCrm);
-
-        return $customerToCrm;
-    }
-
-    /**
-     * Create customer
-     *
-     * @param array $customer
-     * @param \RetailcrmProxy $retailcrmApiClient
-     *
-     * @return mixed
-     */
-    public function sendToCrm($customer, $retailcrmApiClient)
-    {
-        if ($retailcrmApiClient === false || empty($customer)) {
-            return false;
-        }
-
-        $customerToCrm = $this->process($customer);
-
-        $retailcrmApiClient->customersCreate($customerToCrm);
-
-        return $customerToCrm;
-    }
-
-    /**
-     * Process customer
-     * 
-     * @param array $customer
-     * 
-     * @return array $customerToCrm
-     */
-    private function process($customer)
-    {
-        $customerToCrm = array(
-            'externalId' => $customer['customer_id'],
-            'firstName' => $customer['firstname'],
-            'lastName' => $customer['lastname'],
-            'email' => $customer['email'],
-            'phones' => array(
-                array(
-                    'number' => $customer['telephone']
-                )
-            ),
-            'createdAt' => $customer['date_added']
-        );
-
-        if (isset($customer['address'])) {
-            $customerToCrm['address'] = array(
-                'index' => $customer['address']['postcode'],
-                'countryIso' => $customer['address']['iso_code_2'],
-                'region' => $customer['address']['zone'],
-                'city' => $customer['address']['city'],
-                'text' => $customer['address']['address_1'] . ' ' . $customer['address']['address_2'] 
-            );
-        }
-
-        if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $customer['custom_field']) {
-            $customFields = json_decode($customer['custom_field']);
-            
-            foreach ($customFields as $key => $value) {
-                if (isset($this->settings[$this->moduleTitle . '_custom_field']['c_' . $key])) {
-                    $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['c_' . $key]] = $value;
-                }
-            }
-
-            if (isset($customFieldsToCrm)) {
-                $customerToCrm['customFields'] = $customFieldsToCrm;
-            }
-        }
-        
-        return $customerToCrm;
-    }
 }

src/upload/admin/model/extension/retailcrm/history.php

@@ -1,194 +1,341 @@
 <?php
 
-class ModelExtensionRetailcrmHistory extends Model
-{
-    /**
-     * Create order in OC
-     *
-     * @param array $order
-     *
-     * @return int $order_id
-     */
-    public function addOrder($order)
-    {
-        $this->db->query("INSERT INTO `" . DB_PREFIX . "order` SET store_id = '" . (int)$order['store_id'] . "', store_name = '" . $order['store_name'] . "', customer_id = '" . (int)$order['customer_id'] . "', customer_group_id = '" . (int)$order['customer_group_id'] . "', firstname = '" . $this->db->escape($order['firstname']) . "', lastname = '" . $this->db->escape($order['lastname']) . "', email = '" . $this->db->escape($order['email']) . "', telephone = '" . $this->db->escape($order['telephone']) . "', custom_field = '" . $this->db->escape(isset($order['custom_field']) ? json_encode($order['custom_field']) : '') . "', payment_firstname = '" . $this->db->escape($order['payment_firstname']) . "', payment_lastname = '" . $this->db->escape($order['payment_lastname']) . "', payment_address_1 = '" . $this->db->escape($order['payment_address_1']) . "', payment_city = '" . $this->db->escape($order['payment_city']) . "', payment_postcode = '" . $this->db->escape($order['payment_postcode']) . "', payment_country = '" . $this->db->escape($order['payment_country']) . "', payment_country_id = '" . (int)$order['payment_country_id'] . "', payment_zone = '" . $this->db->escape($order['payment_zone']) . "', payment_zone_id = '" . (int)$order['payment_zone_id'] . "', payment_method = '" . $this->db->escape($order['payment_method']) . "', payment_code = '" . $this->db->escape($order['payment_code']) . "', shipping_firstname = '" . $this->db->escape($order['shipping_firstname']) . "', shipping_lastname = '" . $this->db->escape($order['shipping_lastname']) . "', shipping_address_1 = '" . $this->db->escape($order['shipping_address_1']) . "', shipping_address_2 = '" . $this->db->escape($order['shipping_address_2']) . "', shipping_city = '" . $this->db->escape($order['shipping_city']) . "', shipping_postcode = '" . $this->db->escape($order['shipping_postcode']) . "', shipping_country = '" . $this->db->escape($order['shipping_country']) . "', shipping_country_id = '" . (int)$order['shipping_country_id'] . "', shipping_zone = '" . $this->db->escape($order['shipping_zone']) . "', shipping_zone_id = '" . (int)$order['shipping_zone_id'] . "', shipping_method = '" . $this->db->escape($order['shipping_method']) . "', shipping_code = '" . $this->db->escape($order['shipping_code']) . "', comment = '" . $this->db->escape($order['comment']) . "', total = '" . (float)$order['total'] . "', affiliate_id = '" . (int)$order['affiliate_id'] . "', language_id = '" . (int)$order['language_id'] . "', currency_id = '" . (int)$order['currency_id'] . "', currency_code = '" . $this->db->escape($order['currency_code']) . "', currency_value = '" . (float)$order['currency_value'] . "', order_status_id = '" . (int)$order['order_status_id'] . "',  date_added = NOW(), date_modified = NOW()");
+class ModelExtensionRetailcrmHistory extends Model {
+    protected $createResult;
+    protected $settings;
+    protected $moduleTitle;
+    protected $opencartApiClient;
 
-        $order_id = $this->db->getLastId();
+    private $orders_history;
+    private $customers_history;
+    private $data_repository;
 
-        // Products
-        if (isset($order['order_product']) && $order['order_product']) {
-            $this->addOrderProducts($order_id, $order['order_product']);
-        }
-
-        // Totals
-        if (isset($order['order_total'])) {
-            $this->addOrderTotals($order_id, $order['order_total']);
-        }
-
-        return $order_id;
+    public function __construct($registry) {
+        parent::__construct($registry);
+        $this->load->library('retailcrm/retailcrm');
+        $this->moduleTitle = $this->retailcrm->getModuleTitle();
+        $this->opencartApiClient = $this->retailcrm->getOcApiClient($registry);
     }
 
     /**
-     * Edit order in OC
+     * Getting changes from RetailCRM
+     * @param \RetailcrmProxy $retailcrmApiClient
      *
-     * @param int $order_id
-     * @param array $order
-     *
-     * @return void
+     * @return boolean
      */
-    public function editOrder($order_id, $order)
-    {
-        $this->db->query("UPDATE `" . DB_PREFIX . "order` SET customer_id = '" . (int)$order['customer_id'] . "', customer_group_id = '" . (int)$order['customer_group_id'] . "', firstname = '" . $this->db->escape($order['firstname']) . "', lastname = '" . $this->db->escape($order['lastname']) . "', email = '" . $this->db->escape($order['email']) . "', telephone = '" . $this->db->escape($order['telephone']) . "', custom_field = '" . $this->db->escape(json_encode($order['custom_field'])) . "', payment_firstname = '" . $this->db->escape($order['payment_firstname']) . "', payment_lastname = '" . $this->db->escape($order['payment_lastname']) . "',  payment_address_1 = '" . $this->db->escape($order['payment_address_1']) . "', payment_address_2 = '" . $this->db->escape($order['payment_address_2']) . "', payment_city = '" . $this->db->escape($order['payment_city']) . "', payment_postcode = '" . $this->db->escape($order['payment_postcode']) . "', payment_country = '" . $this->db->escape($order['payment_country']) . "', payment_country_id = '" . (int)$order['payment_country_id'] . "', payment_zone = '" . $this->db->escape($order['payment_zone']) . "', payment_zone_id = '" . (int)$order['payment_zone_id'] . "', payment_method = '" . $this->db->escape($order['payment_method']) . "', payment_code = '" . $this->db->escape($order['payment_code']) . "', shipping_firstname = '" . $this->db->escape($order['shipping_firstname']) . "', shipping_lastname = '" . $this->db->escape($order['shipping_lastname']) . "', shipping_address_1 = '" . $this->db->escape($order['shipping_address_1']) . "', shipping_address_2 = '" . $this->db->escape($order['shipping_address_2']) . "', shipping_city = '" . $this->db->escape($order['shipping_city']) . "', shipping_postcode = '" . $this->db->escape($order['shipping_postcode']) . "', shipping_country = '" . $this->db->escape($order['shipping_country']) . "', shipping_country_id = '" . (int)$order['shipping_country_id'] . "', shipping_zone = '" . $this->db->escape($order['shipping_zone']) . "', shipping_zone_id = '" . (int)$order['shipping_zone_id'] . "', shipping_method = '" . $this->db->escape($order['shipping_method']) . "', shipping_code = '" . $this->db->escape($order['shipping_code']) . "', comment = '" . $this->db->escape($order['comment']) . "', total = '" . (float)$order['total'] . "', order_status_id = '" . (int)$order['order_status_id'] . "', date_modified = NOW() WHERE order_id = '" . (int)$order_id . "'");
+    public function request($retailcrmApiClient) {
+        $this->load->library('retailcrm/retailcrm');
+        $this->load->model('setting/setting');
+        $this->load->model('setting/store');
+        $this->load->model('user/api');
+        $this->load->model('sale/order');
+        $this->load->model('customer/customer');
+        $this->load->model('extension/retailcrm/references');
+        $this->load->model('catalog/product');
+        $this->load->model('catalog/option');
+        $this->load->model('localisation/zone');
 
-        $this->db->query("DELETE FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int)$order_id . "'");
+        $this->load->language('extension/module/retailcrm');
 
-        // Products
-        if (isset($order['order_product']) && $order['order_product']) {
-            $this->addOrderProducts($order_id, $order['order_product']);
+        $this->data_repository = new \retailcrm\repository\DataRepository($this->registry);
+        $this->orders_history = new retailcrm\history\Order(
+            $this->data_repository,
+            new \retailcrm\service\SettingsManager($this->registry),
+            new \retailcrm\repository\ProductsRepository($this->registry),
+            new \retailcrm\repository\OrderRepository($this->registry)
+        );
+
+        $this->customers_history = new retailcrm\history\Customer(
+            $this->data_repository,
+            new \retailcrm\repository\CustomerRepository($this->registry),
+            new \retailcrm\service\SettingsManager($this->registry)
+        );
+
+        $this->orders_history->setOcDelivery(
+            $this->model_extension_retailcrm_references->getOpercartDeliveryTypes()
+        );
+
+        $this->orders_history->setOcPayment(
+            $this->model_extension_retailcrm_references->getOpercartPaymentTypes()
+        );
+
+        $settings = $this->model_setting_setting->getSetting($this->moduleTitle);
+        $history = $this->model_setting_setting->getSetting('retailcrm_history');
+        $settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST);
+
+        $url = isset($settings[$this->moduleTitle . '_url']) ? $settings[$this->moduleTitle . '_url'] : null;
+        $key = isset($settings[$this->moduleTitle . '_apikey']) ? $settings[$this->moduleTitle . '_apikey'] : null;
+
+        if (empty($url) || empty($key)) {
+            $this->log->addNotice('You need to configure retailcrm module first.');
+
+            return false;
         }
 
-        // Totals
-        $this->db->query("DELETE FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int)$order_id . "'");
+        $sinceIdOrders = $history['retailcrm_history_orders'] ?? 0;
+        $sinceIdCustomers = $history['retailcrm_history_customers'] ?? 0;
+        $packsOrders = $retailcrmApiClient->ordersHistory(['sinceId' => $sinceIdOrders]);
+        $packsCustomers = $retailcrmApiClient->customersHistory(['sinceId' => $sinceIdCustomers]);
 
-        if (isset($order['order_total'])) {
-            $this->addOrderTotals($order_id, $order['order_total']);
+        if (!$packsOrders->isSuccessful() && count($packsOrders->history) <= 0
+            && !$packsCustomers->isSuccessful() && count($packsCustomers->history) <= 0
+        ) {
+            return false;
         }
-    }
 
-    /**
-     * Add order products
-     *
-     * @param int $order_id
-     * @param array $products
-     *
-     * @return void
-     */
-    public function addOrderProducts($order_id, $products)
-    {
-        foreach ($products as $product) {
-            $this->db->query("INSERT INTO " . DB_PREFIX . "order_product SET order_id = '" . (int)$order_id . "', product_id = '" . (int)$product['product_id'] . "', name = '" . $this->db->escape($product['name']) . "', model = '" . $this->db->escape($product['model']) . "', quantity = '" . (int)$product['quantity'] . "', price = '" . (float)$product['price'] . "', total = '" . (float)$product['total'] . "', reward = '" . (float)$product['reward'] . "'");
+        $ordersHistory = $packsOrders->history;
+        $customersHistory = $packsCustomers->history;
+        $lastChangeOrders = $ordersHistory ? end($ordersHistory) : null;
+        $lastChangeCustomers = $customersHistory ? end($customersHistory) : null;
 
-            $order_product_id = $this->db->getLastId();
+        if ($lastChangeOrders !== null && $lastChangeCustomers !== null) {
+            $this->model_setting_setting->editSetting(
+                'retailcrm_history',
+                [
+                    'retailcrm_history_orders' => $lastChangeOrders['id'],
+                    'retailcrm_history_customers' => $lastChangeCustomers['id']
+                ]
+            );
+        }
 
-            foreach ($product['option'] as $option) {
-                $this->db->query("INSERT INTO " . DB_PREFIX . "order_option SET order_id = '" . (int)$order_id . "', order_product_id = '" . (int)$order_product_id . "', product_option_id = '" . (int)$option['product_option_id'] . "', product_option_value_id = '" . (int)$option['product_option_value_id'] . "', name = '" . $this->db->escape($option['name']) . "', `value` = '" . $this->db->escape($option['value']) . "', `type` = '" . $this->db->escape($option['type']) . "'");
+        $orders = RetailcrmHistoryHelper::assemblyOrder($ordersHistory);
+        $customers = RetailcrmHistoryHelper::assemblyCustomer($customersHistory);
+        $newOrders = [];
+        $updatedOrders = [];
+        $this->settings = $settings;
+        $this->status = array_flip($settings[$this->moduleTitle . '_status']);
+
+        foreach ($orders as $order) {
+            if (isset($order['deleted'])) {
+                continue;
+            }
+
+            if (isset($order['externalId'])) {
+                $updatedOrders[] = $order['id'];
+            } else {
+                $newOrders[] = $order['id'];
             }
         }
+
+        unset($orders);
+
+        $updateCustomers = [];
+
+        foreach ($customers as $customer) {
+            if (isset($customer['deleted'])) {
+                continue;
+            }
+
+            if (isset($customer['externalId'])) {
+                $updateCustomers[] = $customer['id'];
+            }
+        }
+
+        unset($customers);
+
+        if (!empty($updateCustomers)) {
+            $customers = $retailcrmApiClient->customersList(['ids' => $updateCustomers]);
+            if ($customers) {
+                $this->updateCustomers($customers['customers']);
+            }
+        }
+
+        if (!empty($newOrders)) {
+            $orders = $retailcrmApiClient->ordersList(['ids' => $newOrders]);
+            if ($orders) {
+                $this->createResult = $this->createOrders($orders['orders'], $retailcrmApiClient);
+            }
+        }
+
+        if (!empty($updatedOrders)) {
+            $orders = $retailcrmApiClient->ordersList(['ids' => $updatedOrders]);
+
+            if ($orders) {
+                $this->updateOrders($orders['orders'], $retailcrmApiClient);
+            }
+        }
+
+        if (!empty($this->createResult['customers'])) {
+            $retailcrmApiClient->customersFixExternalIds($this->createResult['customers']);
+        }
+
+        if (!empty($this->createResult['orders'])) {
+            $retailcrmApiClient->ordersFixExternalIds($this->createResult['orders']);
+        }
+
+        return true;
     }
 
     /**
-     * Add order totals
+     * Create orders from history
      *
-     * @param int $order_id
-     * @param array $totals
+     * @param array $orders
+     * @param \RetailcrmProxy $retailcrmApiClient
+     *
+     * @return array
+     */
+    protected function createOrders($orders, $retailcrmApiClient) {
+        $customersIdsFix = array();
+        $ordersIdsFix = array();
+
+        foreach ($orders as $order) {
+            $data = array();
+            $corporateAddress = array();
+
+            if (!empty($order['customer']['type']) && $order['customer']['type'] === 'customer_corporate') {
+                $customer = $order['contact'];
+                if (empty($customer['address'])) {
+                    $corporateAddress = $this->getCorporateCustomerAddress($retailcrmApiClient, $order);
+
+                    if (!empty($corporateAddress)) {
+                        $customer['address'] = $corporateAddress;
+                    }
+                }
+            } else {
+                $customer = $order['customer'];
+            }
+
+            $customer_id = (!empty($customer['externalId']))
+                ? $customer['externalId']
+                : 0;
+
+            if ($customer_id === 0) {
+                $customer_data = array();
+
+                $this->customers_history->handleCustomer($customer_data, $customer);
+                $address = $this->customers_history->handleAddress($customer, $order);
+                $this->customers_history->handleCustomFields($customer_data, $customer);
+                $customer_data['address'] = array($address);
+                $customer_id = $this->model_customer_customer->addCustomer($customer_data);
+
+                $customersIdsFix[] = array('id' => $customer['id'], 'externalId' => (int)$customer_id);
+            }
+
+            $this->orders_history->handleBaseOrderData($data, $order);
+            $this->orders_history->handleShipping($data, $order);
+            $this->orders_history->handlePayment($data, $order, $corporateAddress);
+            $this->orders_history->handleProducts($data, $order);
+            $this->orders_history->handleTotals($data, $order);
+            $this->orders_history->handleCustomFields($data, $order);
+            $data['customer_id'] = $customer_id;
+
+            $data['order_status_id'] = 1;
+
+            $order_id = $this->data_repository->addOrder($data);
+
+            $ordersIdsFix[] = array('id' => $order['id'], 'externalId' => (int) $order_id);
+        }
+
+        return array('customers' => $customersIdsFix, 'orders' => $ordersIdsFix);
+    }
+
+    /**
+     * Update orders from history
+     *
+     * @param array $orders
+     * @param \RetailcrmProxy $retailcrmApiClient
      *
      * @return void
      */
-    public function addOrderTotals($order_id, $totals)
-    {
-        foreach ($totals as $total) {
-            $this->db->query("INSERT INTO " . DB_PREFIX . "order_total SET order_id = '" . (int)$order_id . "', code = '" . $this->db->escape($total['code']) . "', title = '" . $this->db->escape($total['title']) . "', `value` = '" . (float)$total['value'] . "', sort_order = '" . (int)$total['sort_order'] . "'");
+    protected function updateOrders($orders, $retailcrmApiClient) {
+        foreach ($orders as $order) {
+            $corporateAddress = array();
+            $data = $this->model_sale_order->getOrder($order['externalId']);
+
+            if (!empty($order['customer']['type']) && $order['customer']['type'] === 'customer_corporate') {
+                $customer = $order['contact'];
+                if (empty($customer['address'])) {
+                    $corporateAddress = $this->getCorporateCustomerAddress($retailcrmApiClient, $order);
+
+                    if (!empty($corporateAddress)) {
+                        $customer['address'] = $corporateAddress;
+                    }
+                }
+            } else {
+                $customer = $order['customer'];
+            }
+
+            $customer_id = (!empty($customer['externalId']))
+                ? $customer['externalId']
+                : 0;
+
+            if ($customer_id === 0) {
+                $customer_data = array();
+
+                $this->customers_history->handleCustomer($customer_data, $customer);
+                $address = $this->customers_history->handleAddress($customer, $order);
+                $this->customers_history->handleCustomFields($customer_data, $customer);
+                $customer_data['address'] = array($address);
+                $customer_id = $this->model_customer_customer->addCustomer($customer_data);
+
+                $this->createResult['customers'][] = array('id' => $customer['id'], 'externalId' => (int)$customer_id);
+            }
+
+            $this->orders_history->handleBaseOrderData($data, $order);
+            $this->orders_history->handleShipping($data, $order);
+            $this->orders_history->handlePayment($data, $order, $corporateAddress);
+            $this->orders_history->handleProducts($data, $order);
+            $this->orders_history->handleTotals($data, $order);
+            $this->orders_history->handleCustomFields($data, $order);
+
+            $data['customer_id'] = $customer_id;
+            if (array_key_exists($order['status'], $this->status)) {
+                $data['order_status_id'] = $this->status[$order['status']];
+            }
+
+            if (isset($this->settings[$this->moduleTitle . '_status_changes'])
+                && $this->settings[$this->moduleTitle . '_status_changes']
+            ) {
+                $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
+            }
+
+            $this->data_repository->editOrder($order['externalId'], $data);
+        }
+    }
+
+    protected function updateCustomers($customers) {
+        foreach ($customers as $customer) {
+            $customer_id = $customer['externalId'];
+            $customer_data = $this->model_customer_customer->getCustomer($customer_id);
+
+            $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;
+            }
+
+            $this->model_customer_customer->editCustomer($customer_id, $customer_data);
         }
     }
 
     /**
-     * Get total titles
-     *
-     * @return string $title
-     */
-    protected function totalTitles()
-    {
-        if (version_compare(VERSION, '3.0', '<')) {
-            $title = '';
-        } else {
-            $title = 'total_';
-        }
-
-        return $title;
-    }
-
-    /**
-     * Get country by iso code 2
-     *
-     * @param string $isoCode
+     * @param \RetailcrmProxy $retailcrmApiClient
+     * @param array $order
      *
      * @return array
      */
-    public function getCountryByIsoCode($isoCode)
-    {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE iso_code_2 = '" . $isoCode . "'");
+    private function getCorporateCustomerAddress($retailcrmApiClient, $order) {
+        $addresses = $retailcrmApiClient->customersCorporateAddresses(
+            $order['customer']['id'],
+            array('ids' => array($order['customer']['mainAddress'])),
+            null,
+            null,
+            'id'
+        );
 
-        return $query->row;
-    }
-
-    /**
-     * Get zone by name
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function getZoneByName($name)
-    {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE name = '" . $name . "'");
-
-        return $query->row;
-    }
-
-    /**
-     * Get currency
-     *
-     * @param string $code
-     * @param string $field (default = '')
-     *
-     * @return mixed array | string
-     */
-    public function getCurrencyByCode($code, $field = '')
-    {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "currency` WHERE code = '" . $code . "'");
-
-        if (!$field) {
-            return $query->row;
+        if ($addresses->isSuccessful() && !empty($addresses['addresses'])) {
+            return $addresses['addresses'][0];
         }
 
-        return $query->row[$field];
-    }
-
-    /**
-     * Get language
-     *
-     * @param string $code
-     * @param string $field (default = '')
-     *
-     * @return mixed array | string
-     */
-    public function getLanguageByCode($code, $field = '')
-    {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "language` WHERE code = '" . $code . "'");
-
-        if (!$field) {
-            return $query->row;
-        }
-
-        return $query->row[$field];
-    }
-
-    /**
-     * Get product option value
-     *
-     * @param int $option_value_id
-     * @param string $field
-     *
-     * @return mixed array | string
-     */
-    public function getOptionValue($option_value_id, $field = '')
-    {
-        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "option_value_description` WHERE option_value_id = '" . $option_value_id . "'");
-
-        if (!$field) {
-            return $query->row;
-        }
-
-        return $query->row[$field];
+        return array();
     }
 }

src/upload/admin/model/extension/retailcrm/history/v3.php

@@ -1,117 +0,0 @@
-<?php
-
-require_once 'v4_5.php';
-
-class ModelExtensionRetailcrmHistoryV3 extends ModelExtensionRetailcrmHistoryV45
-{
-    protected $createResult;
-
-    /**
-     * Getting changes from RetailCRM
-     *
-     * @param \RetailcrmProxy $retailcrmApiClient
-     *
-     * @return boolean
-     */
-    public function request($retailcrmApiClient)
-    {      
-        $moduleTitle = $this->retailcrm->getModuleTitle();
-        $this->load->model('setting/setting');
-        $this->load->model('setting/store');
-        $this->load->model('user/api');
-        $this->load->model('sale/order');
-        $this->load->model('customer/customer');        
-        $this->load->model('extension/retailcrm/references');
-        $this->load->model('catalog/product');
-        $this->load->model('catalog/option');
-        $this->load->model('localisation/zone');
-
-        $this->load->language('extension/module/retailcrm');
-
-        $settings = $this->model_setting_setting->getSetting($moduleTitle);
-        $history = $this->model_setting_setting->getSetting('retailcrm_history');
-        $settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST);
-
-        $url = isset($settings[$moduleTitle . '_url']) ? $settings[$moduleTitle . '_url'] : null;
-        $key = isset($settings[$moduleTitle . '_apikey']) ? $settings[$moduleTitle . '_apikey'] : null;
-
-        if (empty($url) || empty($key)) {
-            $this->log->addNotice('You need to configure retailcrm module first.');
-            return false;
-        }
-
-        $lastRun = !empty($history['retailcrm_history_datetime'])
-            ? new DateTime($history['retailcrm_history_datetime'])
-            : new DateTime(date('Y-m-d H:i:s', strtotime('-1 days', strtotime(date('Y-m-d H:i:s')))));
-
-        $packsOrders = $retailcrmApiClient->ordersHistory($lastRun);
-
-        if(!$packsOrders->isSuccessful() && count($packsOrders['orders']) <= 0) {
-            return false;
-        }
-
-        $generatedAt = $packsOrders['generatedAt'];
-
-        $this->totalTitle = $this->totalTitles();
-        $this->subtotalSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'sub_total');
-        $this->totalSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'total');
-        $this->shippingSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'shipping');
-        $this->delivery = array_flip($settings[$moduleTitle . '_delivery']);
-        $this->payment = array_flip($settings[$moduleTitle . '_payment']);
-        $this->status = array_flip($settings[$moduleTitle . '_status']);
-        $this->payment_default = $settings[$moduleTitle . '_default_payment'];
-        $this->delivery_default = $settings[$moduleTitle . '_default_shipping'];
-        $this->ocPayment = $this->model_extension_retailcrm_references
-            ->getOpercartPaymentTypes();
-
-        $this->ocDelivery = $this->model_extension_retailcrm_references
-            ->getOpercartDeliveryTypes();
-
-        $this->zones = $this->model_localisation_zone->getZones();
-
-        $updatedOrders = array();
-        $newOrders = array();
-        $orders = $packsOrders['orders'];
-
-        foreach ($orders as $order) {
-
-            if (isset($order['deleted'])) {
-                continue;
-            }
-
-            if (isset($order['externalId'])) {
-                $updatedOrders[] = $order['id'];
-            } else {
-                $newOrders[] = $order['id'];
-            }
-        }
-
-        unset($orders);
-
-        if (!empty($newOrders)) {
-            $orders = $retailcrmApiClient->ordersList($filter = array('ids' => $newOrders));
-            if ($orders) {
-                $this->createResult = $this->createOrders($orders['orders']);
-            }
-        }
-
-        if (!empty($updatedOrders)) {
-            $orders = $retailcrmApiClient->ordersList($filter = array('ids' => $updatedOrders));
-            if ($orders) {
-                $this->updateOrders($orders['orders']);
-            }
-        }
-        
-        $this->model_setting_setting->editSetting('retailcrm_history', array('retailcrm_history_datetime' => $generatedAt));
-
-        if (!empty($this->createResult['customers'])) {
-            $retailcrmApiClient->customersFixExternalIds($this->createResult['customers']);
-        }
-
-        if (!empty($this->createResult['orders'])) {
-            $retailcrmApiClient->ordersFixExternalIds($this->createResult['orders']);
-        }
-
-        return true;
-    }
-}

src/upload/admin/model/extension/retailcrm/history/v4_5.php

@@ -1,837 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../history.php';
-
-class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
-{
-    protected $createResult;
-    protected $settings;
-    protected $moduleTitle;
-    protected $opencartApiClient;
-
-    private $customFieldSetting;
-
-    public function __construct($registry)
-    {
-        parent::__construct($registry);
-        $this->load->library('retailcrm/retailcrm');
-        $this->moduleTitle = $this->retailcrm->getModuleTitle();
-        $this->opencartApiClient = $this->retailcrm->getOcApiClient($registry);
-    }
-
-    /**
-     * Getting changes from RetailCRM
-     * @param \RetailcrmProxy $retailcrmApiClient
-     *
-     * @return boolean
-     */
-    public function request($retailcrmApiClient)
-    {
-        $this->load->library('retailcrm/retailcrm');
-        $this->load->model('setting/setting');
-        $this->load->model('setting/store');
-        $this->load->model('user/api');
-        $this->load->model('sale/order');
-        $this->load->model('customer/customer');
-        $this->load->model('extension/retailcrm/references');
-        $this->load->model('catalog/product');
-        $this->load->model('catalog/option');
-        $this->load->model('localisation/zone');
-
-        $this->load->language('extension/module/retailcrm');
-
-        $settings = $this->model_setting_setting->getSetting($this->moduleTitle);
-        $history = $this->model_setting_setting->getSetting('retailcrm_history');
-        $settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST);
-
-        $url = isset($settings[$this->moduleTitle . '_url']) ? $settings[$this->moduleTitle . '_url'] : null;
-        $key = isset($settings[$this->moduleTitle . '_apikey']) ? $settings[$this->moduleTitle . '_apikey'] : null;
-
-        if (empty($url) || empty($key)) {
-            $this->log->addNotice('You need to configure retailcrm module first.');
-            return false;
-        }
-
-        $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) {
-            return false;
-        }
-
-        $generatedAt = $packsOrders['generatedAt'];
-        $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) {
-            $sinceIdOrders = $lastChangeOrders['id'];
-        }
-
-        if ($lastChangeCustomers !== null) {
-            $sinceIdCustomers = $lastChangeCustomers['id'];
-        }
-
-        $this->settings = $settings;
-        $this->totalTitle = $this->totalTitles();
-        $this->subtotalSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'sub_total');
-        $this->totalSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'total');
-        $this->shippingSettings = $this->model_setting_setting->getSetting($this->totalTitle . 'shipping');
-
-        $this->delivery = array_flip($settings[$this->moduleTitle . '_delivery']);
-        $this->payment = array_flip($settings[$this->moduleTitle . '_payment']);
-        $this->status = array_flip($settings[$this->moduleTitle . '_status']);
-        $this->delivery_default = $settings[$this->moduleTitle . '_default_shipping'];
-        $this->payment_default = $settings[$this->moduleTitle . '_default_payment'];
-        $this->ocPayment = $this->model_extension_retailcrm_references
-            ->getOpercartPaymentTypes();
-
-        $this->ocDelivery = $this->model_extension_retailcrm_references
-            ->getOpercartDeliveryTypes();
-
-        $this->zones = $this->model_localisation_zone->getZones();
-
-        if (isset($settings[$this->moduleTitle . '_custom_field'])) {
-            $this->customFieldSetting = array_flip($settings[$this->moduleTitle . '_custom_field']);
-        }
-
-        $updatedOrders = array();
-        $newOrders = array();
-
-        foreach ($orders as $order) {
-
-            if (isset($order['deleted'])) {
-                continue;
-            }
-
-            if (isset($order['externalId'])) {
-                $updatedOrders[] = $order['id'];
-            } else {
-                $newOrders[] = $order['id'];
-            }
-        }
-
-        unset($orders);
-
-        $updateCustomers = array();
-
-        foreach ($customers as $customer) {
-
-            if (isset($customer['deleted'])) {
-                continue;
-            }
-
-            if (isset($customer['externalId'])) {
-                $updateCustomers[] = $customer['id'];
-            }
-        }
-
-        unset($customers);
-
-        if (!empty($updateCustomers)) {
-            $customers = $retailcrmApiClient->customersList($filter = array('ids' => $updateCustomers));
-            if ($customers) {
-                $this->updateCustomers($customers['customers']);
-            }
-        }
-
-        if (!empty($newOrders)) {
-            $orders = $retailcrmApiClient->ordersList($filter = array('ids' => $newOrders));
-            if ($orders) {
-                $this->createResult = $this->createOrders($orders['orders']);
-            }
-        }
-
-        if (!empty($updatedOrders)) {
-            $orders = $retailcrmApiClient->ordersList($filter = array('ids' => $updatedOrders));
-            if ($orders) {
-                $this->updateOrders($orders['orders']);
-            }
-        }
-
-        $this->model_setting_setting->editSetting(
-            'retailcrm_history',
-            array(
-                'retailcrm_history_orders' => $sinceIdOrders,
-                'retailcrm_history_customers' => $sinceIdCustomers,
-                'retailcrm_history_datetime' => $generatedAt
-            )
-        );
-
-        if (!empty($this->createResult['customers'])) {
-            $retailcrmApiClient->customersFixExternalIds($this->createResult['customers']);
-        }
-
-        if (!empty($this->createResult['orders'])) {
-            $retailcrmApiClient->ordersFixExternalIds($this->createResult['orders']);
-        }
-
-        return true;
-    }
-
-    /**
-     * Update orders from history
-     *
-     * @param array $orders
-     *
-     * @return void
-     */
-    protected function updateOrders($orders)
-    {
-        foreach ($orders as $order) {
-            $ocOrder = $this->model_sale_order->getOrder($order['externalId']);
-
-            if (isset($order['payments']) && $order['payments']) {
-                foreach ($order['payments'] as $orderPayment) {
-                    if (isset($orderPayment['externalId'])) {
-                        $payment = $orderPayment;
-                    }
-                }
-
-                if (!isset($payment) && count($order['payments']) == 1) {
-                    $payment = end($order['payments']);
-                }
-            } elseif (isset($order['paymentType'])) {
-                $payment['type'] = $order['paymentType'];
-            }
-
-            $data = array();
-
-            $mail = isset($order['email']) ? $order['email'] : $order['customer']['email'];
-            $phone = isset($order['phone']) ? $order['phone'] : '';
-
-            if (!$phone) {
-                $data['telephone'] = $order['customer']['phones'] ? $order['customer']['phones'][0]['number'] : '80000000000';
-            } else {
-                $data['telephone'] = $phone;
-            }
-
-            if (isset($order['customer']['externalId']) && $order['customer']['externalId']) {
-                $customer = $this->model_customer_customer->getCustomer($order['customer']['externalId']);
-            }
-
-            $data['customer'] = $order['firstName'];
-            $data['customer_id'] = (isset($customer)) ? $customer['customer_id'] : 0;
-            $data['customer_group_id'] = (isset($customer)) ? $customer['customer_group_id'] : 1;
-            $data['firstname'] = $order['firstName'];
-            $data['lastname'] = isset($order['lastName']) ? $order['lastName'] : $order['firstName'];
-            $data['email'] = $mail ? $mail : uniqid() . '@retailrcm.ru';
-            $data['comment'] = !empty($order['customerComment']) ? $order['customerComment'] : '';
-            $data['payment_address'] = '0';
-            $data['payment_firstname'] = $order['firstName'];
-            $data['payment_lastname'] = isset($order['lastName']) ? $order['lastName'] : $order['firstName'];
-            $data['payment_address_1'] = isset($order['customer']['address']) ? $order['customer']['address']['text'] : '';
-            $data['payment_address_2'] = '';
-            $data['payment_city'] = !empty($order['customer']['address']['city']) ? $order['customer']['address']['city'] : $order['delivery']['address']['city'];
-            $data['payment_postcode'] = !empty( $order['customer']['address']['index'] ) ? $order['customer']['address']['index'] : $order['delivery']['address']['index'];
-
-            $shippingZone = '';
-
-            if (is_int($order['delivery']['address']['region'])) {
-                $shippingZone = $order['delivery']['address']['region'];
-            } else {
-                $shippingZone = $this->getZoneByName($order['delivery']['address']['region']);
-
-                if ($shippingZone) {
-                    $shipping_zone_id = $shippingZone['zone_id'];
-                } else {
-                    $shipping_zone_id = 0;
-                }
-            }
-
-            if (isset($order['customer']['address']['region'])) {
-                $paymentZone = $this->getZoneByName($order['customer']['address']['region']);
-
-                if ($paymentZone) {
-                    $payment_zone_id = $paymentZone['zone_id'];
-                } else {
-                    $payment_zone_id = 0;
-                }
-            }
-
-            if (isset($order['countryIso']) && !empty($order['countryIso'])) {
-                $shippingCountry = $this->getCountryByIsoCode($order['countryIso']);
-            }
-
-            if (isset($order['customer']['address']['countryIso']) && !empty($order['customer']['address']['countryIso'])) {
-                $paymentCountry = $this->getCountryByIsoCode($order['customer']['address']['countryIso']);
-            } else {
-                $paymentCountry = $this->getCountryByIsoCode($order['countryIso']);
-            }
-
-            $delivery = isset($order['delivery']['code']) ? $order['delivery']['code'] : null;
-            $data['payment_country_id'] = $paymentCountry ? $paymentCountry['country_id'] : $ocOrder['payment_country_id'];
-            $data['payment_country'] = isset($paymentCountry) ? $paymentCountry['name'] : $ocOrder['payment_country'];
-            $data['payment_zone_id'] = $payment_zone_id ? $payment_zone_id : $ocOrder['payment_zone_id'];
-            $data['payment_zone'] = isset($order['customer']['address']['region']) ? $order['customer']['address']['region'] : $ocOrder['payment_zone'];
-            $data['shipping_country_id'] = isset($shippingCountry) ? $shippingCountry['country_id'] : $ocOrder['shipping_country_id'];
-            $data['shipping_country'] = isset($shippingCountry) ? $shippingCountry['name'] : $ocOrder['shipping_country'];
-            $data['shipping_zone_id'] = $shipping_zone_id ? $shipping_zone_id : $ocOrder['shipping_zone_id'];
-            $data['shipping_zone'] = $shippingZone ? $shippingZone['name'] : $ocOrder['shipping_zone'];
-            $data['shipping_address'] = '0';
-            $data['shipping_firstname'] = $order['firstName'];
-            $data['shipping_lastname'] = isset($order['lastName']) ? $order['lastName'] : $order['firstName'];
-            $data['shipping_address_1'] = $order['delivery']['address']['text'];
-            $data['shipping_address_2'] = '';
-            $data['shipping_company'] = '';
-            $data['shipping_company_id'] = '';
-            $data['shipping_city'] = $order['delivery']['address']['city'];
-            $data['shipping_postcode'] = $order['delivery']['address']['index'];
-
-            if ($delivery !== null) {
-                if (isset($this->settings[$this->moduleTitle . '_delivery'][$ocOrder['shipping_code']])
-                    && isset($this->delivery[$delivery])
-                ) {
-                    $data['shipping'] = $this->delivery[$delivery];
-
-                    $shipping = explode('.', $data['shipping']);
-                    $shippingModule = $shipping[0];
-
-                    if (isset($this->ocDelivery[$shippingModule][$data['shipping']]['title'])) {
-                        $data['shipping_method'] = $this->ocDelivery[$shippingModule][$data['shipping']]['title'];
-                    } else {
-                        $data['shipping_method'] = $this->ocDelivery[$shippingModule]['title'];
-                    }
-
-                    $data['shipping_code'] = $data['shipping'];
-                } elseif (!isset($this->settings[$this->moduleTitle . '_delivery'][$ocOrder['shipping_code']])
-                    ) {
-                    $data['shipping_method'] = $ocOrder['shipping_method'];
-                    $data['shipping_code'] = $ocOrder['shipping_code'];
-                }
-            } else {
-                if (!isset($this->settings[$ocOrder['shipping_code']])
-                    || !isset($this->delivery[$delivery])
-                ) {
-                    $data['shipping_method'] = $ocOrder['shipping_method'];
-                    $data['shipping_code'] = $ocOrder['shipping_code'];
-                }
-            }
-
-            if (isset($payment)) {
-                $data['payment'] = $this->payment[$payment['type']];
-                $data['payment_method'] = isset($this->ocPayment[$data['payment']]) ? $this->ocPayment[$data['payment']] : $ocOrder['payment_method'];
-                $data['payment_code'] = isset($this->payment[$payment['type']]) ? $this->payment[$payment['type']] : $ocOrder['payment_code'];
-            } else {
-                $data['payment_method'] = $ocOrder['payment_method'];
-                $data['payment_code'] = $ocOrder['payment_code'];
-            }
-
-            // this data will not retrive from crm for now
-            $data['tax'] = '';
-            $data['tax_id'] = '';
-            $data['product'] = '';
-            $data['product_id'] = '';
-            $data['reward'] = '';
-            $data['affiliate'] = '';
-            $data['affiliate_id'] = '';
-            $data['payment_tax_id'] = '';
-            $data['order_product_id'] = '';
-            $data['payment_company'] = '';
-            $data['payment_company_id'] = '';
-            $data['company'] = '';
-            $data['company_id'] = '';
-
-            $data['order_product'] = array();
-
-            $discount = false;
-
-            foreach ($order['items'] as $item) {
-                $productId = $item['offer']['externalId'];
-                $options = array();
-
-                if (isset($item['discountTotal']) && $item['discountTotal'] > 0) {
-                    $discount = true;
-                }
-
-                if (mb_strpos($item['offer']['externalId'], '#') > 1) {
-                    $offer = explode('#', $item['offer']['externalId']);
-                    $productId = $offer[0];
-                    $optionsFromCRM = explode('_', $offer[1]);
-
-                    foreach ($optionsFromCRM as $optionFromCRM) {
-                        $optionData = explode('-', $optionFromCRM);
-                        $productOptionId = $optionData[0];
-                        $optionValueId = $optionData[1];
-
-                        $productOptions = $this->model_catalog_product->getProductOptions($productId);
-
-                        foreach($productOptions as $productOption) {
-                            if($productOptionId == $productOption['product_option_id']) {
-                                foreach($productOption['product_option_value'] as $productOptionValue) {
-                                    if($productOptionValue['option_value_id'] == $optionValueId) {
-                                        $options[] = array(
-                                            'product_option_id' => $productOptionId,
-                                            'product_option_value_id' => $productOptionValue['product_option_value_id'],
-                                            'value' => $this->getOptionValue($productOptionValue['option_value_id'], 'name'),
-                                            'type' => $productOption['type'],
-                                            'name' => $productOption['name'],
-                                        );
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                $product = $this->model_catalog_product->getProduct($productId);
-                $rewards = $this->model_catalog_product->getProductRewards($productId);
-
-                $data['order_product'][] = array(
-                    'name' => $product['name'],
-                    'model' => $product['model'],
-                    'price' => $item['initialPrice'],
-                    'total' => (float)($item['initialPrice'] * $item['quantity']),
-                    'product_id' => $productId,
-                    'quantity' => $item['quantity'],
-                    'option' => $options,
-                    'reward' => $rewards[$data['customer_group_id']]['points'] * $item['quantity']
-                );
-            }
-
-            if (isset($this->customFieldSetting) && $order['customFields']) {
-                foreach ($order['customFields'] as $code => $value) {
-                    if (array_key_exists($code, $this->customFieldSetting)) {
-                        $fieldCode = str_replace('o_', '', $this->customFieldSetting[$code]);
-                        $customFields[$fieldCode] = $value;
-                    }
-                }
-
-                $data['custom_field'] = isset($customFields) ? $customFields : '';
-            } else {
-                $data['custom_field'] = $ocOrder['custom_field'];
-            }
-
-            $deliveryCost = !empty($order['delivery']['cost']) ? $order['delivery']['cost'] : 0;
-
-            $data['total'] = $order['totalSumm'];
-            $data['order_total'] = array(
-                array(
-                    'order_total_id' => '',
-                    'code' => 'sub_total',
-                    'title' => $this->language->get('product_summ'),
-                    'value' => $order['summ'],
-                    'text' => $order['summ'],
-                    'sort_order' => $this->subtotalSettings['sub_total_sort_order']
-                ),
-                array(
-                    'order_total_id' => '',
-                    'code' => 'shipping',
-                    'title' => $data['shipping_method'],
-                    'value' => $deliveryCost,
-                    'text' => $deliveryCost,
-                    'sort_order' => $this->shippingSettings[$this->totalTitle . 'shipping_sort_order']
-                ),
-                array(
-                    'order_total_id' => '',
-                    'code' => 'total',
-                    'title' => $this->language->get('column_total'),
-                    'value' => isset($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $deliveryCost,
-                    'text' => isset($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $deliveryCost,
-                    'sort_order' => $this->totalSettings[$this->totalTitle . 'total_sort_order']
-                )
-            );
-
-            if ((isset($order['discount'])
-                && $order['discount'] > 0)
-                || $discount
-            ) {
-                $orderTotals = $this->model_sale_order->getOrderTotals($order['externalId']);
-                foreach ($orderTotals as $orderTotal) {
-                    if ($orderTotal['code'] == 'coupon'
-                        || $orderTotal['code'] == 'reward'
-                    ) {
-                        $data['order_total'][] = $orderTotal;
-                    }
-                }
-            }
-
-            $data['fromApi'] = true;
-
-            if (array_key_exists($order['status'], $this->status)) {
-                $data['order_status_id'] = $this->status[$order['status']];
-            } else {
-                $tmpOrder = $this->model_sale_order->getOrder($order['externalId']);
-                $data['order_status_id'] = $tmpOrder['order_status_id'];
-            }
-
-            if (isset($this->settings[$this->moduleTitle . '_status_changes'])
-                && $this->settings[$this->moduleTitle . '_status_changes']
-            ) {
-                $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
-            }
-
-            $this->editOrder($order['externalId'], $data);
-        }
-    }
-
-    /**
-     * Create orders from history
-     *
-     * @param array $orders
-     *
-     * @return array
-     */
-    protected function createOrders($orders)
-    {
-        $customersIdsFix = array();
-        $ordersIdsFix = array();
-
-        foreach ($orders as $order) {
-            $store = $this->config->get('config_store_id');
-
-            if (isset($order['payments']) && $order['payments']) {
-                $payment = end($order['payments']);
-            } elseif (isset($order['paymentType'])) {
-                $payment['type'] = $order['paymentType'];
-            }
-
-            $customer_id = (!empty($order['customer']['externalId']))
-                ? $order['customer']['externalId']
-                : 0;
-
-            $data = array();
-
-            if ($customer_id == 0) {
-                if (isset($order['customer']['address']['countryIso'])) {
-                    $customerCountry = $this->getCountryByIsoCode($order['customer']['address']['countryIso']);
-                } else {
-                    $customerCountry = $this->getCountryByIsoCode($order['delivery']['address']['countryIso']);
-                }
-
-                if (isset($order['customer']['address']['region'])) {
-                    $customerZone = $this->getZoneByName($order['customer']['address']['region']);
-                } else {
-                    $customerZone = $this->getZoneByName($order['delivery']['address']['region']);
-                }
-
-                $cData = array(
-                    'store_id' => 0,
-                    'customer_group_id' => '1',
-                    'firstname' => isset($order['patronymic']) ? $order['firstName'] . ' ' . $order['patronymic'] : $order['firstName'],
-                    'lastname' => (!empty($order['customer']['lastName'])) ? $order['customer']['lastName'] : ' ',
-                    'email' => $order['customer']['email'],
-                    'telephone' => $order['customer']['phones'] ? $order['customer']['phones'][0]['number'] : ' ',
-                    'fax' => '',
-                    'newsletter' => 0,
-                    'password' => 'tmppass',
-                    'status' => 1,
-                    'approved' => 1,
-                    'safe' => 0,
-                    'affiliate' => '',
-                    'address' => array(
-                        array(
-                            'firstname' => isset($order['patronymic']) ? $order['firstName'] . ' ' . $order['patronymic'] : $order['firstName'],
-                            'lastname' => (!empty($order['customer']['lastName'])) ? $order['customer']['lastName'] : ' ',
-                            'address_1' => $order['customer']['address']['text'],
-                            'address_2' => ' ',
-                            'city' => !empty($order['customer']['address']['city']) ? $order['customer']['address']['city'] : $order['delivery']['address']['city'],
-                            'postcode' => isset($order['customer']['address']['index']) ? $order['customer']['address']['index'] : $order['delivery']['address']['index'],
-                            'tax_id' => '1',
-                            'company' => '',
-                            'company_id' => '',
-                            'zone_id' => $customerZone ? $customerZone['zone_id'] : 0,
-                            'country_id' => $customerCountry ? $customerCountry['country_id'] : 0,
-                            'default' => '1'
-                        )
-                    ),
-                );
-
-                $customer_id = $this->model_customer_customer->addCustomer($cData);
-
-                $customersIdsFix[] = array('id' => $order['customer']['id'], 'externalId' => (int)$customer_id);
-            }
-
-            $mail = isset($order['email']) ? $order['email'] : $order['customer']['email'];
-            $phone = isset($order['phone']) ? $order['phone'] : '';
-
-            if (!$phone) {
-                $data['telephone'] = $order['customer']['phones'] ? $order['customer']['phones'][0]['number'] : '80000000000';
-            } else {
-                $data['telephone'] = $phone;
-            }
-
-            $data['currency_code'] = $this->config->get('config_currency');
-            $data['currency_value'] = $this->getCurrencyByCode($data['currency_code'], 'value');
-            $data['currency_id'] = $this->getCurrencyByCode($data['currency_code'], 'currency_id');
-            $data['language_id'] = $this->getLanguageByCode($this->config->get('config_language'), 'language_id');
-            $data['store_id'] = $store == null ? 0 : $store;
-            $data['store_name'] = $this->config->get('config_name');
-            $data['customer'] = $order['firstName'];
-            $data['customer_id'] = $customer_id;
-            $data['customer_group_id'] = 1;
-            $data['firstname'] = $order['firstName'];
-            $data['lastname'] = (isset($order['lastName'])) ? $order['lastName'] : $order['firstName'];
-            $data['email'] = $mail ? $mail : uniqid() . '@retailrcm.ru';
-            $data['comment'] = !empty($order['customerComment']) ? $order['customerComment'] : '';
-            $data['fax'] = '';
-            $data['payment_address'] = '0';
-            $data['payment_firstname'] = $order['firstName'];
-            $data['payment_lastname'] = (isset($order['lastName'])) ? $order['lastName'] : $order['firstName'];
-            $data['payment_address_1'] = $order['customer']['address']['text'];
-            $data['payment_address_2'] = '';
-            $data['payment_company'] = '';
-            $data['payment_company_id'] = '';
-            $data['payment_city'] = !empty($order['customer']['address']['city']) ? $order['customer']['address']['city'] : $order['delivery']['address']['city'];
-            $data['payment_postcode'] = !empty($order['customer']['address']['index']) ? $order['customer']['address']['index'] : $order['delivery']['address']['index'];
-
-            $shippingZone = '';
-
-            if (!empty($order['delivery']['address']['region']) && is_int($order['delivery']['address']['region'])) {
-                $shippingZone = $order['delivery']['address']['region'];
-            } else {
-                $shippingZone = $this->getZoneByName($order['delivery']['address']['region']);
-
-                if ($shippingZone) {
-                    $shipping_zone_id = $shippingZone['zone_id'];
-                } else {
-                    $shipping_zone_id = 0;
-                }
-            }
-
-            if (isset($order['customer']['address']['region'])) {
-                $paymentZone = $this->getZoneByName($order['customer']['address']['region']);
-
-                if ($paymentZone) {
-                    $payment_zone_id = $paymentZone['zone_id'];
-                } else {
-                    $payment_zone_id = 0;
-                }
-            }
-
-            if (isset($order['countryIso'])) {
-                $shippingCountry = $this->getCountryByIsoCode($order['countryIso']);
-            }
-
-            if (isset($order['customer']['address']['countryIso'])) {
-                $paymentCountry = $this->getCountryByIsoCode($order['customer']['address']['countryIso']);
-            }
-
-            $delivery = isset($order['delivery']['code']) ? $order['delivery']['code'] : null;
-            $data['payment_country_id'] = $paymentCountry ? $paymentCountry['country_id'] : 0;
-            $data['payment_country'] = isset($paymentCountry) ? $paymentCountry['name'] : '';
-            $data['payment_zone_id'] = $payment_zone_id;
-            $data['payment_zone'] = isset($order['customer']['address']['region']) ? $order['customer']['address']['region'] : '';
-            $data['shipping_country_id'] = isset($shippingCountry) ? $shippingCountry['country_id'] : 0;
-            $data['shipping_country'] = isset($shippingCountry) ? $shippingCountry['name'] : '';
-            $data['shipping_zone_id'] = $shipping_zone_id;
-            $data['shipping_zone'] = $shippingZone ? $shippingZone['name'] : $data['payment_zone'];
-            $data['shipping_address'] = '0';
-            $data['shipping_firstname'] = $order['firstName'];
-            $data['shipping_lastname'] = (isset($order['lastName'])) ? $order['lastName'] : $order['firstName'];
-            $data['shipping_address_1'] = $order['delivery']['address']['text'];
-            $data['shipping_address_2'] = '';
-            $data['shipping_company'] = '';
-            $data['shipping_company_id'] = '';
-            $data['shipping_city'] = $order['delivery']['address']['city'];
-            $data['shipping_postcode'] = $order['delivery']['address']['index'];
-            $data['shipping'] = $delivery != null ? $this->delivery[$delivery] : $this->delivery_default;
-            $data['shipping_code'] = $delivery != null ? $this->delivery[$delivery] : $this->delivery_default;
-
-            $shipping = explode('.', $data['shipping']);
-            $shippingModule = $shipping[0];
-
-            if (isset($this->ocDelivery[$shippingModule][$data['shipping']]['title'])) {
-                $data['shipping_method'] = $this->ocDelivery[$shippingModule][$data['shipping']]['title'];
-            } else {
-                $data['shipping_method'] = $this->ocDelivery[$shippingModule]['title'];
-            }
-
-            if (isset($payment)) {
-                $data['payment'] = $this->payment[$payment['type']];
-                $data['payment_method'] = $this->ocPayment[$data['payment']];
-                $data['payment_code'] = $this->payment[$payment['type']];
-            } else {
-                $data['payment'] = $this->payment_default;
-                $data['payment_method'] = $this->ocPayment[$data['payment']];
-                $data['payment_code'] = $this->payment_default;
-            }
-
-            // this data will not retrive from crm for now
-            $data['tax'] = '';
-            $data['tax_id'] = '';
-            $data['product'] = '';
-            $data['product_id'] = '';
-            $data['reward'] = '';
-            $data['affiliate'] = '';
-            $data['affiliate_id'] = 0;
-            $data['payment_tax_id'] = '';
-            $data['order_product_id'] = '';
-            $data['payment_company'] = '';
-            $data['payment_company_id'] = '';
-            $data['company'] = '';
-            $data['company_id'] = '';
-
-            $data['order_product'] = array();
-
-            foreach ($order['items'] as $item) {
-                $productId = $item['offer']['externalId'];
-                $options = array();
-
-                if(mb_strpos($item['offer']['externalId'], '#') > 1) {
-                    $offer = explode('#', $item['offer']['externalId']);
-                    $productId = $offer[0];
-                    $optionsFromCRM = explode('_', $offer[1]);
-
-                    foreach ($optionsFromCRM as $optionFromCRM) {
-                        $optionData = explode('-', $optionFromCRM);
-                        $productOptionId = $optionData[0];
-                        $optionValueId = $optionData[1];
-
-                        $productOptions = $this->model_catalog_product->getProductOptions($productId);
-
-                        foreach($productOptions as $productOption) {
-                            if($productOptionId == $productOption['product_option_id']) {
-                                foreach($productOption['product_option_value'] as $productOptionValue) {
-                                    if($productOptionValue['option_value_id'] == $optionValueId) {
-                                        $options[] = array(
-                                            'product_option_id' => $productOptionId,
-                                            'product_option_value_id' => $productOptionValue['product_option_value_id'],
-                                            'value' => $this->getOptionValue($productOptionValue['option_value_id'], 'name'),
-                                            'type' => $productOption['type'],
-                                            'name' => $productOption['name'],
-                                        );
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                $product = $this->model_catalog_product->getProduct($productId);
-                $rewards = $this->model_catalog_product->getProductRewards($productId);
-
-                $data['order_product'][] = array(
-                    'name' => $product['name'],
-                    'model' => $product['model'],
-                    'price' => $item['initialPrice'],
-                    'total' => (float)($item['initialPrice'] * $item['quantity']),
-                    'product_id' => $productId,
-                    'quantity' => $item['quantity'],
-                    'option' => $options,
-                    'reward' => $rewards[$data['customer_group_id']]['points'] * $item['quantity']
-                );
-            }
-
-            if (isset($this->customFieldSetting) && $order['customFields']) {
-                foreach ($order['customFields'] as $code => $value) {
-                    if (array_key_exists($code, $this->customFieldSetting)) {
-                        $fieldCode = str_replace('o_', '', $this->customFieldSetting[$code]);
-                        $customFields[$fieldCode] = $value;
-                    }
-                }
-
-                $data['custom_field'] = isset($customFields) ? $customFields : '';
-            }
-
-            $deliveryCost = !empty($order['delivery']['cost']) ? $order['delivery']['cost'] : 0;
-
-            $data['total'] = $order['totalSumm'];
-            $data['order_total'] = array(
-                array(
-                    'order_total_id' => '',
-                    'code' => 'sub_total',
-                    'title' => $this->language->get('product_summ'),
-                    'value' => $order['summ'],
-                    'text' => $order['summ'],
-                    'sort_order' => $this->subtotalSettings['sub_total_sort_order']
-                ),
-                array(
-                    'order_total_id' => '',
-                    'code' => 'shipping',
-                    'title' => $data['shipping_method'],
-                    'value' => $deliveryCost,
-                    'text' => $deliveryCost,
-                    'sort_order' => $this->shippingSettings[$this->totalTitle . 'shipping_sort_order']
-                ),
-                array(
-                    'order_total_id' => '',
-                    'code' => 'total',
-                    'title' => $this->language->get('column_total'),
-                    'value' => !empty($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $deliveryCost,
-                    'text' => isset($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $deliveryCost,
-                    'sort_order' => $this->totalSettings[$this->totalTitle . 'total_sort_order']
-                )
-            );
-
-            $data['fromApi'] = true;
-            $data['order_status_id'] = 1;
-
-            $order_id = $this->addOrder($data);
-
-            $ordersIdsFix[] = array('id' => $order['id'], 'externalId' => (int) $order_id);
-        }
-
-        return array('customers' => $customersIdsFix, 'orders' => $ordersIdsFix);
-    }
-
-    protected function updateCustomers($customers)
-    {
-        foreach ($customers as $customer) {
-            $customer_id = $customer['externalId'];
-            $customerData = $this->model_customer_customer->getCustomer($customer_id);
-
-            if (!$customerData) {
-                continue;
-            }
-
-            $customerData['password'] = false;
-
-            $customerData['firstname'] = $customer['firstName'];
-            $customerData['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
-            $customerData['email'] = $customer['email'];
-            $customerData['telephone'] = $customer['phones'] ? $customer['phones'][0]['number'] : '';
-
-            $customerAddress = $this->model_customer_customer->getAddress($customerData['address_id']);
-
-            if (isset($customer['address']['countryIso'])) {
-                $customerCountry = $this->getCountryByIsoCode($customer['address']['countryIso']);
-            }
-
-            if (isset($customer['address']['region'])) {
-                $customerZone = $this->getZoneByName($customer['address']['region']);
-            }
-
-            $customerAddress['firstname'] = isset($customer['patronymic']) ? $customer['firstName'] . ' ' . $customer['patronymic'] : $customer['firstName'];
-            $customerAddress['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
-            $customerAddress['address_1'] = $customer['address']['text'];
-            $customerAddress['city'] = $customer['address']['city'];
-            $customerAddress['postcode'] = isset($customer['address']['index']) ? $customer['address']['index'] : '';
-
-            if (isset($customerCountry)) {
-                $customerAddress['country_id'] = $customerCountry['country_id'];
-            }
-
-            if (isset($customerZone) && isset($customerZone['zone_id'])) {
-                $customerAddress['zone_id'] = $customerZone['zone_id'];
-            }
-
-            $customerData['address'] = array($customerAddress);
-
-            if (isset($this->customFieldSetting) && $customer['customFields']) {
-                foreach ($customer['customFields'] as $code => $value) {
-                    if (array_key_exists($code, $this->customFieldSetting)) {
-                        $fieldCode = str_replace('c_', '', $this->customFieldSetting[$code]);
-                        $customFields[$fieldCode] = $value;
-                    }
-                }
-
-                $customerData['custom_field'] = isset($customFields) ? $customFields : '';
-            }
-
-            $this->model_customer_customer->editCustomer($customer_id, $customerData);
-        }
-    }
-}

src/upload/admin/model/extension/retailcrm/icml.php

@@ -15,13 +15,14 @@ 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()
@@ -77,7 +78,7 @@ class ModelExtensionRetailcrmIcml extends Model
      */
     private function addCategories()
     {
-        $categories = $this->model_catalog_category->getCategories(array());
+        $categories = $this->model_catalog_category->getCategories([]);
         foreach ($categories as $category) {
             $category = $this->model_catalog_category->getCategory($category['category_id']);
 
@@ -102,11 +103,18 @@ class ModelExtensionRetailcrmIcml extends Model
     }
 
     private function addOffers() {
-        $offerManufacturers = array();
+        $offerManufacturers = [];
+        $servicesForIcml = $this->retailcrm->useServicesForIcml();
         $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) {
@@ -115,20 +123,20 @@ class ModelExtensionRetailcrmIcml extends Model
         }
 
         $manufacturers = $this->model_catalog_manufacturer
-            ->getManufacturers(array());
+            ->getManufacturers([]);
 
         foreach ($manufacturers as $manufacturer) {
             $offerManufacturers[$manufacturer['manufacturer_id']] = $manufacturer['name'];
         }
 
-        $products = $this->model_catalog_product->getProducts(array());
+        $products = $this->model_catalog_product->getProducts([]);
 
         foreach ($products as $product) {
             $offers = $this->retailcrm->getOffers($product);
 
             foreach ($offers as $optionsString => $optionsValues) {
                 $optionsString = explode('_', $optionsString);
-                $options = array();
+                $options = [];
 
                 foreach($optionsString as $optionString) {
                     $option = explode('-', $optionString);
@@ -140,37 +148,46 @@ class ModelExtensionRetailcrmIcml extends Model
                             $options[$optionIds[0]] = array(
                                 'name' => $optionData['optionName'],
                                 'value' => $optionData['optionValue'],
-                                'value_id' => $option[1]
+                                'value_id' => $option[1],
+                                'option_id' => $optionIds[1]
                             );
-                        }                     
+                        }
                     }
                 }
 
                 ksort($options);
 
-                $offerId = array();
+                $offerId = [];
 
                 foreach($options as $optionKey => $optionData) {
                     $offerId[] = $optionKey.'-'.$optionData['value_id'];
                 }
 
                 $offerId = implode('_', $offerId);
-                $e = $this->eOffers->appendChild($this->dd->createElement('offer'));
+                $catalog = $this->eOffers->appendChild($this->dd->createElement('offer'));
 
                 if (!empty($offerId)) {
-                    $e->setAttribute('id', $product['product_id'] . '#' . $offerId);
-                    $e->setAttribute('productId', $product['product_id']);
-                    $e->setAttribute('quantity', $optionsValues['qty']);
+                    $catalog->setAttribute('id', $product['product_id'] . '#' . $offerId);
+                    $catalog->setAttribute('productId', $product['product_id']);
+                    $catalog->setAttribute('quantity', $optionsValues['qty']);
                 } else {
-                    $e->setAttribute('id', $product['product_id']);
-                    $e->setAttribute('productId', $product['product_id']);
-                    $e->setAttribute('quantity', $product['quantity']);
+                    $catalog->setAttribute('id', $product['product_id']);
+                    $catalog->setAttribute('productId', $product['product_id']);
+                    $catalog->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';
-                $e->appendChild(
+                $catalog->appendChild(
                     $this->dd->createElement('productActivity')
                 )->appendChild(
                     $this->dd->createTextNode($activity)
@@ -182,7 +199,7 @@ class ModelExtensionRetailcrmIcml extends Model
                     ->getProductCategories($product['product_id']);
                 if (!empty($categories)) {
                     foreach ($categories as $category) {
-                        $e->appendChild($this->dd->createElement('categoryId'))
+                        $catalog->appendChild($this->dd->createElement('categoryId'))
                             ->appendChild(
                                 $this->dd->createTextNode($category)
                             );
@@ -191,18 +208,18 @@ class ModelExtensionRetailcrmIcml extends Model
                 /**
                  * Name & price
                  */
-                $e->appendChild($this->dd->createElement('productName'))
+                $catalog->appendChild($this->dd->createElement('productName'))
                     ->appendChild($this->dd->createTextNode($product['name']));
                 if (!empty($options)) {
-                    $optionsString = array();
+                    $optionsString = [];
                     foreach($options as $option) {
                         $optionsString[] = $option['name'].': '.$option['value'];
                     }
                     $optionsString = ' ('.implode(', ', $optionsString).')';
-                    $e->appendChild($this->dd->createElement('name'))
+                    $catalog->appendChild($this->dd->createElement('name'))
                         ->appendChild($this->dd->createTextNode($product['name'].$optionsString));
                 } else {
-                    $e->appendChild($this->dd->createElement('name'))
+                    $catalog->appendChild($this->dd->createElement('name'))
                         ->appendChild($this->dd->createTextNode($product['name']));
                 }
 
@@ -216,13 +233,13 @@ class ModelExtensionRetailcrmIcml extends Model
                     $price = $product['price'] + $optionsValues['price'];
                 }
 
-                $e->appendChild($this->dd->createElement('price'))
+                $catalog->appendChild($this->dd->createElement('price'))
                     ->appendChild($this->dd->createTextNode($price));
                 /**
                  * Vendor
                  */
                 if ($product['manufacturer_id'] != 0) {
-                    $e->appendChild($this->dd->createElement('vendor'))
+                    $catalog->appendChild($this->dd->createElement('vendor'))
                         ->appendChild(
                             $this->dd->createTextNode(
                                 $offerManufacturers[$product['manufacturer_id']]
@@ -234,7 +251,7 @@ class ModelExtensionRetailcrmIcml extends Model
                  * Dimensions
                  */
                 if ((!empty($product['length']) && $product['length'] > 0) &&
-                    (!empty($product['width'] && $product['width'] > 0))
+                    (!empty($product['width']) && $product['width'] > 0)
                     && !empty($product['height']))
                 {
                     $lenghtArray = $this->model_localisation_length_class->getLengthClass($product['length_class_id']);
@@ -263,7 +280,7 @@ class ModelExtensionRetailcrmIcml extends Model
                         $productHeight
                     );
 
-                    $e->appendChild($this->dd->createElement('dimensions'))
+                    $catalog->appendChild($this->dd->createElement('dimensions'))
                         ->appendChild($this->dd->createTextNode($dimensions));
                 }
 
@@ -272,34 +289,32 @@ class ModelExtensionRetailcrmIcml extends Model
                  */
                 if ($product['image']) {
                     $image = $this->generateImage($product['image']);
-                    $e->appendChild($this->dd->createElement('picture'))
+                    $catalog->appendChild($this->dd->createElement('picture'))
                         ->appendChild($this->dd->createTextNode($image));
                 }
                 /**
                  * Url
                  */
-                $this->url = new Url(
-                    HTTP_CATALOG,
-                    $this->config->get('config_secure')
-                        ? HTTP_CATALOG
-                        : HTTPS_CATALOG
-                );
-                $e->appendChild($this->dd->createElement('url'))
+                $this->url = new Url(HTTP_CATALOG, HTTPS_CATALOG);
+                $catalog->appendChild($this->dd->createElement('url'))
                     ->appendChild(
                         $this->dd->createTextNode(
                             $this->url->link(
-                                'product/product&product_id=' . $product['product_id']
+                                'product/product&product_id=' . $product['product_id'],
+                                '',
+                                (bool) $this->config->get('config_secure')
                             )
                         )
                     );
+
                 // Options
                 if (!empty($options)) {
                     foreach($options as $optionKey => $optionData) {
                         $param = $this->dd->createElement('param');
-                        $param->setAttribute('code', $optionKey);
+                        $param->setAttribute('code', $optionData['option_id']);
                         $param->setAttribute('name', $optionData['name']);
                         $param->appendChild($this->dd->createTextNode($optionData['value']));
-                        $e->appendChild($param);
+                        $catalog->appendChild($param);
                     }
                 }
                 if ($product['sku']) {
@@ -307,18 +322,24 @@ class ModelExtensionRetailcrmIcml extends Model
                     $sku->setAttribute('code', 'article');
                     $sku->setAttribute('name', $this->language->get('article'));
                     $sku->appendChild($this->dd->createTextNode($product['sku']));
-                    $e->appendChild($sku);
+                    $catalog->appendChild($sku);
                 }
                 if ($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)
+                    $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']
                     ;
+                    $weightValue = round($weightValue / $coeffWeight, 6);
+
                     $weight->appendChild($this->dd->createTextNode($weightValue));
-                    $e->appendChild($weight);
+                    $catalog->appendChild($weight);
                 }
             }
         }
@@ -331,7 +352,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;
@@ -358,7 +379,7 @@ class ModelExtensionRetailcrmIcml extends Model
             $this->optionValues[$optionValueId] = $optionValue;
         }
 
-        if (!empty($option['name']) || !empty($optionValue['name'])) {
+        if (!empty($option['name']) && !empty($optionValue['name'])) {
             return array(
                 'optionName' => $option['name'],
                 'optionValue' => $optionValue['name']

src/upload/admin/model/extension/retailcrm/order.php

@@ -1,335 +1,29 @@
 <?php
 
 class ModelExtensionRetailcrmOrder extends Model {
-    protected $settings;
-    protected $moduleTitle;
-    protected $retailcrmApiClient;
-
-    protected static $lastRepsonse = null;
-
-    public function __construct($registry)
-    {
-        parent::__construct($registry);
-        $this->load->model('setting/setting');
-        $this->load->library('retailcrm/retailcrm');
-
-        $this->moduleTitle = $this->retailcrm->getModuleTitle();
-        $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
-    }
-
     /**
      * Upload orders to CRM
      *
      * @param array $orders
-     * @param \RetailcrmProxy $retailcrmApiClient
      *
      * @return mixed
      */
-    public function uploadToCrm($orders, $retailcrmApiClient)
+    public function uploadToCrm($orders)
     {
-        if ($retailcrmApiClient === false) {
-            return false;
-        }
-
         $ordersToCrm = array();
+        /** @var OrderManager $order_manager */
+        $order_manager = $this->retailcrm->getOrderManager();
 
         foreach ($orders as $order) {
-            $ordersToCrm[] = $this->process($order);
+            $ordersToCrm[] = $order_manager->prepareOrder($order, $order['products'], $order['totals']);
         }
 
         $chunkedOrders = array_chunk($ordersToCrm, 50);
 
         foreach($chunkedOrders as $ordersPart) {
-            $retailcrmApiClient->ordersUpload($ordersPart);
+            $order_manager->uploadOrders($ordersPart);
         }
 
         return $chunkedOrders;
     }
-
-    /**
-     * Send one order by id
-     *
-     * @param array $order_data
-     * @param \RetailcrmProxy $retailcrmApiClient
-     *
-     * @return mixed
-     */
-    public function uploadOrder($order_data, $retailcrmApiClient)
-    {
-        if ($retailcrmApiClient === false) {
-            return false;
-        }
-
-        if (isset($this->request->post['fromApi'])) {
-            return false;
-        }
-
-        $order = $this->process($order_data);
-
-        if (isset($order['customer']['externalId'])) {
-            $this->load->model('extension/retailcrm/customer');
-            $this->load->model('customer/customer');
-            $customer = $this->model_customer_customer->getCustomer($order['customer']['externalId']);
-            $this->model_extension_retailcrm_customer->sendToCrm($customer, $retailcrmApiClient);
-        } else {
-            $customers = $retailcrmApiClient->customersList(
-                array(
-                    'name' => $order_data['telephone'],
-                    'email' => $order_data['email']
-                ),
-                1,
-                100
-            );
-
-            if ($customers) {
-                foreach ($customers['customers'] as $customer) {
-                    $order['customer']['id'] = $customer['id'];
-                }
-            }
-
-            unset($customers);
-        }
-
-        if (!isset($order['customer']['externalId']) && !isset($order['customer']['id'])) {
-            $new_customer = array(
-                'firstName' => $order_data['firstname'],
-                'lastName' => $order_data['lastname'],
-                'email' => $order_data['email'],
-                'createdAt' => $order_data['date_added'],
-                'address' => array(
-                    'countryIso' => $order_data['payment_iso_code_2'],
-                    'index' => $order_data['payment_postcode'],
-                    'city' => $order_data['payment_city'],
-                    'region' => $order_data['payment_zone'],
-                    'text' => $order_data['payment_address_1'] . ' ' . $order_data['payment_address_2']
-                )
-            );
-
-            if (!empty($order_data['telephone'])) {
-                $new_customer['phones'] = array(
-                    array(
-                        'number' => $order_data['telephone']
-                    )
-                );
-            }
-
-            $res = $retailcrmApiClient->customersCreate($new_customer);
-
-            if ($res->isSuccessful() && isset($res['id'])) {
-                $order['customer']['id'] = $res['id'];
-            }
-        }
-
-        self::$lastRepsonse = $retailcrmApiClient->ordersCreate($order);
-
-        return $order;
-    }
-
-    /**
-     * Process order
-     *
-     * @param array $order_data
-     *
-     * @return array $order
-     */
-    private function process($order_data) {
-        $order = array();
-
-        $this->load->model('catalog/product');
-
-        if (!empty($order_data['payment_code']) && isset($this->settings[$this->moduleTitle . '_payment'][$order_data['payment_code']])) {
-            $payment_code = $this->settings[$this->moduleTitle . '_payment'][$order_data['payment_code']];
-        } else {
-            $payment_code = '';
-        }
-
-        if (!empty($order_data['shipping_code'])) {
-            $shippingCode = explode('.', $order_data['shipping_code']);
-            $shippingModule = $shippingCode[0];
-
-            if (isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) {
-               $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
-            } elseif (isset($this->settings[$this->moduleTitle . '_delivery'][$shippingModule])) {
-               $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule];
-            }
-        }
-
-        if (!isset($delivery_code) && isset($shippingModule)) {
-            if (isset($this->settings[$this->moduleTitle . '_delivery'])
-                && $this->settings[$this->moduleTitle . '_delivery']
-            ) {
-                $deliveries = array_keys($this->settings[$this->moduleTitle . '_delivery']);
-                $shipping_code = '';
-
-                array_walk($deliveries, function($item, $key) use ($shippingModule, &$shipping_code) {
-                    if (strripos($item, $shippingModule) !== false) {
-                        $shipping_code = $item;
-                    }
-                });
-
-                $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shipping_code];
-            }
-        }
-
-        if (!empty($order_data['payment_iso_code_2'])) {
-            $order['countryIso'] = $order_data['payment_iso_code_2'];
-        }
-
-        if (isset($this->settings[$this->moduleTitle . '_order_number'])
-            && $this->settings[$this->moduleTitle . '_order_number'] == 1
-        ) {
-            $order['number'] = $order_data['order_id'];
-        }
-
-        $order['externalId'] = $order_data['order_id'];
-        $order['firstName'] = $order_data['shipping_firstname'];
-        $order['lastName'] = $order_data['shipping_lastname'];
-        $order['phone'] = $order_data['telephone'];
-        $order['customerComment'] = $order_data['comment'];
-
-        if (!empty($order_data['email'])) {
-            $order['email'] = $order_data['email'];
-        }
-
-        if ($order_data['customer_id']) {
-            $order['customer']['externalId'] = $order_data['customer_id'];
-        }
-
-        $deliveryCost = 0;
-        $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ;
-
-        foreach ($orderTotals as $totals) {
-            if ($totals['code'] == 'shipping') {
-                $deliveryCost = $totals['value'];
-            }
-        }
-
-        $order['createdAt'] = $order_data['date_added'];
-
-        if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v5') {
-            $order['paymentType'] = $payment_code;
-        }
-
-        $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
-
-        $order['delivery'] = array(
-            'code' => isset($delivery_code) ? $delivery_code : '',
-            'cost' => $deliveryCost,
-            'address' => array(
-                'countryIso' => $order_data['shipping_iso_code_2'],
-                'index' => $order_data['shipping_postcode'],
-                'city' => $order_data['shipping_city'],
-                'region' => $order_data['shipping_zone'],
-                'text' => implode(', ', array(
-                    $order_data['shipping_postcode'],
-                    $country,
-                    $order_data['shipping_city'],
-                    $order_data['shipping_address_1'],
-                    $order_data['shipping_address_2']
-                ))
-            )
-        );
-
-        $orderProducts = isset($order_data['products']) ? $order_data['products'] : $order_data['order_product'];
-        $offerOptions = array('select', 'radio');
-
-        foreach ($orderProducts as $product) {
-            $offerId = '';
-
-            if (!empty($product['option'])) {
-                $options = array();
-
-                $productOptions = $this->model_catalog_product->getProductOptions($product['product_id']);
-
-                foreach ($product['option'] as $option) {
-                    if ($option['type'] == 'checkbox') {
-                        $properties[] = array(
-                            'code' => $option['product_option_value_id'],
-                            'name' => $option['name'],
-                            'value' => $option['value']
-                        );
-                    }
-
-                    if (!in_array($option['type'], $offerOptions)) continue;
-                    foreach($productOptions as $productOption) {
-                        if($productOption['product_option_id'] = $option['product_option_id']) {
-                            foreach($productOption['product_option_value'] as $productOptionValue) {
-                                if($productOptionValue['product_option_value_id'] == $option['product_option_value_id']) {
-                                    $options[$option['product_option_id']] = $productOptionValue['option_value_id'];
-                                }
-                            }
-                        }
-                    }
-                }
-
-                ksort($options);
-
-                $offerId = array();
-                foreach($options as $optionKey => $optionValue) {
-                    $offerId[] = $optionKey.'-'.$optionValue;
-                }
-                $offerId = implode('_', $offerId);
-            }
-
-            if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v3') {
-                $item = array(
-                    'offer' => array(
-                        'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
-                    ),
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity'],
-                );
-            } else {
-                $item = array(
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity'],
-                    'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
-                );
-            }
-
-            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']];
-        }
-
-        if ($this->settings[$this->moduleTitle . '_apiversion'] == 'v5') {
-            if ($payment_code) {
-                $payment = array(
-                    'externalId' => $order_data['order_id'],
-                    'type' => $payment_code
-                );
-
-                $order['payments'][] = $payment;
-            }
-        }
-
-        if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
-            $customFields = json_decode($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;
-                }
-            }
-
-            if (isset($customFieldsToCrm)) {
-                $order['customFields'] = $customFieldsToCrm;
-            }
-        }
-
-        return $order;
-    }
-
-    /**
-     * @return mixed
-     */
-    public static function getLastResponse()
-    {
-        return self::$lastRepsonse;
-    }
 }

src/upload/admin/model/extension/retailcrm/prices.php

@@ -60,10 +60,6 @@ class ModelExtensionRetailcrmPrices extends Model
         $prices = array();
         $site = $this->getSite($retailcrmApiClient);
 
-        if ($this->settings[$this->moduleTitle . '_apiversion'] == 'v3') {
-            return false;
-        }
-
         foreach ($products as $product) {
             $specials = $this->model_catalog_product->getProductSpecials($product['product_id']);
 
@@ -175,13 +171,13 @@ class ModelExtensionRetailcrmPrices extends Model
                     ) {
                         $productPrice[$special['customer_group_id']]['price'] = $special['price'];
                         $productPrice[$special['customer_group_id']]['remove'] = false;
-                        $priority = $special['priority'];
                         $groupId = $special['customer_group_id'];
+                        $priority = $special['priority'];
                     }
                 } else {
                     $productPrice[$special['customer_group_id']]['price'] = $special['price'];
-                    $groupId = $special['customer_group_id'];
                     $productPrice[$special['customer_group_id']]['remove'] = false;
+                    $groupId = $special['customer_group_id'];
                 }
             }
         }

src/upload/admin/model/extension/retailcrm/references.php

@@ -21,7 +21,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get opencart delivery methods
-     * 
+     *
      * @return array
      */
     public function getOpercartDeliveryTypes()
@@ -33,7 +33,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get all delivery types
-     * 
+     *
      * @return array
      */
     public function getDeliveryTypes()
@@ -48,7 +48,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get all statuses
-     * 
+     *
      * @return array
      */
     public function getOrderStatuses()
@@ -61,7 +61,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get all payment types
-     * 
+     *
      * @return array
      */
     public function getPaymentTypes()
@@ -74,7 +74,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get all custom fields
-     * 
+     *
      * @return array
      */
     public function getCustomFields()
@@ -87,7 +87,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get opencart order statuses
-     * 
+     *
      * @return array
      */
     public function getOpercartOrderStatuses()
@@ -100,7 +100,7 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get opencart payment types
-     * 
+     *
      * @return array
      */
     public function getOpercartPaymentTypes()
@@ -113,7 +113,7 @@ class ModelExtensionRetailcrmReferences extends Model
                 $extension = basename($file, '.php');
 
                 $this->load->language('extension/payment/' . $extension);
-                
+
                 if (version_compare(VERSION, '3.0', '<')) {
                     $configStatus = $extension . '_status';
                 } else {
@@ -133,61 +133,89 @@ class ModelExtensionRetailcrmReferences extends Model
 
     /**
      * Get opencart custom fields
-     * 
+     *
      * @return array
      */
     public function getOpencartCustomFields()
     {
         $this->load->model('customer/custom_field');
-        
+
         return $this->model_customer_custom_field->getCustomFields();
     }
 
     /**
      * Get RetailCRM delivery types
-     * 
+     *
      * @return array
      */
     public function getApiDeliveryTypes()
     {
         $response = $this->retailcrmApiClient->deliveryTypesList();
+        if (!$response) {
+            return array();
+        }
 
         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
-     * 
+     *
      * @return array
      */
     public function getApiOrderStatuses()
     {
         $response = $this->retailcrmApiClient->statusesList();
+        if (!$response) {
+            return array();
+        }
 
         return (!$response->isSuccessful()) ? array() : $response->statuses;
     }
 
     /**
      * Get RetailCRM payment types
-     * 
+     *
      * @return array
      */
     public function getApiPaymentTypes()
     {
         $response = $this->retailcrmApiClient->paymentTypesList();
+        if (!$response) {
+            return array();
+        }
 
         return (!$response->isSuccessful()) ? array() : $response->paymentTypes;
     }
 
     /**
      * Get RetailCRM custom fields
-     * 
+     *
      * @return array
      */
     public function getApiCustomFields()
     {
         $customers = $this->retailcrmApiClient->customFieldsList(array('entity' => 'customer'));
         $orders = $this->retailcrmApiClient->customFieldsList(array('entity' => 'order'));
+        if (!$customers || !$orders) {
+            return array();
+        }
 
         $customFieldsCustomers = (!$customers->isSuccessful()) ? array() : $customers->customFields;
         $customFieldsOrders = (!$orders->isSuccessful()) ? array() : $orders->customFields;
@@ -195,18 +223,21 @@ class ModelExtensionRetailcrmReferences extends Model
         if (!$customFieldsCustomers && !$customFieldsOrders) {
             return array();
         }
-        
+
         return array('customers' => $customFieldsCustomers, 'orders' => $customFieldsOrders);
     }
 
     /**
      * Get RetailCRM price types
-     * 
+     *
      * @return array
      */
     public function getPriceTypes()
     {
         $response = $this->retailcrmApiClient->priceTypesList();
+        if (!$response) {
+            return array();
+        }
 
         return (!$response->isSuccessful()) ? array() : $response->priceTypes;
     }

src/upload/admin/view/stylesheet/retailcrm.css

@@ -1,5 +1,11 @@
 .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;}
+.retailcrm_unit select {max-width: 500px;}
+
+.question-mark {
+    cursor: help;
+    position: relative;
+}

src/upload/admin/view/template/extension/module/retailcrm.tpl

@@ -40,9 +40,8 @@
             <?php if (isset($saved_settings['retailcrm_apikey']) && $saved_settings['retailcrm_apikey'] != '' && isset($saved_settings['retailcrm_url']) && $saved_settings['retailcrm_url'] != ''): ?>
             <li><a href="#tab-references" data-toggle="tab"><?php echo $references_tab_text; ?></a></li>
             <li><a href="#tab-collector" data-toggle="tab"><?php echo $collector_tab_text; ?></a></li>
-            <?php if ($saved_settings['retailcrm_apiversion'] == 'v5') : ?>
+            <li><a href="#tab-consultant" data-toggle="tab"><?php echo $consultant_tab_text; ?></a></li>
             <li><a href="#tab-custom_fields" data-toggle="tab"><?php echo $custom_fields_tab_text; ?></a></li>
-            <?php endif; ?>
             <li><a href="#tab-logs" data-toggle="tab"><?php echo $logs_tab_text; ?></a></li>
             <?php endif; ?>
           </ul>
@@ -51,16 +50,6 @@
               <input type="hidden" name="retailcrm_status" value="1">
               <fieldset>
                 <legend><?php echo $retailcrm_base_settings; ?></legend>
-                <div class="form-group retailcrm_unit">
-                  <label class="col-sm-2 control-label" for="retailcrm_url"><?php echo $retailcrm_apiversion; ?></label>
-                  <div class="col-lg-1 col-md-2 col-sm-2">
-                    <select name="retailcrm_apiversion" class="form-control">
-                      <?php foreach($api_versions as $version) : ?>
-                      <option value="<?php echo $version; ?>" <?php if (isset($saved_settings['retailcrm_apiversion']) && $saved_settings['retailcrm_apiversion'] == $version) echo "selected='selected'"; elseif (!isset($saved_settings['retailcrm_apiversion']) && $default_apiversion == $version) echo "selected='selected'"; ?>><?php echo $version; ?></option>
-                      <?php endforeach ?>
-                    </select>
-                  </div>
-                </div>
                 <div class="form-group retailcrm_unit">
                   <label class="col-sm-2 control-label" for="retailcrm_url"><?php echo $retailcrm_url; ?></label>
                   <div class="col-lg-4 col-md-6 col-sm-10">
@@ -73,6 +62,21 @@
                     <input id="retailcrm_apikey" type="text" name="retailcrm_apikey" value="<?php if (isset($saved_settings['retailcrm_apikey'])): echo $saved_settings['retailcrm_apikey']; endif;?>" class="form-control" />
                   </div>
                 </div>
+                <div class="form-group retailcrm_unit">
+                  <label class="col-sm-2 control-label" for="retailcrm_corporate_enabled"><?php echo $corporate_enabled_label; ?></label>
+                  <div class="col-sm-10">
+                    <label class="radio-inline">
+                      <input type="radio" name="retailcrm_corporate_enabled" value="1"
+                        <?php if(isset($saved_settings['retailcrm_corporate_enabled']) && $saved_settings['retailcrm_corporate_enabled'] == 1): echo 'checked'; endif;?>/>
+                        <?php echo $text_yes; ?>
+                    </label>
+                    <label class="radio-inline">
+                      <input type="radio" name="retailcrm_corporate_enabled" value="0"
+                        <?php if(!isset($saved_settings['retailcrm_corporate_enabled']) || $saved_settings['retailcrm_corporate_enabled'] == 0): echo 'checked'; endif;?>/>
+                        <?php echo $text_no; ?>
+                    </label>
+                  </div>
+                </div>
               </fieldset>
               <fieldset>
                 <legend><?php echo $retailcrm_countries_settings; ?></legend>
@@ -93,7 +97,22 @@
                 </div>
               </fieldset>
               <fieldset>
-                <legend><?php echo $text_currency; ?></legend>
+                <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
                 <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">
@@ -108,9 +127,6 @@
                     </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">
@@ -166,7 +182,6 @@
                   </div>
                 </div>
               </fieldset>
-              <?php if (isset($saved_settings['retailcrm_apiversion']) && $saved_settings['retailcrm_apiversion'] != 'v3') : ?>
               <fieldset>
                 <legend><?php echo $special_price_settings; ?></legend>
                 <div class="form-group retailcrm_unit">
@@ -190,7 +205,6 @@
                   <?php endforeach; ?>
                 </div>
               </fieldset>
-              <?php endif; ?>
               <fieldset>
                 <legend><?php echo $order_number; ?></legend>
                 <div class="form-group">
@@ -211,6 +225,55 @@
                   </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>
@@ -455,7 +518,37 @@
                 <?php endforeach; ?>
               </fieldset>
             </div>
-            <?php if (isset($saved_settings['retailcrm_apiversion']) && $saved_settings['retailcrm_apiversion'] == 'v5' && isset($customFields)) : ?>
+            <div class="tab-pane" id="tab-consultant">
+              <fieldset>
+                <legend><?php echo $consultant_tab_text; ?></legend>
+                {* onlineConsultant *}
+                <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>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <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) :
+                      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) :
+                      echo 'checked'; endif; ?> />
+                      <?php echo $text_no; ?>
+                    </label>
+                  </div>
+                </div>
+              </fieldset>
+            </div>
             <div class="tab-pane" id="tab-custom_fields">
               <fieldset>
                 <legend><?php echo $retailcrm_dict_custom_fields; ?></legend>
@@ -543,10 +636,9 @@
                 <?php endif; ?>
               </fieldset>
             </div>
-            <?php endif; ?>
             <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>
@@ -656,3 +748,4 @@
     }
   });
 </script>
+

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 }}</h1>
+            <h1>{{ heading_title }} {{ module_version }}</h1>
             <ul class="breadcrumb">
                 {% for breadcrumb in breadcrumbs %}
                     <li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
@@ -39,9 +39,8 @@
                         {% if saved_settings.module_retailcrm_apikey is defined and saved_settings.module_retailcrm_apikey and saved_settings.module_retailcrm_url is defined and saved_settings.module_retailcrm_url %}
                             <li><a href="#tab-references" data-toggle="tab">{{ references_tab_text }}</a></li>
                             <li><a href="#tab-collector" data-toggle="tab">{{ collector_tab_text }}</a></li>
-                            {% if saved_settings.module_retailcrm_apiversion == 'v5' %}
-                                <li><a href="#tab-custom_fields" data-toggle="tab"> {{ custom_fields_tab_text }} </a></li>
-                            {% endif %}
+                            <li><a href="#tab-consultant" data-toggle="tab">{{ consultant_tab_text }}</a></li>
+                            <li><a href="#tab-custom_fields" data-toggle="tab"> {{ custom_fields_tab_text }} </a></li>
                             <li><a href="#tab-logs" data-toggle="tab">{{ logs_tab_text }}</a></li>
                         {% endif %}
                     </ul>
@@ -50,28 +49,37 @@
                             <input type="hidden" name="module_retailcrm_status" value="1">
                             <fieldset>
                                 <legend>{{ retailcrm_base_settings }}</legend>
-                                <div class="form-group retailcrm_unit">
-                                    <label class="col-sm-2 control-label" for="retailcrm_url">{{ retailcrm_apiversion }}</label>
-                                    <div class="col-lg-1 col-md-2 col-sm-2">
-                                        <select name="module_retailcrm_apiversion" class="form-control">
-                                            {% for version in api_versions %}
-                                                <option value="{{ version }}" {% if saved_settings.module_retailcrm_apiversion is defined and saved_settings.module_retailcrm_apiversion == version %} selected="selected" {% elseif saved_settings.module_retailcrm_apiversion is not defined and default_apiversion == version %} selected="selected" {% endif %}>{{ version }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-                                </div>
                                 <div class="form-group retailcrm_unit">
                                     <label class="col-sm-2 control-label" for="retailcrm_url">{{ retailcrm_url }}</label>
                                     <div class="col-lg-4 col-md-6 col-sm-10">
                                         <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">
+                                <div class="form-group retailcrm_unit retailcrm_disable_border">
                                     <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 %}">
                                     </div>
                                 </div>
+                                <div class="form-group retailcrm_unit">
+                                    <label class="col-sm-2 control-label" for="module_retailcrm_corporate_enabled">{{ corporate_enabled_label }}</label>
+                                    <div class="col-sm-10">
+                                        <label class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_corporate_enabled" value="1"
+                                                    {% if saved_settings.module_retailcrm_corporate_enabled is defined and saved_settings.module_retailcrm_corporate_enabled == 1 %}
+                                                        checked
+                                                    {% endif %} />
+                                            {{ text_yes }}
+                                        </label>
+                                        <label class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_corporate_enabled" value="0"
+                                                    {% if saved_settings.module_retailcrm_corporate_enabled is not defined or saved_settings.module_retailcrm_corporate_enabled == 0 %}
+                                                        checked
+                                                    {% endif %} />
+                                            {{ text_no }}
+                                        </label>
+                                    </div>
+                                </div>
                             </fieldset>
                             <fieldset>
                                 <legend>{{ retailcrm_countries_settings }}</legend>
@@ -92,8 +100,27 @@
                                 </div>
                             </fieldset>
                             <fieldset>
-                                <legend>{{ text_currency }}</legend>
-                                <div class="form-group retailcrm_unit">
+                                <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">
                                     <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">
@@ -107,17 +134,14 @@
                                         </select>
                                     </div>
                                 </div>
-                            </fieldset>
-                            <fieldset>
-                                <legend>{{ text_lenght }}</legend>
-                                <div class="form-group retailcrm_unit">
+                                <div class="form-group retailcrm_unit retailcrm_disable_border">
                                     <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>
@@ -167,31 +191,29 @@
                                     </div>
                                 </div>
                             </fieldset>
-                            {% if saved_settings.module_retailcrm_apiversion is defined and saved_settings.module_retailcrm_apiversion != 'v3' %}
-                                <fieldset>
-                                    <legend>{{ special_price_settings }}</legend>
-                                    <div class="form-group retailcrm_unit">
-                                        {% for customerGroup in customerGroups %}
-                                            {% set cud = customerGroup.customer_group_id %}
-                                            <div class="row retailcrm_unit">
-                                                <label class="col-sm-2 control-label" for="opencart_customer_group_{{ cud }}">{{ customerGroup.name }}</label>
-                                                <div class="col-md-4 col-sm-10">
-                                                    <select id="module_retailcrm_special_{{ cud }}" name="module_retailcrm_special_{{ cud }}" class="form-control">
-                                                        <option value="" {% if saved_settings['module_retailcrm_special_'~cud] is not defined or saved_settings['module_retailcrm_special_'~cud] is empty %}selected{% endif %}>---</option>
-                                                        {% for priceType in priceTypes %}
-                                                            {% if priceType.active == true and priceType.default == false%}
-                                                                <option value ="{{ priceType.code }}" {% if saved_settings['module_retailcrm_special_'~cud] is defined and priceType.code == saved_settings['module_retailcrm_special_'~cud] %} selected="selected" {% endif %}>
-                                                                    {{ priceType.name }}
-                                                                </option>
-                                                            {% endif %}
-                                                        {% endfor %}
-                                                    </select>
-                                                </div>
+                            <fieldset>
+                                <legend>{{ special_price_settings }}</legend>
+                                <div class="form-group retailcrm_unit">
+                                    {% for customerGroup in customerGroups %}
+                                        {% set cud = customerGroup.customer_group_id %}
+                                        <div class="row retailcrm_unit">
+                                            <label class="col-sm-2 control-label" for="opencart_customer_group_{{ cud }}">{{ customerGroup.name }}</label>
+                                            <div class="col-md-4 col-sm-10">
+                                                <select id="module_retailcrm_special_{{ cud }}" name="module_retailcrm_special_{{ cud }}" class="form-control">
+                                                    <option value="" {% if saved_settings['module_retailcrm_special_'~cud] is not defined or saved_settings['module_retailcrm_special_'~cud] is empty %}selected{% endif %}>---</option>
+                                                    {% for priceType in priceTypes %}
+                                                        {% if priceType.active == true and priceType.default == false%}
+                                                            <option value ="{{ priceType.code }}" {% if saved_settings['module_retailcrm_special_'~cud] is defined and priceType.code == saved_settings['module_retailcrm_special_'~cud] %} selected="selected" {% endif %}>
+                                                                {{ priceType.name }}
+                                                            </option>
+                                                        {% endif %}
+                                                    {% endfor %}
+                                                </select>
                                             </div>
-                                        {% endfor %}
-                                    </div>
-                                </fieldset>
-                            {% endif %}
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                            </fieldset>
                             <fieldset>
                                 <legend>{{ order_number }}</legend>
                                 <div class="form-group">
@@ -214,6 +236,59 @@
                                     </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>
@@ -460,95 +535,125 @@
                                 {% endfor %}
                             </fieldset>
                         </div>
-                        {% if saved_settings.module_retailcrm_apiversion is defined and saved_settings.module_retailcrm_apiversion == 'v5' and customFields is defined %}
-                            <div class="tab-pane" id="tab-custom_fields">
-                                <fieldset>
-                                    <legend>{{ retailcrm_dict_custom_fields }}</legend>
-                                    {% if customFields.retailcrm is not empty and customFields.opencart is not empty %}
-                                        <div class="form-group">
-                                            <label class="col-sm-2 control-label" for="retailcrm_custom_field_active">{{ text_custom_field_activity }}</label>
-                                            <div class="col-sm-10">
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="module_retailcrm_custom_field_active" value="1" {% if saved_settings.module_retailcrm_custom_field_active is defined and
-                                                        saved_settings.module_retailcrm_custom_field_active == 1 %}
-                                                        checked {% endif %} >
-                                                    {{ text_yes }}
-                                                </label>
-                                                <label class="radio-inline">
-                                                    <input type="radio" name="module_retailcrm_custom_field_active" value="0" {% if saved_settings.module_retailcrm_custom_field_active is not defined or
-                                                        saved_settings.module_retailcrm_custom_field_active == 0 %}
-                                                        checked {% endif %} >
-                                                    {{ text_no }}
-                                                </label>
-                                            </div>
+                        <div class="tab-pane" id="tab-consultant">
+                            <legend>{{ consultant_tab_text }}</legend>
+                            <fieldset>
+                                {# online cosultant #}
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label" for="input-code">{{ entry_code }}</label>
+                                    <div class="col-sm-10">
+                                        <textarea name="module_retailcrm_online_consultant_code" rows="5" placeholder="{{ entry_code }}" id="retailcrm_entry_code" class="form-control">
+                                        {% if saved_settings.module_retailcrm_online_consultant_code is defined %}
+                                            {{ saved_settings.module_retailcrm_online_consultant_code }}{% endif %}
+                                        </textarea>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label" for="retailcrm_online_consultant_active" class="col-md-4">{{ entry_status }}</label>
+                                    <div class="col-sm-10">
+                                        <label class="control-label" class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_online_consultant_active" value="1" {% if saved_settings.module_retailcrm_online_consultant_active is defined and
+                                                saved_settings.module_retailcrm_online_consultant_active == 1 %} {{ 'checked' }}
+                                            {% endif %}>
+                                            {{ text_yes }}
+                                        </label>
+                                        <label class="control-label" class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_online_consultant_active" value="0" {% if not saved_settings.module_retailcrm_online_consultant_active or
+                                                saved_settings.module_retailcrm_online_consultant_active == 0 %} {{ 'checked' }}
+                                            {% endif %}>
+                                            {{ text_no }}
+                                        </label>
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </div>
+                        <div class="tab-pane" id="tab-custom_fields">
+                            <fieldset>
+                                <legend>{{ retailcrm_dict_custom_fields }}</legend>
+                                {% if customFields.retailcrm is not empty and customFields.opencart is not empty %}
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label" for="retailcrm_custom_field_active">{{ text_custom_field_activity }}</label>
+                                        <div class="col-sm-10">
+                                            <label class="radio-inline">
+                                                <input type="radio" name="module_retailcrm_custom_field_active" value="1" {% if saved_settings.module_retailcrm_custom_field_active is defined and
+                                                    saved_settings.module_retailcrm_custom_field_active == 1 %}
+                                                    checked {% endif %} >
+                                                {{ text_yes }}
+                                            </label>
+                                            <label class="radio-inline">
+                                                <input type="radio" name="module_retailcrm_custom_field_active" value="0" {% if saved_settings.module_retailcrm_custom_field_active is not defined or
+                                                    saved_settings.module_retailcrm_custom_field_active == 0 %}
+                                                    checked {% endif %} >
+                                                {{ text_no }}
+                                            </label>
                                         </div>
-                                        <div class="form-group">
-                                            <label class="col-sm-2 control-label">{{ text_customers_custom_fields }}</label>
-                                            <div class="col-sm-10">
-                                                <div class="row">
-                                                    {% for customField in customFields.opencart %}
-                                                        <div class="col-sm-12" style="margin-bottom:5px;">
-                                                            <div class="row">
-                                                                {% set fid = 'c_' ~ customField.custom_field_id %}
-                                                                <div class="col-sm-4">
-                                                                    <select class="form-control" id="module_retailcrm_custom_field_{{ fid }}" name="module_retailcrm_custom_field[{{ fid }}]" >
-                                                                        {% for v in customFields.retailcrm.customers %}
-                                                                            <option value="{{ v.code }}" {% if saved_settings.module_retailcrm_custom_field[fid] is defined and v.code == saved_settings.module_retailcrm_custom_field[fid] %} selected="selected" {% endif %}>
-                                                                                {{ v.name }}
-                                                                            </option>
-                                                                        {% endfor %}
-                                                                    </select>
-                                                                </div>
-                                                                <label style="padding-top: 9px;" for="module_retailcrm_custom_field_{{ fid }}">{{ customField.name }}</label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label">{{ text_customers_custom_fields }}</label>
+                                        <div class="col-sm-10">
+                                            <div class="row">
+                                                {% for customField in customFields.opencart %}
+                                                    <div class="col-sm-12" style="margin-bottom:5px;">
+                                                        <div class="row">
+                                                            {% set fid = 'c_' ~ customField.custom_field_id %}
+                                                            <div class="col-sm-4">
+                                                                <select class="form-control" id="module_retailcrm_custom_field_{{ fid }}" name="module_retailcrm_custom_field[{{ fid }}]" >
+                                                                    {% for v in customFields.retailcrm.customers %}
+                                                                        <option value="{{ v.code }}" {% if saved_settings.module_retailcrm_custom_field[fid] is defined and v.code == saved_settings.module_retailcrm_custom_field[fid] %} selected="selected" {% endif %}>
+                                                                            {{ v.name }}
+                                                                        </option>
+                                                                    {% endfor %}
+                                                                </select>
                                                             </div>
+                                                            <label style="padding-top: 9px;" for="module_retailcrm_custom_field_{{ fid }}">{{ customField.name }}</label>
                                                         </div>
-                                                    {% endfor %}
-                                                </div>
+                                                    </div>
+                                                {% endfor %}
                                             </div>
                                         </div>
-                                        <div class="form-group">
-                                            <label class="col-sm-2 control-label">{{ text_orders_custom_fields }}</label>
-                                            <div class="col-sm-10">
-                                                <div class="row">
-                                                    {% for customField in customFields.opencart %}
-                                                        <div class="col-sm-12" style="margin-bottom:5px;">
-                                                            <div class="row">
-                                                                {% set fid = 'o_' ~ customField.custom_field_id %}
-                                                                <div class="col-sm-4">
-                                                                    <select class="form-control" id="module_retailcrm_custom_field_{{ fid }}" name="module_retailcrm_custom_field[{{ fid }}]" >
-                                                                        {% for v in customFields.retailcrm.orders %}
-                                                                            <option value="{{ v.code }}" {% if saved_settings.module_retailcrm_custom_field[fid] is defined and v.code == saved_settings.module_retailcrm_custom_field[fid] %} selected="selected" {% endif %}>
-                                                                                {{ v.name }}
-                                                                            </option>
-                                                                        {% endfor %}
-                                                                    </select>
-                                                                </div>
-                                                                <label style="padding-top: 9px;" for="module_retailcrm_custom_field_{{ fid }}">{{ customField.name }}</label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label">{{ text_orders_custom_fields }}</label>
+                                        <div class="col-sm-10">
+                                            <div class="row">
+                                                {% for customField in customFields.opencart %}
+                                                    <div class="col-sm-12" style="margin-bottom:5px;">
+                                                        <div class="row">
+                                                            {% set fid = 'o_' ~ customField.custom_field_id %}
+                                                            <div class="col-sm-4">
+                                                                <select class="form-control" id="module_retailcrm_custom_field_{{ fid }}" name="module_retailcrm_custom_field[{{ fid }}]" >
+                                                                    {% for v in customFields.retailcrm.orders %}
+                                                                        <option value="{{ v.code }}" {% if saved_settings.module_retailcrm_custom_field[fid] is defined and v.code == saved_settings.module_retailcrm_custom_field[fid] %} selected="selected" {% endif %}>
+                                                                            {{ v.name }}
+                                                                        </option>
+                                                                    {% endfor %}
+                                                                </select>
                                                             </div>
+                                                            <label style="padding-top: 9px;" for="module_retailcrm_custom_field_{{ fid }}">{{ customField.name }}</label>
                                                         </div>
-                                                    {% endfor %}
-                                                </div>
+                                                    </div>
+                                                {% endfor %}
                                             </div>
                                         </div>
-                                    {% elseif customFields.retailcrm is empty and customFields.opencart is empty %}
-                                        <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
-                                            <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                            {{ text_error_custom_field }}
-                                        </div>
-                                    {% elseif customFields.retailcrm is empty %}
-                                        <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
-                                            <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                            {{ text_error_cf_retailcrm }}
-                                        </div>
-                                    {% elseif customFields.opencart is empty %}
-                                        <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
-                                            <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                            {{ text_error_cf_opencart }}
-                                        </div>
-                                    {% endif %}
-                                </fieldset>
-                            </div>
-                        {% endif %}
+                                    </div>
+                                {% elseif customFields.retailcrm is empty and customFields.opencart is empty %}
+                                    <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
+                                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                                        {{ text_error_custom_field }}
+                                    </div>
+                                {% elseif customFields.retailcrm is empty %}
+                                    <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
+                                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                                        {{ text_error_cf_retailcrm }}
+                                    </div>
+                                {% elseif customFields.opencart is empty %}
+                                    <div class="alert alert-info"><i class="fa fa-exclamation-circle"></i>
+                                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                                        {{ text_error_cf_opencart }}
+                                    </div>
+                                {% endif %}
+                            </fieldset>
+                        </div>
                         <div class="tab-pane" id="tab-logs">
                             <fieldset style="margin-bottom: 30px;">
                                 <legend>Retailcrm API error log</legend>
@@ -662,3 +767,4 @@
         }
     });
 </script>
+

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' => ''

src/upload/catalog/controller/extension/analytics/daemon_collector.php

@@ -1,4 +1,5 @@
 <?php
+
 class ControllerExtensionAnalyticsDaemonCollector extends Controller {
     public function index() {
         $this->load->model('setting/setting');

src/upload/catalog/controller/extension/analytics/online_consultant.php

@@ -0,0 +1,17 @@
+<?php
+
+class ControllerExtensionAnalyticsOnlineConsultant extends Controller {
+    /**
+     * @return string
+     */
+    public function index() {
+        $this->load->model('setting/setting');
+        $this->load->library('retailcrm/retailcrm');
+
+        $moduleTitle = $this->retailcrm->getModuleTitle();
+        $settings = $this->model_setting_setting->getSetting($moduleTitle);
+        $setting = trim($settings['module_retailcrm_online_consultant_code']);
+
+        return html_entity_decode($setting, ENT_QUOTES, 'UTF-8');
+    }
+}

src/upload/catalog/controller/extension/module/retailcrm.php

@@ -1,14 +1,5 @@
 <?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;
@@ -35,38 +26,38 @@ class ControllerExtensionModuleRetailcrm extends Controller {
             return;
         }
 
-        $this->load->model('checkout/order');
-        $this->load->model('account/order');
         $this->load->library('retailcrm/retailcrm');
 
-        $data = $this->model_checkout_order->getOrder($order_id);;
-        $data['products'] = $this->model_account_order->getOrderProducts($order_id);
-        $data['totals'] = $this->model_account_order->getOrderTotals($order_id);
+        $order_data = $this->model_checkout_order->getOrder($order_id);
+        $products = $this->model_account_order->getOrderProducts($order_id);
+        $totals = $this->model_account_order->getOrderTotals($order_id);
         $moduleTitle = $this->retailcrm->getModuleTitle();
 
-        foreach ($data['products'] as $key => $product) {
+        foreach ($products as $key => $product) {
             $productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']);
 
             if (!empty($productOptions)) {
-                $data['products'][$key]['option'] = $productOptions;
+                $products[$key]['option'] = $productOptions;
             }
         }
 
         $this->load->model('setting/setting');
         $status = $this->model_setting_setting->getSetting($moduleTitle);
 
-        if (isset($data['order_status_id']) && $data['order_status_id'] > 0) {
-            $data['order_status'] = $status[$moduleTitle . '_status'][$data['order_status_id']];
+        if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
+            $order_data['order_status'] = $status[$moduleTitle . '_status'][$order_data['order_status_id']];
         }
 
         if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
             $this->load->model('extension/retailcrm/custom/order');
-            $order = $this->model_extension_retailcrm_custom_order->processOrder($data);
-            $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data);
+            $order_data['products'] = $products;
+            $order_data['totals'] = $totals;
+
+            $order = $this->model_extension_retailcrm_custom_order->processOrder($order_data);
+            $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $order_data);
         } else {
-            $this->load->model('extension/retailcrm/order');
-            $order = $this->model_extension_retailcrm_order->processOrder($data);
-            $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data);
+            $order_manager = $this->retailcrm->getOrderManager();
+            $order_manager->createOrder($order_data, $products, $totals);
         }
     }
 
@@ -85,8 +76,6 @@ class ControllerExtensionModuleRetailcrm extends Controller {
 
         $order_id = $parameter2[0];
 
-        $this->load->model('checkout/order');
-        $this->load->model('account/order');
         $this->load->library('retailcrm/retailcrm');
 
         $moduleTitle = $this->retailcrm->getModuleTitle();
@@ -96,19 +85,18 @@ class ControllerExtensionModuleRetailcrm extends Controller {
             return;
         }
 
-        $data['products'] = $this->model_account_order->getOrderProducts($order_id);
-        $data['totals'] = $this->model_account_order->getOrderTotals($order_id);
+        $products = $this->model_account_order->getOrderProducts($order_id);
+        $totals = $this->model_account_order->getOrderTotals($order_id);
 
-        foreach ($data['products'] as $key => $product) {
+        foreach ($products as $key => $product) {
             $productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']);
 
             if (!empty($productOptions)) {
-                $data['products'][$key]['option'] = $productOptions;
+                $products[$key]['option'] = $productOptions;
             }
         }
 
         if (!isset($data['fromApi'])) {
-            $this->load->model('setting/setting');
             $status = $this->model_setting_setting->getSetting($moduleTitle);
 
             if ($data['order_status_id'] > 0) {
@@ -117,12 +105,14 @@ class ControllerExtensionModuleRetailcrm extends Controller {
 
             if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
                 $this->load->model('extension/retailcrm/custom/order');
+                $data['products'] = $products;
+                $data['totals'] = $totals;
+
                 $order = $this->model_extension_retailcrm_custom_order->processOrder($data, false);
                 $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
             } else {
-                $this->load->model('extension/retailcrm/order');
-                $order = $this->model_extension_retailcrm_order->processOrder($data, false);
-                $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
+                $order_manager = $this->retailcrm->getOrderManager();
+                $order_manager->editOrder($data, $products, $totals);
             }
         }
     }
@@ -135,33 +125,30 @@ class ControllerExtensionModuleRetailcrm extends Controller {
      * @return void
      */
     public function customer_create($parameter1, $parameter2 = null, $parameter3 = null) {
-        $this->load->model('account/customer');
-        $this->load->model('localisation/country');
-        $this->load->model('localisation/zone');
-
         $customerId = $parameter3;
         $customer = $this->model_account_customer->getCustomer($customerId);
 
-        if ($this->request->post) {
-            $country = $this->model_localisation_country->getCountry($this->request->post['country_id']);
-            $zone = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
-
-            $customer['address'] = array(
-                'address_1' => $this->request->post['address_1'],
-                'address_2' => $this->request->post['address_2'],
-                'city' => $this->request->post['city'],
-                'postcode' => $this->request->post['postcode'],
-                'iso_code_2' => $country['iso_code_2'],
-                'zone' => $zone['name']
-            );
-        }
-
         if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/customer.php')) {
             $this->load->model('extension/retailcrm/custom/customer');
             $this->model_extension_retailcrm_custom_customer->sendToCrm($customer, $this->retailcrmApiClient);
         } else {
-            $this->load->model('extension/retailcrm/customer');
-            $this->model_extension_retailcrm_customer->sendToCrm($customer, $this->retailcrmApiClient);
+            $address = array();
+            $customer_manager = $this->retailcrm->getCustomerManager();
+            $customer_manager->createCustomer($customer, $address);
+        }
+    }
+
+    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);
         }
     }
 
@@ -175,18 +162,16 @@ class ControllerExtensionModuleRetailcrm extends Controller {
     public function customer_edit($parameter1, $parameter2, $parameter3) {
         $customerId = $this->customer->getId();
 
-        $this->load->model('account/customer');
         $customer = $this->model_account_customer->getCustomer($customerId);
-
-        $this->load->model('account/address');
-        $customer['address'] = $this->model_account_address->getAddress($customer['address_id']);
+        $address = $this->model_account_address->getAddress($customer['address_id']);
 
         if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/customer.php')) {
             $this->load->model('extension/retailcrm/custom/customer');
+            $customer['address'] = $address;
             $this->model_extension_retailcrm_custom_customer->changeInCrm($customer, $this->retailcrmApiClient);
         } else {
-            $this->load->model('extension/retailcrm/customer');
-            $this->model_extension_retailcrm_customer->changeInCrm($customer, $this->retailcrmApiClient);
+            $customer_manager = $this->retailcrm->getCustomerManager();
+            $customer_manager->editCustomer($customer, $address);
         }
     }
 }

src/upload/catalog/model/extension/retailcrm/customer.php

@@ -1,104 +0,0 @@
-<?php
-
-class ModelExtensionRetailcrmCustomer extends Model {
-    protected $settings;
-    protected $moduleTitle;
-
-    public function __construct($registry)
-    {
-        parent::__construct($registry);
-        $this->load->model('setting/setting');
-        $this->load->library('retailcrm/retailcrm');
-
-        $this->moduleTitle = $this->retailcrm->getModuleTitle();
-        $this->settings = $this->model_setting_setting->getSetting($this->moduleTitle);
-    }
-
-    /**
-     * Create customer
-     * 
-     * @param array $customer
-     * 
-     * @return mixed
-     */
-    public function sendToCrm($customer, $retailcrmApiClient)
-    {
-        if (empty($customer) || $retailcrmApiClient === false) {
-            return false;
-        }
-
-        $customerToCrm = $this->process($customer);
-
-        $retailcrmApiClient->customersCreate($customerToCrm);
-
-        return $customerToCrm;
-    }
-
-    /**
-     * Edit customer
-     * 
-     * @param array $customer
-     * 
-     * @return mixed
-     */
-    public function changeInCrm($customer, $retailcrmApiClient)
-    {
-        if (empty($customer) || $retailcrmApiClient === false) {
-            return false;
-        }
-
-        $customerToCrm = $this->process($customer);
-        
-        $retailcrmApiClient->customersEdit($customerToCrm);
-
-        return $customerToCrm;
-    }
-
-    /**
-     * Process customer
-     *
-     * @param array $customer
-     *
-     * @return array $customerToCrm
-     */
-    private function process($customer) {
-        $customerToCrm = array(
-            'externalId' => $customer['customer_id'],
-            'firstName' => $customer['firstname'],
-            'lastName' => $customer['lastname'],
-            'email' => $customer['email'],
-            'phones' => array(
-                array(
-                    'number' => $customer['telephone']
-                )
-            ),
-            'createdAt' => $customer['date_added']
-        );
-
-        if (isset($customer['address'])) {
-            $customerToCrm['address'] = array(
-                'index' => $customer['address']['postcode'],
-                'countryIso' => $customer['address']['iso_code_2'],
-                'region' => $customer['address']['zone'],
-                'city' => $customer['address']['city'],
-                'text' => $customer['address']['address_1'] . ' ' . $customer['address']['address_2'] 
-            );
-        }
-        
-        if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $customer['custom_field']) {
-            $customFields = json_decode($customer['custom_field']);
-            
-            foreach ($customFields as $key => $value) {
-                if (isset($this->settings[$this->moduleTitle . '_custom_field']['c_' . $key])) {
-                    $customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['c_' . $key]] = $value;
-                }
-            }
-            
-            if (isset($customFieldsToCrm)) {
-                $customerToCrm['customFields'] = $customFieldsToCrm;
-            }
-        }
-
-        return $customerToCrm;
-    }
-}

src/upload/catalog/model/extension/retailcrm/order.php

@@ -37,30 +37,7 @@ class ModelExtensionRetailcrmOrder extends Model {
         }
 
         if (!isset($order['customer']['externalId']) && !isset($order['customer']['id'])) {
-            $new_customer = array(
-                'firstName' => $data['firstname'],
-                'lastName' => $data['lastname'],
-                'email' => $data['email'],
-                'createdAt' => $data['date_added'],
-                'address' => array(
-                    'countryIso' => $data['payment_iso_code_2'],
-                    'index' => $data['payment_postcode'],
-                    'city' => $data['payment_city'],
-                    'region' => $data['payment_zone'],
-                    'text' => $data['payment_address_1'] . ' ' . $data['payment_address_2']
-                )
-            );
-
-            if (!empty($data['telephone'])) {
-                $new_customer['phones'] = array(
-                    array(
-                        'number' => $data['telephone']
-                    )
-                );
-            }
-
-            $res = $retailcrmApiClient->customersCreate($new_customer);
-
+            $res = $this->createCustomer($data, $retailcrmApiClient);
             if ($res->isSuccessful() && isset($res['id'])) {
                 $order['customer']['id'] = $res['id'];
             }
@@ -68,14 +45,30 @@ class ModelExtensionRetailcrmOrder extends Model {
 
         if ($create) {
             $order = self::filterRecursive($order);
-            $retailcrmApiClient->ordersCreate($order);
+            $response = $retailcrmApiClient->ordersCreate($order);
+            if (isset($response['errors']['customer.externalId'])) {
+                $res = $this->createCustomer($data, $retailcrmApiClient);
+                if ($res->isSuccessful() && isset($res['id'])) {
+                    $order['customer']['id'] = $res['id'];
+                }
+
+                $retailcrmApiClient->ordersCreate($order);
+            }
         } else {
             $order_payment = reset($order['payments']);
             unset($order['payments']);
             $order = self::filterRecursive($order);
             $response = $retailcrmApiClient->ordersEdit($order);
+            if (isset($response['errors']['customer.externalId'])) {
+                $res = $this->createCustomer($data, $retailcrmApiClient);
+                if ($res->isSuccessful() && isset($res['id'])) {
+                    $order['customer']['id'] = $res['id'];
+                }
 
-            if ($this->settings[$this->moduleTitle . '_apiversion'] == 'v5' && $response->isSuccessful()) {
+                $response = $retailcrmApiClient->ordersEdit($order);
+            }
+
+            if ($response->isSuccessful()) {
                 $this->updatePayment($order_payment, $order['externalId'], $retailcrmApiClient);
             }
         }
@@ -110,9 +103,9 @@ class ModelExtensionRetailcrmOrder extends Model {
             $shippingModule = $shippingCode[0];
 
             if (isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) {
-               $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
+                $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
             } elseif (isset($this->settings[$this->moduleTitle . '_delivery'][$shippingModule])) {
-               $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule];
+                $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule];
             }
         }
 
@@ -143,6 +136,12 @@ 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'];
@@ -176,16 +175,8 @@ class ModelExtensionRetailcrmOrder extends Model {
         }
 
         $order['createdAt'] = $order_data['date_added'];
-
-        if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v5') {
-            $order['paymentType'] = $payment_code;
-            if ($couponTotal > 0) {
-                $order['discount'] = $couponTotal;
-            }
-        } else {
-            if ($couponTotal > 0) {
-                $order['discountManualAmount'] = $couponTotal;
-            }
+        if ($couponTotal > 0) {
+            $order['discountManualAmount'] = $couponTotal;
         }
 
         $country = isset($order_data['shipping_country']) ? $order_data['shipping_country'] : '' ;
@@ -252,71 +243,69 @@ class ModelExtensionRetailcrmOrder extends Model {
                 $offerId = implode('_', $offerId);
             }
 
-            if ($this->settings[$this->moduleTitle . '_apiversion'] != 'v3') {
-                $item = array(
-                    'offer' => array(
-                        'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
-                    ),
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity']
-                );
+            $item = array(
+                'offer' => array(
+                    'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
+                ),
+                'productName' => $product['name'],
+                'initialPrice' => $product['price'],
+                'quantity' => $product['quantity']
+            );
 
-                $specials = $this->model_extension_retailcrm_product->getProductSpecials($product['product_id']);
+            $specials = $this->model_extension_retailcrm_product->getProductSpecials($product['product_id']);
 
-                if (!empty($specials)) {
-                    $customer = $this->model_account_customer->getCustomer($order_data['customer_id']);
+            if (!empty($specials)) {
+                $customer = $this->model_account_customer->getCustomer($order_data['customer_id']);
 
-                    foreach ($specials as $special) {
-                        if (isset($customer['customer_group_id'])) {
-                            if ($special['customer_group_id'] == $customer['customer_group_id']) {
-                                if ($this->settings[$this->moduleTitle . '_special_' . $customer['customer_group_id']]) {
-                                    $item['priceType']['code'] = $this->settings[$this->moduleTitle . '_special_' . $customer['customer_group_id']];
-                                }
+                foreach ($specials as $special) {
+                    if (isset($customer['customer_group_id'])) {
+                        if ($special['customer_group_id'] == $customer['customer_group_id']) {
+                            if ($this->settings[$this->moduleTitle . '_special_' . $customer['customer_group_id']]) {
+                                $item['priceType']['code'] = $this->settings[$this->moduleTitle . '_special_' . $customer['customer_group_id']];
                             }
                         }
                     }
                 }
-            } else {
-                $item = array(
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity'],
-                    'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
-                );
             }
 
             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($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;
-                    }
-                }
-
-                if (isset($customFieldsToCrm)) {
-                    $order['customFields'] = $customFieldsToCrm;
-                }
-            }
         }
 
+        
+        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'];
+
+            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;
+            }
+        }
+        
         $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
@@ -423,4 +412,38 @@ class ModelExtensionRetailcrmOrder extends Model {
         }
         return $haystack;
     }
+
+    /**
+     * @param array $data
+     * @param \RetailcrmProxy $retailcrmApiClient
+     *
+     * @return ApiResponse
+     */
+    private function createCustomer($data, $retailcrmApiClient)
+    {
+        $customer = array(
+            'firstName' => $data['firstname'],
+            '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'],
+                'city' => $data['payment_city'],
+                'region' => $data['payment_zone'],
+                'text' => $data['payment_address_1'] . ' ' . $data['payment_address_2']
+            )
+        );
+
+        if (!empty($data['telephone'])) {
+            $customer['phones'] = array(
+                array(
+                    'number' => $data['telephone']
+                )
+            );
+        }
+
+        return $retailcrmApiClient->customersCreate($customer);
+    }
 }

src/upload/catalog/model/extension/total/retailcrm_discount.php

@@ -0,0 +1,11 @@
+<?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
+{
+}

src/upload/system/library/retailcrm/CurlException.php

@@ -1,15 +0,0 @@
-<?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/ApiVersion4
- */
-class CurlException extends RuntimeException
-{
-}

src/upload/system/library/retailcrm/InvalidJsonException.php

@@ -1,15 +0,0 @@
-<?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/ApiVersion4
- */
-class InvalidJsonException extends DomainException
-{
-}

src/upload/system/library/retailcrm/RetailcrmApiClient3.php

@@ -1,831 +0,0 @@
-<?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/ApiVersion3
- */
-class RetailcrmApiClient3
-{
-    protected $client;
-
-    /**
-     * Site code
-     */
-    protected $siteCode;
-
-    /**
-     * Client creating
-     *
-     * @param  string $url
-     * @param  string $apiKey
-     * @param  string $site
-     * @return mixed
-     */
-    public function __construct($url, $apiKey, $version = null, $site = null)
-    {
-        if ('/' != substr($url, strlen($url) - 1, 1)) {
-            $url .= '/';
-        }
-
-        $url = $version == null ? $url . 'api' : $url . 'api/' . $version;
-
-        $this->client = new RetailcrmHttpClient($url, array('apiKey' => $apiKey));
-        $this->siteCode = $site;
-    }
-    
-    /**
-     * Returns api versions list
-     * 
-     * @throws \RetailCrm\Exception\InvalidJsonException
-     * @throws \RetailCrm\Exception\CurlException
-     * @throws \InvalidArgumentException
-     * 
-     * @return ApiResponse
-     */
-    public function apiVersions()
-    {
-        return $this->client->makeRequest('/api-versions', RetailcrmHttpClient::METHOD_GET);
-    }
-    
-    /**
-     * Create a order
-     *
-     * @param  array       $order
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function ordersCreate(array $order, $site = null)
-    {
-        if (!sizeof($order)) {
-            throw new InvalidArgumentException('Parameter `order` must contains a data');
-        }
-
-        return $this->client->makeRequest("/orders/create", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
-            'order' => json_encode($order)
-        )));
-    }
-
-    /**
-     * Edit a order
-     *
-     * @param  array       $order
-     * @param  string      $by
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function ordersEdit(array $order, $by = 'externalId', $site = null)
-    {
-        if (!sizeof($order)) {
-            throw new InvalidArgumentException('Parameter `order` must contains a data');
-        }
-
-        $this->checkIdParameter($by);
-
-        if (!isset($order[$by])) {
-            throw new InvalidArgumentException(sprintf('Order array must contain the "%s" parameter.', $by));
-        }
-
-        return $this->client->makeRequest(
-            "/orders/" . $order[$by] . "/edit",
-            RetailcrmHttpClient::METHOD_POST,
-            $this->fillSite($site, array(
-                'order' => json_encode($order),
-                'by' => $by,
-            ))
-        );
-    }
-
-    /**
-     * Upload array of the orders
-     *
-     * @param  array       $orders
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function ordersUpload(array $orders, $site = null)
-    {
-        if (!sizeof($orders)) {
-            throw new InvalidArgumentException('Parameter `orders` must contains array of the orders');
-        }
-
-        return $this->client->makeRequest("/orders/upload", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
-            'orders' => json_encode($orders),
-        )));
-    }
-
-    /**
-     * Get order by id or externalId
-     *
-     * @param  string      $id
-     * @param  string      $by (default: 'externalId')
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function ordersGet($id, $by = 'externalId', $site = null)
-    {
-        $this->checkIdParameter($by);
-
-        return $this->client->makeRequest("/orders/$id", RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, array(
-            'by' => $by
-        )));
-    }
-
-    /**
-     * Returns a orders history
-     *
-     * @param  DateTime   $startDate (default: null)
-     * @param  DateTime   $endDate (default: null)
-     * @param  int         $limit (default: 100)
-     * @param  int         $offset (default: 0)
-     * @param  bool        $skipMyChanges (default: true)
-     * @return ApiResponse
-     */
-    public function ordersHistory(
-        DateTime $startDate = null,
-        DateTime $endDate = null,
-        $limit = 100,
-        $offset = 0,
-        $skipMyChanges = true
-    ) {
-        $parameters = array();
-
-        if ($startDate) {
-            $parameters['startDate'] = $startDate->format('Y-m-d H:i:s');
-        }
-        if ($endDate) {
-            $parameters['endDate'] = $endDate->format('Y-m-d H:i:s');
-        }
-        if ($limit) {
-            $parameters['limit'] = (int) $limit;
-        }
-        if ($offset) {
-            $parameters['offset'] = (int) $offset;
-        }
-        if ($skipMyChanges) {
-            $parameters['skipMyChanges'] = (bool) $skipMyChanges;
-        }
-
-        return $this->client->makeRequest('/orders/history', RetailcrmHttpClient::METHOD_GET, $parameters);
-    }
-
-    /**
-     * Returns filtered orders list
-     *
-     * @param  array       $filter (default: array())
-     * @param  int         $page (default: null)
-     * @param  int         $limit (default: null)
-     * @return ApiResponse
-     */
-    public function ordersList(array $filter = array(), $page = null, $limit = null)
-    {
-        $parameters = array();
-
-        if (sizeof($filter)) {
-            $parameters['filter'] = $filter;
-        }
-        if (null !== $page) {
-            $parameters['page'] = (int) $page;
-        }
-        if (null !== $limit) {
-            $parameters['limit'] = (int) $limit;
-        }
-
-        return $this->client->makeRequest('/orders', RetailcrmHttpClient::METHOD_GET, $parameters);
-    }
-
-    /**
-     * Returns statuses of the orders
-     *
-     * @param  array       $ids (default: array())
-     * @param  array       $externalIds (default: array())
-     * @return ApiResponse
-     */
-    public function ordersStatuses(array $ids = array(), array $externalIds = array())
-    {
-        $parameters = array();
-
-        if (sizeof($ids)) {
-            $parameters['ids'] = $ids;
-        }
-        if (sizeof($externalIds)) {
-            $parameters['externalIds'] = $externalIds;
-        }
-
-        return $this->client->makeRequest('/orders/statuses', RetailcrmHttpClient::METHOD_GET, $parameters);
-    }
-
-    /**
-     * Save order IDs' (id and externalId) association in the CRM
-     *
-     * @param  array       $ids
-     * @return ApiResponse
-     */
-    public function ordersFixExternalIds(array $ids)
-    {
-        if (!sizeof($ids)) {
-            throw new InvalidArgumentException('Method parameter must contains at least one IDs pair');
-        }
-
-        return $this->client->makeRequest("/orders/fix-external-ids", RetailcrmHttpClient::METHOD_POST, array(
-            'orders' => json_encode($ids),
-        ));
-    }
-
-    /**
-     * Get orders assembly history
-     *
-     * @param  array       $filter (default: array())
-     * @param  int         $page (default: null)
-     * @param  int         $limit (default: null)
-     * @return ApiResponse
-     */
-    public function ordersPacksHistory(array $filter = array(), $page = null, $limit = null)
-    {
-        $parameters = array();
-
-        if (sizeof($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, $parameters);
-    }
-
-    /**
-     * Create a customer
-     *
-     * @param  array       $customer
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function customersCreate(array $customer, $site = null)
-    {
-        if (!sizeof($customer)) {
-            throw new InvalidArgumentException('Parameter `customer` must contains a data');
-        }
-
-        return $this->client->makeRequest("/customers/create", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
-            'customer' => json_encode($customer)
-        )));
-    }
-
-    /**
-     * Edit a customer
-     *
-     * @param  array       $customer
-     * @param  string      $by (default: 'externalId')
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function customersEdit(array $customer, $by = 'externalId', $site = null)
-    {
-        if (!sizeof($customer)) {
-            throw new InvalidArgumentException('Parameter `customer` must contains a data');
-        }
-
-        $this->checkIdParameter($by);
-
-        if (!isset($customer[$by])) {
-            throw new InvalidArgumentException(sprintf('Customer array must contain the "%s" parameter.', $by));
-        }
-
-        return $this->client->makeRequest(
-            "/customers/" . $customer[$by] . "/edit",
-            RetailcrmHttpClient::METHOD_POST,
-            $this->fillSite(
-                $site,
-                array(
-                    'customer' => json_encode($customer),
-                    'by' => $by
-                )
-            )
-        );
-    }
-
-    /**
-     * Upload array of the customers
-     *
-     * @param  array       $customers
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function customersUpload(array $customers, $site = null)
-    {
-        if (!sizeof($customers)) {
-            throw new InvalidArgumentException('Parameter `customers` must contains array of the customers');
-        }
-
-        return $this->client->makeRequest("/customers/upload", RetailcrmHttpClient::METHOD_POST, $this->fillSite($site, array(
-            'customers' => json_encode($customers),
-        )));
-    }
-
-    /**
-     * Get customer by id or externalId
-     *
-     * @param  string      $id
-     * @param  string      $by (default: 'externalId')
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function customersGet($id, $by = 'externalId', $site = null)
-    {
-        $this->checkIdParameter($by);
-
-        return $this->client->makeRequest("/customers/$id", RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, array(
-            'by' => $by
-        )));
-    }
-
-    /**
-     * Returns filtered customers list
-     *
-     * @param  array       $filter (default: array())
-     * @param  int         $page (default: null)
-     * @param  int         $limit (default: null)
-     * @return ApiResponse
-     */
-    public function customersList(array $filter = array(), $page = null, $limit = null)
-    {
-        $parameters = array();
-
-        if (sizeof($filter)) {
-            $parameters['filter'] = $filter;
-        }
-        if (null !== $page) {
-            $parameters['page'] = (int) $page;
-        }
-        if (null !== $limit) {
-            $parameters['limit'] = (int) $limit;
-        }
-
-        return $this->client->makeRequest('/customers', RetailcrmHttpClient::METHOD_GET, $parameters);
-    }
-
-    /**
-     * Save customer IDs' (id and externalId) association in the CRM
-     *
-     * @param  array       $ids
-     * @return ApiResponse
-     */
-    public function customersFixExternalIds(array $ids)
-    {
-        if (!sizeof($ids)) {
-            throw new InvalidArgumentException('Method parameter must contains at least one IDs pair');
-        }
-
-        return $this->client->makeRequest("/customers/fix-external-ids", RetailcrmHttpClient::METHOD_POST, array(
-            'customers' => json_encode($ids),
-        ));
-    }
-
-    /**
-     * Get purchace prices & stock balance
-     *
-     * @param  array  $filter (default: array())
-     * @param  int    $page (default: null)
-     * @param  int    $limit (default: null)
-     * @param  string $site (default: null)
-     * @return ApiResponse
-     */
-    public function storeInventories(array $filter = array(), $page = null, $limit = null, $site = null)
-    {
-        $parameters = array();
-
-        if (sizeof($filter)) {
-            $parameters['filter'] = $filter;
-        }
-        if (null !== $page) {
-            $parameters['page'] = (int) $page;
-        }
-        if (null !== $limit) {
-            $parameters['limit'] = (int) $limit;
-        }
-
-        return $this->client->makeRequest('/store/inventories', RetailcrmHttpClient::METHOD_GET, $this->fillSite($site, $parameters));
-    }
-
-    /**
-     * Upload store inventories
-     *
-     * @param  array       $offers
-     * @param  string      $site (default: null)
-     * @return ApiResponse
-     */
-    public function storeInventoriesUpload(array $offers, $site = null)
-    {
-        if (!sizeof($offers)) {
-            throw new InvalidArgumentException('Parameter `offers` must contains array of the customers');
-        }
-
-        return $this->client->makeRequest(
-            "/store/inventories/upload",
-            RetailcrmHttpClient::METHOD_POST,
-            $this->fillSite($site, array('offers' => json_encode($offers)))
-        );
-    }
-
-    /**
-     * Returns deliveryServices list
-     *
-     * @return ApiResponse
-     */
-    public function deliveryServicesList()
-    {
-        return $this->client->makeRequest('/reference/delivery-services', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns deliveryTypes list
-     *
-     * @return ApiResponse
-     */
-    public function deliveryTypesList()
-    {
-        return $this->client->makeRequest('/reference/delivery-types', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns orderMethods list
-     *
-     * @return ApiResponse
-     */
-    public function orderMethodsList()
-    {
-        return $this->client->makeRequest('/reference/order-methods', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns orderTypes list
-     *
-     * @return ApiResponse
-     */
-    public function orderTypesList()
-    {
-        return $this->client->makeRequest('/reference/order-types', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns paymentStatuses list
-     *
-     * @return ApiResponse
-     */
-    public function paymentStatusesList()
-    {
-        return $this->client->makeRequest('/reference/payment-statuses', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns paymentTypes list
-     *
-     * @return ApiResponse
-     */
-    public function paymentTypesList()
-    {
-        return $this->client->makeRequest('/reference/payment-types', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns productStatuses list
-     *
-     * @return ApiResponse
-     */
-    public function productStatusesList()
-    {
-        return $this->client->makeRequest('/reference/product-statuses', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns statusGroups list
-     *
-     * @return ApiResponse
-     */
-    public function statusGroupsList()
-    {
-        return $this->client->makeRequest('/reference/status-groups', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns statuses list
-     *
-     * @return ApiResponse
-     */
-    public function statusesList()
-    {
-        return $this->client->makeRequest('/reference/statuses', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns sites list
-     *
-     * @return ApiResponse
-     */
-    public function sitesList()
-    {
-        return $this->client->makeRequest('/reference/sites', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Returns stores list
-     *
-     * @return ApiResponse
-     */
-    public function storesList()
-    {
-        return $this->client->makeRequest('/reference/stores', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Edit deliveryService
-     *
-     * @param array $data delivery service data
-     * @return ApiResponse
-     */
-    public function deliveryServicesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/delivery-services/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'deliveryService' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit deliveryType
-     *
-     * @param array $data delivery type data
-     * @return ApiResponse
-     */
-    public function deliveryTypesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/delivery-types/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'deliveryType' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit orderMethod
-     *
-     * @param array $data order method data
-     * @return ApiResponse
-     */
-    public function orderMethodsEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/order-methods/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'orderMethod' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit orderType
-     *
-     * @param array $data order type data
-     * @return ApiResponse
-     */
-    public function orderTypesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/order-types/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'orderType' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit paymentStatus
-     *
-     * @param array $data payment status data
-     * @return ApiResponse
-     */
-    public function paymentStatusesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/payment-statuses/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'paymentStatus' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit paymentType
-     *
-     * @param array $data payment type data
-     * @return ApiResponse
-     */
-    public function paymentTypesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/payment-types/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'paymentType' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit productStatus
-     *
-     * @param array $data product status data
-     * @return ApiResponse
-     */
-    public function productStatusesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/product-statuses/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'productStatus' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit order status
-     *
-     * @param array $data status data
-     * @return ApiResponse
-     */
-    public function statusesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/statuses/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'status' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit site
-     *
-     * @param array $data site data
-     * @return ApiResponse
-     */
-    public function sitesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/sites/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'site' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Edit store
-     *
-     * @param array $data site data
-     * @return ApiResponse
-     */
-    public function storesEdit(array $data)
-    {
-        if (!isset($data['code'])) {
-            throw new InvalidArgumentException('Data must contain "code" parameter.');
-        }
-
-        if (!isset($data['name'])) {
-            throw new InvalidArgumentException('Data must contain "name" parameter.');
-        }
-
-        return $this->client->makeRequest(
-            '/reference/stores/' . $data['code'] . '/edit',
-            RetailcrmHttpClient::METHOD_POST,
-            array(
-                'store' => json_encode($data)
-            )
-        );
-    }
-
-    /**
-     * Update CRM basic statistic
-     *
-     * @return ApiResponse
-     */
-    public function statisticUpdate()
-    {
-        return $this->client->makeRequest('/statistic/update', RetailcrmHttpClient::METHOD_GET);
-    }
-
-    /**
-     * Return current site
-     *
-     * @return string
-     */
-    public function getSite()
-    {
-        return $this->siteCode;
-    }
-
-    /**
-     * Set site
-     *
-     * @param  string $site
-     * @return void
-     */
-    public function setSite($site)
-    {
-        $this->siteCode = $site;
-    }
-
-    /**
-     * Check ID parameter
-     *
-     * @param  string $by
-     * @return bool
-     */
-    protected function checkIdParameter($by)
-    {
-        $allowedForBy = array('externalId', 'id');
-        if (!in_array($by, $allowedForBy)) {
-            throw new InvalidArgumentException(sprintf(
-                'Value "%s" for parameter "by" is not valid. Allowed values are %s.',
-                $by,
-                implode(', ', $allowedForBy)
-            ));
-        }
-
-        return true;
-    }
-
-    /**
-     * Fill params by site value
-     *
-     * @param  string $site
-     * @param  array $params
-     * @return array
-     */
-    protected function fillSite($site, array $params)
-    {
-        if ($site) {
-            $params['site'] = $site;
-        } elseif ($this->siteCode) {
-            $params['site'] = $this->siteCode;
-        }
-
-        return $params;
-    }
-}

src/upload/system/library/retailcrm/RetailcrmProxy.php

@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Class RequestProxy
- * @package RetailCrm\Component
- */
-class RetailcrmProxy
-{
-
-    private $api;
-    private $log;
-
-    public function __construct($url, $key, $log, $version = null)
-    {   
-        switch ($version) {
-            case 'v5':
-                $this->api = new RetailcrmApiClient5($url, $key, $version);
-                break;
-            case 'v4':
-                $this->api = new RetailcrmApiClient4($url, $key, $version);
-                break;
-            case 'v3':
-                $this->api = new RetailcrmApiClient3($url, $key, $version);
-                break;
-            case null:
-                $this->api = new RetailcrmApiClient3($url, $key, $version);
-                break;
-        }
-
-        $this->log = $log;
-    }
-
-    public function __call($method, $arguments)
-    {   
-        $date = date('[Y-m-d H:i:s]');
-        
-        try {
-            $response = call_user_func_array(array($this->api, $method), $arguments);
-
-            if (!$response->isSuccessful()) {
-                error_log($date . " [$method] " . $response->getErrorMsg() . "\n", 3, $this->log);
-                if (isset($response['errors'])) {
-                    $error = implode("\n", $response['errors']);
-                    error_log($date .' '. $error . "\n", 3, $this->log);
-                }
-            }
-
-            return $response;
-        } catch (CurlException $e) {
-            error_log($date . " [$method] " . $e->getMessage() . "\n", 3, $this->log);
-            return false;
-        } catch (InvalidJsonException $e) {
-            error_log($date . " [$method] " . $e->getMessage() . "\n", 3, $this->log);
-            return false;
-        }
-    }
-
-}

src/upload/system/library/retailcrm/base.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace retailcrm;
+
+/**
+ * Class Base
+ *
+ * @property \Loader load
+ * @property \DB db
+ * @property \Config config
+ * @property \Language language
+ */
+abstract class Base {
+    protected $registry;
+
+    public function __construct(\Registry $registry) {
+        $this->registry = $registry;
+    }
+
+    public function __get($name) {
+        return $this->registry->get($name);
+    }
+}

src/upload/system/library/retailcrm/bootstrap.php

@@ -62,13 +62,14 @@ class RetailcrmAutoloader
         $directory = new RecursiveDirectoryIterator(self::$pathTop);
         $fileIterator = new RecursiveIteratorIterator($directory);
         $filename = $className . self::$fileExt;
+        $chunks = explode("\\", $filename);
+        $filename = end($chunks);
 
         foreach ($fileIterator as $file) {
             if (strtolower($file->getFilename()) === strtolower($filename) && $file->isReadable()) {
                 include_once $file->getPathname();
             }
         }
-
     }
 
     /**

src/upload/system/library/retailcrm/cron/.htaccess

@@ -1,4 +1,4 @@
 <Files *.*>
 Allow from all
-Satisfy any 
-</Files>
+Satisfy any
+</Files>

src/upload/system/library/retailcrm/cron/dispatch.php

@@ -12,7 +12,7 @@ if (!isset($cli_action)) {
 
 // Version
 $version = '2.3.0';
-$indexFile = file_get_contents(realpath(dirname(__FILE__)) . '/../../index.php');
+$indexFile = file_get_contents(realpath(dirname(__FILE__)) . '/../../../../index.php');
 preg_match("/define\([\s]*['\"]VERSION['\"][\s]*,[\s]*['\"](.*)['\"][\s]*\)[\s]*;/mi", $indexFile, $versionMatches);
 
 if (isset($versionMatches[1])) {
@@ -22,7 +22,7 @@ if (isset($versionMatches[1])) {
 define('VERSION', $version);
 
 // Configuration (note we're using the admin config)
-require_once(realpath(dirname(__FILE__)) . '/../../admin/config.php');
+require_once(realpath(dirname(__FILE__)) . '/../../../../admin/config.php');
 
 // Configuration check
 if (!defined('DIR_APPLICATION')) {

src/upload/system/library/retailcrm/lib/ModelsProvider.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace retailcrm;
+
+class ModelsProvider extends Base {
+    public function includeDependencies() {
+        $dependencies = $this->getDependencies();
+
+        foreach ($dependencies[$this->getContext()] as $dependency) {
+            $this->load->model($dependency);
+        }
+    }
+
+    private function getContext() {
+        $match = preg_match('/\/catalog\/$/i', DIR_APPLICATION);
+
+        return $match === 1 ? 'catalog' : 'admin';
+    }
+
+    private function getDependencies() {
+        return array(
+            'catalog' => array(
+                'setting/setting',
+                'checkout/order',
+                'account/order',
+                'account/customer',
+                'account/address',
+                'localisation/country',
+                'localisation/zone',
+                'account/address',
+                'catalog/product',
+            ),
+            'admin' => array(
+                'setting/setting',
+                'sale/order',
+                'customer/customer',
+                'catalog/product'
+            )
+        );
+    }
+}

src/upload/system/library/retailcrm/lib/Utils.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace retailcrm;
+
+class Utils {
+    public static function filterRecursive($haystack) {
+        foreach ($haystack as $key => $value) {
+            if (is_array($value)) {
+                $haystack[$key] = self::filterRecursive($haystack[$key]);
+            }
+
+            if ($haystack[$key] === null
+                || $haystack[$key] === ''
+                || (is_array($haystack[$key]) && empty($haystack[$key]))
+            ) {
+                unset($haystack[$key]);
+            } elseif (!is_array($value)) {
+                $haystack[$key] = trim($value);
+            }
+        }
+
+        return $haystack;
+    }
+
+    public static function addressEquals($address1, $address2) {
+        foreach ($address1 as $field => $value) {
+            if (isset($address2[$field]) && $value !== $address2[$field]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

src/upload/system/library/retailcrm/lib/api/CurlException.php

@@ -0,0 +1,5 @@
+<?php
+
+class CurlException extends RuntimeException
+{
+}

src/upload/system/library/retailcrm/lib/api/InvalidJsonException.php

@@ -0,0 +1,5 @@
+<?php
+
+class InvalidJsonException extends DomainException
+{
+}

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;
             }
 

src/upload/system/library/retailcrm/lib/api/RetailcrmApiClient5.php

@@ -1,18 +1,11 @@
 <?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';
+
     protected $client;
+    protected $clientWithoutVersion;
 
     /**
      * Site code
@@ -22,23 +15,22 @@ class RetailcrmApiClient5
     /**
      * Client creating
      *
-     * @param string $url    api url
+     * @param string $url api url
      * @param string $apiKey api key
-     * @param string $site   site code
+     * @param string $site site code
      *
      * @throws \InvalidArgumentException
      *
      * @return mixed
      */
-    public function __construct($url, $apiKey, $version = null, $site = null)
+    public function __construct($url, $apiKey, $site = null)
     {
         if ('/' !== $url[strlen($url) - 1]) {
             $url .= '/';
         }
 
-        $url = $version == null ? $url . 'api' : $url . 'api/' . $version;
-
-        $this->client = new RetailcrmHttpClient($url, array('apiKey' => $apiKey));
+        $this->client = new RetailcrmHttpClient($url . 'api/' . static::VERSION, array('apiKey' => $apiKey));
+        $this->clientWithoutVersion = new RetailcrmHttpClient($url . 'api', array('apiKey' => $apiKey));
         $this->siteCode = $site;
     }
 
@@ -53,7 +45,7 @@ class RetailcrmApiClient5
      */
     public function apiVersions()
     {
-        return $this->client->makeRequest('/api-versions', RetailcrmHttpClient::METHOD_GET);
+        return $this->clientWithoutVersion->makeRequest('/api-versions', RetailcrmHttpClient::METHOD_GET);
     }
 
     /**
@@ -592,30 +584,18 @@ class RetailcrmApiClient5
 
     /**
      * Get orders history
+     *
      * @param array $filter
-     * @param null $page
-     * @param null $limit
+     * @param int|null $limit
      *
      * @return ApiResponse
      */
-    public function ordersHistory(array $filter = array(), $page = null, $limit = null)
+    public function ordersHistory(array $filter = [], ?int $limit = 100)
     {
-        $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,
-            $parameters
+            ['filter' => $filter, 'limit' => $limit]
         );
     }
 
@@ -916,30 +896,18 @@ class RetailcrmApiClient5
 
     /**
      * Get customers history
+     *
      * @param array $filter
-     * @param null $page
-     * @param null $limit
+     * @param int|null $limit
      *
      * @return ApiResponse
      */
-    public function customersHistory(array $filter = array(), $page = null, $limit = null)
+    public function customersHistory(array $filter = [], ?int $limit = 100)
     {
-        $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,
-            $parameters
+            ['filter' => $filter, 'limit' => $limit]
         );
     }
 
@@ -1116,34 +1084,17 @@ class RetailcrmApiClient5
     /**
      * Get orders assembly history
      *
-     * @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
+     * @param array $filter
+     * @param int|null $limit
      *
      * @return ApiResponse
      */
-    public function ordersPacksHistory(array $filter = array(), $page = null, $limit = null)
+    public function ordersPacksHistory(array $filter = [], ?int $limit = 100)
     {
-        $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,
-            $parameters
+            ['filter' => $filter, 'limit' => $limit]
         );
     }
 
@@ -2369,6 +2320,610 @@ class RetailcrmApiClient5
         );
     }
 
+    /**
+     * Returns filtered corporate customers list
+     *
+     * @param array $filter (default: array())
+     * @param int   $page   (default: null)
+     * @param int   $limit  (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return  \ApiResponse
+     */
+    public function customersCorporateList(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',
+            RetailcrmHttpClient::METHOD_GET,
+            $parameters
+        );
+    }
+
+    /**
+     * Create a corporate customer
+     *
+     * @param array  $customerCorporate corporate customer data
+     * @param string $site     (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateCreate(array $customerCorporate, $site = null)
+    {
+        if (! count($customerCorporate)) {
+            throw new \InvalidArgumentException(
+                'Parameter `customerCorporate` must contains a data'
+            );
+        }
+
+        /* @noinspection PhpUndefinedMethodInspection */
+        return $this->client->makeRequest(
+            '/customers-corporate/create',
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['customerCorporate' => json_encode($customerCorporate)])
+        );
+    }
+
+    /**
+     * Save corporate customer IDs' (id and externalId) association in the CRM
+     *
+     * @param array $ids ids mapping
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateFixExternalIds(array $ids)
+    {
+        if (! count($ids)) {
+            throw new \InvalidArgumentException(
+                'Method parameter must contains at least one IDs pair'
+            );
+        }
+
+        /* @noinspection PhpUndefinedMethodInspection */
+        return $this->client->makeRequest(
+            '/customers-corporate/fix-external-ids',
+            RetailcrmHttpClient::METHOD_POST,
+            ['customersCorporate' => json_encode($ids)]
+        );
+    }
+
+    /**
+     * Get corporate customers history
+     *
+     * @param array $filter
+     * @param int|null $limit
+     *
+     * @return ApiResponse
+     */
+    public function customersCorporateHistory(array $filter = [], ?int $limit = 100)
+    {
+        return $this->client->makeRequest(
+            '/customers-corporate/history',
+            RetailcrmHttpClient::METHOD_GET,
+            ['filter' => $filter, 'limit' => $limit]
+        );
+    }
+
+    /**
+     * Returns filtered corporate customers notes list
+     *
+     * @param array $filter (default: array())
+     * @param int   $page   (default: null)
+     * @param int   $limit  (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateNotesList(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/notes',
+            RetailcrmHttpClient::METHOD_GET,
+            $parameters
+        );
+    }
+
+    /**
+     * Create corporate customer note
+     *
+     * @param array $note (default: array())
+     * @param string $site     (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateNotesCreate($note, $site = null)
+    {
+        if (empty($note['customer']['id']) && empty($note['customer']['externalId'])) {
+            throw new \InvalidArgumentException(
+                'Customer identifier must be set'
+            );
+        }
+
+        return $this->client->makeRequest(
+            '/customers-corporate/notes/create',
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['note' => json_encode($note)])
+        );
+    }
+
+    /**
+     * Delete corporate customer note
+     *
+     * @param integer $id
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateNotesDelete($id)
+    {
+        if (empty($id)) {
+            throw new \InvalidArgumentException(
+                'Note id must be set'
+            );
+        }
+
+        return $this->client->makeRequest(
+            "/customers-corporate/notes/$id/delete",
+            RetailcrmHttpClient::METHOD_POST
+        );
+    }
+
+    /**
+     * Upload array of the corporate customers
+     *
+     * @param array  $customersCorporate array of corporate customers
+     * @param string $site               (default: null)
+     *
+     * @return \ApiResponse
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function customersCorporateUpload(array $customersCorporate, $site = null)
+    {
+        if (!count($customersCorporate)) {
+            throw new \InvalidArgumentException(
+                'Parameter `customersCorporate` must contains array of the corporate customers'
+            );
+        }
+
+        return $this->client->makeRequest(
+            '/customers-corporate/upload',
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['customersCorporate' => json_encode($customersCorporate)])
+        );
+    }
+
+    /**
+     * Get corporate customer by id or externalId
+     *
+     * @param string $id   corporate customer identifier
+     * @param string $by   (default: 'externalId')
+     * @param string $site (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateGet($id, $by = 'externalId', $site = null)
+    {
+        $this->checkIdParameter($by);
+
+        return $this->client->makeRequest(
+            "/customers-corporate/$id",
+            RetailcrmHttpClient::METHOD_GET,
+            $this->fillSite($site, ['by' => $by])
+        );
+    }
+
+    /**
+     * Get corporate customer addresses by id or externalId
+     *
+     * @param string $id     corporate customer identifier
+     * @param array  $filter (default: array())
+     * @param int    $page   (default: null)
+     * @param int    $limit  (default: null)
+     * @param string $by     (default: 'externalId')
+     * @param string $site   (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateAddresses(
+        $id,
+        array $filter = [],
+        $page = null,
+        $limit = null,
+        $by = 'externalId',
+        $site = null
+    ) {
+        $this->checkIdParameter($by);
+
+        $parameters = ['by' => $by];
+
+        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/$id/addresses",
+            RetailcrmHttpClient::METHOD_GET,
+            $this->fillSite($site, $parameters)
+        );
+    }
+
+    /**
+     * Create corporate customer address
+     *
+     * @param string $id       corporate customer identifier
+     * @param array  $address  (default: array())
+     * @param string $by       (default: 'externalId')
+     * @param string $site     (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateAddressesCreate($id, array $address = [], $by = 'externalId', $site = null)
+    {
+        return $this->client->makeRequest(
+            "/customers-corporate/$id/addresses/create",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['address' => json_encode($address), 'by' => $by])
+        );
+    }
+
+    /**
+     * Edit corporate customer address
+     *
+     * @param string $customerId corporate customer identifier
+     * @param string $addressId  corporate customer identifier
+     * @param array  $address    (default: array())
+     * @param string $customerBy (default: 'externalId')
+     * @param string $addressBy  (default: 'externalId')
+     * @param string $site       (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateAddressesEdit(
+        $customerId,
+        $addressId,
+        array $address = [],
+        $customerBy = 'externalId',
+        $addressBy = 'externalId',
+        $site = null
+    ) {
+        $addressFiltered = array_filter($address);
+
+        if ((count(array_keys($addressFiltered)) <= 1)
+            && (!isset($addressFiltered['text'])
+                || (isset($addressFiltered['text']) && empty($addressFiltered['text']))
+            )
+        ) {
+            throw new \InvalidArgumentException(
+                'Parameter `address` must contain address text or all other address field'
+            );
+        }
+
+        return $this->client->makeRequest(
+            "/customers-corporate/$customerId/addresses/$addressId/edit",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, [
+                'address' => json_encode($address),
+                'by' => $customerBy,
+                'entityBy' => $addressBy
+            ])
+        );
+    }
+
+    /**
+     * Get corporate customer companies by id or externalId
+     *
+     * @param string $id     corporate customer identifier
+     * @param array  $filter (default: array())
+     * @param int    $page   (default: null)
+     * @param int    $limit  (default: null)
+     * @param string $by     (default: 'externalId')
+     * @param string $site   (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateCompanies(
+        $id,
+        array $filter = [],
+        $page = null,
+        $limit = null,
+        $by = 'externalId',
+        $site = null
+    ) {
+        $this->checkIdParameter($by);
+
+        $parameters = ['by' => $by];
+
+        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/$id/companies",
+            RetailcrmHttpClient::METHOD_GET,
+            $this->fillSite($site, $parameters)
+        );
+    }
+
+    /**
+     * Create corporate customer company
+     *
+     * @param string $id       corporate customer identifier
+     * @param array  $company  (default: array())
+     * @param string $by       (default: 'externalId')
+     * @param string $site     (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateCompaniesCreate($id, array $company = [], $by = 'externalId', $site = null)
+    {
+        return $this->client->makeRequest(
+            "/customers-corporate/$id/companies/create",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['company' => json_encode($company), 'by' => $by])
+        );
+    }
+
+    /**
+     * Edit corporate customer company
+     *
+     * @param string $customerId corporate customer identifier
+     * @param string $companyId  corporate customer identifier
+     * @param array  $company    (default: array())
+     * @param string $customerBy (default: 'externalId')
+     * @param string $companyBy  (default: 'externalId')
+     * @param string $site       (default: null)
+     *
+     * @return \ApiResponse
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     */
+    public function customersCorporateCompaniesEdit(
+        $customerId,
+        $companyId,
+        array $company = [],
+        $customerBy = 'externalId',
+        $companyBy = 'externalId',
+        $site = null
+    ) {
+
+        return $this->client->makeRequest(
+            "/customers-corporate/$customerId/companies/$companyId/edit",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, [
+                'company' => json_encode($company),
+                'by' => $customerBy,
+                'entityBy' => $companyBy
+            ])
+        );
+    }
+
+    /**
+     * Get corporate customer contacts by id or externalId
+     *
+     * @param string $id     corporate customer identifier
+     * @param array  $filter (default: array())
+     * @param int    $page   (default: null)
+     * @param int    $limit  (default: null)
+     * @param string $by     (default: 'externalId')
+     * @param string $site   (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateContacts(
+        $id,
+        array $filter = [],
+        $page = null,
+        $limit = null,
+        $by = 'externalId',
+        $site = null
+    ) {
+        $this->checkIdParameter($by);
+
+        $parameters = ['by' => $by];
+
+        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/$id/contacts",
+            RetailcrmHttpClient::METHOD_GET,
+            $this->fillSite($site, $parameters)
+        );
+    }
+
+    /**
+     * Create corporate customer contact
+     *
+     * @param string $id      corporate customer identifier
+     * @param array  $contact (default: array())
+     * @param string $by      (default: 'externalId')
+     * @param string $site    (default: null)
+     *
+     * @return \ApiResponse
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function customersCorporateContactsCreate($id, array $contact = [], $by = 'externalId', $site = null)
+    {
+        return $this->client->makeRequest(
+            "/customers-corporate/$id/contacts/create",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, ['contact' => json_encode($contact), 'by' => $by])
+        );
+    }
+
+    /**
+     * Edit corporate customer contact
+     *
+     * @param string $customerId corporate customer identifier
+     * @param string $contactId  corporate customer identifier
+     * @param array  $contact    (default: array())
+     * @param string $customerBy (default: 'externalId')
+     * @param string $contactBy  (default: 'externalId')
+     * @param string $site       (default: null)
+     *
+     * @return \ApiResponse
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     */
+    public function customersCorporateContactsEdit(
+        $customerId,
+        $contactId,
+        array $contact = [],
+        $customerBy = 'externalId',
+        $contactBy = 'externalId',
+        $site = null
+    ) {
+        return $this->client->makeRequest(
+            "/customers-corporate/$customerId/contacts/$contactId/edit",
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite($site, [
+                'contact' => json_encode($contact),
+                'by' => $customerBy,
+                'entityBy' => $contactBy
+            ])
+        );
+    }
+
+    /**
+     * Edit a corporate customer
+     *
+     * @param array  $customerCorporate corporate customer data
+     * @param string $by       (default: 'externalId')
+     * @param string $site     (default: null)
+     *
+     * @throws \InvalidArgumentException
+     * @throws \CurlException
+     * @throws \InvalidJsonException
+     *
+     * @return \ApiResponse
+     */
+    public function customersCorporateEdit(array $customerCorporate, $by = 'externalId', $site = null)
+    {
+        if (!count($customerCorporate)) {
+            throw new \InvalidArgumentException(
+                'Parameter `customerCorporate` must contains a data'
+            );
+        }
+
+        $this->checkIdParameter($by);
+
+        if (!array_key_exists($by, $customerCorporate)) {
+            throw new \InvalidArgumentException(
+                sprintf('Corporate customer array must contain the "%s" parameter.', $by)
+            );
+        }
+
+        return $this->client->makeRequest(
+            sprintf('/customers-corporate/%s/edit', $customerCorporate[$by]),
+            RetailcrmHttpClient::METHOD_POST,
+            $this->fillSite(
+                $site,
+                ['customerCorporate' => json_encode($customerCorporate), 'by' => $by]
+            )
+        );
+    }
+
     /**
      * Return current site
      *

src/upload/system/library/retailcrm/lib/api/RetailcrmApiResponse.php

@@ -1,15 +1,5 @@
 <?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/ApiVersion4
- */
+
 class RetailcrmApiResponse implements ArrayAccess
 {
     // HTTP response status code

src/upload/system/library/retailcrm/lib/api/RetailcrmHttpClient.php

@@ -1,15 +1,7 @@
 <?php
-/**
- * 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/ApiVersion4
- */
+
+use retailcrm\Retailcrm;
+
 class RetailcrmHttpClient
 {
     const METHOD_GET = 'GET';
@@ -56,9 +48,9 @@ class RetailcrmHttpClient
     public function makeRequest(
         $path,
         $method,
-        array $parameters = array()
+        array $parameters = []
     ) {
-        $allowedMethods = array(self::METHOD_GET, self::METHOD_POST);
+        $allowedMethods = [self::METHOD_GET, self::METHOD_POST];
 
         if (!in_array($method, $allowedMethods, false)) {
             throw new \InvalidArgumentException(
@@ -70,7 +62,16 @@ class RetailcrmHttpClient
             );
         }
 
-        $parameters = array_merge($this->defaultParameters, $parameters);
+    
+        $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);
+        
 
         $url = $this->url . $path;
 

src/upload/system/library/retailcrm/lib/api/RetailcrmProxy.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Class RequestProxy
+ *
+ * @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 customersCreate($customer, $site = null)
+ * @method customersEdit($customer, $by = 'externalId', $site = null)
+ * @method customersList(array $filter = [], $page = null, $limit = null)
+ * @method customersGet($id, $by = 'externalId', $site = null)
+ * @method customersCorporateList(array $filter = [], $page = null, $limit = null)
+ * @method customersCorporateCreate(array $customerCorporate, $site = null)
+ * @method customersCorporateAddresses($id, array $filter = [], $page = null, $limit = null, $by = 'externalId', $site = null)
+ * @method customersCorporateAddressesCreate($id, array $address = [], $by = 'externalId', $site = null)
+ * @method customersCorporateAddressesEdit($customerId, $addressId, array $address = [], $customerBy = 'externalId', $addressBy = 'externalId', $site = null)
+ * @method customersCorporateCompanies($id, array $filter = [], $page = null, $limit = null, $by = 'externalId', $site = null)
+ * @method customersCorporateCompaniesCreate($id, array $company = [], $by = 'externalId', $site = null)
+ * @method customersCorporateCompaniesEdit($customerId, $companyId, array $company = [], $customerBy = 'externalId', $companyBy = 'externalId', $site = null)
+ * @method customersCorporateContacts($id, array $filter = [], $page = null, $limit = null, $by = 'externalId', $site = null)
+ */
+class RetailcrmProxy {
+    private $api;
+    private $log;
+
+    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);
+
+            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");
+                }
+            }
+
+            return $response;
+        } catch (CurlException $e) {
+            $this->log->write(sprintf("[%s] %s", $method, $e->getMessage()));
+            return false;
+        } catch (InvalidJsonException $e) {
+            $this->log->write(sprintf("[%s] %s", $method, $e->getMessage()));
+            return false;
+        }
+    }
+}

src/upload/system/library/retailcrm/lib/factory/CustomerConverterFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace retailcrm\factory;
+
+use retailcrm\service\RetailcrmCustomerConverter;
+use retailcrm\service\SettingsManager;
+
+class CustomerConverterFactory {
+    public static function create(\Registry $registry) {
+        return new RetailcrmCustomerConverter(new SettingsManager($registry));
+    }
+}

src/upload/system/library/retailcrm/lib/factory/OrderConverterFactory.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace retailcrm\factory;
+
+use retailcrm\service\RetailcrmOrderConverter;
+use retailcrm\service\SettingsManager;
+use retailcrm\repository\CustomerRepository;
+use retailcrm\repository\ProductsRepository;
+
+class OrderConverterFactory {
+    public static function create(\Registry $registry) {
+        return new RetailcrmOrderConverter(
+            new SettingsManager($registry),
+            new CustomerRepository($registry),
+            new ProductsRepository($registry)
+        );
+    }
+}

src/upload/system/library/retailcrm/lib/history/Customer.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace retailcrm\history;
+
+use retailcrm\repository\CustomerRepository;
+use retailcrm\repository\DataRepository;
+use retailcrm\service\SettingsManager;
+
+class Customer {
+    private $data_repository;
+    private $customer_repository;
+    private $settings_manager;
+
+    public function __construct(
+        DataRepository $data_repository,
+        CustomerRepository $customer_repository,
+        SettingsManager $settings_manager
+    ) {
+        $this->data_repository = $data_repository;
+        $this->customer_repository = $customer_repository;
+        $this->settings_manager = $settings_manager;
+    }
+
+    public function handleCustomer(&$customer_data, $customer) {
+        // is new customer
+        if (!$customer_data) {
+            $customer_data['store_id'] = 0;
+            $customer_data['customer_group_id'] = '1';
+            $customer_data['fax'] = '';
+            $customer_data['newsletter'] = 0;
+            $customer_data['password'] = 'tmppass';
+            $customer_data['status'] = 1;
+            $customer_data['approved'] = 1;
+            $customer_data['safe'] = 0;
+            $customer_data['affiliate'] = '';
+        } else {
+            $customer_data['password'] = false;
+        }
+
+        $customer_data['firstname'] = $customer['firstName'];
+        $customer_data['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;
+    }
+
+    public function handleAddress($customer, $order, $address_id = 0) {
+        if (empty($customer['address']) && !empty($order)) {
+            $customer['address'] = $order['delivery']['address'];
+        }
+
+        if ($address_id) {
+            $customer_address = $this->customer_repository->getAddress($address_id);
+        } else {
+            $customer_address = array(
+                'address_id' => ''
+            );
+        }
+
+        if (isset($customer['address']['countryIso'])) {
+            $customer_country = $this->data_repository->getCountryByIsoCode($customer['address']['countryIso']);
+        }
+
+        if (isset($customer['address']['region'])) {
+            $customer_zone = $this->data_repository->getZoneByName($customer['address']['region']);
+        }
+
+        $customer_address['firstname'] = isset($customer['patronymic'])
+            ? $customer['firstName'] . ' ' . $customer['patronymic']
+            : $customer['firstName'];
+        $customer_address['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
+        $customer_address['address_2'] = !empty($customer_address['address_2']) ? $customer_address['address_2'] : '';
+        $customer_address['company'] = !empty($customer_address['company']) ? $customer_address['company'] : '';
+
+        if (!empty($customer['address'])) {
+            $customer_address['address_1'] = !empty($customer['address']['text']) ? $customer['address']['text'] : '';
+            $customer_address['city'] = !empty($customer['address']['city']) ? $customer['address']['city'] : '';
+            $customer_address['postcode'] = isset($customer['address']['index']) ? $customer['address']['index'] : '';
+        }
+
+        $customer_address['zone_id'] = 0;
+        $customer_address['country_id'] = 0;
+
+        if (isset($customer_country)) {
+            $customer_address['country_id'] = $customer_country['country_id'];
+        }
+
+        if (isset($customer_zone) && isset($customer_zone['zone_id'])) {
+            $customer_address['zone_id'] = $customer_zone['zone_id'];
+        }
+
+        $customer_address['default'] = true;
+
+        return $customer_address;
+    }
+
+    public function handleCustomFields(&$customer_data, $customer) {
+        $settings = $this->settings_manager->getSetting('custom_field');
+        if (!empty($settings)) {
+            $custom_field_setting = array_flip($settings);
+        }
+
+        if (isset($custom_field_setting) && $customer['customFields']) {
+            foreach ($customer['customFields'] as $code => $value) {
+                if (array_key_exists($code, $custom_field_setting)) {
+                    $field_code = str_replace('c_', '', $custom_field_setting[$code]);
+                    $custom_fields[$field_code] = $value;
+                }
+            }
+
+            $customer_data['custom_field'] = $custom_fields ?? [];
+        }
+    }
+}

src/upload/system/library/retailcrm/lib/history/Order.php

@@ -0,0 +1,386 @@
+<?php
+
+namespace retailcrm\history;
+
+use retailcrm\repository\DataRepository;
+use retailcrm\repository\OrderRepository;
+use retailcrm\repository\ProductsRepository;
+use retailcrm\Retailcrm;
+use retailcrm\service\SettingsManager;
+
+class Order {
+    private $data_repository;
+    private $settings_manager;
+    private $product_repository;
+    private $order_repository;
+
+    private $payment;
+    private $delivery;
+    private $oc_payment;
+    private $oc_delivery;
+
+    public function __construct(
+        DataRepository $data_repository,
+        SettingsManager $settings_manager,
+        ProductsRepository $product_repository,
+        OrderRepository $order_repository
+    ) {
+        $this->data_repository = $data_repository;
+        $this->settings_manager = $settings_manager;
+        $this->product_repository = $product_repository;
+        $this->order_repository = $order_repository;
+
+        $this->payment = array_flip($settings_manager->getPaymentSettings());
+        $this->delivery = array_flip($settings_manager->getDeliverySettings());
+    }
+
+    public function setOcPayment($oc_payment) {
+        $this->oc_payment = $oc_payment;
+    }
+
+    public function setOcDelivery($oc_delivery) {
+        $this->oc_delivery = $oc_delivery;
+    }
+
+    /**
+     * @param array $data opencart order
+     * @param array $order RetailCRM order
+     */
+    public function handleBaseOrderData(&$data, $order) {
+        $mail = !empty($order['email']) ? $order['email'] : $order['customer']['email'];
+        $phone = !empty($order['phone']) ? $order['phone'] : '';
+
+        if (!$phone) {
+            $data['telephone'] = $order['customer']['phones'] ? $order['customer']['phones'][0]['number'] : '80000000000';
+        } else {
+            $data['telephone'] = $phone;
+        }
+
+        $data['currency_code'] = $this->data_repository->getConfig('config_currency');
+        $data['currency_value'] = $this->data_repository->getCurrencyByCode($data['currency_code'], 'value');
+        $data['currency_id'] = $this->data_repository->getCurrencyByCode($data['currency_code'], 'currency_id');
+        $data['language_id'] = $this->data_repository->getLanguageByCode(
+            $this->data_repository->getConfig('config_language'),
+            'language_id'
+        );
+        $data['store_id'] = !is_null($this->data_repository->getConfig('config_store_id'))
+            ? $this->data_repository->getConfig('config_store_id') : 0;
+        $data['store_name'] = $this->data_repository->getConfig('config_name');
+//        $data['customer_id'] = $customer_id;
+        $data['customer_group_id'] = 1;
+        $data['firstname'] = $order['firstName'];
+        $data['lastname'] = (!empty($order['lastName'])) ? $order['lastName'] : $order['firstName'];
+        $data['email'] = !empty($mail) ? $mail : uniqid() . '@retailrcm.ru';
+        $data['comment'] = !empty($order['customerComment']) ? $order['customerComment'] : '';
+
+        // this data will not retrive from crm for now
+        $data['fax'] = '';
+        $data['tax'] = '';
+        $data['tax_id'] = '';
+        $data['product'] = '';
+        $data['product_id'] = '';
+        $data['reward'] = '';
+        $data['affiliate'] = '';
+        $data['affiliate_id'] = 0;
+        $data['payment_tax_id'] = '';
+        $data['order_product_id'] = '';
+        $data['payment_company'] = '';
+    }
+
+    /**
+     * @param array $data opencart order
+     * @param array $order RetailCRM order
+     * @param array $corporateAddress
+     */
+    public function handlePayment(&$data, $order, $corporateAddress = array()) {
+        if (!empty($order['customer']['type']) && $order['customer']['type'] === 'customer_corporate') {
+            $customer = $order['contact'];
+
+            if (empty($customer['address'])) {
+                $customer['address'] = $corporateAddress;
+            }
+            if (empty($customer['address'])) {
+                $customer['address'] = $order['delivery']['address'];
+            }
+        } else {
+            $customer = $order['customer'];
+        }
+
+        $default_payment_country = !empty($data['payment_country']) ? $data['payment_country'] : '';
+        $default_payment_country_id = !empty($data['payment_country_id']) ? $data['payment_country_id'] : 0;
+        $default_payment_zone = !empty($data['payment_zone']) ? $data['payment_zone'] : '';
+        $default_payment_zone_id = !empty($data['payment_zone_id']) ? $data['payment_zone_id'] : 0;
+        if (isset($customer['address']['countryIso'])) {
+            $payment_country = $this->data_repository->getCountryByIsoCode($customer['address']['countryIso']);
+        }
+
+        if (isset($customer['address']['region'])) {
+            $payment_zone = $this->data_repository->getZoneByName($customer['address']['region']);
+
+            if ($payment_zone) {
+                $payment_zone_id = $payment_zone['zone_id'];
+            }
+        }
+
+        $data['payment_firstname'] = $customer['firstName'];
+        $data['payment_lastname'] = (isset($customer['lastName'])) ? $customer['lastName'] : $customer['firstName'];
+        $data['payment_address_2'] = '';
+
+        if (!empty($order['company'])) {
+            $data['payment_company'] = $order['company']['name'];
+        }
+
+        if (!empty($customer['address'])) {
+            $data['payment_address_1'] = $customer['address']['text'];
+            $data['payment_city'] = !empty($customer['address']['city'])
+                ? $customer['address']['city']
+                : $order['delivery']['address']['city'];
+            $data['payment_postcode'] = !empty($customer['address']['index'])
+                ? $customer['address']['index']
+                : $order['delivery']['address']['index'];
+        }
+
+        $data['payment_country_id'] = !empty($payment_country['country_id']) ? $payment_country['country_id'] : $default_payment_country_id;
+        $data['payment_country'] = !empty($payment_country['name']) ? $payment_country['name'] : $default_payment_country;
+        $data['payment_zone'] = isset($customer['address']['region']) ? $customer['address']['region'] : $default_payment_zone;
+        $data['payment_zone_id'] = isset($payment_zone_id) ? $payment_zone_id : $default_payment_zone_id;
+
+        if (isset($order['payments']) && $order['payments']) {
+            $payment = end($order['payments']);
+            $data['payment_method'] = $this->oc_payment[$this->payment[$payment['type']]];
+            $data['payment_code'] = $this->payment[$payment['type']];
+        } elseif (empty($data['payment_code']) && empty($data['payment_method'])) {
+            $data['payment_method'] = $this->oc_payment[$this->settings_manager->getSetting('default_payment')];
+            $data['payment_code'] = $this->settings_manager->getSetting('default_payment');
+        }
+    }
+
+    /**
+     * @param array $data opencart order
+     * @param array $order RetailCRM order
+     */
+    public function handleShipping(&$data, $order) {
+        $default_shipping_country = !empty($data['shipping_country']) ? $data['shipping_country'] : '';
+        $default_shipping_country_id = !empty($data['shipping_country_id']) ? $data['shipping_country_id'] : 0;
+        $default_shipping_zone = !empty($data['shipping_zone']) ? $data['shipping_zone'] : '';
+        $default_shipping_zone_id = !empty($data['shipping_zone_id']) ? $data['shipping_zone_id'] : 0;
+        if (!empty($order['delivery']['address']['region'])) {
+            $shipping_zone = $this->data_repository->getZoneByName($order['delivery']['address']['region']);
+        }
+
+        if (isset($order['countryIso'])) {
+            $shipping_country = $this->data_repository->getCountryByIsoCode($order['countryIso']);
+        }
+
+        $delivery = isset($order['delivery']['code']) ? $order['delivery']['code'] : null;
+
+        $data['shipping_country_id'] = isset($shipping_country['country_id']) ? $shipping_country['country_id'] : $default_shipping_country_id;
+        $data['shipping_country'] = isset($shipping_country['name']) ? $shipping_country['name'] : $default_shipping_country;
+        $data['shipping_zone_id'] = isset($shipping_zone['zone_id']) ? $shipping_zone['zone_id'] : $default_shipping_zone_id;
+        $data['shipping_zone'] = isset($shipping_zone['name']) ? $shipping_zone['name'] : $default_shipping_zone;
+        $data['shipping_firstname'] = $order['firstName'];
+        $data['shipping_lastname'] = (isset($order['lastName'])) ? $order['lastName'] : $order['firstName'];
+        $data['shipping_address_1'] = $order['delivery']['address']['text'];
+        $data['shipping_address_2'] = '';
+        $data['shipping_company'] = '';
+        $data['shipping_city'] = $order['delivery']['address']['city'];
+        $data['shipping_postcode'] = $order['delivery']['address']['index'];
+
+        if (!isset($data['shipping_code'])) {
+            $data['shipping_code'] = $delivery != null
+                ? $this->delivery[$delivery]
+                : $this->settings_manager->getSetting('default_shipping');
+
+            $shipping = explode('.', $data['shipping_code']);
+            $shipping_module = $shipping[0];
+
+            if (isset($this->oc_delivery[$shipping_module][$data['shipping_code']]['title'])) {
+                $data['shipping_method'] = $this->oc_delivery[$shipping_module][$data['shipping_code']]['title'];
+            } else {
+                $data['shipping_method'] = $this->oc_delivery[$shipping_module]['title'];
+            }
+        } else {
+            if ($delivery !== null) {
+                if (isset($this->settings_manager->getDeliverySettings()[$data['shipping_code']])
+                    && isset($this->delivery[$delivery])
+                ) {
+                    $data['shipping_code'] = $this->delivery[$delivery];
+
+                    $shipping = explode('.', $data['shipping_code']);
+                    $shippingModule = $shipping[0];
+
+                    if (isset($this->oc_delivery[$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'];
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param array $data opencart order
+     * @param array $order RetailCRM order
+     */
+    public function handleProducts(&$data, $order) {
+        $data['order_product'] = array();
+
+        foreach ($order['items'] as $item) {
+            $product_id = $item['offer']['externalId'];
+            $options = array();
+
+            if (mb_strpos($item['offer']['externalId'], '#', 0, mb_internal_encoding()) > 1) {
+                $offer = explode('#', $item['offer']['externalId']);
+                $product_id = $offer[0];
+                $options_from_crm = explode('_', $offer[1]);
+
+                foreach ($options_from_crm as $option_from_crm) {
+                    $option_data = explode('-', $option_from_crm);
+                    $product_option_id = $option_data[0];
+                    $option_value_id = $option_data[1];
+
+                    $product_options = $this->product_repository->getProductOptions($product_id);
+
+                    foreach ($product_options as $product_option) {
+                        if ($product_option_id == $product_option['product_option_id']) {
+                            foreach ($product_option['product_option_value'] as $product_option_value) {
+                                if ($product_option_value['option_value_id'] == $option_value_id) {
+                                    $options[] = array(
+                                        'product_option_id' => $product_option_id,
+                                        'product_option_value_id' => $product_option_value['product_option_value_id'],
+                                        'value' => $this->data_repository->getOptionValue($product_option_value['option_value_id'], 'name'),
+                                        'type' => $product_option['type'],
+                                        'name' => $product_option['name'],
+                                    );
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            $product = $this->product_repository->getProduct($product_id);
+            $rewards = $this->product_repository->getProductRewards($product_id);
+
+            $data['order_product'][] = array(
+                'name' => $product['name'],
+                'model' => $product['model'],
+                'price' => $item['initialPrice'],
+                'total' => (float)($item['initialPrice'] * $item['quantity']),
+                'product_id' => $product_id,
+                'quantity' => $item['quantity'],
+                'option' => $options,
+                'reward' => $rewards[$data['customer_group_id']]['points'] * $item['quantity']
+            );
+        }
+    }
+
+    /**
+     * @param array $data opencart order
+     * @param array $order RetailCRM order
+     */
+    public function handleTotals(&$data, $order) {
+        $delivery_cost = !empty($order['delivery']['cost']) ? $order['delivery']['cost'] : 0;
+
+        $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(
+            array(
+                'order_total_id' => '',
+                'code' => 'sub_total',
+                'title' => $this->data_repository->getLanguage('product_summ'),
+                'value' => $order['summ'],
+                'text' => $order['summ'],
+                'sort_order' => $subtotal_settings['sub_total_sort_order']
+            ),
+            array(
+                'order_total_id' => '',
+                'code' => 'shipping',
+                'title' => $data['shipping_method'],
+                'value' => $delivery_cost,
+                'text' => $delivery_cost,
+                'sort_order' => $shipping_settings[$this->data_repository->totalTitles() . 'shipping_sort_order']
+            ),
+            array(
+                'order_total_id' => '',
+                'code' => 'total',
+                'title' => $this->data_repository->getLanguage('column_total'),
+                'value' => !empty($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $delivery_cost,
+                'text' => isset($order['totalSumm']) ? $order['totalSumm'] : $order['summ'] + $delivery_cost,
+                'sort_order' => $total_settings[$this->data_repository->totalTitles() . 'total_sort_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
+     */
+    public function handleCustomFields(&$data, $order) {
+        $settings = $this->settings_manager->getSetting('custom_field');
+        if (!empty($settings)) {
+            $custom_field_setting = array_flip($settings);
+        }
+
+        if (isset($custom_field_setting) && $order['customFields']) {
+            foreach ($order['customFields'] as $code => $value) {
+                if (array_key_exists($code, $custom_field_setting)) {
+                    $field_code = str_replace('o_', '', $custom_field_setting[$code]);
+                    $custom_fields[$field_code] = $value;
+                }
+            }
+
+            $data['custom_field'] = isset($custom_fields) ? $custom_fields : '';
+        }
+    }
+}

src/upload/system/library/retailcrm/lib/repository/CustomerRepository.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace retailcrm\repository;
+
+class CustomerRepository extends \retailcrm\Base {
+    public function getCustomer($customer_id) {
+        if (null !== $this->model_account_customer) {
+            return $this->model_account_customer->getCustomer($customer_id);
+        }
+
+        if (null !== $this->model_customer_customer) {
+            return $this->model_customer_customer->getCustomer($customer_id);
+        }
+
+        return array();
+    }
+
+    public function getAddress($address_id) {
+        if (null !== $this->model_customer_customer) {
+            $address_model = $this->model_customer_customer;
+        } elseif (null !== $this->model_account_address) {
+            $address_model = $this->model_account_address;
+        } else {
+            return array();
+        }
+
+        return $address_model->getAddress($address_id);
+    }
+}

src/upload/system/library/retailcrm/lib/repository/DataRepository.php

@@ -0,0 +1,206 @@
+<?php
+
+namespace retailcrm\repository;
+
+class DataRepository extends \retailcrm\Base {
+    /**
+     * Create order in OC
+     *
+     * @param array $order
+     *
+     * @return int $order_id
+     */
+    public function addOrder($order) {
+        $this->db->query("INSERT INTO `" . DB_PREFIX . "order` SET store_id = '" . (int)$order['store_id'] . "', store_name = '" . $order['store_name'] . "', customer_id = '" . (int)$order['customer_id'] . "', customer_group_id = '" . (int)$order['customer_group_id'] . "', firstname = '" . $this->db->escape($order['firstname']) . "', lastname = '" . $this->db->escape($order['lastname']) . "', email = '" . $this->db->escape($order['email']) . "', telephone = '" . $this->db->escape($order['telephone']) . "', custom_field = '" . $this->db->escape(isset($order['custom_field']) ? json_encode($order['custom_field']) : '') . "', payment_firstname = '" . $this->db->escape($order['payment_firstname']) . "', payment_lastname = '" . $this->db->escape($order['payment_lastname']) . "', payment_address_1 = '" . $this->db->escape($order['payment_address_1']) . "', payment_city = '" . $this->db->escape($order['payment_city']) . "', payment_postcode = '" . $this->db->escape($order['payment_postcode']) . "', payment_country = '" . $this->db->escape($order['payment_country']) . "', payment_country_id = '" . (int)$order['payment_country_id'] . "', payment_zone = '" . $this->db->escape($order['payment_zone']) . "', payment_zone_id = '" . (int)$order['payment_zone_id'] . "', payment_method = '" . $this->db->escape($order['payment_method']) . "', payment_code = '" . $this->db->escape($order['payment_code']) . "', payment_company = '" . $this->db->escape($order['payment_company']) . "', shipping_firstname = '" . $this->db->escape($order['shipping_firstname']) . "', shipping_lastname = '" . $this->db->escape($order['shipping_lastname']) . "', shipping_address_1 = '" . $this->db->escape($order['shipping_address_1']) . "', shipping_address_2 = '" . $this->db->escape($order['shipping_address_2']) . "', shipping_city = '" . $this->db->escape($order['shipping_city']) . "', shipping_postcode = '" . $this->db->escape($order['shipping_postcode']) . "', shipping_country = '" . $this->db->escape($order['shipping_country']) . "', shipping_country_id = '" . (int)$order['shipping_country_id'] . "', shipping_zone = '" . $this->db->escape($order['shipping_zone']) . "', shipping_zone_id = '" . (int)$order['shipping_zone_id'] . "', shipping_method = '" . $this->db->escape($order['shipping_method']) . "', shipping_code = '" . $this->db->escape($order['shipping_code']) . "', comment = '" . $this->db->escape($order['comment']) . "', total = '" . (float)$order['total'] . "', affiliate_id = '" . (int)$order['affiliate_id'] . "', language_id = '" . (int)$order['language_id'] . "', currency_id = '" . (int)$order['currency_id'] . "', currency_code = '" . $this->db->escape($order['currency_code']) . "', currency_value = '" . (float)$order['currency_value'] . "', order_status_id = '" . (int)$order['order_status_id'] . "',  date_added = NOW(), date_modified = NOW()");
+
+        $order_id = $this->db->getLastId();
+
+        // Products
+        if (isset($order['order_product']) && $order['order_product']) {
+            $this->addOrderProducts($order_id, $order['order_product']);
+        }
+
+        // Totals
+        if (isset($order['order_total'])) {
+            $this->addOrderTotals($order_id, $order['order_total']);
+        }
+
+        return $order_id;
+    }
+
+    /**
+     * Edit order in OC
+     *
+     * @param int $order_id
+     * @param array $order
+     *
+     * @return void
+     */
+    public function editOrder($order_id, $order) {
+        $this->db->query("UPDATE `" . DB_PREFIX . "order` SET customer_id = '" . (int)$order['customer_id'] . "', customer_group_id = '" . (int)$order['customer_group_id'] . "', firstname = '" . $this->db->escape($order['firstname']) . "', lastname = '" . $this->db->escape($order['lastname']) . "', email = '" . $this->db->escape($order['email']) . "', telephone = '" . $this->db->escape($order['telephone']) . "', custom_field = '" . $this->db->escape(json_encode($order['custom_field'])) . "', payment_firstname = '" . $this->db->escape($order['payment_firstname']) . "', payment_lastname = '" . $this->db->escape($order['payment_lastname']) . "',  payment_address_1 = '" . $this->db->escape($order['payment_address_1']) . "', payment_address_2 = '" . $this->db->escape($order['payment_address_2']) . "', payment_city = '" . $this->db->escape($order['payment_city']) . "', payment_postcode = '" . $this->db->escape($order['payment_postcode']) . "', payment_country = '" . $this->db->escape($order['payment_country']) . "', payment_country_id = '" . (int)$order['payment_country_id'] . "', payment_zone = '" . $this->db->escape($order['payment_zone']) . "', payment_zone_id = '" . (int)$order['payment_zone_id'] . "', payment_method = '" . $this->db->escape($order['payment_method']) . "', payment_code = '" . $this->db->escape($order['payment_code']) . "', payment_company = '" . $this->db->escape($order['payment_company']) . "', shipping_firstname = '" . $this->db->escape($order['shipping_firstname']) . "', shipping_lastname = '" . $this->db->escape($order['shipping_lastname']) . "', shipping_address_1 = '" . $this->db->escape($order['shipping_address_1']) . "', shipping_address_2 = '" . $this->db->escape($order['shipping_address_2']) . "', shipping_city = '" . $this->db->escape($order['shipping_city']) . "', shipping_postcode = '" . $this->db->escape($order['shipping_postcode']) . "', shipping_country = '" . $this->db->escape($order['shipping_country']) . "', shipping_country_id = '" . (int)$order['shipping_country_id'] . "', shipping_zone = '" . $this->db->escape($order['shipping_zone']) . "', shipping_zone_id = '" . (int)$order['shipping_zone_id'] . "', shipping_method = '" . $this->db->escape($order['shipping_method']) . "', shipping_code = '" . $this->db->escape($order['shipping_code']) . "', comment = '" . $this->db->escape($order['comment']) . "', total = '" . (float)$order['total'] . "', order_status_id = '" . (int)$order['order_status_id'] . "', date_modified = NOW() WHERE order_id = '" . (int)$order_id . "'");
+
+        $this->db->query("DELETE FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int)$order_id . "'");
+
+        // Products
+        if (isset($order['order_product']) && $order['order_product']) {
+            $this->addOrderProducts($order_id, $order['order_product']);
+        }
+
+        // Totals
+        $this->db->query("DELETE FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int)$order_id . "'");
+
+        if (isset($order['order_total'])) {
+            $this->addOrderTotals($order_id, $order['order_total']);
+        }
+    }
+
+    /**
+     * Add order products
+     *
+     * @param int $order_id
+     * @param array $products
+     *
+     * @return void
+     */
+    public function addOrderProducts($order_id, $products) {
+        foreach ($products as $product) {
+            $this->db->query("INSERT INTO " . DB_PREFIX . "order_product SET order_id = '" . (int)$order_id . "', product_id = '" . (int)$product['product_id'] . "', name = '" . $this->db->escape($product['name']) . "', model = '" . $this->db->escape($product['model']) . "', quantity = '" . (int)$product['quantity'] . "', price = '" . (float)$product['price'] . "', total = '" . (float)$product['total'] . "', reward = '" . (float)$product['reward'] . "'");
+
+            $order_product_id = $this->db->getLastId();
+
+            foreach ($product['option'] as $option) {
+                $this->db->query("INSERT INTO " . DB_PREFIX . "order_option SET order_id = '" . (int)$order_id . "', order_product_id = '" . (int)$order_product_id . "', product_option_id = '" . (int)$option['product_option_id'] . "', product_option_value_id = '" . (int)$option['product_option_value_id'] . "', name = '" . $this->db->escape($option['name']) . "', `value` = '" . $this->db->escape($option['value']) . "', `type` = '" . $this->db->escape($option['type']) . "'");
+            }
+        }
+    }
+
+    /**
+     * Add order totals
+     *
+     * @param int $order_id
+     * @param array $totals
+     *
+     * @return void
+     */
+    public function addOrderTotals($order_id, $totals) {
+        foreach ($totals as $total) {
+            $this->db->query("INSERT INTO " . DB_PREFIX . "order_total SET order_id = '" . (int)$order_id . "', code = '" . $this->db->escape($total['code']) . "', title = '" . $this->db->escape($total['title']) . "', `value` = '" . (float)$total['value'] . "', sort_order = '" . (int)$total['sort_order'] . "'");
+        }
+    }
+
+    /**
+     * Get total titles
+     *
+     * @return string $title
+     */
+    public function totalTitles() {
+        if (version_compare(VERSION, '3.0', '<')) {
+            $title = '';
+        } else {
+            $title = 'total_';
+        }
+
+        return $title;
+    }
+
+    /**
+     * Get country by iso code 2
+     *
+     * @param string $isoCode
+     *
+     * @return array
+     */
+    public function getCountryByIsoCode($isoCode) {
+        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE iso_code_2 = '" . $isoCode . "'");
+
+        return $query->row;
+    }
+
+    /**
+     * Get zone by name
+     *
+     * @param string $name
+     *
+     * @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;
+    }
+
+    /**
+     * Get currency
+     *
+     * @param string $code
+     * @param string $field (default = '')
+     *
+     * @return mixed array | string
+     */
+    public function getCurrencyByCode($code, $field = '') {
+        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "currency` WHERE code = '" . $code . "'");
+
+        if (!$field) {
+            return $query->row;
+        }
+
+        return $query->row[$field];
+    }
+
+    /**
+     * Get language
+     *
+     * @param string $code
+     * @param string $field (default = '')
+     *
+     * @return mixed array | string
+     */
+    public function getLanguageByCode($code, $field = '') {
+        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "language` WHERE code = '" . $code . "'");
+
+        if (!$field) {
+            return $query->row;
+        }
+
+        return $query->row[$field];
+    }
+
+    /**
+     * Get product option value
+     *
+     * @param int $option_value_id
+     * @param string $field
+     *
+     * @return mixed array | string
+     */
+    public function getOptionValue($option_value_id, $field = '') {
+        $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "option_value_description` WHERE option_value_id = '" . $option_value_id . "'");
+
+        if (!$field) {
+            return $query->row;
+        }
+
+        return $query->row[$field];
+    }
+
+    public function getConfig($key) {
+        return $this->config->get($key);
+    }
+
+    public function getLanguage($key) {
+        return $this->language->get($key);
+    }
+
+    public function getDeliveryTypes() {
+        $this->load->model('extension/retailcrm/references');
+
+        return $this->model_extension_retailcrm_references->getOpercartDeliveryTypes();
+    }
+
+    public function getPaymentTypes() {
+        $this->load->model('extension/retailcrm/references');
+
+        return $this->model_extension_retailcrm_references->getOpercartPaymentTypes();
+    }
+}

src/upload/system/library/retailcrm/lib/repository/OrderRepository.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace retailcrm\repository;
+
+class OrderRepository extends \retailcrm\Base {
+    public function getOrder($order_id) {
+        if (null !== $this->model_sale_order) {
+            return $this->model_sale_order->getOrder($order_id);
+        }
+
+        if (null !== $this->model_checkout_order) {
+            return $this->model_checkout_order->getOrder($order_id);
+        }
+
+        return array();
+    }
+
+    public function getOrderTotals($order_id) {
+        if (null !== $this->model_sale_order) {
+            return $this->model_sale_order->getOrderTotals($order_id);
+        }
+
+        if (null !== $this->model_account_order) {
+            return $this->model_account_order->getOrderTotals($order_id);
+        }
+
+        return array();
+    }
+}

src/upload/system/library/retailcrm/lib/repository/ProductsRepository.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace retailcrm\repository;
+
+class ProductsRepository extends \retailcrm\Base {
+    public function getProductSpecials($product_id) {
+        $query = $this->db->query("SELECT * FROM " . DB_PREFIX . "product_special WHERE product_id = '" . (int)$product_id . "' ORDER BY priority, price");
+
+        return $query->rows;
+    }
+
+    public function getProductOptions($product_id) {
+        return $this->model_catalog_product->getProductOptions($product_id);
+    }
+
+    public function getProduct($product_id) {
+        return $this->model_catalog_product->getProduct($product_id);
+    }
+
+    public function getProductRewards($product_id) {
+        return $this->model_catalog_product->getProductRewards($product_id);
+    }
+}

src/upload/system/library/retailcrm/lib/service/CorporateCustomer.php

@@ -0,0 +1,227 @@
+<?php
+
+namespace retailcrm\service;
+
+use retailcrm\repository\CustomerRepository;
+use retailcrm\Utils;
+
+class CorporateCustomer {
+    private $api;
+    private $customer_repository;
+
+    public function __construct(
+        \RetailcrmProxy $api,
+        CustomerRepository $customer_repository
+    ) {
+        $this->api = $api;
+        $this->customer_repository = $customer_repository;
+    }
+
+    /**
+     * @param $order_data
+     * @param $customer
+     * @return int|null
+     */
+    public function createCorporateCustomer($order_data, $customer) {
+        if (!empty($customer['externalId'])) {
+            return $this->createFromExistingCustomer($order_data, $customer);
+        }
+
+        if (!empty($customer['id'])) {
+            return $this->createFromNotExistingCustomer($order_data, $customer);
+        }
+
+        return null;
+    }
+
+    public function buildFromExistingCustomer($customer_data, $order_data) {
+        $builder = CorporateCustomerBuilder::create()
+            ->setCompany($order_data['payment_company'])
+            ->setCustomerExternalId($customer_data['customer_id']);
+
+        return $builder->build();
+    }
+
+    public function buildCorporateCustomerFromOrder($order_data, $crm_customer_id) {
+        $builder = CorporateCustomerBuilder::create()
+            ->setCompany($order_data['payment_company'])
+            ->setCustomerId($crm_customer_id);
+
+        return $builder->build();
+    }
+
+    /**
+     * Search by provided filter, returns first found customer
+     *
+     * @param array $filter
+     * @param bool  $returnGroup Return all customers for group filter instead of first
+     *
+     * @return bool|array
+     */
+    public function searchCorporateCustomer($filter, $returnGroup = false)
+    {
+        $search = $this->api->customersCorporateList($filter);
+
+        if ($search && $search->isSuccessful()) {
+            $customer = false;
+
+            if (!empty($search['customersCorporate'])) {
+                if ($returnGroup) {
+                    return $search['customersCorporate'];
+                } else {
+                    $dataCorporateCustomers = $search['customersCorporate'];
+                    $customer = reset($dataCorporateCustomers);
+                }
+            }
+
+            return $customer;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $order_data
+     * @param $customer
+     * @return int|null
+     */
+    private function createFromExistingCustomer($order_data, $customer) {
+        $response = $this->api->customersGet($customer['externalId']);
+        if (!$response || !$response->isSuccessful() || empty($response['customer'])) {
+            return null;
+        }
+
+        $customer_data = $this->customer_repository->getCustomer($customer['externalId']);
+
+        $corp_client = $this->searchCorporateCustomer(array(
+            'contactIds' => array($response['customer']['id']),
+            'companyName' => $order_data['payment_company']
+        ));
+
+        if (empty($corp_client)) {
+            $corp_client = $this->searchCorporateCustomer(array(
+                'companyName' => $order_data['payment_company']
+            ));
+        }
+
+        if ($corp_client) {
+            $this->updateOrCreateAddress($order_data, $corp_client);
+
+            return $corp_client['id'];
+        }
+
+        $response = $this->api->customersCorporateCreate($this->buildFromExistingCustomer($customer_data, $order_data));
+        if ($response && $response->isSuccessful()) {
+            $this->createAddressAndCompany($order_data, $response['id']);
+
+            return $response['id'];
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $order_data
+     * @param $customer
+     * @return int|null
+     */
+    private function createFromNotExistingCustomer($order_data, $customer) {
+        $corp_client = $this->searchCorporateCustomer(array(
+            'contactIds' => array($customer['id']),
+            'companyName' => $order_data['payment_company']
+        ));
+
+        if (empty($corp_client)) {
+            $corp_client = $this->searchCorporateCustomer(array(
+                'companyName' => $order_data['payment_company']
+            ));
+        }
+
+        if ($corp_client) {
+            $this->updateOrCreateAddress($order_data, $corp_client);
+
+            return $corp_client['id'];
+        }
+
+        $response = $this->api->customersCorporateCreate(
+            $this->buildCorporateCustomerFromOrder($order_data, $customer['id'])
+        );
+
+        if ($response && $response->isSuccessful()) {
+            $this->createAddressAndCompany($order_data, $response['id']);
+
+            return $response['id'];
+        }
+
+        return null;
+    }
+
+    private function createAddressAndCompany($order_data, $corp_client_id) {
+        $corp_address = CorporateCustomerBuilder::create(false)->buildAddress($order_data);
+        $address_response = $this->api->customersCorporateAddressesCreate($corp_client_id, $corp_address, 'id');
+
+        if ($address_response && $address_response->isSuccessful()) {
+            $company = CorporateCustomerBuilder::create(false)
+                ->setCompany($order_data['payment_company'])
+                ->setCompanyAddressId($address_response['id'])
+                ->buildCompany($order_data);
+
+            $this->api->customersCorporateCompaniesCreate($corp_client_id, $company, 'id');
+        }
+    }
+
+    /**
+     * @param $order_data
+     * @param $corp_client
+     *
+     * @return void
+     */
+    private function updateOrCreateAddress($order_data, $corp_client) {
+        $address_id = null;
+        $addresses_response = $this->api->customersCorporateAddresses($corp_client['id'], array(), null, null, 'id');
+        $corp_address = CorporateCustomerBuilder::create(false)->buildAddress($order_data);
+
+        if ($addresses_response && $addresses_response->isSuccessful() && !empty($addresses_response['addresses'])) {
+            foreach ($addresses_response['addresses'] as $address) {
+                if (Utils::addressEquals($corp_address, $address)) {
+                    $address_id = $address['id'];
+                    $exist_address = $address;
+
+                    break;
+                }
+            }
+        }
+
+        if (!isset($exist_address)) {
+            $response = $this->api->customersCorporateAddressesCreate(
+                $corp_client['id'],
+                $corp_address,
+                'id'
+            );
+
+            if ($response && $response->isSuccessful() && isset($response['id'])) {
+                $address_id = $response['id'];
+            }
+        }
+
+        $company = CorporateCustomerBuilder::create(false)
+            ->setCompany($order_data['payment_company'])
+            ->setCompanyAddressId($address_id)
+            ->buildCompany($order_data);
+        $companies = $this->api->customersCorporateCompanies($corp_client['id'], array(), null, null, 'id');
+
+        if ($companies && $companies->isSuccessful() && !empty($companies['companies'])) {
+            foreach ($companies['companies'] as $crm_company) {
+                if ($crm_company['name'] === $order_data['payment_company']) {
+                    $this->api->customersCorporateCompaniesEdit(
+                        $corp_client['id'],
+                        $crm_company['id'],
+                        $company,
+                        'id',
+                        'id'
+                    );
+                }
+            }
+        }
+    }
+}

src/upload/system/library/retailcrm/lib/service/CorporateCustomerBuilder.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace retailcrm\service;
+
+class CorporateCustomerBuilder {
+    private $is_main_company = false;
+    private $company_address_id = null;
+    private $data = array();
+    private $company;
+
+    public static function create($init = true) {
+        $self = new self();
+
+        if ($init) {
+            $self->initData();
+        }
+
+        return $self;
+    }
+
+    public function initData() {
+        $this->data = array(
+            'customerContacts' => array(
+                array(
+                    'isMain' => true,
+                    'customer' => array()
+                )
+            ),
+            'companies' => array()
+        );
+
+        return $this;
+    }
+
+    public function build() {
+        $this->data['nickName'] = $this->company;
+
+        return $this->data;
+    }
+
+    /**
+     * @param bool $isMainCompany
+     *
+     * @return CorporateCustomerBuilder
+     */
+    public function setIsMainCompany($isMainCompany)
+    {
+        $this->is_main_company = $isMainCompany;
+        return $this;
+    }
+
+    /**
+     * @param int $companyAddressId
+     *
+     * @return CorporateCustomerBuilder
+     */
+    public function setCompanyAddressId($companyAddressId)
+    {
+        $this->company_address_id = $companyAddressId;
+        return $this;
+    }
+
+    public function setCompany($company) {
+        $this->company = $company;
+
+        return $this;
+    }
+
+    public function setCustomerId($customer_id) {
+        $this->setCustomer($customer_id);
+
+        return $this;
+    }
+
+    public function setCustomerExternalId($customer_external_id) {
+        $this->setCustomer($customer_external_id, 'externalId');
+
+        return $this;
+    }
+
+    public function buildAddress($data) {
+        return array(
+            'index' => $data['shipping_postcode'],
+            'countryIso' => $data['shipping_iso_code_2'],
+            'region' => $data['shipping_zone'],
+            'city' => $data['shipping_city'],
+            'name' => $data['payment_company'],
+            'text' => $data['shipping_address_1'] . ' ' . $data['shipping_address_2']
+        );
+    }
+
+    public function addAddress($data) {
+        $this->data['addresses'][] = $this->buildAddress($data);
+
+        return $this;
+    }
+
+    public function buildLegalAddress($data) {
+        return sprintf(
+            "%s %s %s %s %s",
+            $data['payment_postcode'],
+            $data['payment_zone'],
+            $data['payment_city'],
+            $data['payment_address_1'],
+            $data['payment_address_2']
+        );
+    }
+
+    public function buildCompany($data) {
+        $company = array(
+            'name' => $this->company,
+            'contragent' => array(
+                'legalAddress' => $this->buildLegalAddress($data),
+                'contragentType' => 'legal-entity',
+            )
+        );
+
+        if ($this->is_main_company) {
+            $company['isMain'] = true;
+        }
+
+        if (null !== $this->company_address_id) {
+            $company['address'] = array('id' => $this->company_address_id);
+        }
+
+        return $company;
+    }
+
+    public function addCompany($data) {
+        $this->data['companies'][] = $this->buildCompany($data);
+
+        return $this;
+    }
+
+    private function setCustomer($id, $field = 'id') {
+        foreach ($this->data['customerContacts'] as $key => $customerContact) {
+            if ($customerContact['isMain']) {
+                $this->data['customerContacts'][$key]['customer'][$field] = $id;
+            }
+        }
+    }
+}

src/upload/system/library/retailcrm/lib/service/CustomerManager.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace retailcrm\service;
+
+class CustomerManager {
+    protected $api;
+    protected $customer_converter;
+
+    public function __construct(\RetailcrmProxy $proxy, RetailcrmCustomerConverter $customer_converter) {
+        $this->api = $proxy;
+        $this->customer_converter = $customer_converter;
+    }
+
+    public function createCustomer($customer_data, $address) {
+        $customer = $this->prepareCustomer($customer_data, $address, !empty($customer_data['newsletter']));
+
+        $this->api->customersCreate($customer);
+    }
+
+    public function editCustomer($customer_data, $address) {
+        $customer = $this->prepareCustomer($customer_data, $address);
+
+        $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) {
+        return $this->customer_converter
+            ->initCustomerData($customer_data, $address, $isSubscribed)
+            ->setCustomerData()
+            ->setAddress()
+            ->setCustomFields()
+            ->getCustomer();
+    }
+
+    public function getCustomerForOrder($order_data) {
+        $customer = $this->searchCustomer($order_data['telephone'], $order_data['email']);
+        if ($customer) {
+            return $customer;
+        }
+
+        $new_customer = array(
+            'firstName' => $order_data['firstname'],
+            'lastName' => $order_data['lastname'],
+            'email' => $order_data['email'],
+            'createdAt' => $order_data['date_added'],
+            'address' => array(
+                'countryIso' => $order_data['payment_iso_code_2'],
+                'index' => $order_data['payment_postcode'],
+                'city' => $order_data['payment_city'],
+                'region' => $order_data['payment_zone'],
+                'text' => $order_data['payment_address_1'] . ' ' . $order_data['payment_address_2']
+            )
+        );
+
+        if (!empty($order_data['telephone'])) {
+            $new_customer['phones'] = array(
+                array(
+                    'number' => $order_data['telephone']
+                )
+            );
+        }
+
+        $res = $this->api->customersCreate($new_customer);
+
+        $customer = array();
+        if ($res && $res->isSuccessful() && isset($res['id'])) {
+            $customer['id'] = $res['id'];
+        }
+
+        return $customer;
+    }
+
+    private function searchCustomer($phone, $email) {
+        $customer = array();
+
+        $response = $this->api->customersList(
+            array(
+                'name' => $phone,
+                'email' => $email
+            ),
+            1,
+            100
+        );
+
+        if ($response && $response->isSuccessful() && isset($response['customers'])) {
+            $customers = $response['customers'];
+
+            if ($customers) {
+                $customer = end($customers);
+            }
+        }
+
+        return $customer;
+    }
+}

src/upload/system/library/retailcrm/lib/service/OrderManager.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace retailcrm\service;
+
+class OrderManager {
+    protected $api;
+    protected $customer_manager;
+    protected $order_converter;
+    protected $corporate_customer_service;
+    protected $settings_manager;
+
+    /**
+     * OrderManager constructor.
+     * @param \RetailcrmProxy $proxy
+     * @param CustomerManager $customer_manager
+     * @param RetailcrmOrderConverter $order_converter
+     * @param CorporateCustomer $corporate_customer_service
+     * @param SettingsManager $settings_manager
+     */
+    public function __construct(
+        \RetailcrmProxy $proxy,
+        CustomerManager $customer_manager,
+        RetailcrmOrderConverter $order_converter,
+        CorporateCustomer $corporate_customer_service,
+        SettingsManager $settings_manager
+    ) {
+        $this->api = $proxy;
+        $this->customer_manager = $customer_manager;
+        $this->order_converter = $order_converter;
+        $this->corporate_customer_service = $corporate_customer_service;
+        $this->settings_manager = $settings_manager;
+    }
+
+    /**
+     * @param array $order_data
+     * @param array $order_products
+     * @param array $order_totals
+     */
+    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']))
+        ) {
+            $customer = $this->customer_manager->getCustomerForOrder($order_data);
+            if (!empty($customer)) {
+                $order['customer'] = $customer;
+            }
+        }
+
+        $order['contragent']['contragentType'] = 'individual';
+        $this->handleCorporate($order, $order_data);
+
+        return $this->api->ordersCreate($order);
+    }
+
+    /**
+     * @param array $order_data
+     * @param array $order_products
+     * @param array $order_totals
+     */
+    public function editOrder($order_data, $order_products, $order_totals) {
+        $order = $this->prepareOrder($order_data, $order_products, $order_totals);
+
+        if (!isset($order['customer'])) {
+            $customer = $this->customer_manager->getCustomerForOrder($order_data);
+            if (!empty($customer)) {
+                $order['customer'] = array(
+                    'id' => $customer['id']
+                );
+            }
+        }
+
+        $order['contragent']['contragentType'] = 'individual';
+        $this->handleCorporate($order, $order_data);
+
+        $payments = $order['payments'];
+        unset($order['payments']);
+
+        $order_payment = $payments[0];
+        $order = \retailcrm\Utils::filterRecursive($order);
+        $response = $this->api->ordersEdit($order);
+
+        if ($response && $response->isSuccessful()) {
+            $this->updatePayment($order_payment, $order['externalId']);
+        }
+    }
+
+    /**
+     * @param array $orders
+     */
+    public function uploadOrders($orders) {
+        $this->api->ordersUpload($orders);
+    }
+
+    /**
+     * @param array $order_data array of order fields
+     * @param array $order_products array of order products
+     * @param array $order_totals array of order totals
+     * @return array
+     */
+    public function prepareOrder($order_data, $order_products, $order_totals) {
+        return $this->order_converter->initOrderData($order_data, $order_products, $order_totals)
+            ->setOrderData()
+            ->setDelivery()
+            ->setItems()
+            ->setPayment(false)
+            ->setDiscount()
+            ->setCustomFields()
+            ->getOrder();
+    }
+
+    private function handleCorporate(&$order, $order_data) {
+        if ($this->isCorporateOrder($order_data)
+            && !empty($order['customer'])
+            && $this->settings_manager->getSetting('corporate_enabled') == 1
+        ) {
+            $order_data['payment_company'] = htmlspecialchars_decode($order_data['payment_company']);
+            $corp_customer_id = $this->corporate_customer_service->createCorporateCustomer($order_data, $order['customer']);
+
+            if ($corp_customer_id) {
+                $order = $this->order_converter->setCorporateCustomer($order, $corp_customer_id);
+                $companiesResponse = $this->api->customersCorporateCompanies($corp_customer_id, array(), 1, 100, 'id');
+                if ($companiesResponse && $companiesResponse->isSuccessful() && !empty($companiesResponse['companies'])) {
+                    foreach ($companiesResponse['companies'] as $company) {
+                        if ($company['name'] === $order_data['payment_company']) {
+                            $order['company'] = array(
+                                'id' => $company['id']
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param array $order_data array of order fields
+     * @return bool
+     */
+    private function isCorporateOrder($order_data) {
+        return !empty($order_data['payment_company']);
+    }
+
+    /**
+     * @param array $order_payment
+     * @param int $orderId
+     */
+    private function updatePayment($order_payment, $orderId) {
+        $response_order = $this->api->ordersGet($orderId);
+
+        if ($response_order && $response_order->isSuccessful()) {
+            $order_info = $response_order['order'];
+        }
+
+        foreach ($order_info['payments'] as $payment_data) {
+            if (isset($payment_data['externalId'])) {
+                $payment = $payment_data;
+            }
+        }
+
+        if (isset($payment) && $payment['type'] != $order_payment['type']) {
+            $response = $this->api->ordersPaymentDelete($payment['id']);
+
+            if ($response && $response->isSuccessful()) {
+                $this->api->ordersPaymentCreate($order_payment);
+            }
+        } elseif (isset($payment) && $payment['type'] == $order_payment['type']) {
+            $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');
+    }
+}

src/upload/system/library/retailcrm/lib/service/RetailcrmCustomerConverter.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace retailcrm\service;
+
+class RetailcrmCustomerConverter {
+    protected $data;
+    protected $customer_data = [];
+    protected $address = [];
+    protected $isSubscribed;
+    protected $settingsManager;
+
+    public function __construct(
+        SettingsManager $settingsManager
+    ) {
+        $this->settingsManager = $settingsManager;
+    }
+
+    public function getCustomer() {
+        return $this->data;
+    }
+
+    public function initCustomerData($customer_data, $address, $isSubscribed) {
+        $this->data = [];
+        $this->customer_data = $customer_data;
+        $this->address = $address;
+        $this->isSubscribed = $isSubscribed;
+
+        return $this;
+    }
+
+    public function setCustomerData() {
+        $this->data['externalId'] = $this->customer_data['customer_id'];
+        $this->data['firstName'] = $this->customer_data['firstname'];
+        $this->data['lastName'] = $this->customer_data['lastname'];
+        $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']]];
+        }
+
+        return $this;
+    }
+
+    public function setAddress() {
+        if (!empty($this->address)) {
+            $this->data['address'] = [
+                '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;
+    }
+
+    public function setCustomFields() {
+        $settings = $this->settingsManager->getSetting('custom_field');
+        if (!empty($settings) && $this->customer_data['custom_field']) {
+            $customFields = json_decode($this->customer_data['custom_field']);
+
+            foreach ($customFields as $key => $value) {
+                if (isset($settings['c_' . $key])) {
+                    $customFieldsToCrm[$settings['c_' . $key]] = $value;
+                }
+            }
+
+            if (isset($customFieldsToCrm)) {
+                $this->data['customFields'] = $customFieldsToCrm;
+            }
+        }
+
+        return $this;
+    }
+}

src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php

@@ -0,0 +1,331 @@
+<?php
+
+namespace retailcrm\service;
+
+use retailcrm\repository\CustomerRepository;
+use retailcrm\repository\ProductsRepository;
+
+class RetailcrmOrderConverter {
+    protected $data;
+    protected $order_data = array();
+    protected $order_products = array();
+    protected $order_totals = array();
+
+    protected $settingsManager;
+    protected $customerRepository;
+    protected $productsRepository;
+
+    public function __construct(
+        SettingsManager $settingsManager,
+        CustomerRepository $customerRepository,
+        ProductsRepository $productsRepository
+    ) {
+        $this->settingsManager = $settingsManager;
+        $this->customerRepository = $customerRepository;
+        $this->productsRepository = $productsRepository;
+    }
+
+    public function initOrderData($order_data, $order_products, $order_totals) {
+        $this->data = array();
+        $this->order_data = $order_data;
+        $this->order_products = $order_products;
+        $this->order_totals = $order_totals;
+
+        return $this;
+    }
+
+    public function getOrder() {
+        return $this->data;
+    }
+
+    public function setOrderData() {
+        if (!empty($this->order_data['shipping_iso_code_2'])) {
+            $this->data['countryIso'] = $this->order_data['shipping_iso_code_2'];
+        }
+
+        if ($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'];
+        $this->data['phone'] = $this->order_data['telephone'];
+        $this->data['customerComment'] = $this->order_data['comment'];
+
+        if (!empty($this->order_data['customer_id'])) {
+            $this->data['customer']['externalId'] = $this->order_data['customer_id'];
+        }
+
+        if (!empty($this->order_data['email'])) {
+            $this->data['email'] = $this->order_data['email'];
+        }
+
+        $this->data['createdAt'] = $this->order_data['date_added'];
+
+        if (!empty($this->order_data['order_status_id'])) {
+            $this->data['status'] = $this->settingsManager->getStatusSettings()[$this->order_data['order_status_id']];
+        } elseif (isset($this->order_data['order_status_id']) && $this->order_data['order_status_id'] == 0) {
+            $this->data['status'] = $this->settingsManager->getSetting('missing_status');
+        }
+
+        return $this;
+    }
+
+    public function setDiscount() {
+        $discount = 0;
+        $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);
+        }
+
+        if (!empty($totalReward)) {
+            $discount += abs($totalReward);
+        }
+
+        if (!empty($totalVoucher)) {
+            $discount += abs($totalVoucher);
+        }
+
+        if (!empty($retailcrmDiscount)) {
+            $discount += abs($retailcrmDiscount);
+        }
+
+        $this->data['discountManualAmount'] = $discount;
+
+        return $this;
+    }
+
+    public function setPayment($create = true) {
+        $settings = $this->settingsManager->getPaymentSettings();
+        if (!empty($this->order_data['payment_code']) && isset($settings[$this->order_data['payment_code']])) {
+            $payment_type = $settings[$this->order_data['payment_code']];
+        }
+
+        $payment = array(
+            'externalId' => uniqid($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;
+        }
+
+        if (!$create) {
+            $payment['order'] = array(
+                'externalId' => $this->order_data['order_id']
+            );
+        }
+
+        if (!empty($payment['type'])) {
+            $this->data['payments'][] = $payment;
+        }
+
+        return $this;
+    }
+
+    public function setDelivery() {
+        $settings = $this->settingsManager->getDeliverySettings();
+
+        $this->data['delivery']['address'] = array(
+            'index' => $this->order_data['shipping_postcode'],
+            'city' => $this->order_data['shipping_city'],
+            'countryIso' => $this->order_data['shipping_iso_code_2'],
+            'region' => $this->order_data['shipping_zone'],
+            'text' => implode(', ', array(
+                $this->order_data['shipping_postcode'],
+                $this->order_data['shipping_country'] ? $this->order_data['shipping_country'] : '',
+                $this->order_data['shipping_city'],
+                $this->order_data['shipping_address_1'],
+                $this->order_data['shipping_address_2']
+            ))
+        );
+
+        if (!empty($this->order_data['shipping_code'])) {
+            $shippingCode = explode('.', $this->order_data['shipping_code']);
+            $shippingModule = $shippingCode[0];
+
+            if (isset($settings[$this->order_data['shipping_code']])) {
+                $delivery_code = $settings[$this->order_data['shipping_code']];
+            } elseif (isset($settings[$shippingModule])) {
+                $delivery_code = $settings[$shippingModule];
+            }
+        }
+
+        if (!isset($delivery_code) && isset($shippingModule)) {
+            if (!empty($settings)) {
+                $deliveries = array_keys($settings);
+                $shipping_code = '';
+
+                array_walk($deliveries, function ($item, $key) use ($shippingModule, &$shipping_code) {
+                    if (strripos($item, $shippingModule) !== false) {
+                        $shipping_code = $item;
+                    }
+                });
+
+                $delivery_code = $settings[$shipping_code];
+            }
+        }
+
+        if (!empty($delivery_code)) {
+            $this->data['delivery']['code'] = $delivery_code;
+        }
+
+        $totalShipping = $this->getTotal('shipping');
+
+        if (!empty($totalShipping)) {
+            $this->data['delivery']['cost'] = $totalShipping;
+        }
+
+        return $this;
+    }
+
+    public function setItems() {
+        $offerOptions = array('select', 'radio');
+
+        foreach ($this->order_products as $product) {
+            $offerId = '';
+
+            if (!empty($product['option'])) {
+                $options = array();
+
+                foreach ($product['option'] as $option) {
+                    if ($option['type'] == 'checkbox') {
+                        $properties[] = array(
+                            'code' => $option['product_option_value_id'],
+                            'name' => $option['name'],
+                            'value' => $option['value']
+                        );
+                    }
+
+                    if (!in_array($option['type'], $offerOptions)) continue;
+
+                    $productOptions = $this->productsRepository->getProductOptions($product['product_id']);
+
+                    foreach ($productOptions as $productOption) {
+                        if ($productOption['product_option_id'] = $option['product_option_id']) {
+                            foreach ($productOption['product_option_value'] as $productOptionValue) {
+                                if ($productOptionValue['product_option_value_id'] == $option['product_option_value_id']) {
+                                    $options[$option['product_option_id']] = $productOptionValue['option_value_id'];
+                                }
+                            }
+                        }
+                    }
+                }
+
+                ksort($options);
+
+                $offerId = array();
+                foreach ($options as $optionKey => $optionValue) {
+                    $offerId[] = $optionKey . '-' . $optionValue;
+                }
+                $offerId = implode('_', $offerId);
+            }
+
+            $item = array(
+                'offer' => array(
+                    'externalId' => !empty($offerId) ? $product['product_id'] . '#' . $offerId : $product['product_id']
+                ),
+                'productName' => $product['name'],
+                'initialPrice' => $product['price'],
+                '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;
+                            }
+
+                            $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'];
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (isset($properties)) $item['properties'] = $properties;
+
+            $this->data['items'][] = $item;
+        }
+
+        return $this;
+    }
+
+    public function setCorporateCustomer($order, $corp_customer_id) {
+        $order['contragent']['contragentType'] = 'legal-entity';
+        $order['contact'] = $order['customer'];
+        unset($order['customer']);
+        $order['customer'] = array(
+            'id' => $corp_customer_id
+        );
+
+        return $order;
+    }
+
+    public function setCustomFields() {
+        $settings = $this->settingsManager->getSetting('custom_field');
+        if (!empty($settings) && $this->order_data['custom_field']) {
+            $customFields = $this->order_data['custom_field'];
+
+            foreach ($customFields as $key => $value) {
+                if (isset($settings['o_' . $key])) {
+                    $customFieldsToCrm[$settings['o_' . $key]] = $value;
+                }
+            }
+
+            if (isset($customFieldsToCrm)) {
+                $this->data['customFields'] = $customFieldsToCrm;
+            }
+        }
+
+        return $this;
+    }
+
+    private function getTotal($total) {
+        $totals = $this->getTotals();
+
+        if (!empty($totals[$total])) {
+            return $totals[$total];
+        }
+
+        return 0;
+    }
+
+    private function getTotals() {
+        $totals = array();
+
+        foreach ($this->order_totals as $total) {
+            $totals[$total['code']] = $total['value'];
+        }
+
+        return $totals;
+    }
+}

src/upload/system/library/retailcrm/lib/service/SettingsManager.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace retailcrm\service;
+
+class SettingsManager extends \retailcrm\Base {
+    private $settings;
+
+    public function getSettings() {
+        if (!$this->settings) {
+            $this->settings = $this->model_setting_setting->getSetting($this->retailcrm->getModuleTitle());
+        }
+
+        return $this->settings;
+    }
+
+    public function getSettingByKey($key) {
+        return $this->model_setting_setting->getSetting($key);
+    }
+
+    public function getSetting($key) {
+        $settings = $this->getSettings();
+
+        if (!empty($settings[$this->retailcrm->getModuleTitle() . '_' . $key])) {
+            return $settings[$this->retailcrm->getModuleTitle() . '_' . $key];
+        }
+
+        return null;
+    }
+
+    public function getPaymentSettings() {
+        return $this->getSettings()[$this->retailcrm->getModuleTitle() . '_payment'];
+    }
+
+    public function getDeliverySettings() {
+        return $this->getSettings()[$this->retailcrm->getModuleTitle() . '_delivery'];
+    }
+
+    public function getStatusSettings() {
+        return $this->getSettings()[$this->retailcrm->getModuleTitle() . '_status'];
+    }
+}

src/upload/system/library/retailcrm/objects.xml

@@ -14,6 +14,7 @@
         <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>

src/upload/system/library/retailcrm/retailcrm.php

@@ -2,51 +2,88 @@
 
 namespace retailcrm;
 
-require_once 'bootstrap.php';
+use retailcrm\repository\CustomerRepository;
+use retailcrm\service\CorporateCustomer;
+use retailcrm\service\CustomerManager;
+use retailcrm\service\OrderManager;
+use retailcrm\factory\OrderConverterFactory;
+use retailcrm\factory\CustomerConverterFactory;
+use retailcrm\service\SettingsManager;
+
+require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
 
 class Retailcrm {
-    protected $apiClient;
+
+    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) {
+
+
+    public function __construct(\Registry $registry) {
         $this->registry = $registry;
+
+        $modelsProvider = new ModelsProvider($this->registry);
+        $modelsProvider->includeDependencies();
     }
 
     public function __get($name) {
         return $this->registry->get($name);
     }
 
+    public function getCustomerManager() {
+        return new CustomerManager($this->getApiClient(), CustomerConverterFactory::create($this->registry));
+    }
+
+    public function getOrderManager() {
+        return new OrderManager(
+            $this->getApiClient(),
+            $this->getCustomerManager(),
+            OrderConverterFactory::create($this->registry),
+            $this->getCorporateCustomerService(),
+            new SettingsManager($this->registry)
+        );
+    }
+
+    public function getCorporateCustomerService() {
+        return new CorporateCustomer($this->getApiClient(), new CustomerRepository($this->registry));
+    }
+
     /**
      * Get api client object
      *
      * @param string $apiUrl (default = null)
      * @param string $apiKey (default = null)
-     * @param string $apiVersion (default = null)
      *
      * @return mixed object | boolean
      */
-    public function getApiClient($apiUrl = null, $apiKey = null, $apiVersion = null) {
-        $this->load->model('setting/setting');
+    public function getApiClient($apiUrl = null, $apiKey = null) {
+        if (!$this->registry->has('RetailcrmProxy')) {
+            $setting = $this->model_setting_setting->getSetting($this->getModuleTitle());
 
-        $setting = $this->model_setting_setting->getSetting($this->getModuleTitle());
+            if ($apiUrl === null && $apiKey === null) {
+                $apiUrl = isset($setting[$this->getModuleTitle() . '_url'])
+                    ? $setting[$this->getModuleTitle() . '_url'] : '';
+                $apiKey = isset($setting[$this->getModuleTitle() . '_apikey'])
+                    ? $setting[$this->getModuleTitle() . '_apikey'] : '';
+            }
 
-        if ($apiUrl === null && $apiKey === null) {
-            $apiUrl = isset($setting[$this->getModuleTitle() . '_url'])
-                ? $setting[$this->getModuleTitle() . '_url'] : '';
-            $apiKey = isset($setting[$this->getModuleTitle() . '_apikey'])
-                ? $setting[$this->getModuleTitle() . '_apikey'] : '';
-            $apiVersion = isset($setting[$this->getModuleTitle() . '_apiversion'])
-                ? $setting[$this->getModuleTitle() . '_apiversion'] : '';
+            if (!$apiUrl || !$apiKey) {
+                return false;
+            }
+
+            $this->registry->set(
+                'RetailcrmProxy',
+                new \RetailcrmProxy($apiUrl, $apiKey)
+            );
         }
 
-        if ($apiUrl && $apiKey) {
-            return new \RetailcrmProxy($apiUrl, $apiKey, DIR_LOGS . 'retailcrm.log', $apiVersion);
-        }
-
-        return false;
+        return $this->registry->get('RetailcrmProxy');
     }
 
     /**
@@ -91,12 +128,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']) {
@@ -108,14 +145,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)$optionValue['price'],
-                        'qty' => $optionValue['quantity']
+                        'price' => (float)$this->getOptionPrice($optionValue),
+                        'qty' => $optionValue['quantity'],
+                        'weight' => round($this->getWeightOption($optionValue), 3)
                     );
                 }
             } else {
@@ -123,33 +160,34 @@ class Retailcrm {
                     unset($offers[$optionKey]); // Работая в контексте обязательных опций не забываем удалять прошлые обязательные опции, т.к. они должны быть скомбинированы с другими обязательными опциями
                     foreach($requiredOption['product_option_value'] as $optionValue) {
                         $offers[$optionKey.'_'.$requiredOption['product_option_id'].':'.$requiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
-                            'price' => $optionAttr['price'] + (float)$optionValue['price'],
+                            'price' => $optionAttr['price'] + (float)$this->getOptionPrice($optionValue),
                             'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
-                                $optionValue['quantity'] : $optionAttr['qty']
+                                $optionValue['quantity'] : $optionAttr['qty'],
+                            'weight' => round($optionAttr['weight'] + $this->getWeightOption($optionValue), 3)
                         );
                     }
                 }
             }
         }
 
-        // Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть.
         foreach($notRequiredOptions as $notRequiredOption) {
-            // Если обязательных опцией не оказалось и первая итерация
             if(empty($offers)) {
-                $offers['0:0-0'] = 0; // В случае работы с необязательными опциями мы должны учитывать товарное предложение без опций, поэтому создадим "пустую" опцию
+                $offers['0:0-0'] = 0; // Add empty option for mandatory data
                 foreach($notRequiredOption['product_option_value'] as $optionValue) {
                     $offers[$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
-                        'price' => (float)$optionValue['price'],
-                        'qty' => $optionValue['quantity']
+                        'price' => (float)$this->getOptionPrice($optionValue),
+                        'qty' => $optionValue['quantity'],
+                        'weight' => round($this->getWeightOption($optionValue), 3)
                     );
                 }
             } else {
                 foreach($offers as $optionKey => $optionAttr) {
                     foreach($notRequiredOption['product_option_value'] as $optionValue) {
                         $offers[$optionKey.'_'.$notRequiredOption['product_option_id'].':'.$notRequiredOption['option_id'].'-'.$optionValue['option_value_id']] = array(
-                            'price' => $optionAttr['price'] + (float)$optionValue['price'],
+                            'price' => $optionAttr['price'] + (float)$this->getOptionPrice($optionValue),
                             'qty' => ($optionAttr['qty'] > $optionValue['quantity']) ?
-                                $optionValue['quantity'] : $optionAttr['qty']
+                                $optionValue['quantity'] : $optionAttr['qty'],
+                            'weight' => round($optionAttr['weight'] + $this->getWeightOption($optionValue), 3)
                         );
                     }
                 }
@@ -163,6 +201,31 @@ 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
+     */
+    private function getOptionPrice($optionValue) {
+        if ($optionValue['price_prefix'] === '-') {
+            return $optionValue['price'] * -1;
+        }
+
+        return $optionValue['price'];
+    }
+
     /**
      * @return mixed
      */
@@ -180,6 +243,15 @@ 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
      */

tests/2.3/TestCase.php

@@ -1,5 +0,0 @@
-<?php
-
-class TestCase extends OpenCartTest
-{
-}

tests/3.0/TestCase.php

@@ -1,5 +0,0 @@
-<?php
-
-class TestCase extends \Tests\OpenCartTest
-{
-}

tests/3/TestCase.php

@@ -0,0 +1,58 @@
+<?php
+
+class TestCase extends \Tests\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'");
+                }
+            }
+        }
+    }
+
+    public function tearDown()
+    {
+    }
+}

tests/RoboFile.php

@@ -7,6 +7,16 @@ 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
      */
@@ -67,19 +77,21 @@ class RoboFile extends \Robo\Tasks
         }
     }
 
-    public function opencartSetup()
+    public function opencartInstall()
     {
-        $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';
+        $startUp = 'admin/controller/startup/test_startup.php';
+        $startUpTo = 'admin/controller/startup/test_startup.php';
+        $version = getenv('OPENCART');
+        $ocZip = sprintf('/tmp/opencart-%s.zip', $version);
 
         $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->root_dir . 'vendor/opencart/opencart/upload',
+                $this->getOpencartRootDir($version),
                 $this->root_dir . 'www'
             )
             ->copy(
@@ -93,13 +105,31 @@ class RoboFile extends \Robo\Tasks
             ->chmod($this->root_dir . 'www', 0777, 0000, true)
             ->run();
 
-        if (getenv('TEST_SUITE') === '3.0') {
+        if (getenv('TEST_SUITE') === '3') {
             $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']);
@@ -109,7 +139,22 @@ class RoboFile extends \Robo\Tasks
         }
         catch(PDOException $e)
         {
-            $this->printTaskError("<error> Could not connect ot database...");
+            $this->printTaskError($e->getMessage());
+            $this->printTaskError("<error> Could not connect to database...");
+        }
+
+        if (version_compare(getenv('OPENCART'), '3.0.2.0', '<=')) {
+            $install_code = file_get_contents($this->root_dir . 'www/install/cli_install.php');
+            $storage = <<<EOF
+define('DIR_MODIFICATION', DIR_SYSTEM . 'modification/');
+define('DIR_STORAGE', DIR_SYSTEM . 'storage/');
+
+EOF;
+
+            file_put_contents(
+                $this->root_dir . 'www/install/cli_install.php',
+                str_replace("define('DIR_MODIFICATION', DIR_SYSTEM . 'modification/');", $storage, $install_code)
+            );
         }
 
         $install = $this->taskExec('php')->arg($this->root_dir . 'www/install/cli_install.php')->arg('install');
@@ -177,13 +222,31 @@ class RoboFile extends \Robo\Tasks
         $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)
     {
-        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');
-        }
+        $sql = file_get_contents($this->root_dir . 'tests/opencart_sample_data_3.sql');
 
         $conn->exec("USE " . $this->opencart_config['db_database']);
 
@@ -195,4 +258,4 @@ class RoboFile extends \Robo\Tasks
             }
         }
     }
-}
+}

tests/admin/ControllerRetailcrmAdminTest.php

@@ -23,43 +23,81 @@ class ControllerRetailcrmAdminTest extends TestCase
             ->getMock();
     }
 
-    public function testIndex()
+    public function testController()
     {
         $this->login('admin', 'admin');
 
         $response = $this->dispatchAction('extension/module/retailcrm');
         $this->assertRegExp('/Connection settings/', $response->getOutput());
-    }
-
-    public function testIcml()
-    {
-        $this->login('admin', 'admin');
 
         $response = $this->dispatchAction('extension/module/retailcrm/icml');
 
         $this->assertRegExp('/Connection settings/', $response->getOutput());
         $this->assertFileExists(DIR_SYSTEM . '../' . 'retailcrm.xml');
-    }
-
-    public function testInstallCollector()
-    {
-        $this->login('admin', 'admin');
 
         $response = $this->dispatchAction('extension/module/retailcrm/install_collector');
-
         $this->assertRegExp('/Connection settings/', $response->getOutput());
-    }
-
-    public function testUnnstallCollector()
-    {
-        $this->login('admin', 'admin');
 
         $response = $this->dispatchAction('extension/module/retailcrm/uninstall_collector');
-
         $this->assertRegExp('/Connection settings/', $response->getOutput());
     }
 
-    public function tearDown()
+    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'
+                    ]
+                ]
+            ]
+        ];
     }
 }

tests/admin/ModelRetailcrmCustomerAdminTest.php

@@ -22,6 +22,8 @@ class ModelRetailcrmCustomerAdminTest extends TestCase
                 'customersEdit'
             ))
             ->getMock();
+
+        self::$registry->set(\RetailcrmProxy::class, $this->apiClientMock);
     }
 
     public function testUploadToCrm()
@@ -39,23 +41,4 @@ class ModelRetailcrmCustomerAdminTest extends TestCase
         $this->assertArrayHasKey('lastName', $customer);
         $this->assertArrayHasKey('email', $customer);
     }
-
-    public function testChangeInCrm()
-    {
-        $customerModel = $this->loadModel('customer/customer');
-        $customer = $customerModel->getCustomer(self::CUSTOMER_ID);
-
-        $customerSend = $this->customerModel->changeInCrm($customer, $this->apiClientMock);
-
-        $this->assertArrayHasKey('externalId', $customerSend);
-        $this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
-        $this->assertArrayHasKey('firstName', $customerSend);
-        $this->assertEquals('Test', $customerSend['firstName']);
-        $this->assertArrayHasKey('lastName', $customerSend);
-        $this->assertEquals('Test', $customerSend['lastName']);
-        $this->assertArrayHasKey('email', $customerSend);
-        $this->assertEquals('test@mail.ru', $customerSend['email']);
-        $this->assertArrayHasKey('phones', $customerSend);
-        $this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
-    }
 }

tests/admin/ModelRetailcrmEventAdminTest.php

@@ -10,12 +10,7 @@ class ModelRetailcrmEventAdminTest extends TestCase
     {
         parent::setUp();
 
-        if (getenv('TEST_SUITE') === '3.0') {
-            $eventModel = $this->loadModel('setting/event');
-        } else {
-            $eventModel = $this->loadModel('extension/event');
-        }
-
+        $eventModel = $this->loadModel('setting/event');
         $eventModel->addEvent(self::CODE, 'test', 'test');
     }
 

tests/admin/ModelRetailcrmOrderAdminTest.php

@@ -7,7 +7,6 @@ class ModelRetailcrmOrderAdminTest extends TestCase
     private $orderModel;
     private $apiClientMock;
     private $settingModel;
-    private $retailcrm;
 
     const CUSTOMER_ID = 1;
     const ORDER_WITH_CUST_ID = 1;
@@ -17,8 +16,6 @@ class ModelRetailcrmOrderAdminTest extends TestCase
     {
         parent::setUp();
 
-        $this->orderModel = $this->loadModel('extension/retailcrm/order');
-
         $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
             ->disableOriginalConstructor()
             ->setMethods(array(
@@ -30,25 +27,10 @@ class ModelRetailcrmOrderAdminTest extends TestCase
             ))
             ->getMock();
 
-        $this->settingModel = $this->loadModel('setting/setting');
-        $this->retailcrm = new \retailcrm\Retailcrm(self::$registry);
+        self::$registry->set(\RetailcrmProxy::class, $this->apiClientMock);
+        $this->orderModel = $this->loadModel('extension/retailcrm/order');
 
-        $this->settingModel->editSetting(
-            $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->settingModel = $this->loadModel('setting/setting');
     }
 
     public function testUploadToCrm()
@@ -60,7 +42,7 @@ class ModelRetailcrmOrderAdminTest extends TestCase
         foreach ($orders as $order) {
             $fullOrder = $saleOrderModel->getOrder($order['order_id']);
 
-            $fullOrder['order_total'] = $saleOrderModel->getOrderTotals($order['order_id']);
+            $fullOrder['totals'] = $saleOrderModel->getOrderTotals($order['order_id']);
             $fullOrder['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
 
             foreach($fullOrder['products'] as $key => $product) {
@@ -70,7 +52,7 @@ class ModelRetailcrmOrderAdminTest extends TestCase
             $fullOrders[] = $fullOrder;
         }
 
-        $chunkedOrders = $this->orderModel->uploadToCrm($fullOrders, $this->apiClientMock);
+        $chunkedOrders = $this->orderModel->uploadToCrm($fullOrders);
 
         $order = $chunkedOrders[0][0];
 
@@ -90,103 +72,4 @@ class ModelRetailcrmOrderAdminTest extends TestCase
         $this->assertArrayHasKey('payments', $order);
         $this->assertNotEmpty($order['payments']);
     }
-
-    public function testUploadWithCustomerTest()
-    {
-        $saleOrderModel = $this->loadModel('sale/order');
-        $order = $saleOrderModel->getOrder(self::ORDER_WITH_CUST_ID);
-
-        $order['totals'] = $saleOrderModel->getOrderTotals($order['order_id']);
-        $order['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
-
-        foreach($order['products'] as $key => $product) {
-            $order['products'][$key]['option'] = $saleOrderModel->getOrderOptions($product['order_id'], $product['order_product_id']);
-        }
-
-        $response = new \RetailcrmApiResponse(
-            201,
-            json_encode(
-                array(
-                    'success' => true,
-                    'id' => 1
-                )
-            )
-        );
-
-        $this->apiClientMock->expects($this->any())->method('ordersCreate')->willReturn($response);
-        $orderSend = $this->orderModel->uploadOrder($order, $this->apiClientMock);
-
-        $this->assertArrayHasKey('status', $orderSend);
-        $this->assertEquals('new', $orderSend['status']);
-        $this->assertArrayHasKey('externalId', $orderSend);
-        $this->assertArrayHasKey('number', $orderSend);
-        $this->assertArrayHasKey('firstName', $orderSend);
-        $this->assertEquals('Test', $orderSend['firstName']);
-        $this->assertArrayHasKey('lastName', $orderSend);
-        $this->assertEquals('Test', $orderSend['lastName']);
-        $this->assertArrayHasKey('email', $orderSend);
-        $this->assertEquals('test@mail.ru', $orderSend['email']);
-        $this->assertArrayHasKey('phone', $orderSend);
-        $this->assertEquals('+7 (000) 000-00-00', $orderSend['phone']);
-        $this->assertArrayHasKey('createdAt', $orderSend);
-        $this->assertArrayHasKey('delivery', $orderSend);
-        $this->assertInternalType('array', $orderSend['delivery']);
-        $this->assertEquals('flat', $orderSend['delivery']['code']);
-        $this->assertEquals('Test', $orderSend['delivery']['address']['city']);
-        $this->assertEquals('Rostov-na-Donu', $orderSend['delivery']['address']['region']);
-        $this->assertEquals('111111', $orderSend['delivery']['address']['index']);
-        $this->assertArrayHasKey('items', $orderSend);
-        $this->assertArrayHasKey('customerComment', $orderSend);
-        $this->assertArrayHasKey('customer', $orderSend);
-        $this->assertArrayHasKey('externalId', $orderSend['customer']);
-        $this->assertEquals(self::CUSTOMER_ID, $orderSend['customer']['externalId']);
-        $this->assertArrayHasKey('payments', $orderSend);
-        $this->assertEquals('cod', $orderSend['payments'][0]['type']);
-        $this->assertNotEmpty($orderSend['payments']);
-    }
-
-    public function testUploadWithoutCustomerTest()
-    {
-        $saleOrderModel = $this->loadModel('sale/order');
-        $order = $saleOrderModel->getOrder(self::ORDER_ID);
-
-        $order['totals'] = $saleOrderModel->getOrderTotals($order['order_id']);
-        $order['products'] = $saleOrderModel->getOrderProducts($order['order_id']);
-
-        foreach($order['products'] as $key => $product) {
-            $order['products'][$key]['option'] = $saleOrderModel->getOrderOptions($product['order_id'], $product['order_product_id']);
-        }
-
-        $response = new \RetailcrmApiResponse(
-            201,
-            json_encode(
-                array(
-                    'success' => true,
-                    'id' => 1
-                )
-            )
-        );
-
-        $this->apiClientMock->expects($this->any())->method('ordersCreate')->willReturn($response);
-        $this->apiClientMock->expects($this->any())->method('customersCreate')->willReturn($response);
-        $orderSend = $this->orderModel->uploadOrder($order, $this->apiClientMock);
-
-        $this->assertArrayHasKey('status', $orderSend);
-        $this->assertArrayHasKey('externalId', $orderSend);
-        $this->assertArrayHasKey('number', $orderSend);
-        $this->assertArrayHasKey('firstName', $orderSend);
-        $this->assertArrayHasKey('lastName', $orderSend);
-        $this->assertArrayHasKey('email', $orderSend);
-        $this->assertArrayHasKey('phone', $orderSend);
-        $this->assertArrayHasKey('createdAt', $orderSend);
-        $this->assertArrayHasKey('delivery', $orderSend);
-        $this->assertArrayHasKey('items', $orderSend);
-        $this->assertContains('#', $orderSend['items'][0]['offer']['externalId']);
-        $this->assertArrayHasKey('payments', $orderSend);
-        $this->assertArrayHasKey('customerComment', $orderSend);
-        $this->assertArrayHasKey('customer', $orderSend);
-        $this->assertArrayNotHasKey('externalId', $orderSend['customer']);
-        $this->assertArrayHasKey('id', $orderSend['customer']);
-        $this->assertNotEmpty($orderSend['payments']);
-    }
 }

tests/admin/ModelRetailcrmPricesAdminTest.php

@@ -40,9 +40,8 @@ class ModelRetailcrmPricesAdminTest extends TestCase
 
     public function testUploadPrices()
     {
-
         $response = new \RetailcrmApiResponse(
-            201,
+            200,
             json_encode(
                 $this->sites()
             )
@@ -73,7 +72,7 @@ class ModelRetailcrmPricesAdminTest extends TestCase
         return array(
             "success"=> true,
             "sites"=> array(
-                "BitrixMod"=> array(
+                "opencart"=> array(
                     "name"=> "site",
                     "url"=> "http://site.ru",
                     "code"=> "site",
@@ -94,4 +93,4 @@ class ModelRetailcrmPricesAdminTest extends TestCase
             ),
         );
     }
-}
+}

tests/catalog/ControllerDaemonCollectorExtensionAnalyticsCatalogTest.php

@@ -0,0 +1,11 @@
+<?php
+
+require_once __DIR__ . '/../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class ControllerDaemonCollectorExtensionAnalyticsCatalogTest extends TestCase {
+    public function testIndex() {
+        $data = $this->load->controller('extension/analytics/daemon_collector');
+
+        $this->assertContains('RC-XXXXXXXXXX-X', $data);
+    }
+}

tests/catalog/ControllerRetailcrmApiCatalogTest.php

@@ -61,18 +61,4 @@ class ControllerRetailcrmApiCatalogTest extends TestCase
 
         $this->assertEquals('Not found data', $data->error);
     }
-
-    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'");
-                }
-            }
-        }
-    }
 }

tests/catalog/ModelRetailcrmCustomerCatalogTest.php

@@ -1,64 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../' . getenv('TEST_SUITE') . '/TestCase.php';
-
-class ModelRetailcrmCustomerCatalogTest extends TestCase
-{
-    private $customerModel;
-    private $apiClientMock;
-
-    const CUSTOMER_ID = 1;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->customerModel = $this->loadModel('extension/retailcrm/customer');
-
-        $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
-            ->disableOriginalConstructor()
-            ->setMethods(array(
-                'customersCreate',
-                'customersEdit'
-            ))
-            ->getMock();
-    }
-
-    public function testSendToCrm()
-    {
-        $customerModel = $this->loadModel('account/customer');
-        $customer = $customerModel->getCustomer(self::CUSTOMER_ID);
-
-        $customerSend = $this->customerModel->sendToCrm($customer, $this->apiClientMock);
-
-        $this->assertArrayHasKey('externalId', $customerSend);
-        $this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
-        $this->assertArrayHasKey('firstName', $customerSend);
-        $this->assertEquals('Test', $customerSend['firstName']);
-        $this->assertArrayHasKey('lastName', $customerSend);
-        $this->assertEquals('Test', $customerSend['lastName']);
-        $this->assertArrayHasKey('email', $customerSend);
-        $this->assertEquals('test@mail.ru', $customerSend['email']);
-        $this->assertArrayHasKey('phones', $customerSend);
-        $this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
-    }
-
-    public function testChangeInCrm()
-    {
-        $customerModel = $this->loadModel('account/customer');
-        $customer = $customerModel->getCustomer(self::CUSTOMER_ID);
-
-        $customerSend = $this->customerModel->changeInCrm($customer, $this->apiClientMock);
-
-        $this->assertArrayHasKey('externalId', $customerSend);
-        $this->assertEquals(self::CUSTOMER_ID, $customerSend['externalId']);
-        $this->assertArrayHasKey('firstName', $customerSend);
-        $this->assertEquals('Test', $customerSend['firstName']);
-        $this->assertArrayHasKey('lastName', $customerSend);
-        $this->assertEquals('Test', $customerSend['lastName']);
-        $this->assertArrayHasKey('email', $customerSend);
-        $this->assertEquals('test@mail.ru', $customerSend['email']);
-        $this->assertArrayHasKey('phones', $customerSend);
-        $this->assertEquals('+7 (000) 000-00-00', $customerSend['phones'][0]['number']);
-    }
-}

tests/catalog/ModelRetailcrmOrderCatalogTest.php

@@ -71,6 +71,32 @@ class ModelRetailcrmOrderCatalogTest extends TestCase
         }
 
         $orderProcess = $this->orderModel->processOrder($order);
+        $successResponse = new \RetailcrmApiResponse(
+            200,
+            json_encode(
+                array(
+                    'success' => true,
+                    'id' => 1,
+                )
+            )
+        );
+
+        $orderCreateErrorResponse = new \RetailcrmApiResponse(
+            400,
+            json_encode(
+                array(
+                    'errors' => array (
+                        'customer.externalId' => "Customer with externalId=1 not found.",
+                    )
+                )
+            )
+        );
+
+        $this->apiClientMock->expects($this->any())->method('customersCreate')->willReturn($successResponse);
+        $this->apiClientMock->expects($this->any())->method('ordersCreate')->will(
+            $this->onConsecutiveCalls($orderCreateErrorResponse, $successResponse)
+        );
+
         $orderSend = $this->orderModel->sendToCrm($orderProcess, $this->apiClientMock, $order);
 
         $this->assertArrayHasKey('status', $orderSend);
@@ -103,6 +129,7 @@ class ModelRetailcrmOrderCatalogTest extends TestCase
         $this->assertArrayHasKey('customer', $orderSend);
         $this->assertArrayHasKey('externalId', $orderSend['customer']);
         $this->assertEquals(self::CUSTOMER_ID, $orderSend['customer']['externalId']);
+        $this->assertEquals(1, $orderSend['customer']['id']);
         $this->assertArrayHasKey('payments', $orderSend);
         $this->assertEquals('cod', $orderSend['payments'][0]['type']);
         $this->assertNotEmpty($orderSend['payments']);
@@ -145,9 +172,23 @@ class ModelRetailcrmOrderCatalogTest extends TestCase
             )
         );
 
-        $this->apiClientMock->expects($this->any())->method('ordersEdit')->willReturn($orderEditResponse);
+        $orderEditErrorResponse = new \RetailcrmApiResponse(
+            400,
+            json_encode(
+                array(
+                    'errors' => array (
+                        'customer.externalId' => "Customer with externalId=1 not found.",
+                    )
+                )
+            )
+        );
+
         $this->apiClientMock->expects($this->any())->method('ordersGet')->willReturn($ordersGetResponse);
         $this->apiClientMock->expects($this->any())->method('customersCreate')->willReturn($orderEditResponse);
+        $this->apiClientMock->expects($this->any())->method('ordersEdit')->will(
+            $this->onConsecutiveCalls($orderEditErrorResponse, $orderEditResponse)
+        );
+
         $orderProcess = $this->orderModel->processOrder($order);
         $orderSend = $this->orderModel->sendToCrm($orderProcess, $this->apiClientMock, $order, false);
 
@@ -171,6 +212,7 @@ class ModelRetailcrmOrderCatalogTest extends TestCase
         $this->assertEquals('Rostov-na-Donu', $orderSend['delivery']['address']['region']);
         $this->assertEquals('111111', $orderSend['delivery']['address']['index']);
         $this->assertArrayHasKey('items', $orderSend);
+        $this->assertEquals(1, $orderSend['customer']['id']);
 
         foreach($orderSend['items'] as $item) {
             $this->assertArrayHasKey('priceType', $item);
@@ -209,12 +251,12 @@ class ModelRetailcrmOrderCatalogTest extends TestCase
                 array(
                     'success' => true,
                     "pagination"=> [
-                    "limit"=>20,
-                    "totalCount"=> 0,
-                    "currentPage"=> 1,
-                    "totalPageCount"=> 0
-                ],
-                "customers"=> []
+                        "limit"=>20,
+                        "totalCount"=> 0,
+                        "currentPage"=> 1,
+                        "totalPageCount"=> 0
+                    ],
+                    "customers"=> []
                 )
             )
         );

tests/opencart_sample_data.sql

@@ -1,55 +0,0 @@
-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_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`;

tests/opencart_sample_data_3.sql

@@ -1,6 +1,9 @@
 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`, `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', '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');

tests/system/RetailcrmTest.php

@@ -0,0 +1,41 @@
+<?php
+
+require_once __DIR__ . '/../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class RetailcrmTest extends TestCase {
+
+    public function testGetOrderManager() {
+        $retailcrm = new retailcrm\Retailcrm(static::$registry);
+
+        $proxy = $this->getMockBuilder(\RetailcrmProxy::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        static::$registry->set(\RetailcrmProxy::class, $proxy);
+        $manager = $retailcrm->getOrderManager();
+
+        $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);;
+    }
+}

tests/system/lib/ModelsProviderAdminTest.php

@@ -0,0 +1,14 @@
+<?php
+
+require_once __DIR__ . '/../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class ModelsProviderAdminTest extends TestCase {
+    public function testAdminIncludeDependencies() {
+        // TODO should be run with "processIsolation", but with that not working asserting
+//        $provider = new \retailcrm\ModelsProvider(static::$registry);
+//
+//        $provider->includeDependencies();
+//
+//        $this->assertNotEmpty($this->model_sale_order);
+    }
+}

tests/system/lib/ModelsProviderTest.php

@@ -0,0 +1,13 @@
+<?php
+
+require_once __DIR__ . '/../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class ModelsProviderTest extends TestCase {
+    public function testCatalogIncludeDependencies() {
+        $provider = new \retailcrm\ModelsProvider(static::$registry);
+
+        $provider->includeDependencies();
+
+        $this->assertNotEmpty($this->model_checkout_order);
+    }
+}

tests/system/lib/UtilsTest.php

@@ -0,0 +1,21 @@
+<?php
+
+require_once __DIR__ . '/../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class UtilsTest extends TestCase {
+    public function testFilterRecursive() {
+        $testArray = array(
+            '0' => 0, 1 => 1, 'array' => array(), 'array0' => array('0'), 'emptyString' => ''
+        );
+
+        $array = \retailcrm\Utils::filterRecursive($testArray);
+
+        $this->assertNotEmpty($array);
+        $this->assertArrayHasKey('0', $array);
+        $this->assertArrayHasKey(1, $array);
+        $this->assertArrayHasKey('array0', $array);
+        $this->assertEquals('0', $array['array0'][0]);
+        $this->assertArrayNotHasKey('array', $array);
+        $this->assertArrayNotHasKey('emptyString', $array);
+    }
+}

tests/system/lib/factory/CustomerConverterFactoryTest.php

@@ -0,0 +1,11 @@
+<?php
+
+require_once __DIR__ . '/../../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class CustomerConverterFactoryTest extends TestCase {
+    public function testCreate() {
+        $converter = \retailcrm\factory\CustomerConverterFactory::create(static::$registry);
+
+        $this->assertInstanceOf(\retailcrm\service\RetailcrmCustomerConverter::class, $converter);
+    }
+}

tests/system/lib/factory/OrderConverterFactoryTest.php

@@ -0,0 +1,11 @@
+<?php
+
+require_once __DIR__ . '/../../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class OrderConverterFactoryTest extends TestCase {
+    public function testCreate() {
+        $converter = \retailcrm\factory\OrderConverterFactory::create(static::$registry);
+
+        $this->assertInstanceOf(\retailcrm\service\RetailcrmOrderConverter::class, $converter);
+    }
+}

tests/system/lib/history/CustomerAdminTest.php

@@ -0,0 +1,65 @@
+<?php
+
+require_once __DIR__ . '/../../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class CustomerAdminTest extends TestCase {
+    private $customer;
+
+    public function setUp() {
+        parent::setUp();
+
+        $this->customer = array(
+            'firstName' => 'Test',
+            'lastName' => 'Test',
+            'email' => 'test@mail.com',
+            'phones' => array(
+                array('number' => '800000000')
+            ),
+            'address' => array(
+                'countryIso' => 'RU',
+                'index' => '111111',
+                'city' => 'City',
+                'region' => 'Region',
+                'text' => 'Text'
+            )
+        );
+    }
+
+    public function testHandleExistingCustomer() {
+        $data_repository = new \retailcrm\repository\DataRepository(static::$registry);
+        $customer_repository = new \retailcrm\repository\CustomerRepository(static::$registry);
+        $settings_manager = new \retailcrm\service\SettingsManager(static::$registry);
+
+        $customer_history = new \retailcrm\history\Customer($data_repository, $customer_repository, $settings_manager);
+        $customer_data = $customer_repository->getCustomer(OrderManagerTest::CUSTOMER_ID);
+
+        $customer_history->handleCustomer($customer_data, $this->customer);
+
+        $this->assertEquals(false, $customer_data['password']);
+    }
+
+    public function testHandleNotExistingCustomer() {
+        $data_repository = new \retailcrm\repository\DataRepository(static::$registry);
+        $customer_repository = new \retailcrm\repository\CustomerRepository(static::$registry);
+        $settings_manager = new \retailcrm\service\SettingsManager(static::$registry);
+
+        $customer_history = new \retailcrm\history\Customer($data_repository, $customer_repository, $settings_manager);
+        $customer_data = array();
+
+        $customer_history->handleCustomer($customer_data, $this->customer);
+
+        $this->assertNotEquals(false, $customer_data['password']);
+    }
+
+    public function testHandleAddress() {
+        $data_repository = new \retailcrm\repository\DataRepository(static::$registry);
+        $customer_repository = new \retailcrm\repository\CustomerRepository(static::$registry);
+        $settings_manager = new \retailcrm\service\SettingsManager(static::$registry);
+
+        $customer_history = new \retailcrm\history\Customer($data_repository, $customer_repository, $settings_manager);
+
+        $address = $customer_history->handleAddress($this->customer, array());
+
+        $this->assertEquals(true, $address['default']);
+    }
+}

tests/system/lib/history/OrderAdminTest.php

@@ -0,0 +1,147 @@
+<?php
+
+require_once __DIR__ . '/../../../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class OrderAdminTest extends TestCase {
+    private $order;
+    private $order_history;
+
+    public function setUp() {
+        parent::setUp();
+
+        $this->order = $this->getOrder();
+
+        $data_repository = new \retailcrm\repository\DataRepository(static::$registry);
+        $settings_manager = new \retailcrm\service\SettingsManager(static::$registry);
+        $products_repository = new \retailcrm\repository\ProductsRepository(static::$registry);
+        $order_repository = new \retailcrm\repository\OrderRepository(static::$registry);
+
+        $this->order_history = new \retailcrm\history\Order(
+            $data_repository,
+            $settings_manager,
+            $products_repository,
+            $order_repository
+        );
+
+        $this->order_history->setOcDelivery(array(
+            "flat" => array(
+                "title" => "Flat Rate",
+                "flat.flat" => array(
+                    "code" => "flat.flat",
+                    "title" => "Flat Shipping Rate",
+                    "cost" => "5.00",
+                    "tax_class_id" => "9",
+                    "text" => "$8.00"
+                )
+            )
+        ));
+
+        $this->order_history->setOcPayment(array(
+            "cod" => "Cash on delivery"
+        ));
+    }
+
+    public function testHandleBaseOrderData() {
+        $data = array();
+
+        $this->order_history->handleBaseOrderData($data, $this->order);
+
+        $this->assertNotEmpty($data['telephone']);
+        $this->assertNotEmpty($data['email']);
+        $this->assertNotEmpty($data['email']);
+        $this->assertNotEmpty($data['firstname']);
+        $this->assertNotEmpty($data['lastname']);
+        $this->assertNotEmpty($data['store_name']);
+    }
+
+    public function testHandlePayment() {
+        $data = array();
+
+        $this->order_history->handlePayment($data, $this->order);
+
+        $this->assertNotEmpty($data['payment_firstname']);
+        $this->assertNotEmpty($data['payment_lastname']);
+        $this->assertNotEmpty($data['payment_city']);
+        $this->assertNotEmpty($data['payment_postcode']);
+        $this->assertNotEmpty($data['payment_country']);
+        $this->assertNotEmpty($data['payment_method']);
+        $this->assertNotEmpty($data['payment_code']);
+        $this->assertEquals('cod', $data['payment_code']);
+    }
+
+    public function testHandleShipping() {
+        $data = array();
+
+        $this->order_history->handleShipping($data, $this->order);
+
+        $this->assertNotEmpty($data['shipping_firstname']);
+        $this->assertNotEmpty($data['shipping_lastname']);
+        $this->assertNotEmpty($data['shipping_city']);
+        $this->assertNotEmpty($data['shipping_postcode']);
+        $this->assertNotEmpty($data['shipping_method']);
+        $this->assertNotEmpty($data['shipping_code']);
+        $this->assertEquals('flat.flat', $data['shipping_code']);
+    }
+
+    public function testHandleTotals() {
+        $data = array('shipping_method' => 'Flat rate');
+
+        $this->order_history->handleTotals($data, $this->order);
+
+        $this->assertNotEmpty($data['order_total']);
+        $this->assertNotEmpty($data['total']);
+    }
+
+    private function getOrder() {
+        return array(
+            'externalId' => '1',
+            'email' => 'test@test.com',
+            'phone' => '8000000000',
+            'firstName' => 'Test',
+            'lastName' => 'Test',
+            'customerComment' => 'Test comment',
+            'countryIso' => 'RU',
+            'totalSumm' => 200,
+            'summ' => 100,
+            'customer' => array(
+                'firstName' => 'Test customer',
+                'lastName' => 'Test customer',
+                'address' => array(
+                    'countryIso' => 'RU',
+                    'index' => '111111',
+                    'region' => 'Test region',
+                    'city' => 'Test city',
+                    'text' => ''
+                )
+            ),
+            'delivery' => array(
+                'code' => 'flat',
+                'cost' => 100,
+                'address' => array(
+                    'index' => '111111',
+                    'region' => 'Test region',
+                    'city' => 'Test city',
+                    'text' => ''
+                )
+            ),
+            'payments' => array(
+                array(
+                    'externalId' => 'opencart_1',
+                    'type' => 'cod'
+                )
+            ),
+            'items' => array(
+                array(
+                    'initialPrice' => 100,
+                    'discountTotal' => 0,
+                    'quantity' => 1,
+                    'offer' => array(
+                        'displayName' => 'Test',
+                        'externalId' => '42#217-39_218-43',
+                        'name' => 'Test'
+                    )
+                )
+            )
+        );
+    }
+}