diff --git a/src/upload/admin/controller/extension/module/retailcrm.php b/src/upload/admin/controller/extension/module/retailcrm.php index 5b681bb..31b99de 100644 --- a/src/upload/admin/controller/extension/module/retailcrm.php +++ b/src/upload/admin/controller/extension/module/retailcrm.php @@ -305,6 +305,7 @@ class ControllerExtensionModuleRetailcrm extends Controller 'text_summ_around', 'stock_upload', 'text_stock_upload', + 'store_select', 'icml_settings', 'icml_service_enabled_label', 'icml_service_description', @@ -360,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']; diff --git a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php index f160833..9446d73 100644 --- a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php +++ b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php @@ -105,7 +105,9 @@ $_['text_no'] = 'Нет'; $_['stock_from_crm'] = 'Из CRM в Opencart'; $_['stock_from_cms'] = 'Из Opencart в CRM'; -$_['stock_not_upload'] = 'Не выгружать остатки'; +$_['stock_not_upload'] = 'Не выгружать остатки'; +$_['store_select'] = 'Склад для выгрузки остатков в CRM'; +$_['text_store'] = 'Склад: '; // Errors $_['error_permission'] = 'У вас недостаточно прав на изменение настроек модуля'; diff --git a/src/upload/admin/model/extension/retailcrm/references.php b/src/upload/admin/model/extension/retailcrm/references.php index fe76a77..229a701 100644 --- a/src/upload/admin/model/extension/retailcrm/references.php +++ b/src/upload/admin/model/extension/retailcrm/references.php @@ -204,6 +204,21 @@ class ModelExtensionRetailcrmReferences extends Model return (!$response->isSuccessful()) ? array() : $response->paymentTypes; } + /** + * Get RetailCRM stores + * + * @return array + */ + public function getApiStores() + { + $response = $this->retailcrmApiClient->StoresList(); + if (!$response) { + return array(); + } + + return (!$response->isSuccessful()) ? array() : $response->stores; + } + /** * Get RetailCRM custom fields * diff --git a/src/upload/admin/view/template/extension/module/retailcrm.tpl b/src/upload/admin/view/template/extension/module/retailcrm.tpl index 0a3e11f..d9bedaf 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.tpl +++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl @@ -271,6 +271,25 @@ +
+ +
+
+ +
+ +
+
+
+
diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig index 3741953..83dbb0d 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.twig +++ b/src/upload/admin/view/template/extension/module/retailcrm.twig @@ -286,6 +286,27 @@
+
+
+ {% if saved_settings.module_retailcrm_stock_upload is defined and saved_settings.module_retailcrm_stock_upload == 1 %} + {{ store_select }} +
+
+ +
+ +
+
+
+ {% endif %}
{{ text_retailcrm_discount }}