diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/account.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/account.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/account.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/account.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/component.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/component.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/component.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/component.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/images/sec-unlocked.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/images/sec-unlocked.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/images/sec-unlocked.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/images/sec-unlocked.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/images/sec.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/images/sec.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/images/sec.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/images/sec.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/lang/en/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/lang/en/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/lang/en/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/lang/en/template.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/lang/ru/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/lang/ru/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/lang/ru/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/lang/ru/template.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.js b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.js similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.js rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.js diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.map.js b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.map.js similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.map.js rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.map.js diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.min.js b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.min.js similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/script.min.js rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/script.min.js diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/style.css b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/style.css similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/style.css rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/style.css diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/style.min.css b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/style.min.css similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/style.min.css rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/style.min.css diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/bitrix/main.profile/.default/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/bitrix/main.profile/.default/template.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_black.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_black.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_black.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_black.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_blue.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_blue.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_blue.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_blue.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_green.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_green.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_green.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_green.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_red.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_red.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_red.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_red.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_yellow.png b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_yellow.png similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/images/wt_yellow.png rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/images/wt_yellow.png diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/index.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/index.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/index.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/index.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/account.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/account.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/account.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/account.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/index.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/index.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/index.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/index.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_cancel.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_cancel.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_cancel.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_cancel.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_list.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_list.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/order_list.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/order_list.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/orders.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/orders.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/orders.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/orders.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/private.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/private.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/private.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/private.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile_list.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile_list.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/profile_list.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/profile_list.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/subscribe.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/subscribe.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/subscribe.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/subscribe.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/en/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/en/template.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/account.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/account.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/account.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/account.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/index.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/index.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/index.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/index.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_cancel.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_cancel.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_cancel.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_cancel.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_list.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_list.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/order_list.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/order_list.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/orders.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/orders.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/orders.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/orders.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/private.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/private.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/private.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/private.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile_list.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile_list.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/profile_list.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/profile_list.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/subscribe.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/subscribe.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/subscribe.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/subscribe.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/lang/ru/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/lang/ru/template.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/order_cancel.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/order_cancel.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/order_cancel.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/order_cancel.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/order_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/order_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/order_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/order_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/orders.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/orders.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/orders.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/orders.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/private.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/private.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/private.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/private.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/profile.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/profile.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/profile.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/profile.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/profile_detail.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/profile_detail.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/profile_detail.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/profile_detail.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/style.css b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/style.css similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/style.css rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/style.css diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/style.min.css b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/style.min.css similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/style.min.css rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/style.min.css diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/subscribe.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/subscribe.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/subscribe.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/subscribe.php diff --git a/intaro.retailcrm/install/export/local/components/intaro/subscribe/template.php b/intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/template.php similarity index 100% rename from intaro.retailcrm/install/export/local/components/intaro/subscribe/template.php rename to intaro.retailcrm/install/export/local/components/intaro/sale.personal.section/template.php diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index 8af46c6a..f0192c0d 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -15,6 +15,7 @@ use Bitrix\Sale\EventActions; use Bitrix\Sale\Internals\OrderTable; use Intaro\RetailCrm\Component\ConfigProvider; use Intaro\RetailCrm\Component\Installer\LoyaltyInstallerTrait; +use Intaro\RetailCrm\Component\Installer\SubscriberInstallerTrait; use Intaro\RetailCrm\Service\OrderLoyaltyDataService; use Intaro\RetailCrm\Vendor\Symfony\Component\Process\PhpExecutableFinder; use RetailCrm\ApiClient; @@ -30,10 +31,12 @@ if (class_exists('intaro_retailcrm')) { } include(__DIR__ . '/../lib/component/installer/loyaltyinstallertrait.php'); +include (__DIR__ . '/../lib/component/installer/subscriberinstallertrait.php'); class intaro_retailcrm extends CModule { use LoyaltyInstallerTrait; + use SubscriberInstallerTrait; public const V5 = 'v5'; public $MODULE_ID = 'intaro.retailcrm'; @@ -252,6 +255,8 @@ class intaro_retailcrm extends CModule $this->addLPEvents(); $this->addAgreement(); + $this->CopyFilesSubscribe(); + OrderLoyaltyDataService::createLoyaltyHlBlock(); $service = new OrderLoyaltyDataService(); @@ -1094,6 +1099,7 @@ class intaro_retailcrm extends CModule ); $this->CopyFiles(); + $this->CopyFilesSubscribe(); COption::RemoveOption($this->MODULE_ID, $this->CRM_CATALOG_BASE_PRICE); diff --git a/intaro.retailcrm/lib/component/installer/subscriberinstallertrait.php b/intaro.retailcrm/lib/component/installer/subscriberinstallertrait.php new file mode 100644 index 00000000..c63f6d5c --- /dev/null +++ b/intaro.retailcrm/lib/component/installer/subscriberinstallertrait.php @@ -0,0 +1,46 @@ +