From b1d013dd303e785750b03dace6dbd785aa7319ea Mon Sep 17 00:00:00 2001 From: ellynoize <111681973+ellynoize@users.noreply.github.com> Date: Mon, 20 Jan 2025 10:26:45 +0300 Subject: [PATCH] Added option to round order amount (#269) --- CHANGELOG.md | 3 +++ VERSION | 2 +- .../controller/extension/module/retailcrm.php | 2 ++ .../en-gb/extension/module/retailcrm.php | 2 ++ .../es-es/extension/module/retailcrm.php | 2 ++ .../ru-ru/extension/module/retailcrm.php | 2 ++ .../template/extension/module/retailcrm.tpl | 20 +++++++++++++++++ .../template/extension/module/retailcrm.twig | 22 +++++++++++++++++++ .../model/extension/retailcrm/order.php | 6 +++++ .../lib/service/RetailcrmOrderConverter.php | 8 ++++--- .../system/library/retailcrm/retailcrm.php | 2 +- 11 files changed, 66 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1313eee..00f8428 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v4.1.19 +* Added option to round order amount + ## v4.1.18 * Fixed constant with version of module. diff --git a/VERSION b/VERSION index 60623b5..3cee4a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.18 +4.1.19 diff --git a/src/upload/admin/controller/extension/module/retailcrm.php b/src/upload/admin/controller/extension/module/retailcrm.php index d755a07..8a47d52 100644 --- a/src/upload/admin/controller/extension/module/retailcrm.php +++ b/src/upload/admin/controller/extension/module/retailcrm.php @@ -301,6 +301,8 @@ class ControllerExtensionModuleRetailcrm extends Controller 'special_price', 'order_number', 'text_order_number', + 'summ_around', + 'text_summ_around', 'icml_settings', 'icml_service_enabled_label', 'icml_service_description', 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 aab7dd4..8e16810 100644 --- a/src/upload/admin/language/en-gb/extension/module/retailcrm.php +++ b/src/upload/admin/language/en-gb/extension/module/retailcrm.php @@ -72,6 +72,8 @@ $_['retailcrm_missing_status'] = 'Status of lost orders'; $_['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'; $_['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'; 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 9f88136..dad0cf8 100644 --- a/src/upload/admin/language/es-es/extension/module/retailcrm.php +++ b/src/upload/admin/language/es-es/extension/module/retailcrm.php @@ -72,6 +72,8 @@ $_['retailcrm_missing_status'] = 'Estado de pedidos perdidos'; $_['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'; $_['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'; 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 f7e0bd5..51ca02b 100644 --- a/src/upload/admin/language/ru-ru/extension/module/retailcrm.php +++ b/src/upload/admin/language/ru-ru/extension/module/retailcrm.php @@ -72,6 +72,8 @@ $_['retailcrm_missing_status'] = 'Статус пропавших заказо $_['order_number'] = 'Номер заказа'; $_['text_order_number'] = 'Передавать номер заказа в RetailCRM'; +$_['summ_around'] = 'Округление суммы заказа'; +$_['text_summ_around'] = 'Округлять сумму заказа'; $_['icml_settings'] = 'Настройки ICML'; $_['icml_service_enabled_label'] = 'Выгружать услуги в ICML'; $_['icml_service_description'] = 'При включении опции все товары, для которых отключена доставка, будут рассматриваться как услуги и загружаться в CRM как услуги'; diff --git a/src/upload/admin/view/template/extension/module/retailcrm.tpl b/src/upload/admin/view/template/extension/module/retailcrm.tpl index d33e75c..3b6808d 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.tpl +++ b/src/upload/admin/view/template/extension/module/retailcrm.tpl @@ -225,6 +225,26 @@ +
+ +
+ +
+ + +
+
+
diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig index a77a7a6..76b1106 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.twig +++ b/src/upload/admin/view/template/extension/module/retailcrm.twig @@ -236,6 +236,28 @@
+
+ {{ summ_around }} +
+ +
+ + +
+
+
{{ text_retailcrm_discount }}
diff --git a/src/upload/catalog/model/extension/retailcrm/order.php b/src/upload/catalog/model/extension/retailcrm/order.php index b91c596..1343eb6 100644 --- a/src/upload/catalog/model/extension/retailcrm/order.php +++ b/src/upload/catalog/model/extension/retailcrm/order.php @@ -136,6 +136,12 @@ class ModelExtensionRetailcrmOrder extends Model { $order['number'] = $order_data['order_id']; } + if (isset($this->settings[$this->moduleTitle . '_summ_around']) + && $this->settings[$this->moduleTitle . '_summ_around'] == 1 + ) { + $order['applyRound'] = true; + } + $order['externalId'] = $order_id; $order['firstName'] = $order_data['shipping_firstname']; $order['lastName'] = $order_data['shipping_lastname']; diff --git a/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php b/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php index 6d0d6ae..3130f7b 100644 --- a/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php +++ b/src/upload/system/library/retailcrm/lib/service/RetailcrmOrderConverter.php @@ -43,12 +43,14 @@ class RetailcrmOrderConverter { $this->data['countryIso'] = $this->order_data['shipping_iso_code_2']; } - if ($this->settingsManager->getSetting('order_number') - && $this->settingsManager->getSetting('order_number') == 1 - ) { + if ($this->settingsManager->getSetting('order_number') == 1) { $this->data['number'] = $this->order_data['order_id']; } + if ($this->settingsManager->getSetting('summ_around') == 1) { + $this->data['applyRound'] = true; + } + $this->data['externalId'] = $this->order_data['order_id']; $this->data['firstName'] = $this->order_data['shipping_firstname']; $this->data['lastName'] = $this->order_data['shipping_lastname']; diff --git a/src/upload/system/library/retailcrm/retailcrm.php b/src/upload/system/library/retailcrm/retailcrm.php index 5207368..7c980ed 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.18'; + const VERSION_MODULE = '4.1.19'; protected $registry;