Update for api version 4

* history additional functional
* fixed orders upload when customers data is empty and delivery data is empty
* orders update history
* product offers
* fix 5.3 compability
* retailcrm api v4

README.ru.md

@@ -34,3 +34,13 @@ Prestashop module
 ```
 /usr/bin/php /path/to/your/site/modules/retailcrm/job/export.php
 ```
+
+#### Рекомендации
+
+Для более полной выгрузки заказов из CRM в магазин рекомендуется заполнять следующие поля:
+
+1. Покупатель
+..* Фамилия - если не указано, то в магазин выгрузится в виде прочерка(дефиса).
+..* E-mail - если не указано, то в магазин выгрузится в виде md5(Имя)@retailcrm.ru
+2. Доставка
+

retailcrm/job/export.php

@@ -1,4 +1,5 @@
 <?php
+$_SERVER['HTTPS'] = 1;
 
 require(dirname(__FILE__) . '/../../../config/config.inc.php');
 require(dirname(__FILE__) . '/../../../init.php');

retailcrm/job/icml.php

@@ -1,4 +1,5 @@
 <?php
+$_SERVER['HTTPS'] = 1;
 
 require(dirname(__FILE__) . '/../../../config/config.inc.php');
 require(dirname(__FILE__) . '/../../../init.php');

retailcrm/job/missing.php

@@ -1,4 +1,5 @@
 <?php
+$_SERVER['HTTPS'] = 1;
 
 $shortopts = 'o:';
 $options = getopt($shortopts);

retailcrm/job/sync.php

@@ -1,4 +1,5 @@
 <?php
+$_SERVER['HTTPS'] = 1;
 
 require(dirname(__FILE__) . '/../../../config/config.inc.php');
 require(dirname(__FILE__) . '/../../../init.php');
@@ -27,48 +28,37 @@ $startFrom = ($lastSync === false)
 
 $customerFix = array();
 $orderFix = array();
-$address_id = 0;
 
-$history = $api->ordersHistory(new DateTime($startFrom));
+$startDate = new DateTime($startFrom);
+$history = $api->ordersHistory(array(
+    'startDate' => $startDate->format('Y-m-d H:i:s')
+));
 
-if ($history->isSuccessful() && count($history->orders) > 0) {
+if ($history->isSuccessful() && count($history->history) > 0) {
 
     $statuses = array_flip(array_filter(json_decode(Configuration::get('RETAILCRM_API_STATUS'), true)));
     $deliveries = array_flip(array_filter(json_decode(Configuration::get('RETAILCRM_API_DELIVERY'), true)));
     $payments = array_flip(array_filter(json_decode(Configuration::get('RETAILCRM_API_PAYMENT'), true)));
 
-    foreach ($history->orders as $order) {
+    $orders = RetailcrmHistoryHelper::assemblyOrder($history->history);
+
+    foreach ($orders as $order) {
         if (isset($order['deleted']) && $order['deleted'] == true) continue;
 
         if (!array_key_exists('externalId', $order)) {
-
             $customer = new Customer();
-            $customer->getByEmail($order['customer']['email']);
+            if(!empty($order['customer']['email']))
+                $customer->getByEmail($order['customer']['email']);
 
-            if (
+            if (!array_key_exists('externalId', $order['customer'])) {
-                !array_key_exists('externalId', $order['customer']) &&
-                Validate::isEmail($order['customer']['email'])
-            ) {
                 if (!$customer->id)
                 {
                     $customer->firstname = $order['customer']['firstName'];
-                    $customer->lastname = $order['customer']['lastName'];
+                    $customer->lastname = !empty($order['customer']['lastName']) ? $order['customer']['lastName'] : '-';
-                    $customer->email = $order['customer']['email'];
+                    $customer->email = Validate::isEmail($order['customer']['email']) ? $order['customer']['email'] : md5($order['customer']['firstName']) . '@retailcrm.ru';
                     $customer->passwd = substr(str_shuffle(strtolower(sha1(rand() . time()))),0, 5);
 
-                    if($customer->add()) {
+                    $customer->add();
-                        $address = new Address();
-                        $address->id_customer = $customer->id;
-                        $address->id_country = $default_country;
-                        $address->lastname = $customer->lastname;
-                        $address->firstname = $customer->firstname;
-                        $address->alias = 'default';
-                        $address->postcode = $order['address']['index'];
-                        $address->city = $order['address']['city'];
-                        $address->address1 = $order['address']['text'];
-                        $address->phone = $order['phone'];
-                        $address->add();
-                    }
                 }
 
                 array_push(
@@ -80,6 +70,18 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
                 );
             }
 
+            $address = new Address();
+            $address->id_customer = $customer->id;
+            $address->id_country = $default_country;
+            $address->lastname = $customer->lastname;
+            $address->firstname = $customer->firstname;
+            $address->alias = 'default';
+            $address->postcode = $order['delivery']['address']['index'];
+            $address->city = !empty($order['delivery']['address']['city']) ? $order['delivery']['address']['city'] : '-';
+            $address->address1 = !empty($order['delivery']['address']['text']) ? $order['delivery']['address']['text'] : '-';
+            $address->phone = $order['phone'];
+            $address->add();
+
             $delivery = $order['delivery']['code'];
 
             if (array_key_exists($delivery, $deliveries) && $deliveries[$delivery] != '') {
@@ -89,7 +91,11 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
             $payment = $order['paymentType'];
 
             if (array_key_exists($payment, $payments) && $payments[$payment] != '') {
-                $paymentType = $payments[$payment];
+                if(Module::getInstanceByName($payments[$payment])) {
+                    $paymentType = Module::getModuleName($payments[$payment]);
+                } else {
+                    $paymentType = $payments[$payment];
+                }
             }
 
             $state = $order['status'];
@@ -102,8 +108,8 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
             $cart->id_currency = $default_currency;
             $cart->id_lang = $default_lang;
             $cart->id_customer = $customer->id;
-            $cart->id_address_delivery = (int) $address_id;
+            $cart->id_address_delivery = (int) $address->id;
-            $cart->id_address_invoice = (int) $address_id;
+            $cart->id_address_invoice = (int) $address->id;
             $cart->id_carrier = (int) $deliveries[$delivery];
 
             $cart->add();
@@ -112,10 +118,13 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
 
             if(!empty($order['items'])) {
                 foreach ($order['items'] as $item) {
+                    $productId = explode('#', $item['offer']['externalId']);
+
                     $product = array();
-                    $product['id_product'] = (int) $item['offer']['externalId'];
+                    $product['id_product'] = (int) $productId[0];
+                    $product['id_product_attribute'] = !empty($productId[1]) ? $productId[1] : 0;
                     $product['quantity'] = $item['quantity'];
-                    $product['id_address_delivery'] = (int) $address_id;
+                    $product['id_address_delivery'] = (int) $address->id;
                     $products[] = $product;
                 }
             }
@@ -127,19 +136,20 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
              * Create order
             */
             $newOrder = new Order();
-            $newOrder->id_address_delivery = (int) $address_id;
+            $shops = Shop::getShops();
-            $newOrder->id_address_invoice = (int) $address_id;
+            $newOrder->id_shop = Shop::getCurrentShop();
+            $newOrder->id_shop_group = (int)$shops[Shop::getCurrentShop()]['id_shop_group'];
+
+            $newOrder->id_address_delivery = (int) $address->id;
+            $newOrder->id_address_invoice = (int) $address->id;
             $newOrder->id_cart = (int) $cart->id;
             $newOrder->id_currency = $default_currency;
             $newOrder->id_lang = $default_lang;
             $newOrder->id_customer = (int) $customer->id;
             if (isset($deliveryType)) $newOrder->id_carrier = (int) $deliveryType;
-            $newOrder->payment =  $payments[$payment];
             if (isset($paymentType)) {
-                $newOrder->module = (Module::getInstanceByName('advancedcheckout') === false)
+                $newOrder->payment = $paymentType;
-                    ? $paymentType
+                $newOrder->module = $payments[$payment];
-                    : 'advancedcheckout'
-                ;
             }
             $newOrder->total_paid = $order['summ'] + $order['delivery']['cost'];
             $newOrder->total_paid_tax_incl = $order['summ'] + $order['delivery']['cost'];
@@ -155,6 +165,7 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
             if (!empty($order['delivery']['date'])) $newOrder->delivery_date = $order['delivery']['date'];
             $newOrder->date_add = $order['createdAt'];
             $newOrder->date_upd = $order['createdAt'];
+            $newOrder->invoice_date = $order['createdAt'];
             $newOrder->valid = 1;
             $newOrder->secure_key = md5(time());
 
@@ -165,6 +176,14 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
 
             $newOrder->add(false, false);
 
+            $carrier = new OrderCarrierCore();
+            $carrier->id_order = $newOrder->id;
+            $carrier->id_carrier = $deliveryType;
+            $carrier->shipping_cost_tax_excl = $order['delivery']['cost'];
+            $carrier->shipping_cost_tax_incl = $order['delivery']['cost'];
+            $carrier->date_add = $order['delivery']['date'];
+            $carrier->add(false, false);
+
             /*
              * collect order ids for single fix request
             */
@@ -177,8 +196,31 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
 
             foreach ($order['items'] as $item) {
                 $product = new Product((int) $item['offer']['externalId'], false, $default_lang);
-                $qty = $item['quantity'];
+                $product_id = $item['offer']['externalId'];
-                $product_list[] = array('product' => $product, 'quantity' => $qty);
+                $product_attribute_id = 0;
+                if(strpos($item['offer']['externalId'], '#') !== false) {
+                    $product_id = explode('#', $item['offer']['externalId']);
+                    $product_attribute_id = $product_id[1];
+                    $product_id = $product_id[0];
+                }
+
+                if($product_attribute_id != 0) {
+                    $productName = htmlspecialchars(strip_tags(Product::getProductName($product_id, $product_attribute_id)));
+
+                    $productPrice = Combination::getPrice($product_attribute_id);
+                    $productPrice = $productPrice > 0 ? $productPrice : $product->price;
+                } else {
+                    $productName = htmlspecialchars(strip_tags($product->name));
+                    $productPrice = $product->price;
+                }
+
+                $product_list[] = array(
+                    'product' => $product,
+                    'product_attribute_id' => $product_attribute_id,
+                    'product_price' => $productPrice,
+                    'product_name' => $productName,
+                    'quantity' => $item['quantity']
+                );
             }
 
             $query = 'INSERT `'._DB_PREFIX_.'order_detail`
@@ -198,201 +240,281 @@ if ($history->isSuccessful() && count($history->orders) > 0) {
                         0,
                         '. Context::getContext()->shop->id.',
                         '.(int) $product['product']->id.',
-                        0,
+                        '.$product['product_attribute_id'].',
-                        '.implode('', array('\'', $product['product']->name, '\'')).',
+                        '.implode('', array('\'', $product['product_name'], '\'')).',
                         '.(int) $product['quantity'].',
                         '.(int) $product['quantity'].',
-                        '.$product['product']->price.',
+                        '.$product['product_price'].',
                         '.implode('', array('\'', $product['product']->reference, '\'')).',
-                        '.$product['product']->price.',
+                        '.$product['product_price'].',
-                        '.$product['product']->price.',
+                        '.$product['product_price'].',
-                        '.$product['product']->price.',
+                        '.$product['product_price'].',
-                        '.$product['product']->price.',
+                        '.$product['product_price'].',
-                        '.$product['product']->price.'
+                        '.$product['product_price'].'
                     ),';
             }
 
             Db::getInstance()->execute(rtrim($query, ','));
 
-            $api->customersFixExternalIds($customerFix);
+            if(!empty($customerFix))
-            $api->ordersFixExternalIds($orderFix);
+                $api->customersFixExternalIds($customerFix);
+            if(!empty($orderFix))
+                $api->ordersFixExternalIds($orderFix);
         } else {
-            /*
+            $orderToUpdate = new Order((int) $order['externalId']);
-             * take last order update only
-             */
-            if (!empty($order['paymentType']) &&
-                !empty($order['delivery']['code']) &&
-                !empty($order['status'])
-            ) {
-                $orderToUpdate = new Order((int) $order['externalId']);
 
-                /*
+            /*
-                 * check status
+             * check status
-                */
+            */
+            if(!empty($order['status'])) {
                 $stype = $order['status'];
+
                 if ($statuses[$stype] != null) {
                     if ($statuses[$stype] != $orderToUpdate->current_state) {
                         Db::getInstance()->execute('
-                            UPDATE `'._DB_PREFIX_.'orders`
+                        INSERT INTO `' . _DB_PREFIX_ . 'order_history` (`id_employee`, `id_order`, `id_order_state`, `date_add`) 
-                            SET `current_state` = \''.$statuses[$stype].'\'
+                        VALUES (
-                            WHERE `id_order` = '.(int) $order['externalId']
+                            0,
+                            ' . $orderToUpdate->id . ',
+                            ' . $statuses[$stype] . ',
+                            "' . date('Y-m-d H:i:s') . '"
+                        )
+                        ');
+
+                        Db::getInstance()->execute('
+                        UPDATE `' . _DB_PREFIX_ . 'orders`
+                        SET `current_state` = \'' . $statuses[$stype] . '\'
+                        WHERE `id_order` = ' . (int)$order['externalId']
                         );
                     }
                 }
+            }
 
-                /*
+            /*
-                 * check delivery type
+             * check delivery type
-                 */
+             */
+            if(!empty($order['delivery']['code'])) {
                 $dtype = $order['delivery']['code'];
+                $dcost = !empty($order['delivery']['cost']) ? $order['delivery']['cost'] : null;
+
                 if ($deliveries[$dtype] != null) {
-                    if ($deliveries[$dtype] != $orderToUpdate->id_carrier) {
+                    if ($deliveries[$dtype] != $orderToUpdate->id_carrier OR $dcost != null) {
+
+                        if($dtype != null) {
+                            Db::getInstance()->execute('
+                            UPDATE `' . _DB_PREFIX_ . 'orders`
+                            SET `id_carrier` = \'' . $deliveries[$dtype] . '\'
+                            WHERE `id_order` = ' . (int)$order['externalId']
+                            );
+                        }
+
+                        $updateCarrierFields = array();
+                        if($dtype != null) {
+                            $updateCarrierFields[] = '`id_carrier` = \'' . $deliveries[$dtype] . '\' ';
+                        }
+                        if($dcost != null) {
+                            $updateCarrierFields[] = '`shipping_cost_tax_incl` = \'' . $dcost . '\' ';
+                            $updateCarrierFields[] = '`shipping_cost_tax_excl` = \'' . $dcost . '\' ';
+                        }
+                        $updateCarrierFields = implode(', ', $updateCarrierFields);
+
                         Db::getInstance()->execute('
-                            UPDATE `'._DB_PREFIX_.'orders`
+                        UPDATE `' . _DB_PREFIX_ . 'order_carrier` SET 
-                            SET `id_carrier` = \''.$deliveries[$dtype].'\'
+                        '.$updateCarrierFields.'
-                            WHERE `id_order` = '.(int) $order['externalId']
+                        WHERE `id_order` = \'' . $orderToUpdate->id . '\''
-                        );
-                        Db::getInstance()->execute('
-                            UPDATE `'._DB_PREFIX_.'order_carrier`
-                            SET `id_carrier` = \''.$deliveries[$dtype].'\'
-                            WHERE `id_order` = \''.$orderToUpdate->id.'\''
                         );
                     }
                 }
+            }
 
-                /*
+            /*
-                 * check payment type
+             * check payment type
-                 */
+             */
+            if(!empty($order['paymentType'])) {
                 $ptype = $order['paymentType'];
+
                 if ($payments[$ptype] != null) {
                     if ($payments[$ptype] != $orderToUpdate->payment) {
                         Db::getInstance()->execute('
-                            UPDATE `'._DB_PREFIX_.'orders`
+                        UPDATE `' . _DB_PREFIX_ . 'orders`
-                            SET `payment` = \''.$payments[$ptype].'\'
+                        SET `payment` = \'' . $payments[$ptype] . '\'
-                            WHERE `id_order` = '.(int) $order['externalId']
+                        WHERE `id_order` = ' . (int)$order['externalId']
                         );
                         Db::getInstance()->execute('
-                            UPDATE `'._DB_PREFIX_.'order_payment`
+                        UPDATE `' . _DB_PREFIX_ . 'order_payment`
-                            SET `payment_method` = \''.$payments[$ptype].'\'
+                        SET `payment_method` = \'' . $payments[$ptype] . '\'
-                            WHERE `order_reference` = \''.$orderToUpdate->reference.'\''
+                        WHERE `order_reference` = \'' . $orderToUpdate->reference . '\''
                         );
 
                     }
                 }
+            }
 
-                /*
+            /*
-                 * Clean deleted items
+             * Clean deleted items
-                 */
+             */
+            foreach ($order['items'] as $key => $item) {
+                if (isset($item['deleted']) && $item['deleted'] == true) {
+                    if(strpos($item['id'], '#') !== false) {
+                        $itemId = explode('#', $item['id']);
+                        $product_id = $itemId[0];
+                        $product_attribute_id = $itemId[1];
+                    } else {
+                        $product_id = $item['id'];
+                        $product_attribute_id = 0;
+                    }
+
+                    Db::getInstance()->execute('
+                        DELETE FROM `'._DB_PREFIX_.'order_detail`
+                        WHERE `id_order` = '. $orderToUpdate->id .'
+                        AND `product_id` = '.$product_id. '
+                        AND `product_attribute_id` = '.$product_attribute_id
+                    );
+
+                    unset($order['items'][$key]);
+                }
+            }
+
+            /*
+             * Check items quantity
+             */
+            foreach ($orderToUpdate->getProductsDetail() as $orderItem) {
                 foreach ($order['items'] as $key => $item) {
-                    if (isset($item['deleted']) && $item['deleted'] == true) {
+                    if(strpos($item['offer']['externalId'], '#') !== false) {
-                        Db::getInstance()->execute('
+                        $itemId = explode('#', $item['offer']['externalId']);
-                            DELETE FROM `'._DB_PREFIX_.'order_detail`
+                        $product_id = $itemId[0];
-                            WHERE `id_order` = '. $orderToUpdate->id .'
+                        $product_attribute_id = $itemId[1];
-                            AND `product_id` = '.$item['id']
+                    } else {
-                        );
+                        $product_id = $item['offer']['externalId'];
+                        $product_attribute_id = 0;
+                    }
+
+                    if ($product_id == $orderItem['product_id'] && $product_attribute_id == $orderItem['product_attribute_id']) {
+                        if (isset($item['quantity']) && $item['quantity'] != $orderItem['product_quantity']) {
+                            Db::getInstance()->execute('
+                                UPDATE `'._DB_PREFIX_.'order_detail`
+                                SET `product_quantity` = '.$item['quantity'].',
+                                `product_quantity_in_stock` = '.$item['quantity'].'
+                                WHERE `id_order_detail` = '.$orderItem['id_order_detail']
+                            );
+                        }
 
                         unset($order['items'][$key]);
                     }
                 }
+            }
 
-                /*
+            /*
-                 * Check items quantity
+             * Check new items
-                 */
+             */
-                foreach ($orderToUpdate->getProductsDetail() as $orderItem) {
+            if (!empty($order['items'])) {
-                    foreach ($order['items'] as $key => $item) {
+                $query = 'INSERT `'._DB_PREFIX_.'order_detail`
-                        if ($item['offer']['externalId'] == $orderItem['product_id']) {
+                    (
-                            if (isset($item['quantity']) && $item['quantity'] != $orderItem['product_quantity']) {
+                        `id_order`, `id_order_invoice`, `id_shop`, `product_id`, `product_attribute_id`,
-                                Db::getInstance()->execute('
+                        `product_name`, `product_quantity`, `product_quantity_in_stock`, `product_price`,
-                                    UPDATE `'._DB_PREFIX_.'order_detail`
+                        `product_reference`, `total_price_tax_excl`, `total_price_tax_incl`,
-                                    SET `product_quantity` = '.$item['quantity'].',
+                        `unit_price_tax_excl`, `unit_price_tax_incl`, `original_product_price`
-                                    `product_quantity_in_stock` = '.$item['quantity'].'
+                    )
-                                    WHERE `id_order_detail` = '.$orderItem['id_order_detail']
-                                );
-                            }
 
-                            unset($order['items'][$key]);
+                    VALUES';
-                        }
-                    }
-                }
 
-                /*
+                foreach ($order['items'] as $key => $newItem) {
-                 * Check new items
+                    $product_id = $newItem['offer']['externalId'];
-                 */
+                    $product_attribute_id = 0;
-                if (!empty($order['items'])) {
+                    if(strpos($product_id, '#') !== false) {
-                    foreach ($order['items'] as $key => $newItem) {
+                        $product_id = explode('#', $product_id);
-                        $product = new Product((int) $newItem['offer']['externalId'], false, $default_lang);
+
-                        $qty = $newItem['quantity'];
+                        $product_attribute_id = $product_id[1];
-                        $product_list[] = array('product' =>$product, 'quantity' => $qty);
+                        $product_id = $product_id[0];
                     }
 
+                    $product = new Product((int) $product_id, false, $default_lang);
 
-                    $query = 'INSERT `'._DB_PREFIX_.'order_detail`
+                    if($product_attribute_id != 0) {
-                        (
+                        $productName = htmlspecialchars(strip_tags(Product::getProductName($product_id, $product_attribute_id)));
-                            `id_order`, `id_order_invoice`, `id_shop`, `product_id`, `product_attribute_id`,
-                            `product_name`, `product_quantity`, `product_quantity_in_stock`, `product_price`,
-                            `product_reference`, `total_price_tax_excl`, `total_price_tax_incl`,
-                            `unit_price_tax_excl`, `unit_price_tax_incl`, `original_product_price`
-                        )
 
-                        VALUES';
+                        $productPrice = Combination::getPrice($product_attribute_id);
-
+                        $productPrice = $productPrice > 0 ? $productPrice : $product->price;
-                    foreach ($product_list as $product) {
+                    } else {
-                        $query .= '('
+                        $productName = htmlspecialchars(strip_tags($product->name));
-                            .(int) $orderToUpdate->id.',
+                        $productPrice = $product->price;
-                            0,
-                            '. Context::getContext()->shop->id.',
-                            '.(int) $product['product']->id.',
-                            0,
-                            '.implode('', array('\'', $product['product']->name, '\'')).',
-                            '.(int) $product['quantity'].',
-                            '.(int) $product['quantity'].',
-                            '.$product['product']->price.',
-                            '.implode('', array('\'', $product['product']->reference, '\'')).',
-                            '.$product['product']->price.',
-                            '.$product['product']->price.',
-                            '.$product['product']->price.',
-                            '.$product['product']->price.',
-                            '.$product['product']->price.'
-                        ),';
                     }
 
-                    Db::getInstance()->execute(rtrim($query, ','));
+                    $query .= '('
+                        .(int) $orderToUpdate->id.',
+                        0,
+                        '. Context::getContext()->shop->id.',
+                        '.(int) $product_id.',
+                        '.(int) $product_attribute_id.',
+                        '.implode('', array('\'', $productName, '\'')).',
+                        '.(int) $newItem['quantity'].',
+                        '.(int) $newItem['quantity'].',
+                        '.$productPrice.',
+                        '.implode('', array('\'', $product->reference, '\'')).',
+                        '.$productPrice * $newItem['quantity'].',
+                        '.($productPrice + $productPrice / 100 * 18) * $newItem['quantity'].',
+                        '.$productPrice.',
+                        '.($productPrice + $productPrice / 100 * 18).',
+                        '.$productPrice.'
+                    ),';
+
                     unset($order['items'][$key]);
                 }
 
-                /*
+                Db::getInstance()->execute(rtrim($query, ','));
-                 * Fix prices & discounts
+            }
-                 * Discounts only for whole order
-                 */
-                $orderDiscout = null;
-                $orderTotal = $order['summ'];
 
-                if (isset($order['discount']) && $order['discount'] > 0) {
+            /*
-                    if ($order['discount'] != $orderToUpdate->total_discounts) {
+             * Fix prices & discounts
-                        $orderDiscout = ($orderDiscout == null) ? $order['discount'] : $order['discount'] + $orderDiscout;
+             * Discounts only for whole order
-                    }
+             */
+            $orderDiscout = null;
+            $orderTotalProducts = 0;
+            foreach($orderToUpdate->getProductsDetail() as $orderItem) {
+                $orderTotalProducts += $orderItem['total_price_tax_incl'];
+            }
+            $orderTotalProducts = round($orderTotalProducts, 2);
+
+            if (isset($order['discount']) && $order['discount'] > 0) {
+                if ($order['discount'] != $orderToUpdate->total_discounts) {
+                    $orderDiscout = ($orderDiscout == null) ? $order['discount'] : $order['discount'] + $orderDiscout;
                 }
+            }
 
-                if (isset($order['discountPercent']) && $order['discountPercent'] > 0) {
+            if (isset($order['discountPercent']) && $order['discountPercent'] > 0) {
-                    $percent = ($order['summ'] * $order['discountPercent'])/100;
+                $percent = ($order['summ'] * $order['discountPercent'])/100;
-                    if ($percent != $orderToUpdate->total_discounts) {
+                if ($percent != $orderToUpdate->total_discounts) {
-                        $orderDiscout = ($orderDiscout == null) ? $percent : $percent + $orderDiscout;
+                    $orderDiscout = ($orderDiscout == null) ? $percent : $percent + $orderDiscout;
-                    }
                 }
+            }
 
-                $totalDiscount = ($orderDiscout == null) ? $orderToUpdate->total_discounts : $orderDiscout;
+            $totalDiscount = ($orderDiscout == null) ? $orderToUpdate->total_discounts : $orderDiscout;
 
-                if ($totalDiscount != $orderToUpdate->total_discounts || $orderTotal != $orderToUpdate->total_paid) {
+            $deliveryCost = $orderToUpdate->total_shipping;
-                    Db::getInstance()->execute('
+            if(!empty($order['delivery']['cost'])) {
-                        UPDATE `'._DB_PREFIX_.'orders`
+                $deliveryCost = $order['delivery']['cost'];
-                        SET `total_discounts` = '.$totalDiscount.',
+            }
-                        `total_discounts_tax_incl` = '.$totalDiscount.',
+
-                        `total_discounts_tax_excl` = '.$totalDiscount.',
+            $totalPaid = $deliveryCost + $orderTotalProducts;
-                        `total_paid` = '.$orderTotal.',
+
-                        `total_paid_tax_incl` = '.$orderTotal.',
+            if ($totalDiscount != $orderToUpdate->total_discounts ||
-                        `total_paid_tax_excl` = '.$orderTotal.'
+                $orderTotalProducts != $orderToUpdate->total_products_wt ||
-                        WHERE `id_order` = '.(int) $order['externalId']
+                $deliveryCost != $orderToUpdate->total_shipping
-                    );
+            ) {
-                }
+                Db::getInstance()->execute('
+                    UPDATE `'._DB_PREFIX_.'orders`
+                    SET `total_discounts` = '.$totalDiscount.',
+                    `total_discounts_tax_incl` = '.$totalDiscount.',
+                    `total_discounts_tax_excl` = '.$totalDiscount.',
+                    `total_shipping` = '.$deliveryCost.',
+                    `total_shipping_tax_incl` = '.$deliveryCost.',
+                    `total_shipping_tax_excl` = '.$deliveryCost.',
+                    `total_paid` = '.$totalPaid.',
+                    `total_paid_tax_incl` = '.$totalPaid.',
+                    `total_paid_tax_excl` = '.$totalPaid.',
+                    `total_products_wt` = '.$orderTotalProducts.'
+                    WHERE `id_order` = '.(int) $order['externalId']
+                );
             }
         }
     }

retailcrm/lib/CurlException.php

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

retailcrm/lib/InvalidJsonException.php

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

retailcrm/lib/RetailcrmApiResponse.php

@@ -1,8 +1,16 @@
 <?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
+class RetailcrmApiResponse implements \ArrayAccess
 {
     // HTTP response status code
     protected $statusCode;
@@ -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
+     * Offset set
-     * @param mixed $value
+     *
+     * @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];

retailcrm/lib/RetailcrmCatalog.php

@@ -12,7 +12,6 @@ class RetailcrmCatalog
 
     public function getData()
     {
-
         $id_lang = (int) Configuration::get('PS_LANG_DEFAULT');
         $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
         $shop_url = (Configuration::get('PS_SSL_ENABLED') ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
@@ -35,6 +34,8 @@ class RetailcrmCatalog
             );
         }
 
+        $link = new Link();
+
         $products = Product::getProducts($id_lang, 0, 0, 'name', 'asc');
 
         foreach ($products AS $product) {
@@ -53,78 +54,133 @@ class RetailcrmCatalog
                 }
             }
 
-            $link = new Link();
+            $version = substr(_PS_VERSION_, 0, 3);
-            $cover = Image::getCover($product['id_product']);
+            if ($version == "1.3") {
-
+                $available_for_order = $product['active'] && $product['quantity'];
-            $picture = 'http://' . $link->getImageLink($product['link_rewrite'], $product['id_product'] . '-' . $cover['id_image'], 'large_default');
+            } else {
-            if (!(substr($picture, 0, strlen($shop_url)) === $shop_url)) {
+                $available_for_order = $product['active'] && $product['available_for_order'];
-                $picture = rtrim($shop_url, "/") . $picture;
             }
 
             $crewrite = Category::getLinkRewrite($product['id_category_default'], $id_lang);
             $url = $link->getProductLink($product['id_product'], $product['link_rewrite'], $crewrite);
-            $version = substr(_PS_VERSION_, 0, 3);
-
-            if ($version == "1.3") {
-                $available_for_order = $product['active'] && $product['quantity'];
-                $quantity = $product['quantity'];
-            } else {
-                $prod = new Product($product['id_product']);
-                $available_for_order = $product['active'] && $product['available_for_order'] && $prod->checkQty(1);
-                $quantity = (int) StockAvailable::getQuantityAvailableByProduct($prod->id);
-            }
-
-            $item = array(
-                'id' => $product['id_product'],
-                'productId' => $product['id_product'],
-                'productActivity' => ($available_for_order) ? 'Y' : 'N',
-                'name' => htmlspecialchars(strip_tags($product['name'])),
-                'productName' => htmlspecialchars(strip_tags($product['name'])),
-                'categoryId' => array($category),
-                'picture' => $picture,
-                'url' => $url,
-                'quantity' => $quantity > 0 ? $quantity : 0
-            );
 
             if (!empty($product['wholesale_price'])) {
-                $item['purchasePrice'] = round($product['wholesale_price'], 2);
+                $purchasePrice = round($product['wholesale_price'], 2);
+            } else {
+                $purchasePrice = null;
             }
 
-            $item['price'] = !empty($product['rate'])
+            $price = !empty($product['rate'])
                 ? round($product['price'], 2) + (round($product['price'], 2) * $product['rate'] / 100)
                 : round($product['price'], 2)
-                ;
+            ;
-
 
             if (!empty($product['manufacturer_name'])) {
-                $item['vendor'] = $product['manufacturer_name'];
+                $vendor = $product['manufacturer_name'];
+            } else {
+                $vendor = null;
             }
 
             if (!empty($product['reference'])) {
-                $item['article'] = htmlspecialchars($product['reference']);
+                $article = htmlspecialchars($product['reference']);
+            } else {
+                $article = null;
             }
 
             $weight = round($product['weight'], 2);
-
+            if (empty($weight)) {
-            if (!empty($weight)) {
+                $weight = null;
-                $item['weight'] = $weight;
             }
 
             $width = round($product['width'], 2);
             $height = round($product['height'], 2);
             $depth = round($product['depth'], 2);
 
-            if (!empty($width)) {
+            if (!empty($width) && !empty($height)) {
-                if (!empty($height)) {
+                if (!empty($depth)) {
-                    if (!empty($depth)) {
+                    $size = implode('x', array($width, $height, $depth));
-                        $item['size'] = implode('x', array($width, $height, $depth));
+                } else {
-                    } else {
+                    $size = implode('x', array($width, $height));
-                        $item['size'] = implode('x', array($width, $height));
-                    }
                 }
+            } else {
+                $size = null;
+            }
+
+            $offers = Product::getProductAttributesIds($product['id_product']);
+
+            if(!empty($offers)) {
+                foreach($offers as $offer) {
+                    $pictures = array();
+                    $covers = Image::getImages($id_lang, $product['id_product'], $offer['id_product_attribute']);
+                    foreach($covers as $cover) {
+                        $picture = 'http://' . $link->getImageLink($product['link_rewrite'], $product['id_product'] . '-' . $cover['id_image'], 'large_default');
+                        $pictures[] = $picture;
+                    }
+
+                    if ($version == "1.3") {
+                        $quantity = $product['quantity'];
+                    } else {
+                        $quantity = (int) StockAvailable::getQuantityAvailableByProduct($product['id_product'], $offer['id_product_attribute']);
+                    }
+
+                    $offerPrice = Combination::getPrice($offer['id_product_attribute']);
+                    $offerPrice = $offerPrice > 0 ? $offerPrice : $price;
+
+                    $item = array(
+                        'id' => $product['id_product'] . '#' . $offer['id_product_attribute'],
+                        'productId' => $product['id_product'],
+                        'productActivity' => ($available_for_order) ? 'Y' : 'N',
+                        'name' => htmlspecialchars(strip_tags(Product::getProductName($product['id_product'], $offer['id_product_attribute']))),
+                        'productName' => htmlspecialchars(strip_tags($product['name'])),
+                        'categoryId' => array($category),
+                        'picture' => $pictures,
+                        'url' => $url,
+                        'quantity' => $quantity > 0 ? $quantity : 0,
+                        'purchasePrice' => $purchasePrice,
+                        'price' => round($offerPrice, 2),
+                        'vendor' => $vendor,
+                        'article' => $article,
+                        'weight' => $weight,
+                        'size' => $size
+                    );
+
+                    $items[] = $item;
+                }
+            } else {
+                $pictures = array();
+                $covers = Image::getImages($id_lang, $product['id_product'], null);
+                foreach($covers as $cover) {
+                    $picture = 'http://' . $link->getImageLink($product['link_rewrite'], $product['id_product'] . '-' . $cover['id_image'], 'large_default');
+                    $pictures[] = $picture;
+                }
+
+                if ($version == "1.3") {
+                    $quantity = $product['quantity'];
+                } else {
+                    $quantity = (int) StockAvailable::getQuantityAvailableByProduct($product['id_product']);
+                }
+
+                $item = array(
+                    'id' => $product['id_product'],
+                    'productId' => $product['id_product'],
+                    'productActivity' => ($available_for_order) ? 'Y' : 'N',
+                    'name' => htmlspecialchars(strip_tags($product['name'])),
+                    'productName' => htmlspecialchars(strip_tags($product['name'])),
+                    'categoryId' => array($category),
+                    'picture' => $pictures,
+                    'url' => $url,
+                    'quantity' => $quantity > 0 ? $quantity : 0,
+                    'purchasePrice' => round($purchasePrice, 2),
+                    'price' => $price,
+                    'vendor' => $vendor,
+                    'article' => $article,
+                    'weight' => $weight,
+                    'size' => $size
+                );
+
+                $items[] = $item;
             }
 
-            $items[] = $item;
         }
 
         return array($categories, $items);

retailcrm/lib/RetailcrmHistoryHelper.php

@@ -0,0 +1,108 @@
+<?php
+
+class RetailcrmHistoryHelper {
+    public static function assemblyOrder($orderHistory)
+    {
+        if (file_exists(_PS_ROOT_DIR_ . '/modules/retailcrm/objects.xml')) {
+            $objects = simplexml_load_file(_PS_ROOT_DIR_ . '/modules/retailcrm/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;
+    }
+}

retailcrm/lib/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 $path       request url
-     * @param string $method (default: 'GET')
+     * @param string $method     (default: 'GET')
-     * @param array $parameters (default: array())
+     * @param array  $parameters (default: array())
-     * @param int $timeout
+     *
-     * @param bool $verify
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @param bool $debug
+     *
-     * @return RetailcrmApiResponse
+     * @throws \InvalidArgumentException
+     * @throws CurlException
+     * @throws InvalidJsonException
+     *
+     * @return ApiResponse
      */
     public function makeRequest(
         $path,
         $method,
-        array $parameters = array(),
+        array $parameters = array()
-        $timeout = 30,
-        $verify = false,
-        $debug = false
     ) {
         $allowedMethods = array(self::METHOD_GET, self::METHOD_POST);
-        if (!in_array($method, $allowedMethods)) {
+
-            throw new InvalidArgumentException(sprintf(
+        if (!in_array($method, $allowedMethods, false)) {
-                'Method "%s" is not valid. Allowed methods are %s',
+            throw new \InvalidArgumentException(
-                $method,
+                sprintf(
-                implode(', ', $allowedMethods)
+                    '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();
+        $curlHandler = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($curlHandler, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curlHandler, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curlHandler, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($curlHandler, CURLOPT_FAILONERROR, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $verify);
+        curl_setopt($curlHandler, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $verify);
+        curl_setopt($curlHandler, CURLOPT_SSL_VERIFYHOST, false);
-
+        curl_setopt($curlHandler, CURLOPT_TIMEOUT, 30);
-        if (!$debug) {
+        curl_setopt($curlHandler, CURLOPT_CONNECTTIMEOUT, 30);
-            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));
-        }
 
         if (self::METHOD_POST === $method) {
-            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($curlHandler, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $parameters);
+            curl_setopt($curlHandler, CURLOPT_POSTFIELDS, $parameters);
         }
 
-        $responseBody = curl_exec($ch);
+        $responseBody = curl_exec($curlHandler);
-        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $statusCode = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);
-        $errno = curl_errno($ch);
+        $errno = curl_errno($curlHandler);
-        $error = curl_error($ch);
+        $error = curl_error($curlHandler);
 
-        curl_close($ch);
+        curl_close($curlHandler);
-
-        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
-            );
-        }
 
         if ($errno) {
             throw new CurlException($error, $errno);
@@ -105,9 +106,4 @@ class RetailcrmHttpClient
 
         return new RetailcrmApiResponse($statusCode, $responseBody);
     }
-
-    public function getRetry()
-    {
-        return $this->retry;
-    }
 }

retailcrm/lib/RetailcrmIcml.php

@@ -113,12 +113,24 @@ class RetailcrmIcml
             $offerKeys = array_keys($offer);
 
             foreach ($offerKeys as $key) {
+                if($offer[$key] == null) continue;
+
                 if (in_array($key, $this->properties)) {
-                    $e->appendChild(
+                    if(is_array($offer[$key])) {
+                        foreach($offer[$key] as $property) {
+                            $e->appendChild(
+                                $this->dd->createElement($key)
+                            )->appendChild(
+                                $this->dd->createTextNode(trim($property))
+                            );
+                        }
+                    } else {
+                        $e->appendChild(
                             $this->dd->createElement($key)
-                    )->appendChild(
+                        )->appendChild(
                             $this->dd->createTextNode(trim($offer[$key]))
-                    );
+                        );
+                    }
                 }
 
                 if (in_array($key, array_keys($this->params))) {

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>

retailcrm/retailcrm.php

@@ -20,8 +20,8 @@ class RetailCRM extends Module
     {
         $this->name = 'retailcrm';
         $this->tab = 'export';
-        $this->version = '2.0.1';
+        $this->version = '2.1.1';
-        $this->version = '2.0';
+        $this->version = '2.1';
         $this->author = 'Retail Driver LCC';
         $this->displayName = $this->l('RetailCRM');
         $this->description = $this->l('Integration module for RetailCRM');
@@ -38,7 +38,7 @@ class RetailCRM extends Module
             $this->bootstrap = true;
         }
 
-        if (!empty($this->apiUrl) && !empty($this->apiKey)) {
+        if ($this->validateCrmAddress($this->apiUrl) && !empty($this->apiKey)) {
             $this->api = new RetailcrmProxy($this->apiUrl, $this->apiKey, _PS_ROOT_DIR_ . '/retailcrm.log');
             $this->reference = new RetailcrmReferences($this->api);
         }
@@ -74,17 +74,6 @@ class RetailCRM extends Module
         $address = Configuration::get('RETAILCRM_ADDRESS');
         $token = Configuration::get('RETAILCRM_API_TOKEN');
 
-        if (!$address || $address == '') {
-            $output .= $this->displayError($this->l('Invalid or empty crm address'));
-        } elseif (!$token || $token == '') {
-            $output .= $this->displayError($this->l('Invalid or empty crm api token'));
-        } else {
-            $output .= $this->displayConfirmation(
-                $this->l('Timezone settings must be identical to both of your crm and shop') .
-                " <a target=\"_blank\" href=\"$address/admin/settings#t-main\">$address/admin/settings#t-main</a>"
-            );
-        }
-
         if (Tools::isSubmit('submit' . $this->name)) {
             $address = strval(Tools::getValue('RETAILCRM_ADDRESS'));
             $token = strval(Tools::getValue('RETAILCRM_API_TOKEN'));
@@ -92,7 +81,7 @@ class RetailCRM extends Module
             $status = json_encode(Tools::getValue('RETAILCRM_API_STATUS'));
             $payment = json_encode(Tools::getValue('RETAILCRM_API_PAYMENT'));
 
-            if (!$address || empty($address) || !Validate::isGenericName($address)) {
+            if (!$this->validateCrmAddress($address) || !Validate::isGenericName($address)) {
                 $output .= $this->displayError($this->l('Invalid crm address'));
             } elseif (!$token || empty($token) || !Validate::isGenericName($token)) {
                 $output .= $this->displayError($this->l('Invalid crm api token'));
@@ -103,9 +92,25 @@ class RetailCRM extends Module
                 Configuration::updateValue('RETAILCRM_API_STATUS', $status);
                 Configuration::updateValue('RETAILCRM_API_PAYMENT', $payment);
                 $output .= $this->displayConfirmation($this->l('Settings updated'));
+
+                $this->apiUrl = $address;
+                $this->apiKey = $token;
+                $this->api = new RetailcrmProxy($this->apiUrl, $this->apiKey, _PS_ROOT_DIR_ . '/retailcrm.log');
+                $this->reference = new RetailcrmReferences($this->api);
             }
         }
 
+        if (!$this->validateCrmAddress($this->apiUrl)) {
+            $output .= $this->displayError($this->l('Invalid or empty crm address'));
+        } elseif (!$token || $token == '') {
+            $output .= $this->displayError($this->l('Invalid or empty crm api token'));
+        } else {
+            $output .= $this->displayConfirmation(
+                $this->l('Timezone settings must be identical to both of your crm and shop') .
+                " <a target=\"_blank\" href=\"$address/admin/settings#t-main\">$address/admin/settings#t-main</a>"
+            );
+        }
+
         $this->display(__FILE__, 'retailcrm.tpl');
 
         return $output . $this->displayForm();
@@ -148,7 +153,7 @@ class RetailCRM extends Module
         );
 
 
-        if (!empty($this->apiUrl) && !empty($this->apiKey)) {
+        if ($this->api) {
             /*
              * Delivery
              */
@@ -287,103 +292,116 @@ class RetailCRM extends Module
 
         if (isset($params['orderStatus'])) {
 
-            $customer = array(
+                $customer = array(
-                'externalId' => $params['customer']->id,
+                    'externalId' => $params['customer']->id,
-                'lastName' => $params['customer']->lastname,
+                    'lastName' => $params['customer']->lastname,
-                'firstName' => $params['customer']->firstname,
+                    'firstName' => $params['customer']->firstname,
-                'email' => $params['customer']->email,
+                    'email' => $params['customer']->email,
-                'createdAt' => $params['customer']->date_add
+                    'createdAt' => $params['customer']->date_add
-            );
-
-            $order = array(
-                'externalId' => $params['order']->id,
-                'firstName' => $params['customer']->firstname,
-                'lastName' => $params['customer']->lastname,
-                'email' => $params['customer']->email,
-                'discount' => $params['order']->total_discounts,
-                'createdAt' => $params['order']->date_add,
-                'delivery' => array('cost' => $params['order']->total_shipping)
-            );
-
-            $cart = new Cart($params['cart']->id);
-            $addressCollection = $cart->getAddressCollection();
-            $address = array_shift($addressCollection);
-
-            if ($address instanceof Address) {
-                $phone = is_null($address->phone)
-                    ? is_null($address->phone_mobile) ? '' : $address->phone_mobile
-                    : $address->phone
-                ;
-
-                $postcode = $address->postcode;
-                $city = $address->city;
-                $addres_line = sprintf("%s %s", $address->address1, $address->address2);
-            }
-
-            if (!empty($postcode)) {
-                $customer['address']['index'] = $postcode;
-                $order['delivery']['address']['index'] = $postcode;
-            }
-
-            if (!empty($city)) {
-                $customer['address']['city'] = $city;
-                $order['delivery']['address']['city'] = $city;
-            }
-
-            if (!empty($addres_line)) {
-                $customer['address']['text'] = $addres_line;
-                $order['delivery']['address']['text'] = $addres_line;
-            }
-
-            if (!empty($phone)) {
-                $customer['phones'][] = array('number' => $phone);
-                $order['phone'] = $phone;
-            }
-
-            foreach ($cart->getProducts() as $item) {
-                $order['items'][] = array(
-                    'initialPrice' => !empty($item['rate'])
-                        ? $item['price'] + ($item['price'] * $item['rate'] / 100)
-                        : $item['price']
-                        ,
-                    'quantity' => $item['quantity'],
-                    'productId' => $item['id_product'],
-                    'productName' => $item['name']
                 );
-            }
 
-            $deliveryCode = $params['order']->id_carrier;
+                $order = array(
+                    'externalId' => $params['order']->id,
+                    'firstName' => $params['customer']->firstname,
+                    'lastName' => $params['customer']->lastname,
+                    'email' => $params['customer']->email,
+                    'discount' => $params['order']->total_discounts,
+                    'createdAt' => $params['order']->date_add,
+                    'delivery' => array('cost' => $params['order']->total_shipping)
+                );
 
-            if (array_key_exists($deliveryCode, $delivery) && !empty($delivery[$deliveryCode])) {
+                $cart = new Cart($params['cart']->id);
-                $order['delivery']['code'] = $delivery[$deliveryCode];
+                $addressCollection = $cart->getAddressCollection();
-            }
+                $address = array_shift($addressCollection);
 
-            if (Module::getInstanceByName('advancedcheckout') === false) {
+                if ($address instanceof Address) {
-                $paymentCode = $params['order']->module;
+                    $phone = is_null($address->phone)
-            } else {
+                        ? is_null($address->phone_mobile) ? '' : $address->phone_mobile
-                $paymentCode = $params['order']->payment;
+                        : $address->phone;
-            }
 
-            if (array_key_exists($paymentCode, $payment) && !empty($payment[$paymentCode])) {
+                    $postcode = $address->postcode;
-                $order['paymentType'] = $payment[$paymentCode];
+                    $city = $address->city;
-            }
+                    $addres_line = sprintf("%s %s", $address->address1, $address->address2);
+                }
 
-            $statusCode = $params['orderStatus']->id;
+                if (!empty($postcode)) {
+                    $customer['address']['index'] = $postcode;
+                    $order['delivery']['address']['index'] = $postcode;
+                }
 
-            if (array_key_exists($statusCode, $status) && !empty($status[$statusCode])) {
+                if (!empty($city)) {
-                $order['status'] = $status[$statusCode];
+                    $customer['address']['city'] = $city;
-            } else {
+                    $order['delivery']['address']['city'] = $city;
-                $order['status'] = ['new'];
+                }
-            }
 
-            $customerCheck = $this->api->customersGet($customer['externalId']);
+                if (!empty($addres_line)) {
+                    $customer['address']['text'] = $addres_line;
+                    $order['delivery']['address']['text'] = $addres_line;
+                }
 
-            if ($customerCheck === false) {
+                if (!empty($phone)) {
-                $this->api->customersCreate($customer);
+                    $customer['phones'][] = array('number' => $phone);
-            }
+                    $order['phone'] = $phone;
+                }
+
+                foreach ($cart->getProducts() as $item) {
+                    if(isset($item['id_product_attribute']) && $item['id_product_attribute'] > 0) {
+                        $productId = $item['id_product'] . '#' . $item['id_product_attribute'];
+                    } else {
+                        $productId = $item['id_product'];
+                    }
+
+                    $order['items'][] = array(
+                        'initialPrice' => !empty($item['rate'])
+                            ? $item['price'] + ($item['price'] * $item['rate'] / 100)
+                            : $item['price']
+                    ,
+                        'quantity' => $item['quantity'],
+                        'productId' => $productId,
+                        'productName' => $item['name']
+                    );
+                }
+
+                $deliveryCode = $params['order']->id_carrier;
+
+                if (array_key_exists($deliveryCode, $delivery) && !empty($delivery[$deliveryCode])) {
+                    $order['delivery']['code'] = $delivery[$deliveryCode];
+                }
+
+                if (Module::getInstanceByName('advancedcheckout') === false) {
+                    $paymentCode = $params['order']->module;
+                } else {
+                    $paymentCode = $params['order']->payment;
+                }
+
+                if (array_key_exists($paymentCode, $payment) && !empty($payment[$paymentCode])) {
+                    $order['paymentType'] = $payment[$paymentCode];
+                }
+
+                $statusCode = $params['orderStatus']->id;
+
+                if (array_key_exists($statusCode, $status) && !empty($status[$statusCode])) {
+                    $order['status'] = $status[$statusCode];
+                } else {
+                    $order['status'] = array('new');
+                }
+
+                $customerCheck = $this->api->customersGet($customer['externalId']);
+
+                if ($customerCheck === false) {
+                    $this->api->customersCreate($customer);
+                }
+
+                $order['customer']['externalId'] = $customer['externalId'];
+                $this->api->ordersCreate($order);
 
-            $order['customer']['externalId'] = $customer['externalId'];
-            $this->api->ordersCreate($order);
         }
     }
+
+    private function validateCrmAddress($address) {
+        if(preg_match("/https:\/\/(.*).retailcrm.ru/", $address) === 1)
+            return true;
+
+        return false;
+    }
 }