v4, offers, customers

2024-11-22 05:06:07 +03:00 · 2016-08-31 17:28:11 +03:00 · 2016-08-31 17:28:11 +03:00 · 54e8807c2c
commit 54e8807c2c
parent 74993334c5
17 changed files with 1943 additions and 749 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 Opencart module
 ===============

-Module allows integrate CMS Opencart with [retailCRM](http://retailcrm.pro)
+Module allows integrate CMS Opencart 2.x with [retailCRM](http://retailcrm.pro)

 #### Features:

@ -23,56 +23,6 @@ cp -r opencart-module/* /path/to/site/root
 * Fill you api url & api key
 * Specify directories matching

-
-#### Export orders to retailCRM (for opencart 1.5.x, for version 2.x this step is unnecessary)
-
-##### VQmod
-
-Copy _retailcrm_create_order.xml_ into _/path/to/site/root/vqmod/xml_.
-
-For VQmod cache renewal you may need to delete files _/path/to/site/root/vqmod/vqcache/vq2-admin_model_sale_order.php_ & _/path/to/site/root/vqmod/vqcache/vq2-catalog_model_checkout_order.php_
-
-##### Manual setup
-
-In the file:
-
-```
-/catalog/model/checkout/order.php
-```
-
-add theese lines into addOrder method right before return statement:
-
-```php
-$this->load->model('retailcrm/order');
-$this->model_retailcrm_order->sendToCrm($data, $order_id);
-```
-
-In the file:
-
-```
-/admin/model/sale/order.php
-```
-
-add theese lines into addOrder & editOrder methods right before return statement:
-
-```php
-if (!isset($data['fromApi'])) {
-    $this->load->model('setting/setting');
-    $status = $this->model_setting_setting->getSetting('retailcrm');
-
-    if (!empty($data['order_status_id'])) {
-        $data['order_status'] = $status['retailcrm_status'][$data['order_status_id']];
-    }
-
-    $this->load->model('retailcrm/order');
-    if (isset ($order_query)) {
-        $this->model_retailcrm_order->changeInCrm($data, $order_id);
-    } else {
-        $this->model_retailcrm_order->sendToCrm($data, $order_id);
-    }
-}
-```
-
 #### Getting changes in orders

 Add to cron:
@ -94,3 +44,8 @@ Your export file will be available by following url
 ```
 http://youropencartsite.com/retailcrm.xml
 ```
+
+#### Export existing orders and customers
+
+You want to run this command onecly:
+/usr/bin/php /path/to/opencart/system/cron/export.php
--- a/README.ru.md
+++ b/README.ru.md
@ -1,7 +1,7 @@
 Opencart module
 ===============

-Модуль интеграции CMS Openacart c [RetailCRM](http://retailcrm.ru)
+Модуль интеграции CMS Openacart 2.x c [RetailCRM](http://retailcrm.ru)

 #### Модуль позволяет:

@ -26,56 +26,6 @@ cp -r opencart-module/* /path/to/site/root

 На странице настроек модуля укажите URL Вашей CRM и ключ авторизации, после сохранения этих данных укажите соответствия справочников типов доставок, оплат и статусов заказа.

-
-#### Выгрузка новых заказов в CRM (для версии opencart 1.5.x.x, для версии 2.0 и старше не требуется)
-
-##### VQmod
-
-Скопируйте файл _retailcrm_create_order.xml_ в _/path/to/site/root/vqmod/xml_.
-
-Для обновления кеша VQmod может потрбоваться удалить файлы _/path/to/site/root/vqmod/vqcache/vq2-admin_model_sale_order.php_ и _/path/to/site/root/vqmod/vqcache/vq2-catalog_model_checkout_order.php_
-
-##### Ручная установка
-
-В файле:
-
-```
-/catalog/model/checkout/order.php
-```
-
-Добавьте следующие строки в метод addOrder непосредственно перед языковой конструкцией return:
-
-```php
-$this->load->model('retailcrm/order');
-$this->model_retailcrm_order->sendToCrm($data, $order_id);
-```
-
-В файле:
-
-```
-/admin/model/sale/order.php
-```
-
-Добавьте следующие строки в методы addOrder и editOrder в самом конце каждого метода:
-
-```php
-if (!isset($data['fromApi'])) {
-    $this->load->model('setting/setting');
-    $status = $this->model_setting_setting->getSetting('retailcrm');
-
-    if (!empty($data['order_status_id'])) {
-        $data['order_status'] = $status['retailcrm_status'][$data['order_status_id']];
-    }
-
-    $this->load->model('retailcrm/order');
-    if (isset ($order_query)) {
-        $this->model_retailcrm_order->changeInCrm($data, $order_id);
-    } else {
-        $this->model_retailcrm_order->sendToCrm($data, $order_id);
-    }
-}
-```
-
 #### Получение измений из CRM

 Для получения изменений и новых данных добавьте в cron следующую запись:
@ -97,3 +47,8 @@ if (!isset($data['fromApi'])) {
 ```
 http://youropencartsite.com/retailcrm.xml
 ```
+
+#### Выгрузка существующих заказов и покупателей
+
+Запустите команду единожды:
+/usr/bin/php /path/to/opencart/system/cron/export.php
--- a/admin/controller/module/retailcrm.php
+++ b/admin/controller/module/retailcrm.php
@ -43,6 +43,13 @@ class ControllerModuleRetailcrm extends Controller
                version_compare(VERSION, '2.2', '>=') ? 'catalog/model/checkout/order/addOrderHistory/after' : 'post.order.history.add',
                'module/retailcrm/order_edit'
            );
+
+        $this->model_extension_event
+            ->addEvent(
+                'retailcrm',
+                version_compare(VERSION, '2.2', '>=') ? 'catalog/model/account/customer/addCustomer/after' : 'post.customer.add',
+                'module/retailcrm/customer_create'
+            );
    }

    /**
@ -276,6 +283,44 @@ class ControllerModuleRetailcrm extends Controller
        }
    }

+    /**
+     * Export orders
+     *
+     *
+     */
+    public function export() {
+        if(version_compare(VERSION, '2.1', '<')) {
+            $this->load->model('sale/customer');
+            $customers = $this->model_sale_customer->getCustomers();
+        } else {
+            $this->load->model('customer/customer');
+            $customers = $this->model_customer_customer->getCustomers();
+        }
+
+        $this->load->model('retailcrm/customer');
+        $this->model_retailcrm_customer->uploadToCrm($customers);
+
+        $this->load->model('sale/order');
+        $orders = $this->model_sale_order->getOrders();
+
+        $fullOrders = array();
+        foreach($orders as $order) {
+            $fullOrder = $this->model_sale_order->getOrder($order['order_id']);
+
+            $fullOrder['order_total'] = $this->model_sale_order->getOrderTotals($order['order_id']);
+
+            $fullOrder['products'] = $this->model_sale_order->getOrderProducts($order['order_id']);
+            foreach($fullOrder['products'] as $key=>$product) {
+                $fullOrder['products'][$key]['option'] = $this->model_sale_order->getOrderOptions($product['order_id'], $product['order_product_id']);
+            }
+
+            $fullOrders[] = $fullOrder;
+        }
+
+        $this->load->model('retailcrm/order');
+        $this->model_retailcrm_order->uploadToCrm($fullOrders);
+    }
+
    /**
     * Validate
     *
--- a/admin/model/retailcrm/customer.php
+++ b/admin/model/retailcrm/customer.php
@ -0,0 +1,51 @@
+<?php
+
+class ModelRetailcrmCustomer extends Model {
+
+    public function uploadToCrm($customers) {
+        $this->load->model('setting/setting');
+        $settings = $this->model_setting_setting->getSetting('retailcrm');
+
+        if(empty($customers))
+            return false;
+        if(empty($settings['retailcrm_url']) || empty($settings['retailcrm_apikey']))
+            return false;
+
+        require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
+
+        $this->retailcrmApi = new RetailcrmProxy(
+            $settings['retailcrm_url'],
+            $settings['retailcrm_apikey'],
+            DIR_SYSTEM . 'logs/retailcrm.log'
+        );
+
+        $customersToCrm = array();
+
+        foreach($customers as $customer) {
+            $customersToCrm[] = $this->process($customer);
+        }
+
+        $chunkedCustomers = array_chunk($customersToCrm, 50);
+
+        foreach($chunkedCustomers as $customersPart) {
+            $this->retailcrmApi->customersUpload($customersPart);
+        }
+    }
+
+    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']
+        );
+
+        return $customerToCrm;
+    }
+}
--- a/admin/model/retailcrm/history.php
+++ b/admin/model/retailcrm/history.php
@ -48,7 +48,13 @@ class ModelRetailcrmHistory extends Model
            ? new DateTime($history['retailcrm_history'])
            : new DateTime(date('Y-m-d H:i:s', strtotime('-1 days', strtotime(date('Y-m-d H:i:s')))));

-        $orders = $crm->ordersHistory($lastRun);
+        $packs = $crm->ordersHistory(array(
+            'startDate' => $lastRun->format('Y-m-d H:i:s'),
+        ), 1, 100);
+        if(!$packs->isSuccessful() && count($packs->history) <= 0)
+            return false;
+        $orders = RetailcrmHistoryHelper::assemblyOrder($packs->history);
+
        $generatedAt = $orders['generatedAt'];

        $this->subtotalSettings = $this->model_setting_setting->getSetting('sub_total');
@ -70,7 +76,7 @@ class ModelRetailcrmHistory extends Model
        $updatedOrders = array();
        $newOrders = array();

-        foreach ($orders['orders'] as $order) {
+        foreach ($orders as $order) {

            if (isset($order['deleted'])) continue;

--- a/admin/model/retailcrm/order.php
+++ b/admin/model/retailcrm/order.php
@ -1,176 +1,113 @@
 <?php

 class ModelRetailcrmOrder extends Model {
+    public function uploadToCrm($orders) {
+        $this->load->model('catalog/product');

-    public function sendToCrm($order_data, $order_id)
-    {
        $this->load->model('setting/setting');
-        $settings = $this->model_setting_setting->getSetting('retailcrm');
+        $this->settings = $this->model_setting_setting->getSetting('retailcrm');

-        if(!empty($settings['retailcrm_url']) && !empty($settings['retailcrm_apikey'])) {
-            require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
+        $ordersToCrm = array();

-            $this->retailcrm = new RetailcrmProxy(
-                $settings['retailcrm_url'],
-                $settings['retailcrm_apikey'],
-                DIR_SYSTEM . 'logs/retailcrm.log'
-            );
+        foreach($orders as $order) {
+            $ordersToCrm[] = $this->process($order);
+        }

-            $order = array();
+        $chunkedOrders = array_chunk($ordersToCrm, 50);

-            $customers = $this->retailcrm->customersList(
-                array(
-                    'name' => $order_data['telephone'],
-                    'email' => $order_data['email']
-                ),
-                1,
-                100
-            );
+        foreach($chunkedOrders as $ordersPart) {
+            $this->retailcrmApi->ordersUpload($ordersPart);
+        }
+    }

-            foreach($customers['customers'] as $customer) {
-                $order['customer']['id'] = $customer['id'];
+    private function process($order_data) {
+        $order = array();
+
+        $payment_code = $order_data['payment_code'];
+        $delivery_code = $order_data['shipping_code'];
+
+        $order['externalId'] = $order_data['order_id'];
+        $order['firstName'] = $order_data['firstname'];
+        $order['lastName'] = $order_data['lastname'];
+        $order['email'] = $order_data['email'];
+        $order['phone'] = $order_data['telephone'];
+        $order['customerComment'] = $order_data['comment'];
+
+        $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'];
            }
+        }

-            unset($customers);
+        $order['createdAt'] = $order_data['date_added'];
+        $order['paymentType'] = $this->settings['retailcrm_payment'][$payment_code];

-            $order['externalId'] = $order_id;
-            $order['firstName'] = $order_data['firstname'];
-            $order['lastName'] = $order_data['lastname'];
-            $order['email'] = $order_data['email'];
-            $order['phone'] = $order_data['telephone'];
-            $order['customerComment'] = $order_data['comment'];
+        $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;

-            $deliveryCost = 0;
-            $altTotals = isset($order_data['order_total']) ? $order_data['order_total'] : "";
-            $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $altTotals ;
+        $order['delivery'] = array(
+            'code' => !empty($delivery_code) ? $this->settings['retailcrm_delivery'][$delivery_code] : '',
+            'cost' => $deliveryCost,
+            'address' => array(
+                'index' => $order_data['shipping_postcode'],
+                'city' => $order_data['shipping_city'],
+                'country' => $order_data['shipping_country_id'],
+                'region' => $order_data['shipping_zone_id'],
+                'text' => implode(', ', array(
+                    $order_data['shipping_postcode'],
+                    $country,
+                    $order_data['shipping_city'],
+                    $order_data['shipping_address_1'],
+                    $order_data['shipping_address_2']
+                ))
+            )
+        );

-            if (!empty($orderTotals)) {
-                foreach ($orderTotals as $totals) {
-                    if ($totals['code'] == 'shipping') {
-                        $deliveryCost = $totals['value'];
+        $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(!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'];
+                                }
+                            }
+                        }
                    }
                }
-            }

-            $order['createdAt'] = date('Y-m-d H:i:s');
+                ksort($options);

-            $payment_code = $order_data['payment_code'];
-            $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
-
-            $delivery_code = $order_data['shipping_code'];
-            $order['delivery'] = array(
-                'code' => $settings['retailcrm_delivery'][$delivery_code],
-                'cost' => $deliveryCost,
-                'address' => array(
-                    'index' => $order_data['shipping_postcode'],
-                    'city' => $order_data['shipping_city'],
-                    'countryIso' => $order_data['shipping_iso_code_2'],
-                    'region' => $order_data['shipping_zone'],
-                    'text' => implode(', ', array(
-                        $order_data['shipping_postcode'],
-                        (isset($order_data['shipping_country'])) ? $order_data['shipping_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'];
-
-            foreach ($orderProducts as $product) {
-                $order['items'][] = array(
-                    'productId' => $product['product_id'],
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity'],
-                );
-            }
-
-            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
-                $order['status'] = $settings['retailcrm_status'][$order_data['order_status_id']];
-            }
-
-            $this->retailcrm->ordersCreate($order);
-        }
-    }
-
-    public function changeInCrm($order_data, $order_id)
-    {
-        $this->load->model('setting/setting');
-        $settings = $this->model_setting_setting->getSetting('retailcrm');
-
-        if(!empty($settings['retailcrm_url']) && !empty($settings['retailcrm_apikey'])) {
-            require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
-
-            $this->retailcrm = new RetailcrmProxy(
-                $settings['retailcrm_url'],
-                $settings['retailcrm_apikey'],
-                DIR_SYSTEM . 'logs/retailcrm.log'
-            );
-
-            $order = array();
-
-            $payment_code = $order_data['payment_code'];
-            $delivery_code = $order_data['shipping_code'];
-
-            $order['externalId'] = $order_id;
-            $order['firstName'] = $order_data['firstname'];
-            $order['lastName'] = $order_data['lastname'];
-            $order['email'] = $order_data['email'];
-            $order['phone'] = $order_data['telephone'];
-            $order['customerComment'] = $order_data['comment'];
-
-            $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'];
+                $offerId = array();
+                foreach($options as $optionKey => $optionValue) {
+                    $offerId[] = $optionKey.'-'.$optionValue;
                }
+                $offerId = implode('_', $offerId);
            }

-            $order['createdAt'] = date('Y-m-d H:i:s');
-            $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
-
-            $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
-
-            $order['delivery'] = array(
-                'code' => !empty($settings['retailcrm_delivery'][$delivery_code])
-                    ? $settings['retailcrm_delivery'][$delivery_code]
-                    : null,
-                'cost' => $deliveryCost,
-                'address' => array(
-                    'index' => $order_data['shipping_postcode'],
-                    'city' => $order_data['shipping_city'],
-                    'country' => $order_data['shipping_country_id'],
-                    'region' => $order_data['shipping_zone_id'],
-                    'text' => implode(', ', array(
-                        $order_data['shipping_postcode'],
-                        $country,
-                        $order_data['shipping_city'],
-                        $order_data['shipping_address_1'],
-                        $order_data['shipping_address_2']
-                    ))
-                )
+            $order['items'][] = array(
+                'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id'],
+                'productName' => $product['name'],
+                'initialPrice' => $product['price'],
+                'quantity' => $product['quantity'],
            );
-
-            $orderProducts = isset($order_data['products']) ? $order_data['products'] : $order_data['order_product'];
-
-            foreach ($orderProducts as $product) {
-                $order['items'][] = array(
-                    'productId' => $product['product_id'],
-                    'productName' => $product['name'],
-                    'initialPrice' => $product['price'],
-                    'quantity' => $product['quantity'],
-                );
-            }
-
-            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
-                $order['status'] = $settings['retailcrm_status'][$order_data['order_status_id']];
-            }
-
-            $this->retailcrm->ordersEdit($order);
        }
+
+        return $order;
    }
 }
--- a/catalog/controller/module/retailcrm.php
+++ b/catalog/controller/module/retailcrm.php
@ -94,4 +94,24 @@ class ControllerModuleRetailcrm extends Controller
            $this->model_retailcrm_order->changeInCrm($data, $data['order_id']);
        }
    }
+
+    /**
+     * Create customer on event
+     *
+     * @param int $customerId customer identificator
+     *
+     * @return void
+     */
+    public function customer_create($parameter1, $parameter2) {
+        if($parameter2 != null)
+            $customerId = $parameter2;
+        else
+            $customerId = $parameter1;
+
+        $this->load->model('account/customer');
+        $customer = $this->model_account_customer->getCustomer($customerId);
+
+        $this->load->model('retailcrm/customer');
+        $this->model_retailcrm_customer->sendToCrm($customer);
+    }
 }
--- a/catalog/model/retailcrm/customer.php
+++ b/catalog/model/retailcrm/customer.php
@ -0,0 +1,42 @@
+<?php
+
+class ModelRetailcrmCustomer extends Model {
+    public function sendToCrm($customer) {
+        $this->load->model('setting/setting');
+        $settings = $this->model_setting_setting->getSetting('retailcrm');
+
+        if(empty($customer))
+            return false;
+        if(empty($settings['retailcrm_url']) || empty($settings['retailcrm_apikey']))
+            return false;
+
+        require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
+
+        $this->retailcrmApi = new RetailcrmProxy(
+            $settings['retailcrm_url'],
+            $settings['retailcrm_apikey'],
+            DIR_SYSTEM . 'logs/retailcrm.log'
+        );
+
+        $customerToCrm = $this->process($customer);
+
+        $this->retailcrmApi->customersCreate($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']
+        );
+
+        return $customerToCrm;
+    }
+}
--- a/catalog/model/retailcrm/order.php
+++ b/catalog/model/retailcrm/order.php
@ -122,7 +122,9 @@ class ModelRetailcrmOrder extends Model {
                }

                $order['items'][] = array(
-                    'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id'],
+                    'offer' => array(
+                        'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
+                    ),
                    'productName' => $product['name'],
                    'initialPrice' => $product['price'],
                    'quantity' => $product['quantity'],
@ -233,7 +235,9 @@ class ModelRetailcrmOrder extends Model {
                }

                $order['items'][] = array(
-                    'productId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id'],
+                    'offer' => array(
+                        'externalId' => !empty($offerId) ? $product['product_id'].'#'.$offerId : $product['product_id']
+                    ),
                    'productName' => $product['name'],
                    'initialPrice' => $product['price'],
                    'quantity' => $product['quantity'],
--- a/system/cron/export.php
+++ b/system/cron/export.php
@ -0,0 +1,3 @@
+<?php
+$cli_action = 'module/retailcrm/export';
+require_once('dispatch.php');
--- a/system/library/retailcrm/CurlException.php
+++ b/system/library/retailcrm/CurlException.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * Class CurlException
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion4
+ */
 class CurlException extends RuntimeException
 {
 }
--- a/system/library/retailcrm/InvalidJsonException.php
+++ b/system/library/retailcrm/InvalidJsonException.php
@ -1,5 +1,15 @@
 <?php
-
+/**
+ * PHP version 5.3
+ *
+ * Class InvalidJsonException
+ *
+ * @category RetailCrm
+ * @package  RetailCrm
+ * @author   RetailCrm <integration@retailcrm.ru>
+ * @license  https://opensource.org/licenses/MIT MIT License
+ * @link     http://www.retailcrm.ru/docs/Developers/ApiVersion4
+ */
 class InvalidJsonException extends DomainException
 {
 }
--- a/system/library/retailcrm/RetailcrmApiClient.php
+++ b/system/library/retailcrm/RetailcrmApiClient.php
--- a/system/library/retailcrm/RetailcrmApiResponse.php
+++ b/system/library/retailcrm/RetailcrmApiResponse.php
@ -1,6 +1,14 @@
 <?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
 {
@ -10,6 +18,14 @@ class RetailcrmApiResponse implements ArrayAccess
    // response assoc array
    protected $response;

+    /**
+     * ApiResponse constructor.
+     *
+     * @param int   $statusCode   HTTP status code
+     * @param mixed $responseBody HTTP body
+     *
+     * @throws InvalidJsonException
+     */
    public function __construct($statusCode, $responseBody = null)
    {
        $this->statusCode = (int) $statusCode;
@ -51,7 +67,11 @@ class RetailcrmApiResponse implements ArrayAccess
    /**
     * Allow to access for the property throw class method
     *
-     * @param  string $name
+     * @param string $name      method name
+     * @param mixed  $arguments method parameters
+     *
+     * @throws \InvalidArgumentException
+     *
     * @return mixed
     */
    public function __call($name, $arguments)
@ -60,7 +80,7 @@ class RetailcrmApiResponse implements ArrayAccess
        $propertyName = strtolower(substr($name, 3, 1)) . substr($name, 4);

        if (!isset($this->response[$propertyName])) {
-            throw new InvalidArgumentException("Method \"$name\" not found");
+            throw new \InvalidArgumentException("Method \"$name\" not found");
        }

        return $this->response[$propertyName];
@ -69,37 +89,53 @@ class RetailcrmApiResponse implements ArrayAccess
    /**
     * Allow to access for the property throw object property
     *
-     * @param  string $name
+     * @param string $name property name
+     *
+     * @throws \InvalidArgumentException
+     *
     * @return mixed
     */
    public function __get($name)
    {
        if (!isset($this->response[$name])) {
-            throw new InvalidArgumentException("Property \"$name\" not found");
+            throw new \InvalidArgumentException("Property \"$name\" not found");
        }

        return $this->response[$name];
    }

    /**
-     * @param mixed $offset
-     * @param mixed $value
+     * Offset set
+     *
+     * @param mixed $offset offset
+     * @param mixed $value  value
+     *
+     * @throws \BadMethodCallException
+     * @return void
     */
    public function offsetSet($offset, $value)
    {
-        throw new BadMethodCallException('This activity not allowed');
+        throw new \BadMethodCallException('This activity not allowed');
    }

    /**
-     * @param mixed $offset
+     * Offset unset
+     *
+     * @param mixed $offset offset
+     *
+     * @throws \BadMethodCallException
+     * @return void
     */
    public function offsetUnset($offset)
    {
-        throw new BadMethodCallException('This call not allowed');
+        throw new \BadMethodCallException('This call not allowed');
    }

    /**
-     * @param mixed $offset
+     * Check offset
+     *
+     * @param mixed $offset offset
+     *
     * @return bool
     */
    public function offsetExists($offset)
@ -108,13 +144,18 @@ class RetailcrmApiResponse implements ArrayAccess
    }

    /**
-     * @param mixed $offset
+     * Get offset
+     *
+     * @param mixed $offset offset
+     *
+     * @throws \InvalidArgumentException
+     *
     * @return mixed
     */
    public function offsetGet($offset)
    {
        if (!isset($this->response[$offset])) {
-            throw new InvalidArgumentException("Property \"$offset\" not found");
+            throw new \InvalidArgumentException("Property \"$offset\" not found");
        }

        return $this->response[$offset];
--- a/system/library/retailcrm/RetailcrmHistoryHelper.php
+++ b/system/library/retailcrm/RetailcrmHistoryHelper.php
@ -0,0 +1,108 @@
+<?php
+
+class RetailcrmHistoryHelper {
+    public static function assemblyOrder($orderHistory)
+    {
+        if (file_exists(__DIR__ . '/objects.xml')) {
+            $objects = simplexml_load_file(__DIR__ . '/objects.xml');
+            foreach($objects->fields->field as $object) {
+                $fields[(string)$object["group"]][(string)$object["id"]] = (string)$object;
+            }
+        }
+        $orders = array();
+        foreach ($orderHistory as $change) {
+            $change['order'] = self::removeEmpty($change['order']);
+            if($change['order']['items']) {
+                $items = array();
+                foreach($change['order']['items'] as $item) {
+                    if(isset($change['created'])) {
+                        $item['create'] = 1;
+                    }
+                    $items[$item['id']] = $item;
+                }
+                $change['order']['items'] = $items;
+            }
+
+            if($change['order']['contragent']['contragentType']) {
+                $change['order']['contragentType'] = $change['order']['contragent']['contragentType'];
+                unset($change['order']['contragent']);
+            }
+
+            if($orders[$change['order']['id']]) {
+                $orders[$change['order']['id']] = array_merge($orders[$change['order']['id']], $change['order']);
+            } else {
+                $orders[$change['order']['id']] = $change['order'];
+            }
+
+            if($change['item']) {
+                if($orders[$change['order']['id']]['items'][$change['item']['id']]) {
+                    $orders[$change['order']['id']]['items'][$change['item']['id']] = array_merge($orders[$change['order']['id']]['items'][$change['item']['id']], $change['item']);
+                } else {
+                    $orders[$change['order']['id']]['items'][$change['item']['id']] = $change['item'];
+                }
+
+                if(empty($change['oldValue']) && $change['field'] == 'order_product') {
+                    $orders[$change['order']['id']]['items'][$change['item']['id']]['create'] = true;
+                }
+                if(empty($change['newValue']) && $change['field'] == 'order_product') {
+                    $orders[$change['order']['id']]['items'][$change['item']['id']]['delete'] = true;
+                }
+                if(!$orders[$change['order']['id']]['items'][$change['item']['id']]['create'] && $fields['item'][$change['field']]) {
+                    $orders[$change['order']['id']]['items'][$change['item']['id']][$fields['item'][$change['field']]] = $change['newValue'];
+                }
+            } else {
+                if($fields['delivery'][$change['field']] == 'service') {
+                    $orders[$change['order']['id']]['delivery']['service']['code'] = self::newValue($change['newValue']);
+                } elseif($fields['delivery'][$change['field']]) {
+                    $orders[$change['order']['id']]['delivery'][$fields['delivery'][$change['field']]] = self::newValue($change['newValue']);
+                } elseif($fields['orderAddress'][$change['field']]) {
+                    $orders[$change['order']['id']]['delivery']['address'][$fields['orderAddress'][$change['field']]] = $change['newValue'];
+                } elseif($fields['integrationDelivery'][$change['field']]) {
+                    $orders[$change['order']['id']]['delivery']['service'][$fields['integrationDelivery'][$change['field']]] = self::newValue($change['newValue']);
+                } elseif($fields['customerContragent'][$change['field']]) {
+                    $orders[$change['order']['id']][$fields['customerContragent'][$change['field']]] = self::newValue($change['newValue']);
+                } elseif(strripos($change['field'], 'custom_') !== false) {
+                    $orders[$change['order']['id']]['customFields'][str_replace('custom_', '', $change['field'])] = self::newValue($change['newValue']);
+                } elseif($fields['order'][$change['field']]) {
+                    $orders[$change['order']['id']][$fields['order'][$change['field']]] = self::newValue($change['newValue']);
+                }
+
+                if(isset($change['created'])) {
+                    $orders[$change['order']['id']]['create'] = 1;
+                }
+
+                if(isset($change['deleted'])) {
+                    $orders[$change['order']['id']]['deleted'] = 1;
+                }
+            }
+        }
+
+        return $orders;
+    }
+
+    public static function newValue($value)
+    {
+        if(isset($value['code'])) {
+            return $value['code'];
+        } else {
+            return $value;
+        }
+    }
+
+    public static function removeEmpty($inputArray)
+    {
+        $outputArray = array();
+        if (!empty($inputArray)) {
+            foreach ($inputArray as $key => $element) {
+                if(!empty($element) || $element === 0 || $element === '0'){
+                    if (is_array($element)) {
+                        $element = self::removeEmpty($element);
+                    }
+                    $outputArray[$key] = $element;
+                }
+            }
+        }
+
+        return $outputArray;
+    }
+}
--- a/system/library/retailcrm/RetailcrmHttpClient.php
+++ b/system/library/retailcrm/RetailcrmHttpClient.php
@ -1,6 +1,14 @@
 <?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
 */
 class RetailcrmHttpClient
 {
@ -9,95 +17,88 @@ class RetailcrmHttpClient

    protected $url;
    protected $defaultParameters;
-    protected $retry;

+    /**
+     * Client constructor.
+     *
+     * @param string $url               api url
+     * @param array  $defaultParameters array of parameters
+     *
+     * @throws \InvalidArgumentException
+     */
    public function __construct($url, array $defaultParameters = array())
    {
        if (false === stripos($url, 'https://')) {
-            throw new InvalidArgumentException('API schema requires HTTPS protocol');
+            throw new \InvalidArgumentException(
+                'API schema requires HTTPS protocol'
+            );
        }

        $this->url = $url;
        $this->defaultParameters = $defaultParameters;
-        $this->retry = 0;
    }

    /**
     * Make HTTP request
     *
-     * @param string $path
-     * @param string $method (default: 'GET')
-     * @param array $parameters (default: array())
-     * @param int $timeout
-     * @param bool $verify
-     * @param bool $debug
-     * @return RetailcrmApiResponse
+     * @param string $path       request url
+     * @param string $method     (default: 'GET')
+     * @param array  $parameters (default: array())
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     *
+     * @throws \InvalidArgumentException
+     * @throws CurlException
+     * @throws InvalidJsonException
+     *
+     * @return ApiResponse
     */
    public function makeRequest(
        $path,
        $method,
-        array $parameters = array(),
-        $timeout = 30,
-        $verify = false,
-        $debug = false
+        array $parameters = array()
    ) {
        $allowedMethods = array(self::METHOD_GET, self::METHOD_POST);
-        if (!in_array($method, $allowedMethods)) {
-            throw new InvalidArgumentException(sprintf(
-                'Method "%s" is not valid. Allowed methods are %s',
-                $method,
-                implode(', ', $allowedMethods)
-            ));
+
+        if (!in_array($method, $allowedMethods, false)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    'Method "%s" is not valid. Allowed methods are %s',
+                    $method,
+                    implode(', ', $allowedMethods)
+                )
+            );
        }

        $parameters = array_merge($this->defaultParameters, $parameters);

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

-        if (self::METHOD_GET === $method && sizeof($parameters)) {
+        if (self::METHOD_GET === $method && count($parameters)) {
            $url .= '?' . http_build_query($parameters, '', '&');
        }

-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_FAILONERROR, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $verify);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $verify);
-
-        if (!$debug) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, (int) $timeout);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout);
-        } else {
-            curl_setopt($ch, CURLOPT_TIMEOUT_MS, (int) $timeout + ($this->retry * 2000));
-        }
+        $curlHandler = curl_init();
+        curl_setopt($curlHandler, CURLOPT_URL, $url);
+        curl_setopt($curlHandler, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curlHandler, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curlHandler, CURLOPT_FAILONERROR, false);
+        curl_setopt($curlHandler, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($curlHandler, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($curlHandler, CURLOPT_TIMEOUT, 30);
+        curl_setopt($curlHandler, CURLOPT_CONNECTTIMEOUT, 30);

        if (self::METHOD_POST === $method) {
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters);
+            curl_setopt($curlHandler, CURLOPT_POST, true);
+            curl_setopt($curlHandler, CURLOPT_POSTFIELDS, $parameters);
        }

-        $responseBody = curl_exec($ch);
-        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $errno = curl_errno($ch);
-        $error = curl_error($ch);
+        $responseBody = curl_exec($curlHandler);
+        $statusCode = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);
+        $errno = curl_errno($curlHandler);
+        $error = curl_error($curlHandler);

-        curl_close($ch);
-
-        if ($errno && in_array($errno, array(6, 7, 28, 34, 35)) && $this->retry < 3) {
-            $errno = null;
-            $error = null;
-            $this->retry += 1;
-            $this->makeRequest(
-                $path,
-                $method,
-                $parameters,
-                $timeout,
-                $verify,
-                $debug
-            );
-        }
+        curl_close($curlHandler);

        if ($errno) {
            throw new CurlException($error, $errno);
@ -105,9 +106,4 @@ class RetailcrmHttpClient

        return new RetailcrmApiResponse($statusCode, $responseBody);
    }
-
-    public function getRetry()
-    {
-        return $this->retry;
-    }
 }
--- a/system/library/retailcrm/objects.xml
+++ b/system/library/retailcrm/objects.xml
@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<options>
+    <fields>
+        <field id="id" group="customer">id</field>
+        <field id="first_name" group="customer">firstName</field>
+        <field id="last_name" group="customer">lastName</field>
+        <field id="patronymic" group="customer">patronymic</field>
+        <field id="email" group="customer">email</field>
+        <field id="birthday" group="customer">birthday</field>
+        <field id="phones" group="customer">phones</field>
+        <field id="manager" group="customer">manager</field>
+        <field id="commentary" group="customer">commentary</field>
+        <field id="external_id" group="customer">externalId</field>
+        <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="address.index" group="customerAddress">index</field>
+        <field id="address.country" group="customerAddress">country</field>
+        <field id="address.region" group="customerAddress">region</field>
+        <field id="address.city" group="customerAddress">city</field>
+        <field id="address.street" group="customerAddress">street</field>
+        <field id="address.building" group="customerAddress">building</field>
+        <field id="address.house" group="customerAddress">house</field>
+        <field id="address.block" group="customerAddress">block</field>
+        <field id="address.flat" group="customerAddress">flat</field>
+        <field id="address.floor" group="customerAddress">floor</field>
+        <field id="address.intercom_code" group="customerAddress">intercomCode</field>
+        <field id="address.metro" group="customerAddress">metro</field>
+        <field id="address.notes" group="customerAddress">notes</field>
+        
+        <field id="contragent.contragent_type" group="customerContragent">contragentType</field>
+        <field id="contragent.legal_name" group="customerContragent">legalName</field>
+        <field id="contragent.legal_address" group="customerContragent">legalAddress</field>
+        <field id="contragent.certificate_number" group="customerContragent">certificateNumber</field>
+        <field id="contragent.certificate_date" group="customerContragent">certificateDate</field>
+        <field id="contragent.bank" group="customerContragent">bank</field>
+        <field id="contragent.bank_address" group="customerContragent">bankAddress</field>
+        <field id="contragent.corr_account" group="customerContragent">corrAccount</field>
+        <field id="contragent.bank_account" group="customerContragent">bankAccount</field>
+        
+        <field id="id" group="order">id</field>
+        <field id="created_at" group="order">createdAt</field>
+        <field id="order_type" group="order">orderType</field>
+        <field id="order_method" group="order">orderMethod</field>
+        <field id="site" group="order">site</field>
+        <field id="status" group="order">status</field>
+        <field id="manager" group="order">manager</field>
+        <field id="first_name" group="order">firstName</field>
+        <field id="last_name" group="order">lastName</field>
+        <field id="patronymic" group="order">patronymic</field>
+        <field id="phone" group="order">phone</field>
+        <field id="additional_phone" group="order">additionalPhone</field>
+        <field id="email" group="order">email</field> 
+        <field id="payment_type" group="order">paymentType</field>
+        <field id="payment_status" group="order">paymentStatus</field>
+        <field id="discount" group="order">discount</field>
+        <field id="discount_percent" group="order">discountPercent</field>
+        <field id="prepay_sum" group="order">prepaySum</field>
+        <field id="customer_comment" group="order">customerComment</field>
+        <field id="manager_comment" group="order">managerComment</field>
+        <field id="shipment_store" group="order">shipmentStore</field>
+        <field id="shipment_date" group="order">shipmentDate</field>
+        <field id="shipped" group="order">shipped</field>
+        <!--<field id="order_product" group="order">item</field>-->
+        
+        <field id="order_product.id" group="item">id</field>
+        <field id="order_product.initial_price" group="item">initialPrice</field>
+        <field id="order_product.discount" group="item">discount</field>
+        <field id="order_product.discount_percent" group="item">discountPercent</field>
+        <field id="order_product.quantity" group="item">quantity</field>
+        <field id="order_product.status" group="item">status</field>
+        
+        <field id="delivery_type" group="delivery">code</field>
+        <field id="delivery_service" group="delivery">service</field>
+        <field id="delivery_date" group="delivery">date</field>
+        <field id="delivery_time" group="delivery">time</field>
+        <field id="delivery_cost" group="delivery">cost</field>
+        <field id="delivery_net_cost" group="delivery">netCost</field>
+        
+        <field id="delivery_address.country" group="orderAddress">country</field>
+        <field id="delivery_address.index" group="orderAddress">index</field>
+        <field id="delivery_address.region" group="orderAddress">region</field>
+        <field id="delivery_address.city" group="orderAddress">city</field>
+        <field id="delivery_address.street" group="orderAddress">street</field>
+        <field id="delivery_address.building" group="orderAddress">building</field>
+        <field id="delivery_address.house" group="orderAddress">house</field>
+        <field id="delivery_address.block" group="orderAddress">block</field>
+        <field id="delivery_address.flat" group="orderAddress">flat</field>
+        <field id="delivery_address.floor" group="orderAddress">floor</field>
+        <field id="delivery_address.intercom_code" group="orderAddress">intercomCode</field>
+        <field id="delivery_address.metro" group="orderAddress">metro</field>
+        <field id="delivery_address.notes" group="orderAddress">notes</field>
+        
+        <field id="integration_delivery_data.status" group="integrationDelivery">status</field>
+        <field id="integration_delivery_data.track_number" group="integrationDelivery">trackNumber</field>
+        <field id="integration_delivery_data.courier" group="integrationDelivery">courier</field>
+    </fields>
+</options>