From d20035bf02bce56c86ecc279ef90d6cbcaa1422b Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Wed, 18 Oct 2023 09:49:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/general/services/BitrixOrderService.php           | 2 +-
 .../lang/en/classes/general/history/RetailCrmHistory_v4.php   | 4 ----
 .../lang/en/classes/general/services/BitrixOrderService.php   | 1 +
 .../lang/ru/classes/general/history/RetailCrmHistory_v4.php   | 4 ----
 .../lang/ru/classes/general/services/BitrixOrderService.php   | 3 +++
 intaro.retailcrm/lang/ru/options.php                          | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php
 create mode 100644 intaro.retailcrm/lang/en/classes/general/services/BitrixOrderService.php
 delete mode 100644 intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php
 create mode 100644 intaro.retailcrm/lang/ru/classes/general/services/BitrixOrderService.php

diff --git a/intaro.retailcrm/classes/general/services/BitrixOrderService.php b/intaro.retailcrm/classes/general/services/BitrixOrderService.php
index a1f5ba0b..f0f3c9ae 100644
--- a/intaro.retailcrm/classes/general/services/BitrixOrderService.php
+++ b/intaro.retailcrm/classes/general/services/BitrixOrderService.php
@@ -38,7 +38,7 @@ class BitrixOrderService
                 ]);
 
                 if (!empty($arStore['ADDRESS'])) {
-                    $address = 'Пункт самовывоза: ' . $arStore['ADDRESS'];
+                    $address = GetMessage('PICKUP_POINT') . $arStore['ADDRESS'];
 
                     break;
                 }
diff --git a/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php
deleted file mode 100644
index dd398abf..00000000
--- a/intaro.retailcrm/lang/en/classes/general/history/RetailCrmHistory_v4.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$MESS["NO_DELIVERY"] = "No delivery";
-$MESS["PRICE_TYPE"] = "RetailCRM price";
diff --git a/intaro.retailcrm/lang/en/classes/general/services/BitrixOrderService.php b/intaro.retailcrm/lang/en/classes/general/services/BitrixOrderService.php
new file mode 100644
index 00000000..b3d9bbc7
--- /dev/null
+++ b/intaro.retailcrm/lang/en/classes/general/services/BitrixOrderService.php
@@ -0,0 +1 @@
+<?php
diff --git a/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php b/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php
deleted file mode 100644
index bcd505fd..00000000
--- a/intaro.retailcrm/lang/ru/classes/general/history/RetailCrmHistory_v4.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$MESS["NO_DELIVERY"] = "Без доставки";
-$MESS["PRICE_TYPE"] = "Цена RetailCRM";
diff --git a/intaro.retailcrm/lang/ru/classes/general/services/BitrixOrderService.php b/intaro.retailcrm/lang/ru/classes/general/services/BitrixOrderService.php
new file mode 100644
index 00000000..8eedb0f6
--- /dev/null
+++ b/intaro.retailcrm/lang/ru/classes/general/services/BitrixOrderService.php
@@ -0,0 +1,3 @@
+<?php
+
+$MESS["PICKUP_POINT"] = "Пункт самовывоза: ";
diff --git a/intaro.retailcrm/lang/ru/options.php b/intaro.retailcrm/lang/ru/options.php
index 997f08f9..0d18abf6 100644
--- a/intaro.retailcrm/lang/ru/options.php
+++ b/intaro.retailcrm/lang/ru/options.php
@@ -90,7 +90,7 @@ $MESS ['CRM_API_VERSION'] = 'Версия API клиента';
 $MESS ['CURRENCY'] = 'Валюта, устанавливаемая в заказе при выгрузке из CRM';
 $MESS ['ORDER_DIMENSIONS'] = 'Передавать габариты и вес товаров в заказе';
 $MESS ['SEND_PICKUP_POINT_ADDRESS'] = 'Передавать пункт самовывоза';
-$MESS ['SEND_PICKUP_POINT_ADDRESS_WARNING'] = 'Важно! Корректность передачи данных работает при одной добавленной отгрузке в заказе 1C-Bitrix';
+$MESS ['SEND_PICKUP_POINT_ADDRESS_WARNING'] = 'Важно! Адрес пункта самовывоза корректно передается при одной добавленной отгрузке в заказе 1C-Bitrix. Если у вас добавлено более одной отгрузки, будет передана только первая.';
 $MESS ['SEND_PAYMENT_AMOUNT'] = 'Передавать сумму оплаты в заказе';
 
 $MESS ['INVENTORIES_UPLOAD'] = 'Включить выгрузку остатков в разрезе складов';