Merge pull request #2425 from Blair2004/v6.0.x

V6.0.x

Author: Blair2004

.github/instructions/nexopos-blade-layouts.instructions.md

@@ -94,4 +94,5 @@ At the root of the directory, we might also have some laravel (or laravel packag
 .github/instructions/nexopos-localization.instructions.md
 .github/instructions/nexopos-forminput.instructions.md
 .github/instructions/nexopos-roles-permissions.instructions.md
-.github/instructions/nexopos-crud.instructions.md
+.github/instructions/nexopos-crud.instructions.md
+.github/instructions/nexopos-modules.instructions.md

.github/instructions/nexopos-httpclient.instructions.md

@@ -55,12 +55,25 @@ public function handle(): int
 
         $targetFiles = [];
         if ($this->option('file')) {
-            $single = $langPath . DIRECTORY_SEPARATOR . $this->option('file');
-            if (!is_file($single)) {
-                $this->error('Specified file not found: ' . $single);
+            // the option file might consist of multiple files separated by commas
+            $files = explode(',', $this->option('file'));
+
+            foreach ($files as $file) {
+                $file = trim($file);
+                if (empty($file)) { continue; }
+                $single = $langPath . DIRECTORY_SEPARATOR . $file;
+                if (!is_file($single)) {
+                    $this->error('Specified file not found: ' . $single);
+                    return self::FAILURE;
+                }
+                $targetFiles[] = $single;
+            }
+
+            if (empty($targetFiles)) {
+                $this->error('No valid files specified.');
                 return self::FAILURE;
             }
-            $targetFiles[] = $single;
+
         } else {
             foreach (glob($langPath . DIRECTORY_SEPARATOR . '*.json') as $file) {
                 if (basename($file) === 'en.json') { continue; }
@@ -108,13 +121,16 @@ public function handle(): int
                 ];
                 try {
                     $response = Http::timeout(30)->post($endpoint . '/translate', $payload);
-                    if ($response->failed()) { $errors++; continue; }
+                    if ($response->failed()) { 
+                        $errors++; continue; 
+                    }
                     $json = $response->json();
                     if (!is_array($json) || !array_key_exists('translated', $json)) { $errors++; continue; }
                     $data[$key] = $json['translated'];
                     $translatedCount++;
                 } catch (\Throwable $e) {
                     $errors++;
+                    $this->error("Error translating key '{$key}': " . $e->getMessage());
                 }
             }
             $this->output->progressFinish();

.github/instructions/nexopos-modules.instructions.md

@@ -10,10 +10,12 @@
 
 use App\Models\Customer;
 use App\Models\DashboardDay;
+use App\Models\Notification;
 use App\Models\Order;
 use App\Models\Role;
 use App\Services\DateService;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\View;
 
 class DashboardController extends Controller
@@ -126,4 +128,17 @@ public function getWeekReports()
             'result' => $weekMap,
         ];
     }
+
+    public function createSymbolicLinks( Request $request )
+    {
+        // we might delete the notification that is provided on the query parameters
+        if ( $request->has( 'notification_id' ) ) {
+            $notification = Notification::find( $request->get( 'notification_id' ) );
+            if ( $notification ) {
+                $notification->delete();
+            }
+        }
+
+        ns()->createSymbolicLinks();
+    }
 }

.github/instructions/nexopos.instructions.md

@@ -15,6 +15,7 @@
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
@@ -375,7 +376,7 @@ public function checkModulesSymbolicLinks(): void
             /**
              * We'll check if the links is broken
              */
-            if ( is_link( public_path( 'modules/' . $tolowercase ) ) ) {
+            if ( ! is_link( public_path( 'modules/' . $tolowercase ) ) ) {
                 $notification = Notification::where( 'identifier', 'symlink-' . $tolowercase )->first();
 
                 if ( ! $notification instanceof Notification ) {
@@ -405,6 +406,7 @@ public function checkSymbolicLinks(): void
     {
         if ( ! file_exists( public_path( 'storage' ) ) ) {
             $notification = Notification::where( 'identifier', NotificationsEnum::NSSYMBOLICLINKSMISSING )
+                ->where( 'user_id', Auth::id() )
                 ->first();
 
             if ( ! $notification instanceof Notification ) {
@@ -417,6 +419,13 @@ public function checkSymbolicLinks(): void
                     source: 'system',
                     url: 'https://my.nexopos.com/en/documentation/troubleshooting/broken-media-images?utm_source=nexopos&utm_campaign=warning&utm_medium=app',
                     description: __( 'The Symbolic Links to the public directory is missing. Your medias might be broken and not display.' ),
+                    actions: [
+                        [
+                            'label' => __( 'Fix it' ),
+                            'url' => route( 'ns.dashboard.system.fix-symbolic-links' ),
+                            'type' => 'primary',
+                        ]
+                    ]
                 )->dispatchForGroup( Role::namespace( Role::ADMIN ) );
             }
         } else {
@@ -629,4 +638,15 @@ public function moduleViteAssets( string $fileName, $moduleId ): string
 
         return $assets->flatten()->join( '' );
     }
+
+    public function createSymbolicLinks(): void
+    {
+        // we'll first delete any symbolic links that might exists
+        if ( file_exists( public_path( 'storage' ) ) ) {
+            @unlink( public_path( 'storage' ) );
+        }
+
+        // We'll create a symbolic link using the command line
+        Artisan::call( 'storage:link' );
+    }
 }

app/Console/Commands/AutoTranslateCommand.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' => '6.0.3',
+    'version' => '6.0.4',
 
     /**
      * --------------------------------------------------------------------