From 5f6d2480c4f2f0bbeda810672dfead8f956ae142 Mon Sep 17 00:00:00 2001 From: ellynoize Date: Thu, 23 Jan 2025 12:24:24 +0300 Subject: [PATCH 01/12] add radio --- .../controller/extension/module/retailcrm.php | 2 ++ .../ru-ru/extension/module/retailcrm.php | 6 ++++ .../template/extension/module/retailcrm.tpl | 26 +++++++++++++++++ .../template/extension/module/retailcrm.twig | 29 +++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/src/upload/admin/controller/extension/module/retailcrm.php b/src/upload/admin/controller/extension/module/retailcrm.php index 8a47d52..5b681bb 100644 --- a/src/upload/admin/controller/extension/module/retailcrm.php +++ b/src/upload/admin/controller/extension/module/retailcrm.php @@ -303,6 +303,8 @@ class ControllerExtensionModuleRetailcrm extends Controller 'text_order_number', 'summ_around', 'text_summ_around', + 'stock_upload', + 'text_stock_upload', 'icml_settings', 'icml_service_enabled_label', 'icml_service_description', 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 51ca02b..f160833 100644 --- a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php +++ b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php @@ -74,6 +74,8 @@ $_['order_number'] = 'Номер заказа'; $_['text_order_number'] = 'Передавать номер заказа в RetailCRM'; $_['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,10 @@ $_['size'] = 'Размер'; $_['text_yes'] = 'Да'; $_['text_no'] = 'Нет'; + +$_['stock_from_crm'] = 'Из CRM в Opencart'; +$_['stock_from_cms'] = 'Из Opencart в CRM'; +$_['stock_not_upload'] = 'Не выгружать остатки'; // Errors $_['error_permission'] = 'У вас недостаточно прав на изменение настроек модуля'; diff --git a/src/upload/admin/view/template/extension/module/retailcrm.tpl b/src/upload/admin/view/template/extension/module/retailcrm.tpl index 3b6808d..0a3e11f 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.tpl +++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl @@ -245,6 +245,32 @@ +
+ +
+ +
+ + + +
+
+
diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig index 76b1106..3741953 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.twig +++ b/src/upload/admin/view/template/extension/module/retailcrm.twig @@ -258,6 +258,35 @@
+
+ {{ stock_upload }} +
+ +
+ + + +
+
+
{{ text_retailcrm_discount }}
From a2309e3a5b6da3162493d59a54fa5d4a9c9d1ec4 Mon Sep 17 00:00:00 2001 From: ellynoize Date: Thu, 23 Jan 2025 16:10:00 +0300 Subject: [PATCH 02/12] add stocks --- .../controller/extension/module/retailcrm.php | 2 ++ .../ru-ru/extension/module/retailcrm.php | 4 +++- .../model/extension/retailcrm/references.php | 15 +++++++++++++ .../template/extension/module/retailcrm.tpl | 19 +++++++++++++++++ .../template/extension/module/retailcrm.twig | 21 +++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) 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 }} From a2a844a37f10cf61c72be7043bc3d2d6b8839ca6 Mon Sep 17 00:00:00 2001 From: ellynoize Date: Thu, 23 Jan 2025 16:18:02 +0300 Subject: [PATCH 03/12] bump --- CHANGELOG.md | 3 +++ VERSION | 2 +- src/upload/system/library/retailcrm/retailcrm.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00f8428..cd7b29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v4.1.20 +* Added option to upload inventories + ## v4.1.19 * Added option to round order amount diff --git a/VERSION b/VERSION index 3cee4a0..b76ffaa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.19 +4.1.20 diff --git a/src/upload/system/library/retailcrm/retailcrm.php b/src/upload/system/library/retailcrm/retailcrm.php index 7c980ed..c4ce323 100644 --- a/src/upload/system/library/retailcrm/retailcrm.php +++ b/src/upload/system/library/retailcrm/retailcrm.php @@ -16,7 +16,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; From b63dbf3459eb4e744f6fd3cb5696b7ec0748262d Mon Sep 17 00:00:00 2001 From: ellynoize Date: Fri, 24 Jan 2025 08:49:59 +0300 Subject: [PATCH 04/12] add translates --- .../admin/language/en-gb/extension/module/retailcrm.php | 8 ++++++++ .../admin/language/es-es/extension/module/retailcrm.php | 8 ++++++++ .../admin/language/ru-ru/extension/module/retailcrm.php | 6 +++--- .../admin/view/template/extension/module/retailcrm.tpl | 2 +- .../admin/view/template/extension/module/retailcrm.twig | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/upload/admin/language/en-gb/extension/module/retailcrm.php b/src/upload/admin/language/en-gb/extension/module/retailcrm.php index 8e16810..6ebc904 100644 --- a/src/upload/admin/language/en-gb/extension/module/retailcrm.php +++ b/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'; diff --git a/src/upload/admin/language/es-es/extension/module/retailcrm.php b/src/upload/admin/language/es-es/extension/module/retailcrm.php index dad0cf8..1f25bc8 100644 --- a/src/upload/admin/language/es-es/extension/module/retailcrm.php +++ b/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'; 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 9446d73..12a8363 100644 --- a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php +++ b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php @@ -72,8 +72,8 @@ $_['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'; @@ -107,7 +107,7 @@ $_['stock_from_crm'] = 'Из CRM в Opencart'; $_['stock_from_cms'] = 'Из Opencart в CRM'; $_['stock_not_upload'] = 'Не выгружать остатки'; $_['store_select'] = 'Склад для выгрузки остатков в CRM'; -$_['text_store'] = 'Склад: '; +$_['text_store'] = 'Склад: '; // Errors $_['error_permission'] = 'У вас недостаточно прав на изменение настроек модуля'; diff --git a/src/upload/admin/view/template/extension/module/retailcrm.tpl b/src/upload/admin/view/template/extension/module/retailcrm.tpl index d9bedaf..a168ccb 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.tpl +++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl @@ -280,7 +280,7 @@ +