сменил зависимость с modxProVueCore на VueTools

TolkIT-team · TolkIT-team · commit 1d400e733aa7 · 2026-01-05T21:51:23.000+05:00
diff --git a/_build/config.inc.php b/_build/config.inc.php
@@ -13,7 +13,7 @@
     'name_lower' => 'minishop3',
     'name_short' => 'ms3',
     'version' => '1.0.0',
-    'release' => 'alpha.5',
+    'release' => 'beta.1',
     // Install package to site right after build
     'install' => false,
     // Which elements should be updated on package upgrade
diff --git a/_build/resolvers/resolver_06_metrics.php b/_build/resolvers/resolver_06_metrics.php
@@ -120,7 +120,7 @@
 
     return [
         'package_name' => 'MiniShop3',
-        'package_version' => '1.0.0-alpha.5',
+        'package_version' => '1.0.0-beta.1',
         'ms3_install_type' => $installType,
         'ms3_previous_version' => $previousVersion,
         'php_version' => PHP_VERSION,
diff --git a/core/components/minishop3/composer.json b/core/components/minishop3/composer.json
@@ -15,7 +15,8 @@
     "robmorgan/phinx": "^0.16",
     "nikic/fast-route": "^1.3",
     "intervention/image": "^3.0",
-     "ramsey/uuid": "^4.7"
+    "ramsey/uuid": "^4.7",
+    "brick/math": "^0.12"
   },
   "autoload": {
     "psr-4": {
diff --git a/core/components/minishop3/composer.lock b/core/components/minishop3/composer.lock
diff --git a/core/components/minishop3/controllers/category/update.class.php b/core/components/minishop3/controllers/category/update.class.php
@@ -90,7 +90,7 @@ public function loadCustomCssJs()
         $this->addJavascript($assetsUrl . 'js/mgr/category/product.grid.js');
         $this->addLastJavascript($assetsUrl . 'js/mgr/category/update.js');
 
-        // Vue Category Products Grid with ModxProVueCore dependency check
+        // Vue Category Products Grid with VueTools dependency check
         $this->addCss($assetsUrl . 'css/mgr/vue-dist/category-products.min.css');
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/category-products.min.js');
 
diff --git a/core/components/minishop3/controllers/manager.class.php b/core/components/minishop3/controllers/manager.class.php
@@ -7,7 +7,7 @@ class msManagerController extends \MODX\Revolution\modExtraManagerController
     public $ms3;
 
     /**
-     * Check if ModxProVueCore check script is already registered
+     * Check if VueTools check script is already registered
      * @var bool
      */
     protected static $vueCoreCheckRegistered = false;
@@ -51,7 +51,7 @@ public function addLastJavascript($script)
     }
 
     /**
-     * Register Vue ES module with ModxProVueCore dependency check
+     * Register Vue ES module with VueTools dependency check
      *
      * @param string $src Module script URL
      * @return void
@@ -74,14 +74,14 @@ public function addVueModule($src)
     }
 
     /**
-     * Register inline script that checks for ModxProVueCore Import Map
+     * Register inline script that checks for VueTools Import Map
      * If not found, shows MODX alert and prevents Vue module loading
      */
     protected function registerVueCoreCheck()
     {
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
-        $alertMessage = $this->modx->lexicon('ms3_modxprovuecore_required')
-            ?: 'ModxProVueCore package is required. Please install it from Package Manager.';
+        $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
+            ?: 'VueTools package is required. Please install it from Package Manager.';
 
         $script = <<<JS
 <script>
diff --git a/core/components/minishop3/controllers/mgr/customers.class.php b/core/components/minishop3/controllers/mgr/customers.class.php
@@ -41,7 +41,7 @@ public function loadCustomCssJs()
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/customers.min.css');
-        // Vue module with ModxProVueCore dependency check
+        // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/customers.min.js');
 
         $this->addHtml('
diff --git a/core/components/minishop3/controllers/mgr/notifications.class.php b/core/components/minishop3/controllers/mgr/notifications.class.php
@@ -39,7 +39,7 @@ public function loadCustomCssJs()
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/notifications.min.css');
-        // Vue module with ModxProVueCore dependency check
+        // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/notifications.min.js');
 
         $this->addHtml('
diff --git a/core/components/minishop3/controllers/mgr/order.class.php b/core/components/minishop3/controllers/mgr/order.class.php
@@ -42,7 +42,7 @@ public function loadCustomCssJs()
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/order.min.css');
-        // Vue module with ModxProVueCore dependency check
+        // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/order.min.js');
 
         $this->addHtml('
diff --git a/core/components/minishop3/controllers/mgr/orders.class.php b/core/components/minishop3/controllers/mgr/orders.class.php
@@ -41,7 +41,7 @@ public function loadCustomCssJs()
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/orders.min.css');
-        // Vue module with ModxProVueCore dependency check
+        // Vue module with VueTools dependency check
         $this->addVueModule($this->ms3->config['assetsUrl'] . 'js/mgr/vue-dist/orders.min.js');
 
         $this->addHtml('
diff --git a/core/components/minishop3/controllers/mgr/settings.class.php b/core/components/minishop3/controllers/mgr/settings.class.php
@@ -48,7 +48,7 @@ public function loadCustomCssJs()
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/statuses.min.css');
         $this->addCss($this->ms3->config['assetsUrl'] . 'css/mgr/vue-dist/links.min.css');
 
-        // Vue modules with ModxProVueCore dependency check
+        // Vue modules with VueTools dependency check
         $this->addVueModule($this->ms3->config['jsUrl'] . 'mgr/vue-dist/deliveries.min.js');
         $this->addVueModule($this->ms3->config['jsUrl'] . 'mgr/vue-dist/payments.min.js');
         $this->addVueModule($this->ms3->config['jsUrl'] . 'mgr/vue-dist/vendors.min.js');
diff --git a/core/components/minishop3/controllers/mgr/utilities.class.php b/core/components/minishop3/controllers/mgr/utilities.class.php
@@ -84,7 +84,7 @@ public function loadCustomCssJs()
         // Config MUST be set BEFORE Vue modules load (they read from ms3.config)
         $this->addHtml('<script>Object.assign(ms3.config, ' . json_encode($config) . ');</script>');
 
-        // Vue modules with ModxProVueCore dependency check
+        // Vue modules with VueTools dependency check
         $assetsUrl = $this->ms3->config['assetsUrl'];
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/fields-management.min.js');
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/extra-fields.min.js');
diff --git a/core/components/minishop3/controllers/product/update.class.php b/core/components/minishop3/controllers/product/update.class.php
@@ -64,7 +64,7 @@ public function loadCustomCssJs()
         $show_gallery = $this->getOption('ms3_product_tab_gallery', null, true);
         if ($show_gallery) {
             $this->addCss($assetsUrl . 'css/mgr/vue-dist/gallery-uploader.min.css');
-            // Vue module with ModxProVueCore dependency check
+            // Vue module with VueTools dependency check
             $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/gallery-uploader.min.js');
             $this->addLastJavascript($assetsUrl . 'js/mgr/misc/ext.ddview.js');
             $this->addLastJavascript($assetsUrl . 'js/mgr/product/gallery/gallery.panel.js');
@@ -156,7 +156,7 @@ public function loadCustomCssJs()
         ];
 
         $this->addCss($assetsUrl . 'css/mgr/vue-dist/main.min.css');
-        // Vue module with ModxProVueCore dependency check
+        // Vue module with VueTools dependency check
         $this->addVueModule($assetsUrl . 'js/mgr/vue-dist/main.min.js');
 
         $this->addHtml('
diff --git a/core/components/minishop3/controllers/resource_create.class.php b/core/components/minishop3/controllers/resource_create.class.php
@@ -7,7 +7,7 @@ class msResourceCreateController extends ResourceCreateManagerController
     public $ms3;
 
     /**
-     * Check if ModxProVueCore check script is already registered
+     * Check if VueTools check script is already registered
      * @var bool
      */
     protected static $vueCoreCheckRegistered = false;
@@ -52,7 +52,7 @@ public function addLastJavascript($script)
     }
 
     /**
-     * Register Vue ES module with ModxProVueCore dependency check
+     * Register Vue ES module with VueTools dependency check
      *
      * @param string $src Module script URL
      * @return void
@@ -75,14 +75,14 @@ public function addVueModule($src)
     }
 
     /**
-     * Register inline script that checks for ModxProVueCore Import Map
+     * Register inline script that checks for VueTools Import Map
      * If not found, shows MODX alert and prevents Vue module loading
      */
     protected function registerVueCoreCheck()
     {
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
-        $alertMessage = $this->modx->lexicon('ms3_modxprovuecore_required')
-            ?: 'ModxProVueCore package is required. Please install it from Package Manager.';
+        $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
+            ?: 'VueTools package is required. Please install it from Package Manager.';
 
         $script = <<<JS
 <script>
diff --git a/core/components/minishop3/controllers/resource_update.class.php b/core/components/minishop3/controllers/resource_update.class.php
@@ -11,7 +11,7 @@ class msResourceUpdateController extends ResourceUpdateManagerController
     public $ms3;
 
     /**
-     * Check if ModxProVueCore check script is already registered
+     * Check if VueTools check script is already registered
      * @var bool
      */
     protected static $vueCoreCheckRegistered = false;
@@ -56,7 +56,7 @@ public function addLastJavascript($script)
     }
 
     /**
-     * Register Vue ES module with ModxProVueCore dependency check
+     * Register Vue ES module with VueTools dependency check
      *
      * @param string $src Module script URL
      * @return void
@@ -79,14 +79,14 @@ public function addVueModule($src)
     }
 
     /**
-     * Register inline script that checks for ModxProVueCore Import Map
+     * Register inline script that checks for VueTools Import Map
      * If not found, shows MODX alert and prevents Vue module loading
      */
     protected function registerVueCoreCheck()
     {
         $alertTitle = $this->modx->lexicon('ms3_error') ?: 'Error';
-        $alertMessage = $this->modx->lexicon('ms3_modxprovuecore_required')
-            ?: 'ModxProVueCore package is required. Please install it from Package Manager.';
+        $alertMessage = $this->modx->lexicon('ms3_vuetools_required')
+            ?: 'VueTools package is required. Please install it from Package Manager.';
 
         $script = <<<JS
 <script>
diff --git a/core/components/minishop3/docs/changelog.txt b/core/components/minishop3/docs/changelog.txt
@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0-alpha]
+## [1.0.0-beta.1] - 2026-01-05
 
-- Initial release.
+First beta release of MiniShop3 for MODX 3.
+
+### Added
+- Modern admin interface with Vue 3 + PrimeVue components
+- Service-based architecture with dependency injection
+- Flexible field configuration system for products, orders, customers
+- Grid configuration system with customizable columns and actions
+- API router with FastRoute for REST endpoints
+- Customer management with addresses and order history
+- Order management with status workflow and notifications
+- Delivery and payment methods configuration
+- Product gallery with drag-and-drop upload
+- Extra fields system for extending entities
+- Import functionality for products
+- Notification system for order events
+- Full lexicon support (Russian, English)
+
+### Changed
+- Complete rewrite for MODX 3.0+ compatibility
+- PHP 8.1+ required
+- Namespace changed to MiniShop3
+- Database tables prefixed with ms3_
+- ExtJS panels integrated with Vue components
+
+### Dependencies
+- Requires VueTools package for Vue infrastructure
+- Uses PdoTools for template rendering
+
+## [1.0.0-alpha] - 2025
+
+- Initial alpha releases for testing and development.
diff --git a/core/components/minishop3/lexicon/en/default.inc.php b/core/components/minishop3/lexicon/en/default.inc.php
@@ -219,4 +219,4 @@
 $_lang['ms3_help_desc'] = 'Useful links and information';
 
 $_lang['ms3_error'] = 'Error';
-$_lang['ms3_modxprovuecore_required'] = 'ModxProVueCore package is required for MiniShop3. Please install it via Package Manager.';
+$_lang['ms3_vuetools_required'] = 'VueTools package is required for MiniShop3. Please install it via Package Manager.';
diff --git a/core/components/minishop3/lexicon/ru/default.inc.php b/core/components/minishop3/lexicon/ru/default.inc.php
@@ -219,4 +219,4 @@
 $_lang['ms3_help_desc'] = 'Полезные ссылки и информация';
 
 $_lang['ms3_error'] = 'Ошибка';
-$_lang['ms3_modxprovuecore_required'] = 'Для работы MiniShop3 требуется пакет ModxProVueCore. Установите его через Менеджер пакетов.';
+$_lang['ms3_vuetools_required'] = 'Для работы MiniShop3 требуется пакет VueTools. Установите его через Менеджер пакетов.';
diff --git a/core/components/minishop3/migrations/20251023000000_seed_order_statuses.php b/core/components/minishop3/migrations/20251023000000_seed_order_statuses.php
@@ -98,32 +98,43 @@ public function up()
 
     /**
      * Update system settings with default status IDs
+     * Looks up actual IDs from database by status name
      *
      * @param string $prefix Table prefix
      */
     protected function updateSystemSettings(string $prefix)
     {
         $this->output->writeln('<info>Updating system settings with status IDs...</info>');
 
-        // Map of setting keys to status IDs
+        // Map of setting keys to status names in database
+        // Setting key => status name in ms3_order_statuses.name
         $settingsMap = [
-            'ms3_status_draft' => 1,      // Draft
-            'ms3_status_new' => 2,        // New
-            'ms3_status_paid' => 3,       // Paid
-            'ms3_status_sent' => 4,       // Sent
-            'ms3_status_canceled' => 5,   // Cancelled (note: canceled, not cancelled in setting name)
+            'ms3_status_new' => 'ms3_order_status_new',
+            'ms3_status_paid' => 'ms3_order_status_paid',
+            'ms3_status_canceled' => 'ms3_order_status_cancelled', // Note: setting uses 'canceled', status uses 'cancelled'
         ];
 
-        foreach ($settingsMap as $settingKey => $statusId) {
-            // Check if setting exists (system_settings has no 'id' column, 'key' is the primary key)
+        foreach ($settingsMap as $settingKey => $statusName) {
+            // Get actual status ID from database by name
+            $sql = "SELECT `id` FROM {$prefix}ms3_order_statuses WHERE `name` = '{$statusName}'";
+            $statusRow = $this->fetchRow($sql);
+
+            if (!$statusRow || !isset($statusRow['id'])) {
+                $this->output->writeln("<comment>  ⚠ Status '{$statusName}' not found in database, skipping</comment>");
+                continue;
+            }
+
+            $statusId = (int) $statusRow['id'];
+
+            // Check if setting exists
             $sql = "SELECT `key`, `value` FROM {$prefix}system_settings WHERE `key` = '{$settingKey}'";
             $result = $this->fetchRow($sql);
 
             if ($result && isset($result['key'])) {
-                // Update existing setting
+                // Update existing setting with actual ID
                 $updateSql = "UPDATE {$prefix}system_settings SET `value` = '{$statusId}' WHERE `key` = '{$settingKey}'";
                 $this->execute($updateSql);
-                $this->output->writeln("<info>  ✓ Updated {$settingKey} = {$statusId}</info>");
+                $this->output->writeln("<info>  ✓ Updated {$settingKey} = {$statusId} (from {$statusName})</info>");
             } else {
                 $this->output->writeln("<comment>  ⚠ Setting {$settingKey} not found, skipping</comment>");
             }
@@ -140,12 +151,10 @@ public function down()
         $prefix = $this->adapter->getOption('table_prefix');
         $pdo = $this->getAdapter()->getConnection();
 
-        // Reset system settings to 0 (or you can set to NULL)
+        // Reset system settings to 0
         $settingKeys = [
-            'ms3_status_draft',
             'ms3_status_new',
             'ms3_status_paid',
-            'ms3_status_sent',
             'ms3_status_canceled',
         ];
 
@@ -156,8 +165,17 @@ public function down()
 
         $this->output->writeln('<info>✓ Reset system settings for order statuses</info>');
 
-        // Remove status records
-        $this->execute("DELETE FROM {$prefix}ms3_order_statuses WHERE id IN (1,2,3,4,5)");
+        // Remove status records by name (more reliable than by ID)
+        $statusNames = [
+            'ms3_order_status_draft',
+            'ms3_order_status_new',
+            'ms3_order_status_paid',
+            'ms3_order_status_sent',
+            'ms3_order_status_cancelled',
+        ];
+
+        $namesStr = "'" . implode("','", $statusNames) . "'";
+        $this->execute("DELETE FROM {$prefix}ms3_order_statuses WHERE name IN ({$namesStr})");
         $this->output->writeln('<info>✓ Removed default order statuses</info>');
     }
 }
diff --git a/core/components/minishop3/src/MiniShop3.php b/core/components/minishop3/src/MiniShop3.php
@@ -20,7 +20,7 @@
 
 class MiniShop3
 {
-    public $version = '1.0.0-alpha.5';
+    public $version = '1.0.0-beta.1';
 
     /** @var modX $modx */
     public $modx;
diff --git a/vueManager/src/entries/deliveries.js b/vueManager/src/entries/deliveries.js
@@ -56,7 +56,6 @@ export function init(selector = '#ms3-vue-deliveries') {
   app.mount(selector)
   $el.dataset.vApp = 'true'
 
-  console.log('[DeliveriesGrid] Mounted successfully')
   return app
 }
 
diff --git a/vueManager/src/entries/links.js b/vueManager/src/entries/links.js
@@ -49,7 +49,6 @@ function mountApp() {
 
   app.mount(container)
 
-  console.log('[MS3 Links] Vue app mounted')
   return true
 }
 
@@ -60,7 +59,6 @@ function unmountApp() {
   if (app) {
     app.unmount()
     app = null
-    console.log('[MS3 Links] Vue app unmounted')
   }
 }
 
diff --git a/vueManager/src/entries/payments.js b/vueManager/src/entries/payments.js
@@ -56,7 +56,6 @@ export function init(selector = '#ms3-vue-payments') {
   app.mount(selector)
   $el.dataset.vApp = 'true'
 
-  console.log('[PaymentsGrid] Mounted successfully')
   return app
 }
 
diff --git a/vueManager/src/entries/statuses.js b/vueManager/src/entries/statuses.js
diff --git a/vueManager/src/entries/vendors.js b/vueManager/src/entries/vendors.js
