From 2da4187b59e312757aac66a70f1ebb9e9bc74205 Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Mon, 5 Jun 2023 00:07:10 +0300
Subject: [PATCH 01/19] Add ui for import

---
 _build/data/transport.settings.php            |  11 +
 .../minishop2/js/mgr/utilites/import/panel.js | 212 ++++++++++++++++++
 .../minishop2/js/mgr/utilites/panel.js        |   4 +-
 .../controllers/mgr/utilites.class.php        |   5 +
 .../minishop2/lexicon/ru/manager.inc.php      |  14 ++
 .../minishop2/lexicon/ru/setting.inc.php      |   3 +
 .../mgr/utilites/import/import.class.php      |  86 +++++++
 .../mgr/utilites/import/saveconfig.class.php  |  63 ++++++
 8 files changed, 395 insertions(+), 3 deletions(-)
 create mode 100644 assets/components/minishop2/js/mgr/utilites/import/panel.js
 create mode 100644 core/components/minishop2/processors/mgr/utilites/import/import.class.php
 create mode 100644 core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php

diff --git a/_build/data/transport.settings.php b/_build/data/transport.settings.php
index 89a8749e0..1fb4196da 100644
--- a/_build/data/transport.settings.php
+++ b/_build/data/transport.settings.php
@@ -357,6 +357,17 @@
         'value' => '2,3',
         'xtype' => 'textfield',
         'area' => 'ms2_statuses',
+    ],
+
+    'ms2_utility_import_fields' => [
+        'value' => 'article,pagetitle,price',
+        'xtype' => 'textfield',
+        'area' => 'ms2_import',
+    ],
+    'ms2_utility_import_fields_delimiter' => [
+        'value' => ';',
+        'xtype' => 'textfield',
+        'area' => 'ms2_import',
     ]
 ];
 
diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilites/import/panel.js
new file mode 100644
index 000000000..2bc1554bb
--- /dev/null
+++ b/assets/components/minishop2/js/mgr/utilites/import/panel.js
@@ -0,0 +1,212 @@
+miniShop2.panel.UtilitesImport = function (config) {
+    config = config || {};
+
+    Ext.apply(config, { 
+		cls: 'container form-with-labels',
+		autoHeight: true,  
+		url: miniShop2.config.connector_url,
+		progress:true,
+		id: 'ms2-panel-import',
+		baseParams: {
+			action: 'mgr/utility/import/import'
+		}, 
+        items: [{
+            layout: 'column',
+            border: false,
+            anchor: '100%',
+            cls: 'main-wrapper',
+            labelAlign: 'top',
+            buttonAlign: 'left', 
+            style: 'padding: 0 0 0 7px',
+            items: [{
+                columnWidth: 0.5,
+                layout: 'form',
+                defaults: { msgTarget: 'under' },
+                border: false,
+                style: { margin: '0' },
+                items: [
+                    {
+                        xtype: 'modx-combo-browser',
+                        fieldLabel: _('ms2_utilites_import_label_file'),
+                        emptyText: _('ms2_utilites_import_label_file_empty'),
+                        anchor: '81%',
+                        name: 'importfile',
+                        allowBlank: false,
+                    }, 
+                    {
+                        layout: 'column',
+                        items:[{
+                            columnWidth: 0.8,
+                            layout: 'form',
+                            border: false,
+                            style: { margin: '0' },
+                            items:[
+                                {
+                                    xtype: 'textfield',
+                                    name: 'fields',
+                                    value: miniShop2.config.utility_import_fields,
+                                    width: '99%',
+                                    fieldLabel: _('ms2_utilites_import_label_fields'),
+                                    allowBlank: false,
+                                }, 
+                                {
+                                    xtype: 'textfield',
+                                    name: 'delimiter',
+                                    value:  miniShop2.config.utility_import_fields_delimiter,
+                                    width: '99%',
+                                    allowBlank: false,
+                                    fieldLabel: _('ms2_utilites_import_label_delimiter'),
+                                }
+                            ]
+                        },
+                        {
+                            columnWidth: 0.2,
+                            layout: 'form',
+                            border: false,
+                            style: { margin: '20px 0 0 15px' },
+                            items:[
+                                {
+                                    xtype: 'button',
+                                    style: 'padding: 4px 10px 7px; margin: 18px 0 0 0',
+                                    tooltip: _('ms2_utilites_import_save_fields'),
+                                    text: '<i class="icon icon-save"></i>',
+                                    handler: function() {
+                                        this.saveConfig(this);
+                                    }, scope: this
+                                } 
+                            ]
+                            
+                        }]
+                    },
+                    {
+                        xtype: 'xcheckbox',
+                        name: 'update',
+                        value: 1,
+                        id: 'ms-utilites-import-update',
+                        boxLabel: _('ms2_utilites_import_update_products'), 
+                        labelAlign: 'right',
+                        listeners: { 
+                            check: {
+                                fn : this.onUpdateNeed,
+                                scope : this
+                            },
+                        }    
+                    }, 
+                    {
+                        xtype: 'textfield',
+                        name: 'key',
+                        value: 'article', 
+                        width: '99%',
+                        hidden: true,
+                        id: 'ms-utilites-import-key',
+                        fieldLabel: _('ms2_utilites_import_update_key'),
+                    }, 
+                    {
+                        xtype: 'xcheckbox',
+                        name: 'debug',
+                        value: 1,
+                        hideLabel: true,
+                        id: 'ms-utilites-import-debug',
+                        boxLabel: _('ms2_utilites_import_debug'), 
+                        labelAlign: 'right', 
+                    }, 
+                    {
+                        xtype: 'xcheckbox',
+                        name: 'scheduler',
+                        value: 1,
+                        hideLabel: true,
+                        id: 'ms-utilites-import-scheduler',
+                        boxLabel: _('ms2_utilites_import_use_scheduler'), 
+                        labelAlign: 'right', 
+                    }, 
+                    { 
+                        xtype: 'button',
+                        style: 'margin: 25px 0 0 2px',
+                        text: '<i class="icon icon-download"></i> &nbsp;'+_('ms2_utilites_import_submit'),
+                        handler: function() {
+                            this.submit(this);
+                        }, scope: this
+                    }
+                ]
+            }/*, {
+                columnWidth: 0.5,
+                layout: 'form',
+                defaults: { msgTarget: 'under' },
+                border: false,
+                style: { margin: '0 0 0 20px' },
+                items: [
+                    {
+                        xtype: 'fieldset',
+                        title: 'Инструкция',
+                        id: 'ms2-utilites-import-instruction',
+                        cls: 'x-fieldset-checkbox-toggle',
+                        style: 'margin: 5px 0 15px; padding: 20px; ',
+                        collapsible: true,
+                        collapsed: true,
+                        stateful: true, 
+                        labelAlign: 'top',
+                        stateEvents: ['collapse', 'expand'],
+                        items: [
+                            {
+                                html:  ''
+                            },
+                        ]
+                    }
+                ]
+            }*/]
+        }] ,
+        listeners: { 
+            success: {fn: function(response) {
+				var data = response.result.object;
+                MODx.msg.alert(_('info'), data.message);
+			},scope: this},
+			failure: {
+			    fn:function(response) {
+				    console.log(response);
+		        },scope: this
+			}
+        }
+    });
+    
+    miniShop2.panel.UtilitesImport.superclass.constructor.call(this, config);
+};
+
+Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
+    
+    onUpdateNeed: function (cb) {
+       var updateKey = Ext.getCmp('ms-utilites-import-key');
+        if (cb.getValue()) {
+            updateKey.show();
+        } else {
+            updateKey.hide();
+        }
+    },
+    
+    saveConfig: function () {
+        var form = this.getForm();   
+        var values = form.getValues(); 
+        
+        MODx.Ajax.request({
+            url: miniShop2.config['connector_url'],
+            params: {
+                action: 'mgr/utility/import/saveconfig',
+                fields: values.fields,
+                delimiter: values.delimiter
+            },
+            listeners: {
+                success: {
+                    fn: function (r) {
+                        MODx.msg.status({
+    						title: _('ms2_utilites_import_save_fields_title'),
+    						message:  _('ms2_utilites_import_save_fields_message'),
+    						delay: 7
+    					});
+                    }, scope: this
+                }
+            }
+        });
+        
+    }
+	
+});
+Ext.reg('minishop2-utilites-import', miniShop2.panel.UtilitesImport);
diff --git a/assets/components/minishop2/js/mgr/utilites/panel.js b/assets/components/minishop2/js/mgr/utilites/panel.js
index 8c13cd0c0..2ba3831c9 100644
--- a/assets/components/minishop2/js/mgr/utilites/panel.js
+++ b/assets/components/minishop2/js/mgr/utilites/panel.js
@@ -28,8 +28,6 @@ miniShop2.panel.Utilites = function (config) {
                     cls: 'main-wrapper',
                 }]
             },
-            /*
-            // todo
             {
                 title: _('ms2_utilites_import'),
                 layout: 'anchor',
@@ -40,7 +38,7 @@ miniShop2.panel.Utilites = function (config) {
                     xtype: 'minishop2-utilites-import',
                     cls: 'main-wrapper',
                 }]
-            }*/
+            }
         ]
         }]
 
diff --git a/core/components/minishop2/controllers/mgr/utilites.class.php b/core/components/minishop2/controllers/mgr/utilites.class.php
index e6c6c1ef9..c33fb746a 100644
--- a/core/components/minishop2/controllers/mgr/utilites.class.php
+++ b/core/components/minishop2/controllers/mgr/utilites.class.php
@@ -33,6 +33,7 @@ public function loadCustomCssJs()
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/minishop2.js');
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/panel.js');
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/gallery/panel.js');
+        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/import/panel.js');
 
         $config = $this->miniShop2->config;
 
@@ -54,6 +55,10 @@ public function loadCustomCssJs()
         $config['utility_gallery_total_products'] = $this->modx->getCount('msProduct', ['class_key' => 'msProduct']);
         $config['utility_gallery_total_products_files'] = $this->modx->getCount('msProductFile', ['parent' => 0]);
 
+        // get params for import 
+        $config['utility_import_fields'] = $this->getOption('ms2_utility_import_fields', null, 'article,pagetitle,price', true);
+        $config['utility_import_fields_delimiter'] = $this->getOption('ms2_utility_import_fields_delimiter', null, ';', true);
+
         $this->addHtml(
             '<script>
             miniShop2.config = ' . json_encode($config) . ';
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 0b44e8d4b..ccf4d910f 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -161,6 +161,20 @@
 $_lang['ms2_utilites_gallery_intro'] = 'Обновление всех изображений товаров согласно указанным параметрам. <br>Данная операция является трудозатратной, поэтому не указывайте большое число для одной итерации.';
 $_lang['ms2_utilites_gallery_refresh'] = 'Обновить';
 $_lang['ms2_utilites_gallery_updating'] = 'Обновлению превью';
+$_lang['ms2_utilites_import'] = 'Импорт';
+$_lang['ms2_utilites_import_debug'] = 'Режим отладки';
+$_lang['ms2_utilites_import_intro'] = 'Простой импорт каталога товаров. <br>При импорте большого объема товаров ваш сайт может зависнуть.<br>Рекомендуем запускать выполнение в фоновом режиме, для этого необходимо отметить чекбокс "Использовать планировщик" (требуется установленный компонент <a href="https://modstore.pro/packages/utilities/scheduler" target="_blank">Scheduler</a>)';
+$_lang['ms2_utilites_import_label_delimiter'] = 'Разделитель колонок в файле';
+$_lang['ms2_utilites_import_label_fields'] = 'Поля импорта';
+$_lang['ms2_utilites_import_label_file'] = 'Файл для импорта';
+$_lang['ms2_utilites_import_label_file_empty'] = 'Выберите файл';
+$_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
+$_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
+$_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
+$_lang['ms2_utilites_import_submit'] = 'Импортировать';
+$_lang['ms2_utilites_import_update_key'] = 'Уникальное поле для обновления';
+$_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
+$_lang['ms2_utilites_import_use_scheduler'] = 'Использовать планировщик';
 $_lang['ms2_utilites_params'] = 'Параметры ';
 $_lang['ms2_weight'] = 'Вес';
 $_lang['ms2_weight_price'] = 'Стоимость ед/вес';
diff --git a/core/components/minishop2/lexicon/ru/setting.inc.php b/core/components/minishop2/lexicon/ru/setting.inc.php
index 0a82f2312..d51c6dd44 100644
--- a/core/components/minishop2/lexicon/ru/setting.inc.php
+++ b/core/components/minishop2/lexicon/ru/setting.inc.php
@@ -12,6 +12,7 @@
 $_lang['area_ms2_category'] = 'Категория товаров';
 $_lang['area_ms2_frontend'] = 'Сайт';
 $_lang['area_ms2_gallery'] = 'Галерея';
+$_lang['area_ms2_import'] = 'Импорт';
 $_lang['area_ms2_main'] = 'Основные настройки';
 $_lang['area_ms2_order'] = 'Заказы';
 $_lang['area_ms2_payment'] = 'Платежи';
@@ -158,6 +159,8 @@
 $_lang['setting_ms2_toggle_js_type_desc'] = 'если выбрано ДА будут подключены скрипты без зависимости от jQuery, написанные с использованием возможностей стандарта ES6';
 $_lang['setting_ms2_use_scheduler'] = 'Использовать менеджер очередей';
 $_lang['setting_ms2_use_scheduler_desc'] = 'Перед использованием убедитесь, что у вас установлен компонент Scheduler';
+$_lang['setting_ms2_utility_import_fields'] = 'Список полей для импорта';
+$_lang['setting_ms2_utility_import_fields_delimiter'] = 'Разделитель колонок в файле импорта';
 $_lang['setting_ms2_vanila_js'] = 'Новые скрипты фронтенда';
 $_lang['setting_ms2_vanila_js_desc'] = 'Путь к файлу инициализации новых скриптов магазина. Если хотите указать свои параметры инициализации - укажите путь к ним здесь, или очистите параметр и загрузите их вручную через шаблон сайта.';
 $_lang['setting_ms2_weight_format'] = 'Формат веса';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
new file mode 100644
index 000000000..85302d221
--- /dev/null
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Simple Import
+ * import products
+ *
+ * @package miniShop2
+ * @subpackage processors
+ */
+class msUtilityImportProcessor extends modProcessor
+{
+
+    public $classKey = 'msProduct';
+    public $languageTopics = ['minishop2:default', 'minishop2:manager'];
+    public $permission = 'msproduct_save';
+    public $properties = [];
+
+    /** @var miniShop $miniShop */
+    public $miniShop;
+
+
+
+    /**
+     * @return bool|null|string
+     */
+    public function initialize()
+    {
+        if (!$this->modx->hasPermission($this->permission)) {
+            return $this->modx->lexicon('access_denied');
+        }
+
+        $this->properties = $this->getProperties();
+
+        return parent::initialize();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLanguageTopics()
+    {
+        return $this->languageTopics;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public function process()
+    {
+
+        $required = ['importfile', 'fields', 'delimiter'];
+
+        foreach ($required as $field) {
+            if (!trim($this->getProperty($field))) {
+                return $this->addFieldError($field, $this->modx->lexicon('field_required'));
+            }
+        }
+
+        $url = $this->modx->getOption('site_url') . 'core/components/minishop2/import/csv.php';
+
+        $importParams = [
+            'file' => $this->properties['importfile'],
+            'fields' => $this->properties['fields'],
+            'update' => $this->properties['update'],
+            'key' => $this->properties['key'],
+            'debug' => $this->properties['debug'],
+            'delimiter' => $this->properties['delimiter']
+        ];
+
+        $url .= '?' . http_build_query($importParams);
+
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $url);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        $result = curl_exec($curl);
+        curl_close($curl);
+
+        return $this->success($result, [
+            'message' => $result
+        ]);
+    }
+}
+
+return 'msUtilityImportProcessor';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php b/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
new file mode 100644
index 000000000..f2b009fdb
--- /dev/null
+++ b/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Save ms import config to system settings 
+ *
+ * @package miniShop2
+ * @subpackage processors
+ */
+class msUtilityImportSaveConfigProcessor extends modProcessor
+{
+
+    public $languageTopics = ['minishop2:default', 'minishop2:manager'];
+    public $permission = 'mssetting_save';
+    public $fields = '';
+    public $delimiter = '';
+
+    /**
+     * @return bool|null|string
+     */
+    public function initialize()
+    {
+        if (!$this->modx->hasPermission($this->permission)) {
+            return $this->modx->lexicon('access_denied');
+        }
+
+        return parent::initialize();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getLanguageTopics()
+    {
+        return $this->languageTopics;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public function process()
+    {
+        $this->fields = $this->getProperty('fields');
+        $this->delimiter = $this->getProperty('delimiter', ';');
+
+        // save fields to system settings
+        if ($settingFields = $this->modx->getObject('modSystemSetting', 'ms2_utility_import_fields')) {
+            $settingFields->set('value', $this->fields);
+            $settingFields->save();
+        }
+
+        // save delimiter to system settings
+        if ($settingDelimiter = $this->modx->getObject('modSystemSetting', 'ms2_utility_import_field_delimiter')) {
+            $settingDelimiter->set('value', $this->delimiter);
+            $settingDelimiter->save();
+        }
+
+        return $this->success();
+    }
+}
+
+return 'msUtilityImportSaveConfigProcessor';

From 393d644d61f99554505ca5bbdb5e2073a48420dc Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Mon, 5 Jun 2023 00:16:21 +0300
Subject: [PATCH 02/19] Fix processor path

---
 assets/components/minishop2/js/mgr/utilites/import/panel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilites/import/panel.js
index 2bc1554bb..02598c9a7 100644
--- a/assets/components/minishop2/js/mgr/utilites/import/panel.js
+++ b/assets/components/minishop2/js/mgr/utilites/import/panel.js
@@ -8,7 +8,7 @@ miniShop2.panel.UtilitesImport = function (config) {
 		progress:true,
 		id: 'ms2-panel-import',
 		baseParams: {
-			action: 'mgr/utility/import/import'
+			action: 'mgr/utilites/import/import'
 		}, 
         items: [{
             layout: 'column',
@@ -189,7 +189,7 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
         MODx.Ajax.request({
             url: miniShop2.config['connector_url'],
             params: {
-                action: 'mgr/utility/import/saveconfig',
+                action: 'mgr/utilites/import/saveconfig',
                 fields: values.fields,
                 delimiter: values.delimiter
             },

From 73ea0922b48ea5b3639f2e1ac16554a98d1f6a0c Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Mon, 5 Jun 2023 00:22:03 +0300
Subject: [PATCH 03/19] Fix delimiter setting name

---
 .../processors/mgr/utilites/import/saveconfig.class.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php b/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
index f2b009fdb..196ce40e4 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
@@ -51,7 +51,7 @@ public function process()
         }
 
         // save delimiter to system settings
-        if ($settingDelimiter = $this->modx->getObject('modSystemSetting', 'ms2_utility_import_field_delimiter')) {
+        if ($settingDelimiter = $this->modx->getObject('modSystemSetting', 'ms2_utility_import_fields_delimiter')) {
             $settingDelimiter->set('value', $this->delimiter);
             $settingDelimiter->save();
         }

From ac1ef6611d4102ab81e8b368873c7da3dbe0ca78 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Mon, 12 Jun 2023 15:33:18 +0600
Subject: [PATCH 04/19] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=B4=20=D0=B2=20=D0=BE=D0=BE=D0=BF=20+?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D1=83=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _build/data/transport.settings.php            |   2 +-
 .../controllers/mgr/utilites.class.php        |   9 +-
 .../components/minishop2/import/importCSV.php | 222 ++++++++++++++++++
 .../minishop2/lexicon/ru/manager.inc.php      |   3 +
 .../mgr/utilites/import/import.class.php      |  63 ++++-
 core/components/minishop2/tasks/csvImport.php |  14 ++
 6 files changed, 294 insertions(+), 19 deletions(-)
 create mode 100644 core/components/minishop2/import/importCSV.php
 create mode 100644 core/components/minishop2/tasks/csvImport.php

diff --git a/_build/data/transport.settings.php b/_build/data/transport.settings.php
index 1fb4196da..fea4e56bd 100644
--- a/_build/data/transport.settings.php
+++ b/_build/data/transport.settings.php
@@ -360,7 +360,7 @@
     ],
 
     'ms2_utility_import_fields' => [
-        'value' => 'article,pagetitle,price',
+        'value' => 'pagetitle,parent,price,article',
         'xtype' => 'textfield',
         'area' => 'ms2_import',
     ],
diff --git a/core/components/minishop2/controllers/mgr/utilites.class.php b/core/components/minishop2/controllers/mgr/utilites.class.php
index c33fb746a..a3d980dd8 100644
--- a/core/components/minishop2/controllers/mgr/utilites.class.php
+++ b/core/components/minishop2/controllers/mgr/utilites.class.php
@@ -27,9 +27,7 @@ public function getLanguageTopics()
      */
     public function loadCustomCssJs()
     {
-
         $this->addCss($this->miniShop2->config['cssUrl'] . 'mgr/utilites/gallery.css');
-
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/minishop2.js');
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/panel.js');
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/gallery/panel.js');
@@ -43,7 +41,7 @@ public function loadCustomCssJs()
             $config['utility_gallery_source_id'] = $productSource;
             $config['utility_gallery_source_name'] = $source->get('name');
 
-            $properties =  $source->get('properties');
+            $properties = $source->get('properties');
             $propertiesString = '';
             foreach (json_decode($properties['thumbnails']['value'], true) as $key => $value) {
                 $propertiesString .= "<strong>$key: </strong>" . json_encode($value) . "<br>";
@@ -55,14 +53,13 @@ public function loadCustomCssJs()
         $config['utility_gallery_total_products'] = $this->modx->getCount('msProduct', ['class_key' => 'msProduct']);
         $config['utility_gallery_total_products_files'] = $this->modx->getCount('msProductFile', ['parent' => 0]);
 
-        // get params for import 
-        $config['utility_import_fields'] = $this->getOption('ms2_utility_import_fields', null, 'article,pagetitle,price', true);
+        // get params for import
+        $config['utility_import_fields'] = $this->getOption('ms2_utility_import_fields', null, 'pagetitle,parent,price,article', true);
         $config['utility_import_fields_delimiter'] = $this->getOption('ms2_utility_import_fields_delimiter', null, ';', true);
 
         $this->addHtml(
             '<script>
             miniShop2.config = ' . json_encode($config) . ';
-
             Ext.onReady(function() {
                 MODx.add({xtype: "minishop2-utilites"});
             });
diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
new file mode 100644
index 000000000..cf1e162ff
--- /dev/null
+++ b/core/components/minishop2/import/importCSV.php
@@ -0,0 +1,222 @@
+<?php
+
+class ImportCSV
+{
+    /**
+     * @var modX
+     */
+    private $modx;
+
+    public function __construct(modX $modx)
+    {
+        $this->modx = $modx;
+        // Time limit
+        set_time_limit(600);
+        $tmp = 'Trying to set time limit = 600 sec: ';
+        $tmp .= ini_get('max_execution_time') == 600 ? 'done' : 'error';
+        $this->modx->log(modX::LOG_LEVEL_INFO, $tmp);
+    }
+
+    public function process($params)
+    {
+        $file = @$params['file'];
+        $fields = @$params['fields'];
+        $update = !empty($params['update']);
+        $key = @$params['key'];
+        $is_debug = !empty($params['debug']);
+        $delimeter = @$params['delimeter'];
+
+
+        // Check required options
+        if (empty($fields)) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, 'You must specify the parameter "fields". It needed for parse of your file.');
+            return false;
+        }
+        if (empty($key)) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, 'You must specify the parameter "key". It needed for check for duplicates.');
+            return false;
+        }
+
+        $keys = array_map('trim', explode(',', strtolower($fields)));
+        $tv_enabled = false;
+        foreach ($keys as $v) {
+            if (preg_match('/^tv(\d+)$/', $v)) {
+                $tv_enabled = true;
+                break;
+            }
+        }
+        if (empty($delimeter)) {
+            $delimeter = ';';
+        }
+
+        // Check file
+        if (empty($file)) {
+            $error = 'You must specify an file in the ';
+            $error .= XPDO_CLI_MODE ? 'first parameter of console call' : '$_GET["file"] parameter';
+            $error .= '!';
+            $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+            return false;
+        } elseif (!preg_match('/\.csv$/i', $file)) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, 'Wrong file extension. File must be an *.csv.');
+            return false;
+        }
+
+        $file = str_replace('//', '/', MODX_BASE_PATH . $file);
+        if (!file_exists($file)) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, 'File not found at ' . $file . '.');
+            return false;
+        }
+
+        // Import!
+        $handle = fopen($file, "r");
+        $rows = $created = $updated = 0;
+
+        while (($csv = fgetcsv($handle, 0, $delimeter)) !== false) {
+            $rows++;
+            $data = $gallery = [];
+            $this->modx->error->reset();
+            $this->modx->log(modX::LOG_LEVEL_INFO, "Raw data for import: \n" . print_r($csv, 1));
+
+            foreach ($keys as $k => $v) {
+                if (!isset($csv[$k])) {
+                    exit('Field "' . $v . '" not exists in file. Please fix import file or parameter "fields".');
+                }
+                if ($v == 'gallery') {
+                    $gallery[] = $csv[$k];
+                } elseif (isset($data[$v]) && !is_array($data[$v])) {
+                    $data[$v] = [$data[$v], $csv[$k]];
+                } elseif (isset($data[$v])) {
+                    $data[$v][] = $csv[$k];
+                } else {
+                    $data[$v] = $csv[$k];
+                }
+            }
+            $is_product = false;
+
+            // Set default values
+            if (empty($data['class_key'])) {
+                $data['class_key'] = 'msProduct';
+            }
+            if (empty($data['context_key'])) {
+                if (isset($data['parent']) && $parent = $this->modx->getObject('modResource', ['id' => $data['parent']])) {
+                    $data['context_key'] = $parent->get('context_key');
+                } elseif (isset($this->modx->resource) && isset($this->modx->context)) {
+                    $data['context_key'] = $this->modx->context->key;
+                } else {
+                    $data['context_key'] = 'web';
+                }
+            }
+            $data['tvs'] = $tv_enabled;
+            $this->modx->log(modX::LOG_LEVEL_INFO, "Array with importing data: \n" . print_r($data, 1));
+
+            // Duplicate check
+            $q = $this->modx->newQuery($data['class_key']);
+            $q->select($data['class_key'] . '.id');
+            if (strtolower($data['class_key']) === 'msproduct') {
+                $q->innerJoin('msProductData', 'Data', $data['class_key'] . '.id = Data.id');
+                $is_product = true;
+            }
+            $tmp = $this->modx->getFields($data['class_key']);
+            if (isset($tmp[$key])) {
+                $q->where([$key => $data[$key]]);
+            } elseif ($is_product) {
+                $q->where(['Data.' . $key => $data[$key]]);
+            }
+            $q->prepare();
+            $this->modx->log(modX::LOG_LEVEL_INFO, "SQL query for check for duplicate: \n" . $q->toSql());
+
+            /** @var modResource $exists */
+            if ($exists = $this->modx->getObject($data['class_key'], $q)) {
+                $this->modx->log(modX::LOG_LEVEL_INFO, "Key $key = $data[$key] has duplicate.");
+                if (!$update) {
+                    $this->modx->log(modX::LOG_LEVEL_ERROR, "Skipping line with $key = \"$data[$key]\" because update is disabled.");
+                    if ($is_debug) {
+                        $this->modx->log(
+                            modX::LOG_LEVEL_INFO,
+                            'You in debug mode, so we process only 1 row. Time: ' . number_format(
+                                microtime(true) - $this->modx->startTime,
+                                7
+                            ) . " s"
+                        );
+                        return true;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    $action = 'update';
+                    $data['id'] = $exists->id;
+                }
+            } else {
+                $action = 'create';
+            }
+
+            $this->modx->log(1, print_r([
+                $action, $data
+            ], 1));
+
+            // Create or update resource
+            /** @var modProcessorResponse $response */
+            $response = $this->modx->runProcessor('resource/' . $action, $data);
+            if ($response->isError()) {
+                $this->modx->log(modX::LOG_LEVEL_ERROR, "Error on $action: \n" . print_r($response->getAllErrors(), 1));
+            } else {
+                if ($action == 'update') {
+                    $updated++;
+                } else {
+                    $created++;
+                }
+
+                $resource = $response->getObject();
+                $this->modx->log(modX::LOG_LEVEL_INFO, "Successful $action: \n" . print_r($resource, 1));
+
+                // Process gallery images, if exists
+                if (!empty($gallery)) {
+                    $this->modx->log(modX::LOG_LEVEL_INFO, "Importing images: \n" . print_r($gallery, 1));
+                    foreach ($gallery as $v) {
+                        if (empty($v)) {
+                            continue;
+                        }
+                        $image = str_replace('//', '/', MODX_BASE_PATH . $v);
+                        if (!file_exists($image)) {
+                            $this->modx->log(
+                                modX::LOG_LEVEL_ERROR,
+                                "Could not import image \"$v\" to gallery. File \"$image\" not found on server."
+                            );
+                        } else {
+                            $response = $this->modx->runProcessor(
+                                'gallery/upload',
+                                ['id' => $resource['id'], 'name' => $v, 'file' => $image],
+                                ['processors_path' => MODX_CORE_PATH . 'components/minishop2/processors/mgr/']
+                            );
+                            if ($response->isError()) {
+                                $this->modx->log(
+                                    modX::LOG_LEVEL_ERROR,
+                                    "Error on upload \"$v\": \n" . print_r($response->getAllErrors(), 1)
+                                );
+                            } else {
+                                $this->modx->log(
+                                    modX::LOG_LEVEL_INFO,
+                                    "Successful upload  \"$v\": \n" . print_r($response->getObject(), 1)
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ($is_debug) {
+                $this->modx->log(
+                    modX::LOG_LEVEL_INFO,
+                    'You in debug mode, so we process only 1 row. Time: ' . number_format(
+                        microtime(true) - $this->modx->startTime,
+                        7
+                    ) . " s"
+                );
+                return true;
+            }
+        }
+        fclose($handle);
+
+        return true;
+    }
+}
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index ccf4d910f..65b802a02 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -179,3 +179,6 @@
 $_lang['ms2_weight'] = 'Вес';
 $_lang['ms2_weight_price'] = 'Стоимость ед/вес';
 $_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';
+$_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
+$_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
+$_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index 85302d221..0879bcc8c 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once dirname(__FILE__, 5) . '/import/importCSV.php';
+
 /**
  * Simple Import
  * import products
@@ -19,7 +21,6 @@ class msUtilityImportProcessor extends modProcessor
     public $miniShop;
 
 
-
     /**
      * @return bool|null|string
      */
@@ -49,7 +50,6 @@ public function getLanguageTopics()
      */
     public function process()
     {
-
         $required = ['importfile', 'fields', 'delimiter'];
 
         foreach ($required as $field) {
@@ -58,8 +58,6 @@ public function process()
             }
         }
 
-        $url = $this->modx->getOption('site_url') . 'core/components/minishop2/import/csv.php';
-
         $importParams = [
             'file' => $this->properties['importfile'],
             'fields' => $this->properties['fields'],
@@ -69,17 +67,58 @@ public function process()
             'delimiter' => $this->properties['delimiter']
         ];
 
-        $url .= '?' . http_build_query($importParams);
+        $scheduler = $this->getProperty('scheduler', 0);
+        if (empty($scheduler)) {
+            $importCSV = new ImportCSV($this->modx);
+            $result = $importCSV->process($importParams);
+            return $this->success($result, [
+                'message' => $result
+            ]);
+        }
+
+
+        /** @var Scheduler $scheduler */
+        $path = $this->modx->getOption(
+            'scheduler.core_path',
+            null,
+            $this->modx->getOption('core_path') . 'components/scheduler/'
+        );
+        $scheduler = $this->modx->getService('scheduler', 'Scheduler', $path . 'model/scheduler/');
+        if (!$scheduler) {
+            $this->modx->log(1, 'not found Scheduler extra');
+            return $this->failure('ms2_utilites_scheduler_nf', []);
+        }
+        $task = $scheduler->getTask('minishop2', 'ms2_csv_import');
+        if (!$task) {
+            $task = $this->createImportTask();
+        }
+        if (empty($task)) {
+            return $this->failure('ms2_utilites_scheduler_task_ce', []);
+        }
+
+        $task->schedule('+1 second', $importParams);
 
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $url);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        $result = curl_exec($curl);
-        curl_close($curl);
+        return $this->success('ms2_utilites_scheduler_success');
+    }
 
-        return $this->success($result, [
-            'message' => $result
+    /**
+     * Creating Sheduler's task for start import
+     * @return false|object|null
+     */
+    private function createImportTask()
+    {
+        $task = $this->modx->newObject('sFileTask');
+        $task->fromArray([
+            'class_key' => 'sFileTask',
+            'content' => '/tasks/csvImport.php',
+            'namespace' => 'minishop2',
+            'reference' => 'ms2_csv_import',
+            'description' => 'MiniShop2 CSV import'
         ]);
+        if (!$task->save()) {
+            return false;
+        }
+        return $task;
     }
 }
 
diff --git a/core/components/minishop2/tasks/csvImport.php b/core/components/minishop2/tasks/csvImport.php
new file mode 100644
index 000000000..afa20ed64
--- /dev/null
+++ b/core/components/minishop2/tasks/csvImport.php
@@ -0,0 +1,14 @@
+<?php
+
+/** @var modX $modx */
+/** @var sFileTask $task */
+/** @var sTaskRun $run */
+/** @var array $scriptProperties */
+
+require_once $modx->getOption('modx_core_path') . 'components/minishop2/import/importCSV.php';
+$importCSV = new ImportCSV($this->modx);
+$result = $importCSV->process($scriptProperties);
+
+if (!$result) {
+    $run->addError('csv import error');
+}

From ea09ce27764c1210a2e4d11932353aa58e94168f Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Mon, 12 Jun 2023 23:49:32 +0300
Subject: [PATCH 05/19] Sorting lexicon

---
 core/components/minishop2/lexicon/ru/manager.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 65b802a02..78627d4dc 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -176,9 +176,9 @@
 $_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
 $_lang['ms2_utilites_import_use_scheduler'] = 'Использовать планировщик';
 $_lang['ms2_utilites_params'] = 'Параметры ';
+$_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
+$_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';
+$_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
 $_lang['ms2_weight'] = 'Вес';
 $_lang['ms2_weight_price'] = 'Стоимость ед/вес';
 $_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';
-$_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
-$_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
-$_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';

From 0ef548ffe16229ec7400ea2277caf3bbce479fcb Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Wed, 14 Jun 2023 17:37:25 +0600
Subject: [PATCH 06/19] split big class and add skip_header

---
 .../minishop2/js/mgr/utilites/import/panel.js |  71 ++--
 .../components/minishop2/import/importCSV.php | 324 ++++++++++--------
 .../minishop2/lexicon/ru/manager.inc.php      |   7 +-
 .../mgr/utilites/import/import.class.php      |   3 +-
 4 files changed, 219 insertions(+), 186 deletions(-)

diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilites/import/panel.js
index 02598c9a7..f341c65c2 100644
--- a/assets/components/minishop2/js/mgr/utilites/import/panel.js
+++ b/assets/components/minishop2/js/mgr/utilites/import/panel.js
@@ -1,22 +1,22 @@
 miniShop2.panel.UtilitesImport = function (config) {
     config = config || {};
 
-    Ext.apply(config, { 
+    Ext.apply(config, {
 		cls: 'container form-with-labels',
-		autoHeight: true,  
+		autoHeight: true,
 		url: miniShop2.config.connector_url,
 		progress:true,
 		id: 'ms2-panel-import',
 		baseParams: {
 			action: 'mgr/utilites/import/import'
-		}, 
+		},
         items: [{
             layout: 'column',
             border: false,
             anchor: '100%',
             cls: 'main-wrapper',
             labelAlign: 'top',
-            buttonAlign: 'left', 
+            buttonAlign: 'left',
             style: 'padding: 0 0 0 7px',
             items: [{
                 columnWidth: 0.5,
@@ -32,7 +32,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                         anchor: '81%',
                         name: 'importfile',
                         allowBlank: false,
-                    }, 
+                    },
                     {
                         layout: 'column',
                         items:[{
@@ -48,7 +48,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                                     width: '99%',
                                     fieldLabel: _('ms2_utilites_import_label_fields'),
                                     allowBlank: false,
-                                }, 
+                                },
                                 {
                                     xtype: 'textfield',
                                     name: 'delimiter',
@@ -73,9 +73,9 @@ miniShop2.panel.UtilitesImport = function (config) {
                                     handler: function() {
                                         this.saveConfig(this);
                                     }, scope: this
-                                } 
+                                }
                             ]
-                            
+
                         }]
                     },
                     {
@@ -83,43 +83,52 @@ miniShop2.panel.UtilitesImport = function (config) {
                         name: 'update',
                         value: 1,
                         id: 'ms-utilites-import-update',
-                        boxLabel: _('ms2_utilites_import_update_products'), 
+                        boxLabel: _('ms2_utilites_import_update_products'),
                         labelAlign: 'right',
-                        listeners: { 
+                        listeners: {
                             check: {
                                 fn : this.onUpdateNeed,
                                 scope : this
                             },
-                        }    
-                    }, 
+                        }
+                    },
                     {
                         xtype: 'textfield',
                         name: 'key',
-                        value: 'article', 
+                        value: 'article',
                         width: '99%',
                         hidden: true,
                         id: 'ms-utilites-import-key',
                         fieldLabel: _('ms2_utilites_import_update_key'),
-                    }, 
+                    },
                     {
                         xtype: 'xcheckbox',
                         name: 'debug',
                         value: 1,
                         hideLabel: true,
                         id: 'ms-utilites-import-debug',
-                        boxLabel: _('ms2_utilites_import_debug'), 
-                        labelAlign: 'right', 
-                    }, 
+                        boxLabel: _('ms2_utilites_import_debug'),
+                        labelAlign: 'right',
+                    },
                     {
                         xtype: 'xcheckbox',
                         name: 'scheduler',
                         value: 1,
                         hideLabel: true,
                         id: 'ms-utilites-import-scheduler',
-                        boxLabel: _('ms2_utilites_import_use_scheduler'), 
-                        labelAlign: 'right', 
-                    }, 
-                    { 
+                        boxLabel: _('ms2_utilites_import_use_scheduler'),
+                        labelAlign: 'right',
+                    },
+                    {
+                        xtype: 'xcheckbox',
+                        name: 'skip_header',
+                        value: 1,
+                        hideLabel: true,
+                        id: 'ms-utilites-import-header',
+                        boxLabel: _('ms2_utilites_import_skip_header'),
+                        labelAlign: 'right',
+                    },
+                    {
                         xtype: 'button',
                         style: 'margin: 25px 0 0 2px',
                         text: '<i class="icon icon-download"></i> &nbsp;'+_('ms2_utilites_import_submit'),
@@ -143,7 +152,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                         style: 'margin: 5px 0 15px; padding: 20px; ',
                         collapsible: true,
                         collapsed: true,
-                        stateful: true, 
+                        stateful: true,
                         labelAlign: 'top',
                         stateEvents: ['collapse', 'expand'],
                         items: [
@@ -155,7 +164,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                 ]
             }*/]
         }] ,
-        listeners: { 
+        listeners: {
             success: {fn: function(response) {
 				var data = response.result.object;
                 MODx.msg.alert(_('info'), data.message);
@@ -167,12 +176,12 @@ miniShop2.panel.UtilitesImport = function (config) {
 			}
         }
     });
-    
+
     miniShop2.panel.UtilitesImport.superclass.constructor.call(this, config);
 };
 
 Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
-    
+
     onUpdateNeed: function (cb) {
        var updateKey = Ext.getCmp('ms-utilites-import-key');
         if (cb.getValue()) {
@@ -181,11 +190,11 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
             updateKey.hide();
         }
     },
-    
+
     saveConfig: function () {
-        var form = this.getForm();   
-        var values = form.getValues(); 
-        
+        var form = this.getForm();
+        var values = form.getValues();
+
         MODx.Ajax.request({
             url: miniShop2.config['connector_url'],
             params: {
@@ -205,8 +214,8 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
                 }
             }
         });
-        
+
     }
-	
+
 });
 Ext.reg('minishop2-utilites-import', miniShop2.panel.UtilitesImport);
diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index cf1e162ff..707e2e497 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -6,6 +6,11 @@ class ImportCSV
      * @var modX
      */
     private $modx;
+    private $rows = 0;
+    private $created = 0;
+    private $updated = 0;
+
+    private $params;
 
     public function __construct(modX $modx)
     {
@@ -19,16 +24,19 @@ public function __construct(modX $modx)
 
     public function process($params)
     {
-        $file = @$params['file'];
-        $fields = @$params['fields'];
-        $update = !empty($params['update']);
-        $key = @$params['key'];
-        $is_debug = !empty($params['debug']);
-        $delimeter = @$params['delimeter'];
+        $this->params['file'] = @$params['file'];
+        $this->params['fields'] = @$params['fields'];
+        $this->params['update'] = !empty($params['update']);
+        $this->params['key'] = @$params['key'];
+        $this->params['is_debug'] = !empty($params['debug']);
+        $this->params['delimeter'] = $params['delimeter'] ?? ';';
+        $this->params['skip_header'] = @$params['skip_header'];
+        $this->params['keys'] = [];
+        $this->params['tv_enabled'] = false;
 
 
         // Check required options
-        if (empty($fields)) {
+        if (empty($this->params['fields'])) {
             $this->modx->log(modX::LOG_LEVEL_ERROR, 'You must specify the parameter "fields". It needed for parse of your file.');
             return false;
         }
@@ -37,186 +45,200 @@ public function process($params)
             return false;
         }
 
-        $keys = array_map('trim', explode(',', strtolower($fields)));
-        $tv_enabled = false;
-        foreach ($keys as $v) {
+        $this->params['keys'] = array_map('trim', explode(',', strtolower($this->params['fields'])));
+        foreach ($this->params['keys'] as $v) {
             if (preg_match('/^tv(\d+)$/', $v)) {
-                $tv_enabled = true;
+                $this->params['tv_enabled'] = true;
                 break;
             }
         }
-        if (empty($delimeter)) {
-            $delimeter = ';';
-        }
 
         // Check file
-        if (empty($file)) {
+        if (empty($this->params['file'])) {
             $error = 'You must specify an file in the ';
             $error .= XPDO_CLI_MODE ? 'first parameter of console call' : '$_GET["file"] parameter';
             $error .= '!';
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
             return false;
-        } elseif (!preg_match('/\.csv$/i', $file)) {
+        } elseif (!preg_match('/\.csv$/i', $this->params['file'])) {
             $this->modx->log(modX::LOG_LEVEL_ERROR, 'Wrong file extension. File must be an *.csv.');
             return false;
         }
 
-        $file = str_replace('//', '/', MODX_BASE_PATH . $file);
-        if (!file_exists($file)) {
-            $this->modx->log(modX::LOG_LEVEL_ERROR, 'File not found at ' . $file . '.');
+        $this->params['file'] = str_replace('//', '/', MODX_BASE_PATH . $this->params['file']);
+        if (!file_exists($this->params['file'])) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, 'File not found at ' . $this->params['file'] . '.');
             return false;
         }
 
-        // Import!
-        $handle = fopen($file, "r");
-        $rows = $created = $updated = 0;
+        $this->import();
 
-        while (($csv = fgetcsv($handle, 0, $delimeter)) !== false) {
-            $rows++;
-            $data = $gallery = [];
-            $this->modx->error->reset();
-            $this->modx->log(modX::LOG_LEVEL_INFO, "Raw data for import: \n" . print_r($csv, 1));
+        echo "\nImport complete in " . number_format(microtime(true) - $this->modx->startTime, 7) . " s\n";
+        echo "\nTotal rows:	$this->rows\n";
+        echo "Created:	$this->created\n";
+        echo "Updated:	$this->updated\n";
+        return true;
+    }
 
-            foreach ($keys as $k => $v) {
-                if (!isset($csv[$k])) {
-                    exit('Field "' . $v . '" not exists in file. Please fix import file or parameter "fields".');
-                }
-                if ($v == 'gallery') {
-                    $gallery[] = $csv[$k];
-                } elseif (isset($data[$v]) && !is_array($data[$v])) {
-                    $data[$v] = [$data[$v], $csv[$k]];
-                } elseif (isset($data[$v])) {
-                    $data[$v][] = $csv[$k];
-                } else {
-                    $data[$v] = $csv[$k];
-                }
+    private function import()
+    {
+        $handle = fopen($this->params['file'], "r");
+
+        while (($csv = fgetcsv($handle, 0, $this->params['delimeter'])) !== false) {
+            $this->rows++;
+            if (!empty($has_header) && $this->rows === 1) {
+                continue;
             }
-            $is_product = false;
+            $this->processRow($csv);
 
-            // Set default values
-            if (empty($data['class_key'])) {
-                $data['class_key'] = 'msProduct';
+            if ($this->params['is_debug'] && $this->rows === 1) {
+                $this->modx->log(
+                    modX::LOG_LEVEL_INFO,
+                    'You in debug mode, so we process only 1 row. Time: ' . number_format(
+                        microtime(true) - $this->modx->startTime,
+                        7
+                    ) . ' s'
+                );
+                return true;
             }
-            if (empty($data['context_key'])) {
-                if (isset($data['parent']) && $parent = $this->modx->getObject('modResource', ['id' => $data['parent']])) {
-                    $data['context_key'] = $parent->get('context_key');
-                } elseif (isset($this->modx->resource) && isset($this->modx->context)) {
-                    $data['context_key'] = $this->modx->context->key;
-                } else {
-                    $data['context_key'] = 'web';
-                }
+        }
+        fclose($handle);
+    }
+
+    private function processRow($csv)
+    {
+        $data = $gallery = [];
+        $this->modx->error->reset();
+        $this->modx->log(modX::LOG_LEVEL_INFO, "Raw data for import: \n" . print_r($csv, 1));
+
+        foreach ($this->params['keys'] as $k => $v) {
+            if (!isset($csv[$k])) {
+                exit('Field "' . $v . '" not exists in file. Please fix import file or parameter "fields".');
             }
-            $data['tvs'] = $tv_enabled;
-            $this->modx->log(modX::LOG_LEVEL_INFO, "Array with importing data: \n" . print_r($data, 1));
-
-            // Duplicate check
-            $q = $this->modx->newQuery($data['class_key']);
-            $q->select($data['class_key'] . '.id');
-            if (strtolower($data['class_key']) === 'msproduct') {
-                $q->innerJoin('msProductData', 'Data', $data['class_key'] . '.id = Data.id');
-                $is_product = true;
+            if ($v == 'gallery') {
+                $gallery[] = $csv[$k];
+            } elseif (isset($data[$v]) && !is_array($data[$v])) {
+                $data[$v] = [$data[$v], $csv[$k]];
+            } elseif (isset($data[$v])) {
+                $data[$v][] = $csv[$k];
+            } else {
+                $data[$v] = $csv[$k];
             }
-            $tmp = $this->modx->getFields($data['class_key']);
-            if (isset($tmp[$key])) {
-                $q->where([$key => $data[$key]]);
-            } elseif ($is_product) {
-                $q->where(['Data.' . $key => $data[$key]]);
+        }
+        $is_product = false;
+
+        // Set default values
+        if (empty($data['class_key'])) {
+            $data['class_key'] = 'msProduct';
+        }
+        if (empty($data['context_key'])) {
+            if (isset($data['parent']) && $parent = $this->modx->getObject('modResource', ['id' => $data['parent']])) {
+                $data['context_key'] = $parent->get('context_key');
+            } elseif (isset($this->modx->resource) && isset($this->modx->context)) {
+                $data['context_key'] = $this->modx->context->key;
+            } else {
+                $data['context_key'] = 'web';
             }
-            $q->prepare();
-            $this->modx->log(modX::LOG_LEVEL_INFO, "SQL query for check for duplicate: \n" . $q->toSql());
-
-            /** @var modResource $exists */
-            if ($exists = $this->modx->getObject($data['class_key'], $q)) {
-                $this->modx->log(modX::LOG_LEVEL_INFO, "Key $key = $data[$key] has duplicate.");
-                if (!$update) {
-                    $this->modx->log(modX::LOG_LEVEL_ERROR, "Skipping line with $key = \"$data[$key]\" because update is disabled.");
-                    if ($is_debug) {
-                        $this->modx->log(
-                            modX::LOG_LEVEL_INFO,
-                            'You in debug mode, so we process only 1 row. Time: ' . number_format(
-                                microtime(true) - $this->modx->startTime,
-                                7
-                            ) . " s"
-                        );
-                        return true;
-                    } else {
-                        continue;
-                    }
-                } else {
-                    $action = 'update';
-                    $data['id'] = $exists->id;
+        }
+        $data['tvs'] = $this->params['tv_enabled'];
+        $this->modx->log(modX::LOG_LEVEL_INFO, "Array with importing data: \n" . print_r($data, 1));
+
+        // Duplicate check
+        $q = $this->modx->newQuery($data['class_key']);
+        $q->select($data['class_key'] . '.id');
+        if (strtolower($data['class_key']) === 'msproduct') {
+            $q->innerJoin('msProductData', 'Data', $data['class_key'] . '.id = Data.id');
+            $is_product = true;
+        }
+        $tmp = $this->modx->getFields($data['class_key']);
+        $key = $this->params['key'];
+        if (isset($tmp[$key])) {
+            $q->where([$key => $data[$key]]);
+        } elseif ($is_product) {
+            $q->where(['Data.' . $key => $data[$key]]);
+        }
+        $q->prepare();
+        $this->modx->log(modX::LOG_LEVEL_INFO, "SQL query for check for duplicate: \n" . $q->toSql());
+
+        $action = 'create';
+        /** @var modResource $exists */
+        if ($exists = $this->modx->getObject($data['class_key'], $q)) {
+            $this->modx->log(modX::LOG_LEVEL_INFO, "Key $key = $data[$key] has duplicate.");
+            if (!$this->params['update']) {
+                $this->modx->log(modX::LOG_LEVEL_ERROR, "Skipping line with $key = \"$data[$key]\" because update is disabled.");
+                if ($this->params['is_debug'] && $this->rows === 1) {
+                    $this->modx->log(
+                        modX::LOG_LEVEL_INFO,
+                        'You in debug mode, so we process only 1 row. Time: ' . number_format(
+                            microtime(true) - $this->modx->startTime,
+                            7
+                        ) . ' s'
+                    );
+                    return true;
                 }
             } else {
-                $action = 'create';
+                $action = 'update';
+                $data['id'] = $exists->id;
             }
+        }
 
-            $this->modx->log(1, print_r([
-                $action, $data
-            ], 1));
+        $this->runAction($action, $data);
+    }
 
-            // Create or update resource
-            /** @var modProcessorResponse $response */
-            $response = $this->modx->runProcessor('resource/' . $action, $data);
-            if ($response->isError()) {
-                $this->modx->log(modX::LOG_LEVEL_ERROR, "Error on $action: \n" . print_r($response->getAllErrors(), 1));
+    private function runAction($action, $data)
+    {
+        /** @var modProcessorResponse $response */
+        $response = $this->modx->runProcessor('resource/' . $action, $data);
+        if ($response->isError()) {
+            $this->modx->log(modX::LOG_LEVEL_ERROR, "Error on $action: \n" . print_r($response->getAllErrors(), 1));
+        } else {
+            if ($action == 'update') {
+                $this->updated++;
             } else {
-                if ($action == 'update') {
-                    $updated++;
-                } else {
-                    $created++;
-                }
+                $this->created++;
+            }
 
-                $resource = $response->getObject();
-                $this->modx->log(modX::LOG_LEVEL_INFO, "Successful $action: \n" . print_r($resource, 1));
-
-                // Process gallery images, if exists
-                if (!empty($gallery)) {
-                    $this->modx->log(modX::LOG_LEVEL_INFO, "Importing images: \n" . print_r($gallery, 1));
-                    foreach ($gallery as $v) {
-                        if (empty($v)) {
-                            continue;
-                        }
-                        $image = str_replace('//', '/', MODX_BASE_PATH . $v);
-                        if (!file_exists($image)) {
-                            $this->modx->log(
-                                modX::LOG_LEVEL_ERROR,
-                                "Could not import image \"$v\" to gallery. File \"$image\" not found on server."
-                            );
-                        } else {
-                            $response = $this->modx->runProcessor(
-                                'gallery/upload',
-                                ['id' => $resource['id'], 'name' => $v, 'file' => $image],
-                                ['processors_path' => MODX_CORE_PATH . 'components/minishop2/processors/mgr/']
-                            );
-                            if ($response->isError()) {
-                                $this->modx->log(
-                                    modX::LOG_LEVEL_ERROR,
-                                    "Error on upload \"$v\": \n" . print_r($response->getAllErrors(), 1)
-                                );
-                            } else {
-                                $this->modx->log(
-                                    modX::LOG_LEVEL_INFO,
-                                    "Successful upload  \"$v\": \n" . print_r($response->getObject(), 1)
-                                );
-                            }
-                        }
+            $resource = $response->getObject();
+            $this->modx->log(modX::LOG_LEVEL_INFO, "Successful $action: \n" . print_r($resource, 1));
+
+            // Process gallery images, if exists
+            $this->processGallery($resource);
+        }
+    }
+
+    private function processGallery($resource)
+    {
+        if (!empty($gallery)) {
+            $this->modx->log(modX::LOG_LEVEL_INFO, "Importing images: \n" . print_r($gallery, 1));
+            foreach ($gallery as $v) {
+                if (empty($v)) {
+                    continue;
+                }
+                $image = str_replace('//', '/', MODX_BASE_PATH . $v);
+                if (!file_exists($image)) {
+                    $this->modx->log(
+                        modX::LOG_LEVEL_ERROR,
+                        "Could not import image \"$v\" to gallery. File \"$image\" not found on server."
+                    );
+                } else {
+                    $response = $this->modx->runProcessor(
+                        'gallery/upload',
+                        ['id' => $resource['id'], 'name' => $v, 'file' => $image],
+                        ['processors_path' => MODX_CORE_PATH . 'components/minishop2/processors/mgr/']
+                    );
+                    if ($response->isError()) {
+                        $this->modx->log(
+                            modX::LOG_LEVEL_ERROR,
+                            "Error on upload \"$v\": \n" . print_r($response->getAllErrors(), 1)
+                        );
+                    } else {
+                        $this->modx->log(
+                            modX::LOG_LEVEL_INFO,
+                            "Successful upload  \"$v\": \n" . print_r($response->getObject(), 1)
+                        );
                     }
                 }
             }
-
-            if ($is_debug) {
-                $this->modx->log(
-                    modX::LOG_LEVEL_INFO,
-                    'You in debug mode, so we process only 1 row. Time: ' . number_format(
-                        microtime(true) - $this->modx->startTime,
-                        7
-                    ) . " s"
-                );
-                return true;
-            }
         }
-        fclose($handle);
-
-        return true;
     }
 }
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 65b802a02..337616361 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -176,9 +176,10 @@
 $_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
 $_lang['ms2_utilites_import_use_scheduler'] = 'Использовать планировщик';
 $_lang['ms2_utilites_params'] = 'Параметры ';
-$_lang['ms2_weight'] = 'Вес';
-$_lang['ms2_weight_price'] = 'Стоимость ед/вес';
-$_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';
 $_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
 $_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
 $_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';
+$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
+$_lang['ms2_weight'] = 'Вес';
+$_lang['ms2_weight_price'] = 'Стоимость ед/вес';
+$_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index 0879bcc8c..7df3b7cc4 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -64,7 +64,8 @@ public function process()
             'update' => $this->properties['update'],
             'key' => $this->properties['key'],
             'debug' => $this->properties['debug'],
-            'delimiter' => $this->properties['delimiter']
+            'delimiter' => $this->properties['delimiter'],
+            'has_header' => $this->properties['has_header'],
         ];
 
         $scheduler = $this->getProperty('scheduler', 0);

From 3a33fd687ec451a0b2135a03f5e7180824ea13c3 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Wed, 14 Jun 2023 19:02:34 +0600
Subject: [PATCH 07/19] fixes and updates

---
 .../components/minishop2/import/importCSV.php | 68 +++++++++++--------
 .../minishop2/lexicon/ru/manager.inc.php      |  9 ++-
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index 707e2e497..11065335c 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -37,12 +37,14 @@ public function process($params)
 
         // Check required options
         if (empty($this->params['fields'])) {
-            $this->modx->log(modX::LOG_LEVEL_ERROR, 'You must specify the parameter "fields". It needed for parse of your file.');
-            return false;
+            $error = $this->modx->lexicon('ms2_utilities_import_fields_ns');
+            $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+            return $error;
         }
-        if (empty($key)) {
-            $this->modx->log(modX::LOG_LEVEL_ERROR, 'You must specify the parameter "key". It needed for check for duplicates.');
-            return false;
+        if (empty($this->params['key'])) {
+            $error = $this->modx->lexicon('ms2_utilities_import_key_ns');
+            $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+            return $error;
         }
 
         $this->params['keys'] = array_map('trim', explode(',', strtolower($this->params['fields'])));
@@ -55,34 +57,34 @@ public function process($params)
 
         // Check file
         if (empty($this->params['file'])) {
-            $error = 'You must specify an file in the ';
-            $error .= XPDO_CLI_MODE ? 'first parameter of console call' : '$_GET["file"] parameter';
-            $error .= '!';
+            $error = $this->modx->lexicon('ms2_utilities_import_file_ns');
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return false;
+            return $error;
         } elseif (!preg_match('/\.csv$/i', $this->params['file'])) {
-            $this->modx->log(modX::LOG_LEVEL_ERROR, 'Wrong file extension. File must be an *.csv.');
-            return false;
+            $error = $this->modx->lexicon('ms2_utilities_import_file_ext_err');
+            $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+            return $error;
         }
 
         $this->params['file'] = str_replace('//', '/', MODX_BASE_PATH . $this->params['file']);
         if (!file_exists($this->params['file'])) {
-            $this->modx->log(modX::LOG_LEVEL_ERROR, 'File not found at ' . $this->params['file'] . '.');
-            return false;
+            $error = $this->modx->lexicon('ms2_utilities_import_file_nf', ['path' => $this->params['file']]);
+            $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+            return $error;
         }
 
         $this->import();
 
-        echo "\nImport complete in " . number_format(microtime(true) - $this->modx->startTime, 7) . " s\n";
-        echo "\nTotal rows:	$this->rows\n";
-        echo "Created:	$this->created\n";
-        echo "Updated:	$this->updated\n";
-        return true;
+        return $this->modx->lexicon('ms2_utilities_import_success', [
+            'total' => $this->rows,
+            'created' => $this->created,
+            'updated' => $this->updated
+        ]);
     }
 
     private function import()
     {
-        $handle = fopen($this->params['file'], "r");
+        $handle = fopen($this->params['file'], 'r');
 
         while (($csv = fgetcsv($handle, 0, $this->params['delimeter'])) !== false) {
             $this->rows++;
@@ -108,12 +110,13 @@ private function import()
     private function processRow($csv)
     {
         $data = $gallery = [];
-        $this->modx->error->reset();
         $this->modx->log(modX::LOG_LEVEL_INFO, "Raw data for import: \n" . print_r($csv, 1));
 
         foreach ($this->params['keys'] as $k => $v) {
             if (!isset($csv[$k])) {
-                exit('Field "' . $v . '" not exists in file. Please fix import file or parameter "fields".');
+                $error = $this->modx->lexicon('ms2_utilities_file_field_nf', ['field' => $v, 'row' => $this->rows]);
+                $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
+                return false;
             }
             if ($v == 'gallery') {
                 $gallery[] = $csv[$k];
@@ -132,7 +135,8 @@ private function processRow($csv)
             $data['class_key'] = 'msProduct';
         }
         if (empty($data['context_key'])) {
-            if (isset($data['parent']) && $parent = $this->modx->getObject('modResource', ['id' => $data['parent']])) {
+            $parent = $this->modx->getObject('modResource', ['id' => $data['parent']]);
+            if (isset($data['parent']) && $parent) {
                 $data['context_key'] = $parent->get('context_key');
             } elseif (isset($this->modx->resource) && isset($this->modx->context)) {
                 $data['context_key'] = $this->modx->context->key;
@@ -145,6 +149,10 @@ private function processRow($csv)
 
         // Duplicate check
         $q = $this->modx->newQuery($data['class_key']);
+        $q->where([
+            'deleted' => 0,
+            'class_key' => $data['class_key']
+        ]);
         $q->select($data['class_key'] . '.id');
         if (strtolower($data['class_key']) === 'msproduct') {
             $q->innerJoin('msProductData', 'Data', $data['class_key'] . '.id = Data.id');
@@ -162,7 +170,8 @@ private function processRow($csv)
 
         $action = 'create';
         /** @var modResource $exists */
-        if ($exists = $this->modx->getObject($data['class_key'], $q)) {
+        $exists = $this->modx->getObject($data['class_key'], $q);
+        if ($exists) {
             $this->modx->log(modX::LOG_LEVEL_INFO, "Key $key = $data[$key] has duplicate.");
             if (!$this->params['update']) {
                 $this->modx->log(modX::LOG_LEVEL_ERROR, "Skipping line with $key = \"$data[$key]\" because update is disabled.");
@@ -182,11 +191,12 @@ private function processRow($csv)
             }
         }
 
-        $this->runAction($action, $data);
+        $this->runAction($action, $data, $gallery);
     }
 
-    private function runAction($action, $data)
+    private function runAction($action, $data, $gallery = [])
     {
+        $this->modx->error->reset();
         /** @var modProcessorResponse $response */
         $response = $this->modx->runProcessor('resource/' . $action, $data);
         if ($response->isError()) {
@@ -201,12 +211,14 @@ private function runAction($action, $data)
             $resource = $response->getObject();
             $this->modx->log(modX::LOG_LEVEL_INFO, "Successful $action: \n" . print_r($resource, 1));
 
-            // Process gallery images, if exists
-            $this->processGallery($resource);
+            if (!empty($gallery)) {
+                // Process gallery images, if exists
+                $this->processGallery($resource, $gallery);
+            }
         }
     }
 
-    private function processGallery($resource)
+    private function processGallery($resource, $gallery)
     {
         if (!empty($gallery)) {
             $this->modx->log(modX::LOG_LEVEL_INFO, "Importing images: \n" . print_r($gallery, 1));
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 337616361..3d1209266 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -163,7 +163,14 @@
 $_lang['ms2_utilites_gallery_updating'] = 'Обновлению превью';
 $_lang['ms2_utilites_import'] = 'Импорт';
 $_lang['ms2_utilites_import_debug'] = 'Режим отладки';
+$_lang['ms2_utilities_import_file_ns'] = 'Не выбран файл для импорта.';
+$_lang['ms2_utilities_import_file_ext_err'] = 'Не верное расширение файла.<br> Разрешен только *.csv';
+$_lang['ms2_utilities_import_file_nf'] = 'Файл с расположением <strong>[[+path]]</strong> не найден';
+$_lang['ms2_utilities_import_fields_ns'] = 'Не заполнен параметр <br><strong>Поля импорта</strong>.';
 $_lang['ms2_utilites_import_intro'] = 'Простой импорт каталога товаров. <br>При импорте большого объема товаров ваш сайт может зависнуть.<br>Рекомендуем запускать выполнение в фоновом режиме, для этого необходимо отметить чекбокс "Использовать планировщик" (требуется установленный компонент <a href="https://modstore.pro/packages/utilities/scheduler" target="_blank">Scheduler</a>)';
+$_lang['ms2_utilities_import_key_ns'] = 'Не заполнен параметр <br><strong>Уникальное поле</strong>.';
+$_lang['ms2_utilities_import_success'] = 'Импорт выполнен.<br>Всего обработано строк: <strong>[[+total]]</strong><br>Создано: <strong>[[+created]]</strong><br>Обновлено: <strong>[[+updated]]</strong>';
+
 $_lang['ms2_utilites_import_label_delimiter'] = 'Разделитель колонок в файле';
 $_lang['ms2_utilites_import_label_fields'] = 'Поля импорта';
 $_lang['ms2_utilites_import_label_file'] = 'Файл для импорта';
@@ -171,6 +178,7 @@
 $_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
 $_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
 $_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
+$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
 $_lang['ms2_utilites_import_submit'] = 'Импортировать';
 $_lang['ms2_utilites_import_update_key'] = 'Уникальное поле для обновления';
 $_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
@@ -179,7 +187,6 @@
 $_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
 $_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
 $_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';
-$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
 $_lang['ms2_weight'] = 'Вес';
 $_lang['ms2_weight_price'] = 'Стоимость ед/вес';
 $_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';

From ce23384acdebc165a91495d46dd49eb14d2d3a37 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Wed, 14 Jun 2023 23:17:49 +0600
Subject: [PATCH 08/19] remove skip header

---
 .../minishop2/js/mgr/utilites/import/panel.js | 355 +++++++++---------
 .../components/minishop2/import/importCSV.php |   4 -
 .../minishop2/lexicon/ru/manager.inc.php      |   2 -
 .../mgr/utilites/import/import.class.php      |   3 +-
 core/components/minishop2/tasks/csvImport.php |   4 +-
 5 files changed, 177 insertions(+), 191 deletions(-)

diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilites/import/panel.js
index f341c65c2..a9f9fbf19 100644
--- a/assets/components/minishop2/js/mgr/utilites/import/panel.js
+++ b/assets/components/minishop2/js/mgr/utilites/import/panel.js
@@ -1,143 +1,134 @@
 miniShop2.panel.UtilitesImport = function (config) {
-    config = config || {};
+  config = config || {}
 
-    Ext.apply(config, {
-		cls: 'container form-with-labels',
-		autoHeight: true,
-		url: miniShop2.config.connector_url,
-		progress:true,
-		id: 'ms2-panel-import',
-		baseParams: {
-			action: 'mgr/utilites/import/import'
-		},
-        items: [{
+  Ext.apply(config, {
+    cls: 'container form-with-labels',
+    autoHeight: true,
+    url: miniShop2.config.connector_url,
+    progress: true,
+    id: 'ms2-panel-import',
+    baseParams: {
+      action: 'mgr/utilites/import/import'
+    },
+    items: [{
+      layout: 'column',
+      border: false,
+      anchor: '100%',
+      cls: 'main-wrapper',
+      labelAlign: 'top',
+      buttonAlign: 'left',
+      style: 'padding: 0 0 0 7px',
+      items: [{
+        columnWidth: 0.5,
+        layout: 'form',
+        defaults: { msgTarget: 'under' },
+        border: false,
+        style: { margin: '0' },
+        items: [
+          {
+            xtype: 'modx-combo-browser',
+            fieldLabel: _('ms2_utilites_import_label_file'),
+            emptyText: _('ms2_utilites_import_label_file_empty'),
+            anchor: '81%',
+            name: 'importfile',
+            allowBlank: false,
+          },
+          {
             layout: 'column',
-            border: false,
-            anchor: '100%',
-            cls: 'main-wrapper',
-            labelAlign: 'top',
-            buttonAlign: 'left',
-            style: 'padding: 0 0 0 7px',
             items: [{
-                columnWidth: 0.5,
+              columnWidth: 0.8,
+              layout: 'form',
+              border: false,
+              style: { margin: '0' },
+              items: [
+                {
+                  xtype: 'textfield',
+                  name: 'fields',
+                  value: miniShop2.config.utility_import_fields,
+                  width: '99%',
+                  fieldLabel: _('ms2_utilites_import_label_fields'),
+                  allowBlank: false,
+                },
+                {
+                  xtype: 'textfield',
+                  name: 'delimiter',
+                  value: miniShop2.config.utility_import_fields_delimiter,
+                  width: '99%',
+                  allowBlank: false,
+                  fieldLabel: _('ms2_utilites_import_label_delimiter'),
+                }
+              ]
+            },
+              {
+                columnWidth: 0.2,
                 layout: 'form',
-                defaults: { msgTarget: 'under' },
                 border: false,
-                style: { margin: '0' },
+                style: { margin: '20px 0 0 15px' },
                 items: [
-                    {
-                        xtype: 'modx-combo-browser',
-                        fieldLabel: _('ms2_utilites_import_label_file'),
-                        emptyText: _('ms2_utilites_import_label_file_empty'),
-                        anchor: '81%',
-                        name: 'importfile',
-                        allowBlank: false,
-                    },
-                    {
-                        layout: 'column',
-                        items:[{
-                            columnWidth: 0.8,
-                            layout: 'form',
-                            border: false,
-                            style: { margin: '0' },
-                            items:[
-                                {
-                                    xtype: 'textfield',
-                                    name: 'fields',
-                                    value: miniShop2.config.utility_import_fields,
-                                    width: '99%',
-                                    fieldLabel: _('ms2_utilites_import_label_fields'),
-                                    allowBlank: false,
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    name: 'delimiter',
-                                    value:  miniShop2.config.utility_import_fields_delimiter,
-                                    width: '99%',
-                                    allowBlank: false,
-                                    fieldLabel: _('ms2_utilites_import_label_delimiter'),
-                                }
-                            ]
-                        },
-                        {
-                            columnWidth: 0.2,
-                            layout: 'form',
-                            border: false,
-                            style: { margin: '20px 0 0 15px' },
-                            items:[
-                                {
-                                    xtype: 'button',
-                                    style: 'padding: 4px 10px 7px; margin: 18px 0 0 0',
-                                    tooltip: _('ms2_utilites_import_save_fields'),
-                                    text: '<i class="icon icon-save"></i>',
-                                    handler: function() {
-                                        this.saveConfig(this);
-                                    }, scope: this
-                                }
-                            ]
-
-                        }]
-                    },
-                    {
-                        xtype: 'xcheckbox',
-                        name: 'update',
-                        value: 1,
-                        id: 'ms-utilites-import-update',
-                        boxLabel: _('ms2_utilites_import_update_products'),
-                        labelAlign: 'right',
-                        listeners: {
-                            check: {
-                                fn : this.onUpdateNeed,
-                                scope : this
-                            },
-                        }
-                    },
-                    {
-                        xtype: 'textfield',
-                        name: 'key',
-                        value: 'article',
-                        width: '99%',
-                        hidden: true,
-                        id: 'ms-utilites-import-key',
-                        fieldLabel: _('ms2_utilites_import_update_key'),
-                    },
-                    {
-                        xtype: 'xcheckbox',
-                        name: 'debug',
-                        value: 1,
-                        hideLabel: true,
-                        id: 'ms-utilites-import-debug',
-                        boxLabel: _('ms2_utilites_import_debug'),
-                        labelAlign: 'right',
-                    },
-                    {
-                        xtype: 'xcheckbox',
-                        name: 'scheduler',
-                        value: 1,
-                        hideLabel: true,
-                        id: 'ms-utilites-import-scheduler',
-                        boxLabel: _('ms2_utilites_import_use_scheduler'),
-                        labelAlign: 'right',
-                    },
-                    {
-                        xtype: 'xcheckbox',
-                        name: 'skip_header',
-                        value: 1,
-                        hideLabel: true,
-                        id: 'ms-utilites-import-header',
-                        boxLabel: _('ms2_utilites_import_skip_header'),
-                        labelAlign: 'right',
-                    },
-                    {
-                        xtype: 'button',
-                        style: 'margin: 25px 0 0 2px',
-                        text: '<i class="icon icon-download"></i> &nbsp;'+_('ms2_utilites_import_submit'),
-                        handler: function() {
-                            this.submit(this);
-                        }, scope: this
-                    }
+                  {
+                    xtype: 'button',
+                    style: 'padding: 4px 10px 7px; margin: 18px 0 0 0',
+                    tooltip: _('ms2_utilites_import_save_fields'),
+                    text: '<i class="icon icon-save"></i>',
+                    handler: function () {
+                      this.saveConfig(this)
+                    }, scope: this
+                  }
                 ]
-            }/*, {
+
+              }]
+          },
+          {
+            xtype: 'xcheckbox',
+            name: 'update',
+            value: 1,
+            id: 'ms-utilites-import-update',
+            boxLabel: _('ms2_utilites_import_update_products'),
+            labelAlign: 'right',
+            listeners: {
+              check: {
+                fn: this.onUpdateNeed,
+                scope: this
+              },
+            }
+          },
+          {
+            xtype: 'textfield',
+            name: 'key',
+            value: 'article',
+            width: '99%',
+            hidden: true,
+            id: 'ms-utilites-import-key',
+            fieldLabel: _('ms2_utilites_import_update_key'),
+          },
+          {
+            xtype: 'xcheckbox',
+            name: 'debug',
+            value: 1,
+            hideLabel: true,
+            id: 'ms-utilites-import-debug',
+            boxLabel: _('ms2_utilites_import_debug'),
+            labelAlign: 'right',
+          },
+          {
+            xtype: 'xcheckbox',
+            name: 'scheduler',
+            value: 1,
+            hideLabel: true,
+            id: 'ms-utilites-import-scheduler',
+            boxLabel: _('ms2_utilites_import_use_scheduler'),
+            labelAlign: 'right',
+          },
+          {
+            xtype: 'button',
+            style: 'margin: 25px 0 0 2px',
+            text: '<i class="icon icon-download"></i> &nbsp;' + _('ms2_utilites_import_submit'),
+            handler: function () {
+              this.submit(this)
+            }, scope: this
+          }
+        ]
+      }/*, {
                 columnWidth: 0.5,
                 layout: 'form',
                 defaults: { msgTarget: 'under' },
@@ -163,59 +154,61 @@ miniShop2.panel.UtilitesImport = function (config) {
                     }
                 ]
             }*/]
-        }] ,
-        listeners: {
-            success: {fn: function(response) {
-				var data = response.result.object;
-                MODx.msg.alert(_('info'), data.message);
-			},scope: this},
-			failure: {
-			    fn:function(response) {
-				    console.log(response);
-		        },scope: this
-			}
-        }
-    });
+    }],
+    listeners: {
+      success: {
+        fn: function (response) {
+          const data = response.result
+          const alert = data.success === true ? _('success') : _('error')
+          MODx.msg.alert(alert, data.message)
+        }, scope: this
+      },
+      failure: {
+        fn: function (response) {
+        }, scope: this
+      }
+    }
+  })
 
-    miniShop2.panel.UtilitesImport.superclass.constructor.call(this, config);
-};
+  miniShop2.panel.UtilitesImport.superclass.constructor.call(this, config)
+}
 
-Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel,{
+Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel, {
 
-    onUpdateNeed: function (cb) {
-       var updateKey = Ext.getCmp('ms-utilites-import-key');
-        if (cb.getValue()) {
-            updateKey.show();
-        } else {
-            updateKey.hide();
-        }
-    },
+  onUpdateNeed: function (cb) {
+    var updateKey = Ext.getCmp('ms-utilites-import-key')
+    if (cb.getValue()) {
+      updateKey.show()
+    } else {
+      updateKey.hide()
+    }
+  },
 
-    saveConfig: function () {
-        var form = this.getForm();
-        var values = form.getValues();
+  saveConfig: function () {
+    var form = this.getForm()
+    var values = form.getValues()
 
-        MODx.Ajax.request({
-            url: miniShop2.config['connector_url'],
-            params: {
-                action: 'mgr/utilites/import/saveconfig',
-                fields: values.fields,
-                delimiter: values.delimiter
-            },
-            listeners: {
-                success: {
-                    fn: function (r) {
-                        MODx.msg.status({
-    						title: _('ms2_utilites_import_save_fields_title'),
-    						message:  _('ms2_utilites_import_save_fields_message'),
-    						delay: 7
-    					});
-                    }, scope: this
-                }
-            }
-        });
+    MODx.Ajax.request({
+      url: miniShop2.config['connector_url'],
+      params: {
+        action: 'mgr/utilites/import/saveconfig',
+        fields: values.fields,
+        delimiter: values.delimiter
+      },
+      listeners: {
+        success: {
+          fn: function (r) {
+            MODx.msg.status({
+              title: _('ms2_utilites_import_save_fields_title'),
+              message: _('ms2_utilites_import_save_fields_message'),
+              delay: 7
+            })
+          }, scope: this
+        }
+      }
+    })
 
-    }
+  }
 
-});
-Ext.reg('minishop2-utilites-import', miniShop2.panel.UtilitesImport);
+})
+Ext.reg('minishop2-utilites-import', miniShop2.panel.UtilitesImport)
diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index 11065335c..5462f09d2 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -30,7 +30,6 @@ public function process($params)
         $this->params['key'] = @$params['key'];
         $this->params['is_debug'] = !empty($params['debug']);
         $this->params['delimeter'] = $params['delimeter'] ?? ';';
-        $this->params['skip_header'] = @$params['skip_header'];
         $this->params['keys'] = [];
         $this->params['tv_enabled'] = false;
 
@@ -88,9 +87,6 @@ private function import()
 
         while (($csv = fgetcsv($handle, 0, $this->params['delimeter'])) !== false) {
             $this->rows++;
-            if (!empty($has_header) && $this->rows === 1) {
-                continue;
-            }
             $this->processRow($csv);
 
             if ($this->params['is_debug'] && $this->rows === 1) {
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 3d1209266..4dc002841 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -170,7 +170,6 @@
 $_lang['ms2_utilites_import_intro'] = 'Простой импорт каталога товаров. <br>При импорте большого объема товаров ваш сайт может зависнуть.<br>Рекомендуем запускать выполнение в фоновом режиме, для этого необходимо отметить чекбокс "Использовать планировщик" (требуется установленный компонент <a href="https://modstore.pro/packages/utilities/scheduler" target="_blank">Scheduler</a>)';
 $_lang['ms2_utilities_import_key_ns'] = 'Не заполнен параметр <br><strong>Уникальное поле</strong>.';
 $_lang['ms2_utilities_import_success'] = 'Импорт выполнен.<br>Всего обработано строк: <strong>[[+total]]</strong><br>Создано: <strong>[[+created]]</strong><br>Обновлено: <strong>[[+updated]]</strong>';
-
 $_lang['ms2_utilites_import_label_delimiter'] = 'Разделитель колонок в файле';
 $_lang['ms2_utilites_import_label_fields'] = 'Поля импорта';
 $_lang['ms2_utilites_import_label_file'] = 'Файл для импорта';
@@ -178,7 +177,6 @@
 $_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
 $_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
 $_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
-$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
 $_lang['ms2_utilites_import_submit'] = 'Импортировать';
 $_lang['ms2_utilites_import_update_key'] = 'Уникальное поле для обновления';
 $_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index 7df3b7cc4..45206c84c 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -65,7 +65,6 @@ public function process()
             'key' => $this->properties['key'],
             'debug' => $this->properties['debug'],
             'delimiter' => $this->properties['delimiter'],
-            'has_header' => $this->properties['has_header'],
         ];
 
         $scheduler = $this->getProperty('scheduler', 0);
@@ -99,7 +98,7 @@ public function process()
 
         $task->schedule('+1 second', $importParams);
 
-        return $this->success('ms2_utilites_scheduler_success');
+        return $this->success($this->modx->lexicon('ms2_utilites_scheduler_success'));
     }
 
     /**
diff --git a/core/components/minishop2/tasks/csvImport.php b/core/components/minishop2/tasks/csvImport.php
index afa20ed64..51e2a1e72 100644
--- a/core/components/minishop2/tasks/csvImport.php
+++ b/core/components/minishop2/tasks/csvImport.php
@@ -5,8 +5,8 @@
 /** @var sTaskRun $run */
 /** @var array $scriptProperties */
 
-require_once $modx->getOption('modx_core_path') . 'components/minishop2/import/importCSV.php';
-$importCSV = new ImportCSV($this->modx);
+require_once $modx->getOption('core_path') . 'components/minishop2/import/importCSV.php';
+$importCSV = new ImportCSV($modx);
 $result = $importCSV->process($scriptProperties);
 
 if (!$result) {

From 9ccfa2453b83a7c2f84c86c09ce8e289b6a1f6c2 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Fri, 16 Jun 2023 16:51:51 +0600
Subject: [PATCH 09/19] add skip_header again

---
 .../components/minishop2/js/mgr/utilites/import/panel.js | 9 +++++++++
 core/components/minishop2/import/importCSV.php           | 4 ++++
 core/components/minishop2/lexicon/ru/manager.inc.php     | 1 +
 .../processors/mgr/utilites/import/import.class.php      | 1 +
 4 files changed, 15 insertions(+)

diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilites/import/panel.js
index a9f9fbf19..088f10f51 100644
--- a/assets/components/minishop2/js/mgr/utilites/import/panel.js
+++ b/assets/components/minishop2/js/mgr/utilites/import/panel.js
@@ -119,6 +119,15 @@ miniShop2.panel.UtilitesImport = function (config) {
             boxLabel: _('ms2_utilites_import_use_scheduler'),
             labelAlign: 'right',
           },
+          {
+            xtype: 'xcheckbox',
+            name: 'skip_header',
+            value: 0,
+            hideLabel: true,
+            id: 'ms-utilites-import-skip_header',
+            boxLabel: _('ms2_utilites_import_skip_header'),
+            labelAlign: 'right',
+          },
           {
             xtype: 'button',
             style: 'margin: 25px 0 0 2px',
diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index 5462f09d2..a921d2038 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -28,6 +28,7 @@ public function process($params)
         $this->params['fields'] = @$params['fields'];
         $this->params['update'] = !empty($params['update']);
         $this->params['key'] = @$params['key'];
+        $this->params['skip_header'] = @$params['skip_header'];
         $this->params['is_debug'] = !empty($params['debug']);
         $this->params['delimeter'] = $params['delimeter'] ?? ';';
         $this->params['keys'] = [];
@@ -87,6 +88,9 @@ private function import()
 
         while (($csv = fgetcsv($handle, 0, $this->params['delimeter'])) !== false) {
             $this->rows++;
+            if (!empty($this->params['skip_header']) && $this->rows === 1) {
+                continue;
+            }
             $this->processRow($csv);
 
             if ($this->params['is_debug'] && $this->rows === 1) {
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 4dc002841..9364bb633 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -177,6 +177,7 @@
 $_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
 $_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
 $_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
+$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
 $_lang['ms2_utilites_import_submit'] = 'Импортировать';
 $_lang['ms2_utilites_import_update_key'] = 'Уникальное поле для обновления';
 $_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index 45206c84c..aa0d1ca4a 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -65,6 +65,7 @@ public function process()
             'key' => $this->properties['key'],
             'debug' => $this->properties['debug'],
             'delimiter' => $this->properties['delimiter'],
+            'skip_header' => $this->properties['skip_header'],
         ];
 
         $scheduler = $this->getProperty('scheduler', 0);

From 890ff9a7fc1d3de57c79224371c517f8897b42f8 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Fri, 16 Jun 2023 17:05:06 +0600
Subject: [PATCH 10/19] fix message type

---
 .../components/minishop2/import/importCSV.php | 19 +++++++++++++------
 .../mgr/utilites/import/import.class.php      |  5 +----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index a921d2038..01b28c984 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -6,6 +6,10 @@ class ImportCSV
      * @var modX
      */
     private $modx;
+    /**
+     * @var miniShop2
+     */
+    private $miniShop2;
     private $rows = 0;
     private $created = 0;
     private $updated = 0;
@@ -15,6 +19,7 @@ class ImportCSV
     public function __construct(modX $modx)
     {
         $this->modx = $modx;
+        $this->miniShop2 = $this->modx->getService('miniShop2');
         // Time limit
         set_time_limit(600);
         $tmp = 'Trying to set time limit = 600 sec: ';
@@ -39,12 +44,12 @@ public function process($params)
         if (empty($this->params['fields'])) {
             $error = $this->modx->lexicon('ms2_utilities_import_fields_ns');
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return $error;
+            return $this->miniShop2->error($error);
         }
         if (empty($this->params['key'])) {
             $error = $this->modx->lexicon('ms2_utilities_import_key_ns');
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return $error;
+            return $this->miniShop2->error($error);
         }
 
         $this->params['keys'] = array_map('trim', explode(',', strtolower($this->params['fields'])));
@@ -59,27 +64,28 @@ public function process($params)
         if (empty($this->params['file'])) {
             $error = $this->modx->lexicon('ms2_utilities_import_file_ns');
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return $error;
+            return $this->miniShop2->error($error);
         } elseif (!preg_match('/\.csv$/i', $this->params['file'])) {
             $error = $this->modx->lexicon('ms2_utilities_import_file_ext_err');
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return $error;
+            return $this->miniShop2->error($error);
         }
 
         $this->params['file'] = str_replace('//', '/', MODX_BASE_PATH . $this->params['file']);
         if (!file_exists($this->params['file'])) {
             $error = $this->modx->lexicon('ms2_utilities_import_file_nf', ['path' => $this->params['file']]);
             $this->modx->log(modX::LOG_LEVEL_ERROR, $error);
-            return $error;
+            return $this->miniShop2->error($error);
         }
 
         $this->import();
 
-        return $this->modx->lexicon('ms2_utilities_import_success', [
+        $message = $this->modx->lexicon('ms2_utilities_import_success', [
             'total' => $this->rows,
             'created' => $this->created,
             'updated' => $this->updated
         ]);
+        return $this->miniShop2->success($message);
     }
 
     private function import()
@@ -105,6 +111,7 @@ private function import()
             }
         }
         fclose($handle);
+        return true;
     }
 
     private function processRow($csv)
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index aa0d1ca4a..5a94a2e1c 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -71,10 +71,7 @@ public function process()
         $scheduler = $this->getProperty('scheduler', 0);
         if (empty($scheduler)) {
             $importCSV = new ImportCSV($this->modx);
-            $result = $importCSV->process($importParams);
-            return $this->success($result, [
-                'message' => $result
-            ]);
+            return $importCSV->process($importParams);
         }
 
 

From caf537b5587ed356194f7f490601562b5b828a89 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Fri, 16 Jun 2023 17:25:07 +0600
Subject: [PATCH 11/19] add required fields

---
 core/components/minishop2/import/importCSV.php      | 13 +++++++++++++
 .../components/minishop2/lexicon/ru/manager.inc.php |  1 +
 .../processors/mgr/utilites/import/import.class.php |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/components/minishop2/import/importCSV.php b/core/components/minishop2/import/importCSV.php
index 01b28c984..8f500dbd6 100644
--- a/core/components/minishop2/import/importCSV.php
+++ b/core/components/minishop2/import/importCSV.php
@@ -78,6 +78,19 @@ public function process($params)
             return $this->miniShop2->error($error);
         }
 
+        $requiredFields = [
+            'parent',
+            'pagetitle',
+        ];
+
+        foreach ($requiredFields as $rf) {
+            if (!in_array($rf, $this->params['keys'])) {
+                $error = $this->modx->lexicon('ms2_utilities_import_required_field', ['field' => $rf]);
+                return $this->miniShop2->error($error);
+            }
+        }
+
+
         $this->import();
 
         $message = $this->modx->lexicon('ms2_utilities_import_success', [
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 9364bb633..3bb8065d6 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -174,6 +174,7 @@
 $_lang['ms2_utilites_import_label_fields'] = 'Поля импорта';
 $_lang['ms2_utilites_import_label_file'] = 'Файл для импорта';
 $_lang['ms2_utilites_import_label_file_empty'] = 'Выберите файл';
+$_lang['ms2_utilities_import_required_field'] = 'Пропущено обязательное поле <strong>[[+field]]</strong>';
 $_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
 $_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
 $_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
index 5a94a2e1c..b05d27d26 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilites/import/import.class.php
@@ -84,14 +84,14 @@ public function process()
         $scheduler = $this->modx->getService('scheduler', 'Scheduler', $path . 'model/scheduler/');
         if (!$scheduler) {
             $this->modx->log(1, 'not found Scheduler extra');
-            return $this->failure('ms2_utilites_scheduler_nf', []);
+            return $this->failure($this->modx->lexicon('ms2_utilites_scheduler_nf'));
         }
         $task = $scheduler->getTask('minishop2', 'ms2_csv_import');
         if (!$task) {
             $task = $this->createImportTask();
         }
         if (empty($task)) {
-            return $this->failure('ms2_utilites_scheduler_task_ce', []);
+            return $this->failure($this->modx->lexicon('ms2_utilites_scheduler_task_ce'));
         }
 
         $task->schedule('+1 second', $importParams);

From 866cfc7192a3a41da3906a1458b21b1a7d65f4ae Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Fri, 16 Jun 2023 23:37:35 +0300
Subject: [PATCH 12/19] Rename path

---
 .../mgr/{utilites => utilities}/gallery.css   |   0
 .../js/mgr/utilites/gallery/panel.js          | 135 -----------------
 .../js/mgr/utilities/gallery/panel.js         | 137 ++++++++++++++++++
 .../{utilites => utilities}/import/panel.js   |  84 +++++------
 .../js/mgr/{utilites => utilities}/panel.js   |  32 ++--
 ...utilites.class.php => utilities.class.php} |  14 +-
 .../minishop2/lexicon/ru/default.inc.php      |   4 +-
 .../minishop2/lexicon/ru/manager.inc.php      |  56 +++----
 .../gallery/update.class.php                  |   2 +-
 .../import/import.class.php                   |   6 +-
 .../import/saveconfig.class.php               |   0
 11 files changed, 236 insertions(+), 234 deletions(-)
 rename assets/components/minishop2/css/mgr/{utilites => utilities}/gallery.css (100%)
 delete mode 100644 assets/components/minishop2/js/mgr/utilites/gallery/panel.js
 create mode 100644 assets/components/minishop2/js/mgr/utilities/gallery/panel.js
 rename assets/components/minishop2/js/mgr/{utilites => utilities}/import/panel.js (69%)
 rename assets/components/minishop2/js/mgr/{utilites => utilities}/panel.js (55%)
 rename core/components/minishop2/controllers/mgr/{utilites.class.php => utilities.class.php} (87%)
 rename core/components/minishop2/processors/mgr/{utilites => utilities}/gallery/update.class.php (98%)
 rename core/components/minishop2/processors/mgr/{utilites => utilities}/import/import.class.php (95%)
 rename core/components/minishop2/processors/mgr/{utilites => utilities}/import/saveconfig.class.php (100%)

diff --git a/assets/components/minishop2/css/mgr/utilites/gallery.css b/assets/components/minishop2/css/mgr/utilities/gallery.css
similarity index 100%
rename from assets/components/minishop2/css/mgr/utilites/gallery.css
rename to assets/components/minishop2/css/mgr/utilities/gallery.css
diff --git a/assets/components/minishop2/js/mgr/utilites/gallery/panel.js b/assets/components/minishop2/js/mgr/utilites/gallery/panel.js
deleted file mode 100644
index 1ef65dd75..000000000
--- a/assets/components/minishop2/js/mgr/utilites/gallery/panel.js
+++ /dev/null
@@ -1,135 +0,0 @@
-miniShop2.panel.UtilitesGallery = function (config) {
-    config = config || {};
-
-    Ext.apply(config, { 
-		cls: 'container form-with-labels',
-		autoHeight: true,  
-		url: miniShop2.config.connector_url,
-		saveMsg: _('ms2_utilites_gallery_updating'),
-
-		progress:true,
-		baseParams: {
-			action: 'mgr/utilites/gallery/update'
-		},
-        items: [{
-			layout: 'form',
-			cls: 'main-wrapper',
-            labelWidth: 200,
-            labelAlign: 'left',
-			border: false,
-			buttonAlign: 'left',
-			style: 'padding: 0 0 0 7px',
-			items: [
-                {
-                    html: String.format(
-						_('ms2_utilites_gallery_information'),
-						miniShop2.config.utility_gallery_source_name,
-						miniShop2.config.utility_gallery_source_id,
-						miniShop2.config.utility_gallery_total_products,
-						miniShop2.config.utility_gallery_total_products_files
-					),
-                }, 
-				{
-					xtype: 'fieldset',
-					title: _('ms2_utilites_params'),
-					id: 'ms2-utilites-gallery-params',
-					cls: 'x-fieldset-checkbox-toggle',
-					style: 'margin: 5px 0 15px ',
-					collapsible: true,
-					collapsed: true,
-					stateful: true, 
-					labelAlign: 'top',
-					stateEvents: ['collapse', 'expand'],
-					items: [
-						{
-							html:  miniShop2.config.utility_gallery_thumbnails
-						},
-					]
-				},
-                {
-                    name: 'limit',
-                    xtype: 'numberfield',
-                    value: 10,
-                    width: 80,
-                    fieldLabel: _('ms2_utilites_gallery_for_step')
-                }, 
-                {
-                    name: 'offset',
-                    xtype: 'numberfield',
-                    value: 0,
-                    hidden: true,
-                }, 
-                { 
-                    xtype: 'button',
-                    style: 'margin: 15px 0 0 2px',
-					text: '<i class="icon icon-refresh"></i> &nbsp;' + _('ms2_utilites_gallery_refresh'),
-					handler: function() {
-					    var form = this.getForm();  
-    					form.setValues({
-    						offset: 0
-    					}); 
-						this.submit(this);
-					}, scope: this
-                }, 
-				{
-                    style: 'padding: 15px 0', 
-					html: '\
-						<div id="ms-utility-gallery-range_outer">\
-							<div class="ms-utility-gallery-labels"><span id="ms-utility-gallery-label">0%</span><span id="ms-utility-gallery-iteration"></span></div>\
-							<div id="ms-utility-gallery-progress"><span id="ms-utility-gallery-progress-bar"></span></div>\
-						</div>\
-					'
-				}
-            ]
-		}],
-        listeners: { 
-            success: {fn: function(response) {
-				var data = response.result.object;
-				var form = this.getForm();  
-				this.updateProgress(data);
-
-				if (!data.done) {
-					form.setValues({
-						offset: Number(data.offset)
-					});
-					this.submit(this);
-				}
-				else { 
-					MODx.msg.status({
-						title: _('ms2_utilites_gallery_done'),
-						message: _('ms2_utilites_gallery_done_message'),
-						delay: 5
-					});
-				}
-			},scope: this}
-        }
-    });
-    miniShop2.panel.UtilitesGallery.superclass.constructor.call(this, config);
-};
-
-Ext.extend(miniShop2.panel.UtilitesGallery, MODx.FormPanel,{
-
-	updateProgress: function (data) {
-		const progressblock = document.getElementById('ms-utility-gallery-range_outer');
-		const progresslabel = document.getElementById('ms-utility-gallery-label');
-		const progressbar = document.getElementById('ms-utility-gallery-progress-bar');
-		const progressiteration = document.getElementById('ms-utility-gallery-iteration');
-		progressblock.style.visibility = 'visible';
-
-		if(data.done) {
-			progresslabel.innerHTML = '100%';
-			progressbar.style.width = '100%';
-			progressiteration.style.visibility = 'hidden';
-		} else {
-			let progress = (parseFloat((data.offset/data.total) * 100)).toFixed(2);
-			progresslabel.innerHTML = progress + '%';
-			progressbar.style.width = progress + '%';
-
-			// count iterations
-			const totalIterations = Math.ceil(data.total/data.limit);
-			const currentIteration = data.offset/data.limit;
-			progressiteration.innerHTML = currentIteration + "/" + totalIterations;
-		}
-	}
-});
-Ext.reg('minishop2-utilites-gallery', miniShop2.panel.UtilitesGallery);
diff --git a/assets/components/minishop2/js/mgr/utilities/gallery/panel.js b/assets/components/minishop2/js/mgr/utilities/gallery/panel.js
new file mode 100644
index 000000000..32920bb40
--- /dev/null
+++ b/assets/components/minishop2/js/mgr/utilities/gallery/panel.js
@@ -0,0 +1,137 @@
+miniShop2.panel.UtilitiesGallery = function (config) {
+	config = config || {};
+
+	Ext.apply(config, {
+		cls: 'container form-with-labels',
+		autoHeight: true,
+		url: miniShop2.config.connector_url,
+		saveMsg: _('ms2_utilities_gallery_updating'),
+
+		progress: true,
+		baseParams: {
+			action: 'mgr/utilities/gallery/update'
+		},
+		items: [{
+			layout: 'form',
+			cls: 'main-wrapper',
+			labelWidth: 200,
+			labelAlign: 'left',
+			border: false,
+			buttonAlign: 'left',
+			style: 'padding: 0 0 0 7px',
+			items: [
+				{
+					html: String.format(
+						_('ms2_utilities_gallery_information'),
+						miniShop2.config.utility_gallery_source_name,
+						miniShop2.config.utility_gallery_source_id,
+						miniShop2.config.utility_gallery_total_products,
+						miniShop2.config.utility_gallery_total_products_files
+					),
+				},
+				{
+					xtype: 'fieldset',
+					title: _('ms2_utilities_params'),
+					id: 'ms2-utilities-gallery-params',
+					cls: 'x-fieldset-checkbox-toggle',
+					style: 'margin: 5px 0 15px ',
+					collapsible: true,
+					collapsed: true,
+					stateful: true,
+					labelAlign: 'top',
+					stateEvents: ['collapse', 'expand'],
+					items: [
+						{
+							html: miniShop2.config.utility_gallery_thumbnails
+						},
+					]
+				},
+				{
+					name: 'limit',
+					xtype: 'numberfield',
+					value: 10,
+					width: 80,
+					fieldLabel: _('ms2_utilities_gallery_for_step')
+				},
+				{
+					name: 'offset',
+					xtype: 'numberfield',
+					value: 0,
+					hidden: true,
+				},
+				{
+					xtype: 'button',
+					style: 'margin: 15px 0 0 2px',
+					text: '<i class="icon icon-refresh"></i> &nbsp;' + _('ms2_utilities_gallery_refresh'),
+					handler: function () {
+						var form = this.getForm();
+						form.setValues({
+							offset: 0
+						});
+						this.submit(this);
+					}, scope: this
+				},
+				{
+					style: 'padding: 15px 0',
+					html: '\
+						<div id="ms-utility-gallery-range_outer">\
+							<div class="ms-utility-gallery-labels"><span id="ms-utility-gallery-label">0%</span><span id="ms-utility-gallery-iteration"></span></div>\
+							<div id="ms-utility-gallery-progress"><span id="ms-utility-gallery-progress-bar"></span></div>\
+						</div>\
+					'
+				}
+			]
+		}],
+		listeners: {
+			success: {
+				fn: function (response) {
+					var data = response.result.object;
+					var form = this.getForm();
+					this.updateProgress(data);
+
+					if (!data.done) {
+						form.setValues({
+							offset: Number(data.offset)
+						});
+						this.submit(this);
+					}
+					else {
+						MODx.msg.status({
+							title: _('ms2_utilities_gallery_done'),
+							message: _('ms2_utilities_gallery_done_message'),
+							delay: 5
+						});
+					}
+				}, scope: this
+			}
+		}
+	});
+	miniShop2.panel.UtilitiesGallery.superclass.constructor.call(this, config);
+};
+
+Ext.extend(miniShop2.panel.UtilitiesGallery, MODx.FormPanel, {
+
+	updateProgress: function (data) {
+		const progressblock = document.getElementById('ms-utility-gallery-range_outer');
+		const progresslabel = document.getElementById('ms-utility-gallery-label');
+		const progressbar = document.getElementById('ms-utility-gallery-progress-bar');
+		const progressiteration = document.getElementById('ms-utility-gallery-iteration');
+		progressblock.style.visibility = 'visible';
+
+		if (data.done) {
+			progresslabel.innerHTML = '100%';
+			progressbar.style.width = '100%';
+			progressiteration.style.visibility = 'hidden';
+		} else {
+			let progress = (parseFloat((data.offset / data.total) * 100)).toFixed(2);
+			progresslabel.innerHTML = progress + '%';
+			progressbar.style.width = progress + '%';
+
+			// count iterations
+			const totalIterations = Math.ceil(data.total / data.limit);
+			const currentIteration = data.offset / data.limit;
+			progressiteration.innerHTML = currentIteration + "/" + totalIterations;
+		}
+	}
+});
+Ext.reg('minishop2-utilities-gallery', miniShop2.panel.UtilitiesGallery);
diff --git a/assets/components/minishop2/js/mgr/utilites/import/panel.js b/assets/components/minishop2/js/mgr/utilities/import/panel.js
similarity index 69%
rename from assets/components/minishop2/js/mgr/utilites/import/panel.js
rename to assets/components/minishop2/js/mgr/utilities/import/panel.js
index 088f10f51..0ff6cc435 100644
--- a/assets/components/minishop2/js/mgr/utilites/import/panel.js
+++ b/assets/components/minishop2/js/mgr/utilities/import/panel.js
@@ -1,4 +1,4 @@
-miniShop2.panel.UtilitesImport = function (config) {
+miniShop2.panel.UtilitiesImport = function (config) {
   config = config || {}
 
   Ext.apply(config, {
@@ -8,7 +8,7 @@ miniShop2.panel.UtilitesImport = function (config) {
     progress: true,
     id: 'ms2-panel-import',
     baseParams: {
-      action: 'mgr/utilites/import/import'
+      action: 'mgr/utilities/import/import'
     },
     items: [{
       layout: 'column',
@@ -27,8 +27,8 @@ miniShop2.panel.UtilitesImport = function (config) {
         items: [
           {
             xtype: 'modx-combo-browser',
-            fieldLabel: _('ms2_utilites_import_label_file'),
-            emptyText: _('ms2_utilites_import_label_file_empty'),
+            fieldLabel: _('ms2_utilities_import_label_file'),
+            emptyText: _('ms2_utilities_import_label_file_empty'),
             anchor: '81%',
             name: 'importfile',
             allowBlank: false,
@@ -46,7 +46,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                   name: 'fields',
                   value: miniShop2.config.utility_import_fields,
                   width: '99%',
-                  fieldLabel: _('ms2_utilites_import_label_fields'),
+                  fieldLabel: _('ms2_utilities_import_label_fields'),
                   allowBlank: false,
                 },
                 {
@@ -55,35 +55,35 @@ miniShop2.panel.UtilitesImport = function (config) {
                   value: miniShop2.config.utility_import_fields_delimiter,
                   width: '99%',
                   allowBlank: false,
-                  fieldLabel: _('ms2_utilites_import_label_delimiter'),
+                  fieldLabel: _('ms2_utilities_import_label_delimiter'),
                 }
               ]
             },
-              {
-                columnWidth: 0.2,
-                layout: 'form',
-                border: false,
-                style: { margin: '20px 0 0 15px' },
-                items: [
-                  {
-                    xtype: 'button',
-                    style: 'padding: 4px 10px 7px; margin: 18px 0 0 0',
-                    tooltip: _('ms2_utilites_import_save_fields'),
-                    text: '<i class="icon icon-save"></i>',
-                    handler: function () {
-                      this.saveConfig(this)
-                    }, scope: this
-                  }
-                ]
+            {
+              columnWidth: 0.2,
+              layout: 'form',
+              border: false,
+              style: { margin: '20px 0 0 15px' },
+              items: [
+                {
+                  xtype: 'button',
+                  style: 'padding: 4px 10px 7px; margin: 18px 0 0 0',
+                  tooltip: _('ms2_utilities_import_save_fields'),
+                  text: '<i class="icon icon-save"></i>',
+                  handler: function () {
+                    this.saveConfig(this)
+                  }, scope: this
+                }
+              ]
 
-              }]
+            }]
           },
           {
             xtype: 'xcheckbox',
             name: 'update',
             value: 1,
-            id: 'ms-utilites-import-update',
-            boxLabel: _('ms2_utilites_import_update_products'),
+            id: 'ms-utilities-import-update',
+            boxLabel: _('ms2_utilities_import_update_products'),
             labelAlign: 'right',
             listeners: {
               check: {
@@ -98,16 +98,16 @@ miniShop2.panel.UtilitesImport = function (config) {
             value: 'article',
             width: '99%',
             hidden: true,
-            id: 'ms-utilites-import-key',
-            fieldLabel: _('ms2_utilites_import_update_key'),
+            id: 'ms-utilities-import-key',
+            fieldLabel: _('ms2_utilities_import_update_key'),
           },
           {
             xtype: 'xcheckbox',
             name: 'debug',
             value: 1,
             hideLabel: true,
-            id: 'ms-utilites-import-debug',
-            boxLabel: _('ms2_utilites_import_debug'),
+            id: 'ms-utilities-import-debug',
+            boxLabel: _('ms2_utilities_import_debug'),
             labelAlign: 'right',
           },
           {
@@ -115,8 +115,8 @@ miniShop2.panel.UtilitesImport = function (config) {
             name: 'scheduler',
             value: 1,
             hideLabel: true,
-            id: 'ms-utilites-import-scheduler',
-            boxLabel: _('ms2_utilites_import_use_scheduler'),
+            id: 'ms-utilities-import-scheduler',
+            boxLabel: _('ms2_utilities_import_use_scheduler'),
             labelAlign: 'right',
           },
           {
@@ -124,14 +124,14 @@ miniShop2.panel.UtilitesImport = function (config) {
             name: 'skip_header',
             value: 0,
             hideLabel: true,
-            id: 'ms-utilites-import-skip_header',
-            boxLabel: _('ms2_utilites_import_skip_header'),
+            id: 'ms-utilities-import-skip_header',
+            boxLabel: _('ms2_utilities_import_skip_header'),
             labelAlign: 'right',
           },
           {
             xtype: 'button',
             style: 'margin: 25px 0 0 2px',
-            text: '<i class="icon icon-download"></i> &nbsp;' + _('ms2_utilites_import_submit'),
+            text: '<i class="icon icon-download"></i> &nbsp;' + _('ms2_utilities_import_submit'),
             handler: function () {
               this.submit(this)
             }, scope: this
@@ -147,7 +147,7 @@ miniShop2.panel.UtilitesImport = function (config) {
                     {
                         xtype: 'fieldset',
                         title: 'Инструкция',
-                        id: 'ms2-utilites-import-instruction',
+                        id: 'ms2-utilities-import-instruction',
                         cls: 'x-fieldset-checkbox-toggle',
                         style: 'margin: 5px 0 15px; padding: 20px; ',
                         collapsible: true,
@@ -179,13 +179,13 @@ miniShop2.panel.UtilitesImport = function (config) {
     }
   })
 
-  miniShop2.panel.UtilitesImport.superclass.constructor.call(this, config)
+  miniShop2.panel.UtilitiesImport.superclass.constructor.call(this, config)
 }
 
-Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel, {
+Ext.extend(miniShop2.panel.UtilitiesImport, MODx.FormPanel, {
 
   onUpdateNeed: function (cb) {
-    var updateKey = Ext.getCmp('ms-utilites-import-key')
+    var updateKey = Ext.getCmp('ms-utilities-import-key')
     if (cb.getValue()) {
       updateKey.show()
     } else {
@@ -200,7 +200,7 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel, {
     MODx.Ajax.request({
       url: miniShop2.config['connector_url'],
       params: {
-        action: 'mgr/utilites/import/saveconfig',
+        action: 'mgr/utilities/import/saveconfig',
         fields: values.fields,
         delimiter: values.delimiter
       },
@@ -208,8 +208,8 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel, {
         success: {
           fn: function (r) {
             MODx.msg.status({
-              title: _('ms2_utilites_import_save_fields_title'),
-              message: _('ms2_utilites_import_save_fields_message'),
+              title: _('ms2_utilities_import_save_fields_title'),
+              message: _('ms2_utilities_import_save_fields_message'),
               delay: 7
             })
           }, scope: this
@@ -220,4 +220,4 @@ Ext.extend(miniShop2.panel.UtilitesImport, MODx.FormPanel, {
   }
 
 })
-Ext.reg('minishop2-utilites-import', miniShop2.panel.UtilitesImport)
+Ext.reg('minishop2-utilities-import', miniShop2.panel.UtilitiesImport)
diff --git a/assets/components/minishop2/js/mgr/utilites/panel.js b/assets/components/minishop2/js/mgr/utilities/panel.js
similarity index 55%
rename from assets/components/minishop2/js/mgr/utilites/panel.js
rename to assets/components/minishop2/js/mgr/utilities/panel.js
index 2ba3831c9..dc4499a79 100644
--- a/assets/components/minishop2/js/mgr/utilites/panel.js
+++ b/assets/components/minishop2/js/mgr/utilities/panel.js
@@ -1,15 +1,15 @@
-miniShop2.panel.Utilites = function (config) {
+miniShop2.panel.Utilities = function (config) {
     config = config || {};
-    Ext.apply(config, { 
-		cls: 'container', 
+    Ext.apply(config, {
+        cls: 'container',
         items: [{
-            html: '<h2>' + _('minishop2') + ' :: ' + _('ms2_utilites') + '</h2>',
+            html: '<h2>' + _('minishop2') + ' :: ' + _('ms2_utilities') + '</h2>',
             cls: 'modx-page-header',
         }, {
             xtype: 'modx-tabs',
-            id: 'minishop2-utilites-tabs',
+            id: 'minishop2-utilities-tabs',
             stateful: true,
-            stateId: 'minishop2-utilites-tabs',
+            stateId: 'minishop2-utilities-tabs',
             stateEvents: ['tabchange'],
             cls: 'minishop2-panel',
             getState: function () {
@@ -18,32 +18,32 @@ miniShop2.panel.Utilites = function (config) {
                 };
             },
             items: [{
-                title: _('ms2_utilites_gallery'),
+                title: _('ms2_utilities_gallery'),
                 layout: 'anchor',
                 items: [{
-                    html: _('ms2_utilites_gallery_intro'),
+                    html: _('ms2_utilities_gallery_intro'),
                     bodyCssClass: 'panel-desc',
                 }, {
-                    xtype: 'minishop2-utilites-gallery',
+                    xtype: 'minishop2-utilities-gallery',
                     cls: 'main-wrapper',
                 }]
             },
             {
-                title: _('ms2_utilites_import'),
+                title: _('ms2_utilities_import'),
                 layout: 'anchor',
                 items: [{
-                    html: _('ms2_utilites_import_intro'),
+                    html: _('ms2_utilities_import_intro'),
                     bodyCssClass: 'panel-desc',
                 }, {
-                    xtype: 'minishop2-utilites-import',
+                    xtype: 'minishop2-utilities-import',
                     cls: 'main-wrapper',
                 }]
             }
-        ]
+            ]
         }]
 
     });
-    miniShop2.panel.Utilites.superclass.constructor.call(this, config);
+    miniShop2.panel.Utilities.superclass.constructor.call(this, config);
 };
-Ext.extend(miniShop2.panel.Utilites, MODx.Panel);
-Ext.reg('minishop2-utilites', miniShop2.panel.Utilites);
+Ext.extend(miniShop2.panel.Utilities, MODx.Panel);
+Ext.reg('minishop2-utilities', miniShop2.panel.Utilities);
diff --git a/core/components/minishop2/controllers/mgr/utilites.class.php b/core/components/minishop2/controllers/mgr/utilities.class.php
similarity index 87%
rename from core/components/minishop2/controllers/mgr/utilites.class.php
rename to core/components/minishop2/controllers/mgr/utilities.class.php
index a3d980dd8..0ae3594af 100644
--- a/core/components/minishop2/controllers/mgr/utilites.class.php
+++ b/core/components/minishop2/controllers/mgr/utilities.class.php
@@ -4,14 +4,14 @@
     require_once dirname(__FILE__, 2) . '/manager.class.php';
 }
 
-class Minishop2MgrUtilitesManagerController extends msManagerController
+class Minishop2MgrutilitiesManagerController extends msManagerController
 {
     /**
      * @return string
      */
     public function getPageTitle()
     {
-        return $this->modx->lexicon('ms2_utilites') . ' | miniShop2';
+        return $this->modx->lexicon('ms2_utilities') . ' | miniShop2';
     }
 
     /**
@@ -27,11 +27,11 @@ public function getLanguageTopics()
      */
     public function loadCustomCssJs()
     {
-        $this->addCss($this->miniShop2->config['cssUrl'] . 'mgr/utilites/gallery.css');
+        $this->addCss($this->miniShop2->config['cssUrl'] . 'mgr/utilities/gallery.css');
         $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/minishop2.js');
-        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/panel.js');
-        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/gallery/panel.js');
-        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilites/import/panel.js');
+        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilities/panel.js');
+        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilities/gallery/panel.js');
+        $this->addJavascript($this->miniShop2->config['jsUrl'] . 'mgr/utilities/import/panel.js');
 
         $config = $this->miniShop2->config;
 
@@ -61,7 +61,7 @@ public function loadCustomCssJs()
             '<script>
             miniShop2.config = ' . json_encode($config) . ';
             Ext.onReady(function() {
-                MODx.add({xtype: "minishop2-utilites"});
+                MODx.add({xtype: "minishop2-utilities"});
             });
         </script>'
         );
diff --git a/core/components/minishop2/lexicon/ru/default.inc.php b/core/components/minishop2/lexicon/ru/default.inc.php
index 72994762c..5cdabe8f3 100644
--- a/core/components/minishop2/lexicon/ru/default.inc.php
+++ b/core/components/minishop2/lexicon/ru/default.inc.php
@@ -165,7 +165,7 @@
 $_lang['ms2_system_settings'] = 'Системные настройки';
 $_lang['ms2_system_settings_desc'] = 'Системные настройки miniShop2';
 $_lang['ms2_type'] = 'Тип';
-$_lang['ms2_utilites'] = 'Утилиты';
-$_lang['ms2_utilites_desc'] = 'Инструменты разработчика';
+$_lang['ms2_utilities'] = 'Утилиты';
+$_lang['ms2_utilities_desc'] = 'Инструменты разработчика';
 $_lang['ms2_vendors'] = 'Производители товаров';
 $_lang['ms2_vendors_intro'] = 'Список возможных производителей товаров. То, что вы сюда добавите, можно выбрать в поле "vendor" товара.';
diff --git a/core/components/minishop2/lexicon/ru/manager.inc.php b/core/components/minishop2/lexicon/ru/manager.inc.php
index 3bb8065d6..396e102d0 100644
--- a/core/components/minishop2/lexicon/ru/manager.inc.php
+++ b/core/components/minishop2/lexicon/ru/manager.inc.php
@@ -152,41 +152,41 @@
 $_lang['ms2_updatedon'] = 'Дата изменения';
 $_lang['ms2_user'] = 'Пользователь';
 $_lang['ms2_username'] = 'Логин';
-$_lang['ms2_utilites_gallery'] = 'Галерея';
-$_lang['ms2_utilites_gallery_done'] = 'Завершено';
-$_lang['ms2_utilites_gallery_done_message'] = 'Обновление превью изображений успешно завершено.';
-$_lang['ms2_utilites_gallery_err_noproducts'] = 'В каталоге нет товаров';
-$_lang['ms2_utilites_gallery_for_step'] = 'Обработать товаров за 1 шаг';
-$_lang['ms2_utilites_gallery_information'] = 'Выбранный источник файлов: <strong>{0}</strong> <a href="?a=source/update&id={1}" target="_blank"><i class="icon icon-cog"></i></a><br>Всего товаров: <strong>{2} шт.</strong> <br> Изображений: <strong>{3} шт.</strong> ';
-$_lang['ms2_utilites_gallery_intro'] = 'Обновление всех изображений товаров согласно указанным параметрам. <br>Данная операция является трудозатратной, поэтому не указывайте большое число для одной итерации.';
-$_lang['ms2_utilites_gallery_refresh'] = 'Обновить';
-$_lang['ms2_utilites_gallery_updating'] = 'Обновлению превью';
-$_lang['ms2_utilites_import'] = 'Импорт';
-$_lang['ms2_utilites_import_debug'] = 'Режим отладки';
+$_lang['ms2_utilities_gallery'] = 'Галерея';
+$_lang['ms2_utilities_gallery_done'] = 'Завершено';
+$_lang['ms2_utilities_gallery_done_message'] = 'Обновление превью изображений успешно завершено.';
+$_lang['ms2_utilities_gallery_err_noproducts'] = 'В каталоге нет товаров';
+$_lang['ms2_utilities_gallery_for_step'] = 'Обработать товаров за 1 шаг';
+$_lang['ms2_utilities_gallery_information'] = 'Выбранный источник файлов: <strong>{0}</strong> <a href="?a=source/update&id={1}" target="_blank"><i class="icon icon-cog"></i></a><br>Всего товаров: <strong>{2} шт.</strong> <br> Изображений: <strong>{3} шт.</strong> ';
+$_lang['ms2_utilities_gallery_intro'] = 'Обновление всех изображений товаров согласно указанным параметрам. <br>Данная операция является трудозатратной, поэтому не указывайте большое число для одной итерации.';
+$_lang['ms2_utilities_gallery_refresh'] = 'Обновить';
+$_lang['ms2_utilities_gallery_updating'] = 'Обновлению превью';
+$_lang['ms2_utilities_import'] = 'Импорт';
+$_lang['ms2_utilities_import_debug'] = 'Режим отладки';
 $_lang['ms2_utilities_import_file_ns'] = 'Не выбран файл для импорта.';
 $_lang['ms2_utilities_import_file_ext_err'] = 'Не верное расширение файла.<br> Разрешен только *.csv';
 $_lang['ms2_utilities_import_file_nf'] = 'Файл с расположением <strong>[[+path]]</strong> не найден';
 $_lang['ms2_utilities_import_fields_ns'] = 'Не заполнен параметр <br><strong>Поля импорта</strong>.';
-$_lang['ms2_utilites_import_intro'] = 'Простой импорт каталога товаров. <br>При импорте большого объема товаров ваш сайт может зависнуть.<br>Рекомендуем запускать выполнение в фоновом режиме, для этого необходимо отметить чекбокс "Использовать планировщик" (требуется установленный компонент <a href="https://modstore.pro/packages/utilities/scheduler" target="_blank">Scheduler</a>)';
+$_lang['ms2_utilities_import_intro'] = 'Простой импорт каталога товаров. <br>При импорте большого объема товаров ваш сайт может зависнуть.<br>Рекомендуем запускать выполнение в фоновом режиме, для этого необходимо отметить чекбокс "Использовать планировщик" (требуется установленный компонент <a href="https://modstore.pro/packages/utilities/scheduler" target="_blank">Scheduler</a>)';
 $_lang['ms2_utilities_import_key_ns'] = 'Не заполнен параметр <br><strong>Уникальное поле</strong>.';
 $_lang['ms2_utilities_import_success'] = 'Импорт выполнен.<br>Всего обработано строк: <strong>[[+total]]</strong><br>Создано: <strong>[[+created]]</strong><br>Обновлено: <strong>[[+updated]]</strong>';
-$_lang['ms2_utilites_import_label_delimiter'] = 'Разделитель колонок в файле';
-$_lang['ms2_utilites_import_label_fields'] = 'Поля импорта';
-$_lang['ms2_utilites_import_label_file'] = 'Файл для импорта';
-$_lang['ms2_utilites_import_label_file_empty'] = 'Выберите файл';
+$_lang['ms2_utilities_import_label_delimiter'] = 'Разделитель колонок в файле';
+$_lang['ms2_utilities_import_label_fields'] = 'Поля импорта';
+$_lang['ms2_utilities_import_label_file'] = 'Файл для импорта';
+$_lang['ms2_utilities_import_label_file_empty'] = 'Выберите файл';
 $_lang['ms2_utilities_import_required_field'] = 'Пропущено обязательное поле <strong>[[+field]]</strong>';
-$_lang['ms2_utilites_import_save_fields'] = 'Сохранить настройки полей';
-$_lang['ms2_utilites_import_save_fields_title'] = 'Сохранено';
-$_lang['ms2_utilites_import_save_fields_message'] = 'Список полей для импорта сохранен';
-$_lang['ms2_utilites_import_skip_header'] = 'Пропускать первую строку-шапку';
-$_lang['ms2_utilites_import_submit'] = 'Импортировать';
-$_lang['ms2_utilites_import_update_key'] = 'Уникальное поле для обновления';
-$_lang['ms2_utilites_import_update_products'] = 'Обновить товары';
-$_lang['ms2_utilites_import_use_scheduler'] = 'Использовать планировщик';
-$_lang['ms2_utilites_params'] = 'Параметры ';
-$_lang['ms2_utilites_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
-$_lang['ms2_utilites_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
-$_lang['ms2_utilites_scheduler_success'] = 'Задание Scheduler создано';
+$_lang['ms2_utilities_import_save_fields'] = 'Сохранить настройки полей';
+$_lang['ms2_utilities_import_save_fields_title'] = 'Сохранено';
+$_lang['ms2_utilities_import_save_fields_message'] = 'Список полей для импорта сохранен';
+$_lang['ms2_utilities_import_skip_header'] = 'Пропускать первую строку-шапку';
+$_lang['ms2_utilities_import_submit'] = 'Импортировать';
+$_lang['ms2_utilities_import_update_key'] = 'Уникальное поле для обновления';
+$_lang['ms2_utilities_import_update_products'] = 'Обновить товары';
+$_lang['ms2_utilities_import_use_scheduler'] = 'Использовать планировщик';
+$_lang['ms2_utilities_params'] = 'Параметры ';
+$_lang['ms2_utilities_scheduler_nf'] = 'У вас не установлен компонент Scheduler';
+$_lang['ms2_utilities_scheduler_task_ce'] = 'Не удалось создать задание Scheduler';
+$_lang['ms2_utilities_scheduler_success'] = 'Задание Scheduler создано';
 $_lang['ms2_weight'] = 'Вес';
 $_lang['ms2_weight_price'] = 'Стоимость ед/вес';
 $_lang['ms2_weight_price_help'] = 'Добавочная стоимость доставки за единицу веса. <br>Может быть использовано в кастомных классах.';
diff --git a/core/components/minishop2/processors/mgr/utilites/gallery/update.class.php b/core/components/minishop2/processors/mgr/utilities/gallery/update.class.php
similarity index 98%
rename from core/components/minishop2/processors/mgr/utilites/gallery/update.class.php
rename to core/components/minishop2/processors/mgr/utilities/gallery/update.class.php
index d192ae470..567518974 100644
--- a/core/components/minishop2/processors/mgr/utilites/gallery/update.class.php
+++ b/core/components/minishop2/processors/mgr/utilities/gallery/update.class.php
@@ -65,7 +65,7 @@ public function process()
         }
 
         if (!is_array($products) || empty($products)) {
-            return $this->failure($this->modx->lexicon('ms2_utilites_gallery_err_noproducts'));
+            return $this->failure($this->modx->lexicon('ms2_utilities_gallery_err_noproducts'));
         }
 
         $i = 0;
diff --git a/core/components/minishop2/processors/mgr/utilites/import/import.class.php b/core/components/minishop2/processors/mgr/utilities/import/import.class.php
similarity index 95%
rename from core/components/minishop2/processors/mgr/utilites/import/import.class.php
rename to core/components/minishop2/processors/mgr/utilities/import/import.class.php
index b05d27d26..0b5687648 100644
--- a/core/components/minishop2/processors/mgr/utilites/import/import.class.php
+++ b/core/components/minishop2/processors/mgr/utilities/import/import.class.php
@@ -84,19 +84,19 @@ public function process()
         $scheduler = $this->modx->getService('scheduler', 'Scheduler', $path . 'model/scheduler/');
         if (!$scheduler) {
             $this->modx->log(1, 'not found Scheduler extra');
-            return $this->failure($this->modx->lexicon('ms2_utilites_scheduler_nf'));
+            return $this->failure($this->modx->lexicon('ms2_utilities_scheduler_nf'));
         }
         $task = $scheduler->getTask('minishop2', 'ms2_csv_import');
         if (!$task) {
             $task = $this->createImportTask();
         }
         if (empty($task)) {
-            return $this->failure($this->modx->lexicon('ms2_utilites_scheduler_task_ce'));
+            return $this->failure($this->modx->lexicon('ms2_utilities_scheduler_task_ce'));
         }
 
         $task->schedule('+1 second', $importParams);
 
-        return $this->success($this->modx->lexicon('ms2_utilites_scheduler_success'));
+        return $this->success($this->modx->lexicon('ms2_utilities_scheduler_success'));
     }
 
     /**
diff --git a/core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php b/core/components/minishop2/processors/mgr/utilities/import/saveconfig.class.php
similarity index 100%
rename from core/components/minishop2/processors/mgr/utilites/import/saveconfig.class.php
rename to core/components/minishop2/processors/mgr/utilities/import/saveconfig.class.php

From 73760833dc31423d9d741c43d0b69b50652e780d Mon Sep 17 00:00:00 2001
From: webinmd <89poilo@gmail.com>
Date: Fri, 16 Jun 2023 23:55:53 +0300
Subject: [PATCH 13/19] Fix namespace

---
 _build/data/transport.menu.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_build/data/transport.menu.php b/_build/data/transport.menu.php
index ae476147b..5ac254a89 100644
--- a/_build/data/transport.menu.php
+++ b/_build/data/transport.menu.php
@@ -36,11 +36,11 @@
         'menuindex' => 3,
         'action' => 'mgr/help',
     ],
-    'ms2_utilites' => [
-        'description' => 'ms2_utilites_desc',
+    'ms2_utilities' => [
+        'description' => 'ms2_utilities_desc',
         'parent' => 'minishop2',
         'menuindex' => 4,
-        'action' => 'mgr/utilites',
+        'action' => 'mgr/utilities',
     ],
 ];
 

From ad989a303882be5946d8899ab50fba12edcd14ae Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Mon, 19 Jun 2023 22:56:06 +0600
Subject: [PATCH 14/19] fix for removing installed old incorrect menu

---
 _build/build.config.php               |  1 +
 _build/resolvers/resolve.utilites.php | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 _build/resolvers/resolve.utilites.php

diff --git a/_build/build.config.php b/_build/build.config.php
index 0cbcde4d3..3fa9cbcd0 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -54,5 +54,6 @@
     'settings',
     'chunks',
     'statuses',
+    'menu',
     'setup',
 ];
diff --git a/_build/resolvers/resolve.utilites.php b/_build/resolvers/resolve.utilites.php
new file mode 100644
index 000000000..6331f75e1
--- /dev/null
+++ b/_build/resolvers/resolve.utilites.php
@@ -0,0 +1,21 @@
+<?php
+
+/** @var xPDOTransport $transport */
+/** @var array $options */
+/** @var modX $modx */
+if ($transport->xpdo) {
+    $modx = $transport->xpdo;
+    // fix for removing installed old incorrect menu
+    /** @var modMenu $menu */
+    if ($options[xPDOTransport::PACKAGE_ACTION] == xPDOTransport::ACTION_UPGRADE) {
+        $menu = $modx->getObject('modMenu', ['text' => 'ms2_utilites']);
+        if ($menu) {
+            $menu->remove();
+            unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/panel.js');
+            rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/');
+            unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/panel.js');
+            rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/');
+        }
+    }
+}
+return true;

From fcdf05c22faee97c277d4c0c51bef9bcc2eb9173 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Mon, 19 Jun 2023 23:01:16 +0600
Subject: [PATCH 15/19] fix name resolver

---
 _build/build.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_build/build.config.php b/_build/build.config.php
index 3fa9cbcd0..c52759c13 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -54,6 +54,6 @@
     'settings',
     'chunks',
     'statuses',
-    'menu',
+    'utilites',
     'setup',
 ];

From ae521afb173c2efb21288c42f2d3c714906c807b Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Mon, 19 Jun 2023 23:06:22 +0600
Subject: [PATCH 16/19] Revert "fix name resolver"

This reverts commit fcdf05c22faee97c277d4c0c51bef9bcc2eb9173.
---
 _build/build.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_build/build.config.php b/_build/build.config.php
index c52759c13..3fa9cbcd0 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -54,6 +54,6 @@
     'settings',
     'chunks',
     'statuses',
-    'utilites',
+    'menu',
     'setup',
 ];

From 37b063fcb8d9ff79138c18afc5a43d34244cf64f Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Mon, 19 Jun 2023 23:06:22 +0600
Subject: [PATCH 17/19] Revert "fix for removing installed old incorrect menu"

This reverts commit ad989a303882be5946d8899ab50fba12edcd14ae.
---
 _build/build.config.php               |  1 -
 _build/resolvers/resolve.utilites.php | 21 ---------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 _build/resolvers/resolve.utilites.php

diff --git a/_build/build.config.php b/_build/build.config.php
index 3fa9cbcd0..0cbcde4d3 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -54,6 +54,5 @@
     'settings',
     'chunks',
     'statuses',
-    'menu',
     'setup',
 ];
diff --git a/_build/resolvers/resolve.utilites.php b/_build/resolvers/resolve.utilites.php
deleted file mode 100644
index 6331f75e1..000000000
--- a/_build/resolvers/resolve.utilites.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/** @var xPDOTransport $transport */
-/** @var array $options */
-/** @var modX $modx */
-if ($transport->xpdo) {
-    $modx = $transport->xpdo;
-    // fix for removing installed old incorrect menu
-    /** @var modMenu $menu */
-    if ($options[xPDOTransport::PACKAGE_ACTION] == xPDOTransport::ACTION_UPGRADE) {
-        $menu = $modx->getObject('modMenu', ['text' => 'ms2_utilites']);
-        if ($menu) {
-            $menu->remove();
-            unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/panel.js');
-            rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/');
-            unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/panel.js');
-            rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/');
-        }
-    }
-}
-return true;

From 9c91073ea604f614ba7bee9b56eb89a0620b34bf Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Tue, 20 Jun 2023 00:07:07 +0600
Subject: [PATCH 18/19] fix utilites menu item

---
 _build/build.config.php               |  1 +
 _build/resolvers/resolve.utilites.php | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 _build/resolvers/resolve.utilites.php

diff --git a/_build/build.config.php b/_build/build.config.php
index 0cbcde4d3..c52759c13 100644
--- a/_build/build.config.php
+++ b/_build/build.config.php
@@ -54,5 +54,6 @@
     'settings',
     'chunks',
     'statuses',
+    'utilites',
     'setup',
 ];
diff --git a/_build/resolvers/resolve.utilites.php b/_build/resolvers/resolve.utilites.php
new file mode 100644
index 000000000..62cff50f5
--- /dev/null
+++ b/_build/resolvers/resolve.utilites.php
@@ -0,0 +1,25 @@
+<?php
+
+/** @var xPDOTransport $transport */
+/** @var array $options */
+/** @var modX $modx */
+if ($transport->xpdo) {
+    $modx = $transport->xpdo;
+    // fix for removing installed old incorrect menu
+    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
+        case xPDOTransport::ACTION_INSTALL:
+        case xPDOTransport::ACTION_UPGRADE:
+            $menu = $modx->getObject('modMenu', ['text' => 'ms2_utilites']);
+            if ($menu) {
+                $menu->remove();
+                $modx->log(modX::LOG_LEVEL_ERROR, "Removed menu item \"ms2_utilites\"");
+                unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/panel.js');
+                rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/');
+                unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/panel.js');
+                rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/');
+                $modx->log(modX::LOG_LEVEL_ERROR, "Removed all files in \"utilites\"");
+            }
+            break;
+    }
+}
+return true;

From 47559d4c99689d2193ac4b7eda3cdf293d4bea75 Mon Sep 17 00:00:00 2001
From: biz87 <info@megawebs.kz>
Date: Tue, 20 Jun 2023 00:10:17 +0600
Subject: [PATCH 19/19] remove unused logs

---
 _build/resolvers/resolve.utilites.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/_build/resolvers/resolve.utilites.php b/_build/resolvers/resolve.utilites.php
index 62cff50f5..2ed9fb63d 100644
--- a/_build/resolvers/resolve.utilites.php
+++ b/_build/resolvers/resolve.utilites.php
@@ -12,12 +12,10 @@
             $menu = $modx->getObject('modMenu', ['text' => 'ms2_utilites']);
             if ($menu) {
                 $menu->remove();
-                $modx->log(modX::LOG_LEVEL_ERROR, "Removed menu item \"ms2_utilites\"");
                 unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/panel.js');
                 rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/gallery/');
                 unlink(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/panel.js');
                 rmdir(MODX_ASSETS_PATH . 'components/minishop2/js/mgr/utilites/');
-                $modx->log(modX::LOG_LEVEL_ERROR, "Removed all files in \"utilites\"");
             }
             break;
     }