Merge 3ff21d102f into b1d013dd30

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v4.1.20
+* Added option to upload inventories
+
 ## v4.1.19
 * Added option to round order amount
 

README.md

@@ -72,3 +72,11 @@ Run this command (replace `/path/to/your/site` with the actual path to your site
 ```
 
 You should run this command only once.
+
+#### Setting inventories export
+
+Add to cron (replace `/path/to/your/site` with the actual path to your site):
+
+```
+*/15 * * * *  /usr/bin/php /path/to/your/site/system/library/retailcrm/cron/inventories.php >> /path/to/your/site/system/storage/logs/cronjob_inventories.log 2>&1
+```

VERSION

@@ -1 +1 @@
-4.1.19
+4.1.20

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

@@ -303,6 +303,9 @@ class ControllerExtensionModuleRetailcrm extends Controller
             'text_order_number',
             'summ_around',
             'text_summ_around',
+            'stock_upload',
+            'text_stock_upload',
+            'store_select',
             'icml_settings',
             'icml_service_enabled_label',
             'icml_service_description',
@@ -358,6 +361,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
             $_data['priceTypes'] = $this->model_extension_retailcrm_references
                 ->getPriceTypes();
             $_data['customerGroups'] = $this->model_customer_customer_group->getCustomerGroups();
+            $_data['crmStocks'] = $this->model_extension_retailcrm_references->getApiStores();
         }
 
         $config_data = [$this->moduleTitle . '_status'];
@@ -484,6 +488,17 @@ class ControllerExtensionModuleRetailcrm extends Controller
         }
     }
 
+    /**
+     * Inventories upload
+     *
+     * @return void
+     */
+    public function inventories()
+    {
+        $this->load->model('extension/retailcrm/inventories');
+        $this->model_extension_retailcrm_inventories->uploadInventories();
+    }
+
     /**
      * ICML generation
      *

src/upload/admin/language/en-gb/extension/module/retailcrm.php

@@ -74,6 +74,8 @@ $_['order_number']               = 'Order number';
 $_['text_order_number']          = 'Upload the order number to RetailCRM';
 $_['summ_around']               = 'Around total summ';
 $_['text_summ_around']          = 'Around the order total summ';
+$_['stock_upload']               = 'Inventories uploading';
+$_['text_stock_upload']          = 'Upload inventories';
 $_['icml_settings']              = 'ICML settings';
 $_['icml_service_enabled_label'] = 'Upload services in ICML';
 $_['icml_service_description']   = 'When the option is enabled, all products for which delivery is disabled will be considered as services and uploaded to CRM as services';
@@ -98,6 +100,12 @@ $_['color']                      = 'Color';
 $_['weight']                     = 'Weight';
 $_['size']                       = 'Size';
 
+$_['stock_from_crm']             = 'From CRM in Opencart';
+$_['stock_from_cms']             = 'From Opencart in CRM';
+$_['stock_not_upload']           = 'Do not upload inventories';
+$_['store_select']               = 'Store for upload inventories';
+$_['text_store']                 = 'Store: ';
+
 $_['text_yes']                   = 'Yes';
 $_['text_no']                    = 'No';
 

src/upload/admin/language/es-es/extension/module/retailcrm.php

@@ -74,6 +74,8 @@ $_['order_number']               = 'Número de pedido';
 $_['text_order_number']          = 'Transferir número de pedido a RetailCRM';
 $_['summ_around']               = 'Redondeo del costo del pedido';
 $_['text_summ_around']          = 'Redondear los costos del pedido a RetailCRM';
+$_['stock_upload']               = 'Descarga de residuos';
+$_['text_stock_upload']          = 'Descargar las sobras';
 $_['icml_settings']              = 'Ajustes de ICML';
 $_['icml_service_enabled_label'] = 'Subir servicios de ICML';
 $_['icml_service_description']   = 'Si habilita la opción, todos los productos para los que la entrega está desactivada se tratarán como servicios y se cargarán en CRM como servicios';
@@ -99,6 +101,12 @@ $_['color']                      = 'Color';
 $_['weight']                     = 'Peso';
 $_['size']                       = 'Tamaño';
 
+$_['stock_from_crm']             = 'De CRM a Opencart';
+$_['stock_from_cms']             = 'De Opencart a CRM';
+$_['stock_not_upload']           = 'No descargues las sobras';
+$_['store_select']               = 'Almacén de descarga';
+$_['text_store']                 = 'Depósito: ';
+
 $_['text_yes']                   = 'Sí';
 $_['text_no']                    = 'No';
 

src/upload/admin/language/ru-ru/extension/module/retailcrm.php

@@ -72,8 +72,10 @@ $_['retailcrm_missing_status']   = 'Статус пропавших заказо
 
 $_['order_number']               = 'Номер заказа';
 $_['text_order_number']          = 'Передавать номер заказа в RetailCRM';
-$_['summ_around']               = 'Округление суммы заказа';
-$_['text_summ_around']          = 'Округлять сумму заказа';
+$_['summ_around']                = 'Округление суммы заказа';
+$_['text_summ_around']           = 'Округлять сумму заказа';
+$_['stock_upload']               = 'Выгрузка остатков';
+$_['text_stock_upload']          = 'Выгружать остатки';
 $_['icml_settings']              = 'Настройки ICML';
 $_['icml_service_enabled_label'] = 'Выгружать услуги в ICML';
 $_['icml_service_description']   = 'При включении опции все товары, для которых отключена доставка, будут рассматриваться как услуги и загружаться в CRM как услуги';
@@ -100,6 +102,12 @@ $_['size']                       = 'Размер';
 
 $_['text_yes']                   = 'Да';
 $_['text_no']                    = 'Нет';
+
+$_['stock_from_crm']             = 'Из CRM в Opencart';
+$_['stock_from_cms']             = 'Из Opencart в CRM';
+$_['stock_not_upload']           = 'Не выгружать остатки';
+$_['store_select']               = 'Склад для выгрузки остатков в CRM';
+$_['text_store']                 = 'Склад: ';
 // Errors
 $_['error_permission']           = 'У вас недостаточно прав на изменение настроек модуля';
 

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

@@ -0,0 +1,42 @@
+<?php
+
+class ModelExtensionRetailcrmInventories extends Model {
+
+    public function uploadInventories()
+    {
+        $this->load->model('setting/setting');
+        
+        $module_setting = $this->model_setting_setting->getSetting('module_retailcrm');
+        $uploadType = $module_setting['module_retailcrm_stock_upload'];
+        $store = $module_setting['module_retailcrm_store_select'];
+
+        if ($uploadType === '1') {
+            $this->toCrmUpload($store);
+        }
+    }
+
+    public function toCrmUpload($store) {
+        $products = $this->model_catalog_product->getProducts([]);
+        $offers = [];
+
+        foreach ($products as $product) {
+           $offers[] = [
+               'externalId' => $product['product_id'],
+               'stores' => [['code' => $store, 'available' => $product['quantity']]]
+            ]; 
+        }
+
+        $packs = array_chunk($offers, 50);
+
+        foreach ($packs as $pack) {
+           $this->sendToCrm($pack);
+        }
+   }
+
+   public function sendToCrm($pack) {
+       $inventory_manager = $this->retailcrm->getInventoryManager(); 
+      
+       return $inventory_manager->storeInventoriesUpload($pack);
+   }
+}
+

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

@@ -40,10 +40,10 @@ class ModelExtensionRetailcrmReferences extends Model
     {
         $this->load->model('setting/store');
 
-        return array(
+        return [
             'opencart' => $this->getOpercartDeliveryTypes(),
             'retailcrm' => $this->getApiDeliveryTypes()
-        );
+        ];
     }
 
     /**
@@ -53,10 +53,10 @@ class ModelExtensionRetailcrmReferences extends Model
      */
     public function getOrderStatuses()
     {
-        return array(
+        return [
             'opencart' => $this->getOpercartOrderStatuses(),
             'retailcrm' => $this->getApiOrderStatuses()
-        );
+        ];
     }
 
     /**
@@ -66,10 +66,10 @@ class ModelExtensionRetailcrmReferences extends Model
      */
     public function getPaymentTypes()
     {
-        return array(
+        return [
             'opencart' => $this->getOpercartPaymentTypes(),
             'retailcrm' => $this->getApiPaymentTypes()
-        );
+        ];
     }
 
     /**
@@ -79,10 +79,10 @@ class ModelExtensionRetailcrmReferences extends Model
      */
     public function getCustomFields()
     {
-        return array(
+        return [
             'opencart' => $this->getOpencartCustomFields(),
             'retailcrm' => $this->getApiCustomFields()
-        );
+        ];
     }
 
     /**
@@ -95,7 +95,7 @@ class ModelExtensionRetailcrmReferences extends Model
         $this->load->model('localisation/order_status');
 
         return $this->model_localisation_order_status
-            ->getOrderStatuses(array());
+            ->getOrderStatuses([]);
     }
 
     /**
@@ -105,7 +105,7 @@ class ModelExtensionRetailcrmReferences extends Model
      */
     public function getOpercartPaymentTypes()
     {
-        $paymentTypes = array();
+        $paymentTypes = [];
         $files = glob(DIR_APPLICATION . 'controller/extension/payment/*.php');
 
         if ($files) {
@@ -151,11 +151,12 @@ class ModelExtensionRetailcrmReferences extends Model
     public function getApiDeliveryTypes()
     {
         $response = $this->retailcrmApiClient->deliveryTypesList();
+
         if (!$response) {
-            return array();
+            return [];
         }
 
-        return (!$response->isSuccessful()) ? array() : $response->deliveryTypes;
+        return (!$response->isSuccessful()) ? [] : $response->deliveryTypes;
     }
 
     /**
@@ -182,11 +183,12 @@ class ModelExtensionRetailcrmReferences extends Model
     public function getApiOrderStatuses()
     {
         $response = $this->retailcrmApiClient->statusesList();
+
         if (!$response) {
-            return array();
+            return [];
         }
 
-        return (!$response->isSuccessful()) ? array() : $response->statuses;
+        return (!$response->isSuccessful()) ? [] : $response->statuses;
     }
 
     /**
@@ -197,11 +199,28 @@ class ModelExtensionRetailcrmReferences extends Model
     public function getApiPaymentTypes()
     {
         $response = $this->retailcrmApiClient->paymentTypesList();
+
         if (!$response) {
-            return array();
+            return [];
         }
 
-        return (!$response->isSuccessful()) ? array() : $response->paymentTypes;
+        return (!$response->isSuccessful()) ? [] : $response->paymentTypes;
+    }
+
+    /**
+     * Get RetailCRM stores
+     *
+     * @return array
+     */
+    public function getApiStores()
+    {
+        $response = $this->retailcrmApiClient->StoresList();
+
+        if (!$response) {
+            return [];
+        }
+
+        return (!$response->isSuccessful()) ? [] : $response->stores;
     }
 
     /**
@@ -211,20 +230,21 @@ class ModelExtensionRetailcrmReferences extends Model
      */
     public function getApiCustomFields()
     {
-        $customers = $this->retailcrmApiClient->customFieldsList(array('entity' => 'customer'));
-        $orders = $this->retailcrmApiClient->customFieldsList(array('entity' => 'order'));
+        $customers = $this->retailcrmApiClient->customFieldsList(['entity' => 'customer']);
+        $orders = $this->retailcrmApiClient->customFieldsList(['entity' => 'order']);
+
         if (!$customers || !$orders) {
-            return array();
+            return [];
         }
 
-        $customFieldsCustomers = (!$customers->isSuccessful()) ? array() : $customers->customFields;
-        $customFieldsOrders = (!$orders->isSuccessful()) ? array() : $orders->customFields;
+        $customFieldsCustomers = (!$customers->isSuccessful()) ? [] : $customers->customFields;
+        $customFieldsOrders = (!$orders->isSuccessful()) ? [] : $orders->customFields;
 
         if (!$customFieldsCustomers && !$customFieldsOrders) {
-            return array();
+            return [];
         }
 
-        return array('customers' => $customFieldsCustomers, 'orders' => $customFieldsOrders);
+        return ['customers' => $customFieldsCustomers, 'orders' => $customFieldsOrders];
     }
 
     /**
@@ -235,10 +255,11 @@ class ModelExtensionRetailcrmReferences extends Model
     public function getPriceTypes()
     {
         $response = $this->retailcrmApiClient->priceTypesList();
+        
         if (!$response) {
-            return array();
+            return [];
         }
 
-        return (!$response->isSuccessful()) ? array() : $response->priceTypes;
+        return (!$response->isSuccessful()) ? [] : $response->priceTypes;
     }
 }

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

@@ -245,6 +245,51 @@
                   </div>
                 </div>
               </fieldset>
+              <fieldset>
+                <legend><?php echo $stock_upload; ?></legend>
+                <div class="form-group">
+                  <label class="col-sm-2 control-label" for="retailcrm_stock_upload"><?php echo $text_stock_upload; ?></label>
+                  <div class="col-sm-10">
+                    <label class="radio-inline">
+                      <input type="radio" name="retailcrm_stock_upload" value="2" <?php if (isset($saved_settings['retailcrm_stock_upload']) &&
+                      $saved_settings['retailcrm_stock_upload'] == 2) :
+                      echo 'checked'; endif; ?> />
+                      <?php echo $stock_from_crm; ?>
+                    </label>
+                    <label class="radio-inline">
+                      <input type="radio" name="retailcrm_stock_upload" value="1" <?php if (isset($saved_settings['retailcrm_stock_upload']) &&
+                      $saved_settings['retailcrm_stock_upload'] == 1) :
+                      echo 'checked'; endif; ?> />
+                      <?php echo $stock_from_cms; ?>
+                    </label>
+                    <label class="radio-inline">
+                      <input type="radio" name="retailcrm_stock_upload" value="0" <?php if (!isset($saved_settings['retailcrm_stock_upload']) ||
+                      $saved_settings['retailcrm_stock_upload'] == 0) :
+                      echo 'checked'; endif; ?> />
+                      <?php echo $stock_not_upload; ?>
+                    </label>
+                  </div>
+                </div>
+              </fieldset>
+              <fieldset>
+                <legend><?php echo $store_select; ?></legend>
+                <div class="form-group retailcrm_unit">
+                  <div class="row retailcrm_unit">
+                    <label class="col-sm-2 control-label" style="text-align:right!important;" for="retailcrm_store_select"><?php echo $text_store; ?></label>
+                    <div class="col-md-4 col-sm-10">
+                      <select id="retailcrm_store_select" name="retailcrm_store_select" class="form-control">
+                        <?php foreach ($crmStocks as $crmStock): ?>
+                        <?php if ($crmStock['active'] == true :?>
+                        <option value="<?php echo $crmStock['code'];?>" <?php if(isset($saved_settings['retailcrm_store_select']) && $crmStock['code'] == $saved_settings['retailcrm_store_select']):?> selected="selected"<?php endif;?>>
+                        <?php echo $$crmStock['name'];?>
+                        </option>
+                        <?php endif; ?>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                </div>
+              </fieldset>
               <fieldset>
                 <legend><?php echo $text_retailcrm_discount; ?></legend>
                 <div class="form-group">

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

@@ -258,6 +258,56 @@
                                     </div>
                                 </div>
                             </fieldset>
+                            <fieldset>
+                                <legend>{{ stock_upload }}</legend>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label" class="col-sm-2 control-label" for="module_retailcrm_stock_upload">{{ text_stock_upload }}</label>
+                                    <div class="col-sm-10">
+                                        <label class="control-label" class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_stock_upload" value="2"
+                                                    {% if saved_settings.module_retailcrm_stock_upload is defined and saved_settings.module_retailcrm_stock_upload == 2 %}
+                                                        checked
+                                                    {% endif %} />
+                                            {{ stock_from_crm }}
+                                        </label>
+                                        <label class="control-label" class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_stock_upload" value="1"
+                                                    {% if saved_settings.module_retailcrm_stock_upload is defined and saved_settings.module_retailcrm_stock_upload == 1 %}
+                                                        checked
+                                                    {% endif %} />
+                                            {{ stock_from_cms }}
+                                        </label>
+                                        <label class="control-label" class="radio-inline">
+                                            <input type="radio" name="module_retailcrm_stock_upload" value="0"
+                                                    {% if saved_settings.module_retailcrm_stock_upload is not defined or saved_settings.module_retailcrm_stock_upload == 0 %}
+                                                        checked
+                                                    {% endif %} />
+                                            {{ stock_not_upload }}
+                                        </label>
+                                    </div>
+                                </div>
+                            </fieldset>
+                                <fieldset>
+                                    {% if saved_settings.module_retailcrm_stock_upload is defined and saved_settings.module_retailcrm_stock_upload == 1 %}
+                                        <legend>{{ store_select }}</legend>
+                                        <div class="form-group retailcrm_unit">
+                                                <div class="row retailcrm_unit">
+                                                    <label class="col-sm-2 control-label" class="col-sm-2 control-label" for="module_retailcrm_store_select">{{ text_store }}</label>
+                                                    <div class="col-md-4 col-sm-10">
+                                                        <select id="module_retailcrm_store_select" name="module_retailcrm_store_select" class="form-control">
+                                                            {% for crmStock in crmStocks %}
+                                                                {% if crmStock.active == true %}
+                                                                    <option value ="{{ crmStock.code }}" {% if saved_settings.module_retailcrm_store_select is defined and crmStock.code == saved_settings.module_retailcrm_store_select %} selected="selected" {% endif %}>
+                                                                        {{ crmStock.name }}
+                                                                    </option>
+                                                                {% endif %}
+                                                            {% endfor %}
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                        </div>
+                                    {% endif %}
+                            </fieldset>
                             <fieldset>
                                 <legend>{{ text_retailcrm_discount }}</legend>
                                 <div class="form-group">

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

@@ -0,0 +1,3 @@
+<?php
+$cli_action = 'extension/module/retailcrm/inventories';
+require_once('dispatch.php');

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace retailcrm\service;
+
+class InventoryManager 
+{
+    private $api;
+
+    public function __construct(\RetailcrmProxy $api) {
+        $this->api = $api;
+    }
+
+    public function storeInventoriesUpload($pack) {
+       return  $this->api->storeInventoriesUpload($pack);
+    }
+}

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

@@ -9,6 +9,7 @@ use retailcrm\service\OrderManager;
 use retailcrm\factory\OrderConverterFactory;
 use retailcrm\factory\CustomerConverterFactory;
 use retailcrm\service\SettingsManager;
+use retailcrm\service\InventoryManager;
 
 require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
 
@@ -16,7 +17,7 @@ class Retailcrm {
 
     const RETAILCRM_DISCOUNT = 'retailcrm_discount';
     const RETAILCRM_DISCOUNT_SORT_ORDER = 8;
-    const VERSION_MODULE = '4.1.19';
+    const VERSION_MODULE = '4.1.20';
 
     protected $registry;
 
@@ -54,6 +55,10 @@ class Retailcrm {
         return new CorporateCustomer($this->getApiClient(), new CustomerRepository($this->registry));
     }
 
+    public function getInventoryManager() {
+        return new InventoryManager($this->getApiClient());
+    }
+
     /**
      * Get api client object
      *

tests/admin/ModelRetailcrmInventoryAdminTest.php

@@ -0,0 +1,37 @@
+<?php
+
+require_once __DIR__ . '/../' . getenv('TEST_SUITE') . '/TestCase.php';
+
+class ModelRetailcrmInventoryAdminTest extends TestCase
+{
+    private $inventoriesModel;
+    private $apiClientMock;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->inventoriesModel = $this->loadModel('extension/retailcrm/inventories');
+
+        $this->apiClientMock = $this->getMockBuilder(\RetailcrmProxy::class)
+            ->disableOriginalConstructor()
+            ->setMethods(array(
+                'storeInventoriesUpload',
+            ))
+            ->getMock();
+
+        self::$registry->set(\RetailcrmProxy::class, $this->apiClientMock);
+    }
+
+    public function testUploadToCrm()
+    {
+        $productModel = $this->loadModel('catalog/product');
+        $product = $productModel->getProducts([]);
+        $productSend = $this->inventoriesModel->uploadToCrm($product, $this->apiClientMock);
+        $product= $productSend[0][0];
+
+        $this->assertInternalType('array', $productSend);
+        $this->assertArrayHasKey('externalId', $product);
+        $this->assertArrayHasKey('stores', $product);
+    }
+}