Merge pull request #2372 from Blair2004/v5.0.x

V5.0.x

Author: nexopos

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 jobs:
   laravel-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2

.gitignore

@@ -52,3 +52,4 @@ public/hot
 .phpunit.cache/test-results
 storage/dotenv-editor
 .cloud
+ns

app/Services/ModulesService.php

@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Classes\Cache;
 use App\Classes\XMLParser;
 use App\Events\ModulesAfterDisabledEvent;
 use App\Events\ModulesAfterEnabledEvent;
@@ -23,6 +22,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\View;
@@ -206,6 +206,7 @@ public function __init( string $dir ): void
                  */
                 if ( Helper::installed() ) {
                     $modules = $this->options->get( 'enabled_modules', [] );
+                    $modules = collect( array_merge( $modules, $this->autoloadedNamespace ) )->unique()->toArray();
                     $config[ 'enabled' ] = in_array( $config[ 'namespace' ], (array) $modules ) ? true : false;
                 }
 
@@ -1228,6 +1229,7 @@ public function enable( string $namespace ): array|JsonResponse
              * enabled.
              */
             $enabledModules = $this->options->get( 'enabled_modules', [] );
+            $enabledModules = collect( array_merge( $enabledModules, $this->autoloadedNamespace ) )->unique()->toArray();
 
             ModulesBeforeEnabledEvent::dispatch( $module );
 
@@ -1347,7 +1349,7 @@ public function disable( string $namespace ): array
     {
         $this->checkManagementStatus();
 
-        // check if module exists
+        // check if the module exists
         if ( $module = $this->get( $namespace ) ) {
             if ( $module[ 'autoloaded' ] ) {
                 throw new NotAllowedException( sprintf( __( 'The module "%s" is autoloaded and cannot be disabled.' ), $module[ 'name' ] ) );

config/nexopos.php

@@ -9,7 +9,7 @@
      * This is the core version of NexoPOS. This is used to displays on the
      * dashboard and to ensure a compatibility with the modules.
      */
-    'version' => '5.3.9',
+    'version' => '5.3.10',
 
     /**
      * --------------------------------------------------------------------

tests/Traits/WithProductTest.php

@@ -160,7 +160,7 @@ protected function attemptChangeProductCategory()
         $newCategoryRefreshed = $newCategory->fresh();
 
         $this->assertGreaterThan(
-            minimum: $newCategory->total_items,
+            expected: $newCategory->total_items,
             actual: $newCategoryRefreshed->total_items,
             message: sprintf(
                 'The new category "total_items" has\nt properly been updated. %s was expected, we have %s currently defined.',
@@ -170,7 +170,7 @@ protected function attemptChangeProductCategory()
         );
 
         $this->assertGreaterThan(
-            minimum: $oldCategoryRefreshed->total_items,
+            expected: $oldCategoryRefreshed->total_items,
             actual: $oldCategory->total_items,
             message: sprintf(
                 'The old category "total_items" has\nt properly been updated. %s was expected, we have %s currently defined.',