Merge 3.x into v4

.github/workflows/compile-assets.yml

@@ -0,0 +1,33 @@
+name: Compile Assets
+
+on: [push]
+
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install NPM dependencies
+        working-directory: ./app/admin/assets
+        run: npm ci
+
+      - name: Compile assets
+        working-directory: ./app/admin/assets
+        run: npm run prod
+
+      - name: Commit compiled files
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Compile Assets
+          commit_options: '--no-verify --signoff'
+          file_pattern: app/

.github/workflows/split.yml

@@ -3,9 +3,7 @@ name: Split Modules
 on:
   push:
     branches:
-      - master
-      - develop
-      - 3.x
+      - '*'
     tags:
       - '*'
 
@@ -30,28 +28,30 @@ jobs:
       - if: "!startsWith(github.ref, 'refs/tags/')"
         # Uses an action in the root directory
         name: Module Split of app/${{ matrix.package.path }}
-        uses: symplify/github-action-monorepo-split@2.0
+        uses: danharrin/monorepo-split-github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         with:
-          package-directory: 'app/${{ matrix.package.path }}'
-          split-repository-organization: 'tastyigniter'
-          split-repository-name: '${{ matrix.package.repository }}'
-          user-name: "Sam Poyigi"
-          user-email: "6567634+sampoyigi@users.noreply.github.com"
+          branch: ${GITHUB_REF#refs/heads/}
+
+          package_directory: 'app/${{ matrix.package.path }}'
+          repository_organization: 'tastyigniter'
+          repository_name: '${{ matrix.package.repository }}'
+          user_name: "Sam Poyigi"
+          user_email: "6567634+sampoyigi@users.noreply.github.com"
 
       # with tag
       - if: "startsWith(github.ref, 'refs/tags/')"
         # Uses an action in the root directory
         name: Modules Tagged Split of ${{ matrix.package.path }}
-        uses: symplify/github-action-monorepo-split@2.0
+        uses: danharrin/monorepo-split-github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         with:
           tag: ${GITHUB_REF#refs/tags/}
 
-          package-directory: 'app/${{ matrix.package.path }}'
-          split-repository-organization: 'tastyigniter'
-          split-repository-name: '${{ matrix.package.repository }}'
-          user-name: "Sam Poyigi"
-          user-email: "6567634+sampoyigi@users.noreply.github.com"
+          package_directory: 'app/${{ matrix.package.path }}'
+          repository_organization: 'tastyigniter'
+          repository_name: '${{ matrix.package.repository }}'
+          user_name: "Sam Poyigi"
+          user_email: "6567634+sampoyigi@users.noreply.github.com"

README.md

@@ -1,9 +1,9 @@
-<p align="center"><a href="https://tastyigniter" target="_blank"><img src="https://tastyigniter.com/assets/ui/images/logos/logo-padded.png" width="400"></a></p>
+<p align="center"><a href="https://tastyigniter" target="_blank"><img src="https://tastyigniter.com/images/logos/logo-padded.png" width="400"></a></p>
 
 <p align="center">
 <a href="https://packagist.org/packages/tastyigniter/TastyIgniter"><img src="https://img.shields.io/packagist/v/tastyigniter/TastyIgniter.svg?label=Stable&style=flat-square" alt="Stable"></a>
 <a href="https://packagist.org/packages/tastyigniter/TastyIgniter"><img src="https://poser.pugx.org/tastyigniter/flame/downloads" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/tastyigniter/TastyIgniter"><img src="https://img.shields.io/github/workflow/status/tastyigniter/TastyIgniter/Tests?label=Tests" alt="GitHub Workflow Status"></a>
+<a href="https://packagist.org/packages/tastyigniter/TastyIgniter"><img src="https://img.shields.io/github/actions/workflow/status/tastyigniter/TastyIgniter/tests.yml?branch=3.x&label=Tests" alt="GitHub Workflow Status"></a>
 <a href="https://github.styleci.io/repos/16455664"><img src="https://github.styleci.io/repos/7548986/shield?style=flat" alt="Build Status"></a>
 <a href="https://github.com/tastyigniter/TastyIgniter/blob/master/LICENSE.txt"><img src="https://img.shields.io/github/license/tastyigniter/TastyIgniter.svg?label=License&style=flat-square" alt="License"></a>
 <a href="https://crowdin.com/project/tastyigniter"><img src="https://badges.crowdin.net/tastyigniter/localized.svg" alt="Crowdin"></a>
@@ -13,7 +13,7 @@
 [TastyIgniter](https://tastyigniter.com/) provides a professional and reliable platform for restaurants wanting to offer
 online food ordering and table reservation to their customers.
 
-![screenshot](https://tastyigniter.com/assets/ui/images/mockups/Menus-v2.png)
+![screenshot](https://tastyigniter.com/images/mockups/Menus-v2.png)
 
 ### Documentation
 The best place to learn TastyIgniter is by reading the [documentation](https://tastyigniter.com/docs)
@@ -66,5 +66,5 @@ TastyIgniter was created by [Samuel Adepoyigi](https://github.com/sampoyigi).
 If you discover a security vulnerability within TastyIgniter, please send an e-mail to support@tastyigniter.com.
 
 ## License
-Starting with version 3.0.0 TastyIgniter is licensed under the [The MIT License (MIT)](https://tastyigniter.com/licence/). Older versions were GPL-licensed.
+Starting with version 3.0.0 TastyIgniter is licensed under the [The MIT License (MIT)](https://tastyigniter.com/license/). Older versions were GPL-licensed.
 

app/admin/ServiceProvider.php

@@ -74,6 +74,9 @@ protected function registerMailTemplates()
                 'admin::_mail.reservation_update' => 'lang:system::lang.mail_templates.text_reservation_update',
                 'admin::_mail.password_reset' => 'lang:system::lang.mail_templates.text_password_reset_alert',
                 'admin::_mail.password_reset_request' => 'lang:system::lang.mail_templates.text_password_reset_request_alert',
+                'admin::_mail.invite' => 'lang:system::lang.mail_templates.text_invite',
+                'admin::_mail.invite_customer' => 'lang:system::lang.mail_templates.text_invite_customer',
+                'admin::_mail.low_stock_alert' => 'lang:system::lang.mail_templates.text_low_stock_alert',
             ]);
         });
     }
@@ -88,7 +91,7 @@ protected function registerAssets()
             }
 
             // Admin asset bundles
-            $manager->registerBundle('scss', '~/app/admin/assets/scss/admin.scss', null, 'admin');
+            $manager->registerBundle('scss', '~/app/admin/assets/src/scss/admin.scss', null, 'admin');
         });
     }
 
@@ -99,33 +102,33 @@ protected function registerDashboardWidgets()
     {
         Widgets::instance()->registerDashboardWidgets(function (Widgets $manager) {
             $manager->registerDashboardWidget(\System\DashboardWidgets\Activities::class, [
+                'code' => 'recent-activities',
                 'label' => 'Recent activities',
-                'context' => 'dashboard',
             ]);
 
             $manager->registerDashboardWidget(\System\DashboardWidgets\Cache::class, [
+                'code' => 'cache',
                 'label' => 'Cache Usage',
-                'context' => 'dashboard',
             ]);
 
             $manager->registerDashboardWidget(\System\DashboardWidgets\News::class, [
+                'code' => 'news',
                 'label' => 'Latest News',
-                'context' => 'dashboard',
             ]);
 
             $manager->registerDashboardWidget(\Admin\DashboardWidgets\Statistics::class, [
+                'code' => 'stats',
                 'label' => 'Statistics widget',
-                'context' => 'dashboard',
             ]);
 
             $manager->registerDashboardWidget(\Admin\DashboardWidgets\Onboarding::class, [
+                'code' => 'onboarding',
                 'label' => 'Onboarding widget',
-                'context' => 'dashboard',
             ]);
 
             $manager->registerDashboardWidget(\Admin\DashboardWidgets\Charts::class, [
+                'code' => 'charts',
                 'label' => 'Charts widget',
-                'context' => 'dashboard',
             ]);
         });
     }

app/admin/actions/FormController.php

@@ -274,7 +274,7 @@ public function create_onSave($context = null)
     public function edit($context = null, $recordId = null)
     {
         try {
-            $this->context = $context ?: $this->getConfig('edit[context]', self::CONTEXT_CREATE);
+            $this->context = $context ?: $this->getConfig('edit[context]', self::CONTEXT_EDIT);
 
             $this->setFormTitle('lang:admin::lang.form.edit_title');
 

app/admin/actions/ListController.php

@@ -45,7 +45,7 @@ class ListController extends ControllerAction
     /**
      * @var \Admin\Widgets\Toolbar[] Reference to the toolbar widget objects.
      */
-    protected $toolbarWidget;
+    protected $toolbarWidgets = [];
 
     /**
      * @var \Admin\Widgets\Filter[] Reference to the filter widget objects.
@@ -176,9 +176,9 @@ public function makeList($alias)
         $model = $this->controller->listExtendModel($model, $alias);
 
         // Prep the list widget config
-        $requiredConfig = ['list'];
+        $requiredConfig = [$alias];
         $configFile = $listConfig['configFile'];
-        $modelConfig = $this->loadConfig($configFile, $requiredConfig, 'list');
+        $modelConfig = $this->loadConfig($configFile, $requiredConfig, $alias);
 
         $columnConfig['bulkActions'] = $modelConfig['bulkActions'] ?? [];
         $columnConfig['columns'] = $modelConfig['columns'];
@@ -199,6 +199,10 @@ public function makeList($alias)
             $this->controller->listExtendQuery($query, $alias);
         });
 
+        $widget->bindEvent('list.extendRecords', function ($records) use ($alias) {
+            return $this->controller->listExtendRecords($records, $alias);
+        });
+
         $widget->bindEvent('list.overrideColumnValue', function ($record, $column, $value) use ($alias) {
             return $this->controller->listOverrideColumnValue($record, $column, $alias);
         });
@@ -211,9 +215,10 @@ public function makeList($alias)
 
         // Prep the optional toolbar widget
         if (isset($this->controller->widgets['toolbar']) && (isset($listConfig['toolbar']) || isset($modelConfig['toolbar']))) {
-            $this->toolbarWidget = $this->controller->widgets['toolbar'];
-            if ($this->toolbarWidget instanceof \Admin\Widgets\Toolbar)
-                $this->toolbarWidget->reInitialize($listConfig['toolbar'] ?? $modelConfig['toolbar']);
+            $this->toolbarWidget[$alias] = clone $this->controller->widgets['toolbar'];
+            if ($this->toolbarWidget[$alias] instanceof \Admin\Widgets\Toolbar)
+                $this->toolbarWidget[$alias]->reInitialize($listConfig['toolbar'] ?? $modelConfig['toolbar']);
+                $this->toolbarWidget[$alias]->bindToController();
         }
 
         // Prep the optional filter widget
@@ -271,8 +276,8 @@ public function renderList($alias = null)
 
         $list = [];
 
-        if (!is_null($this->toolbarWidget)) {
-            $list[] = $this->toolbarWidget->render();
+        if (isset($this->toolbarWidget[$alias])) {
+            $list[] = $this->toolbarWidget[$alias]->render();
         }
 
         if (isset($this->filterWidgets[$alias])) {

app/admin/assets/.gitignore

@@ -1,3 +1,2 @@
 node_modules
 mix-manifest.json
-package-lock.json

app/admin/assets/js/updates.js

@@ -401,7 +401,7 @@
         })
     }
 
-    // Move to script tags instead
+    // @todo: Move to script tags instead
     Updates.TEMPLATES = {
         suggestion: [
             '<div class="item-details">',