Merge pull request #8813 from turbo124/v5-develop

v5.7.15

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           ref: v5-develop
-          
+      
       - name: Copy .env file
         run: |
           cp .env.example .env
@@ -46,7 +46,15 @@ jobs:
           git checkout main
           npm i
           npm run build
-          cp -r dist/react/* ../public/react 
+          
+          for file in dist/react/* ; do
+          filename=$(basename -- "$file")
+          extension="${filename##*.}"
+          filename="${filename%.*}"
+          version=${{ github.event.release.tag_name }}
+          cp $file ../public/react/$filename"."$version"."$extension
+          done
+
           mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/
           cd ..

VERSION.txt

@@ -1 +1 @@
-5.7.14
+5.7.15

app/Console/Commands/CreateTestData.php

@@ -61,6 +61,8 @@ class CreateTestData extends Command
 
     protected $invoice_repo;
 
+    protected $count;
+    
     /**
      * Execute the console command.
      *

app/Console/Commands/ReactBuilder.php

@@ -12,7 +12,6 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
 
 class ReactBuilder extends Command
 {
@@ -48,13 +47,11 @@ class ReactBuilder extends Command
     public function handle()
     {
         $includes = '';
-        
-        Storage::makeDirectory(public_path('react'));
 
         $directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-            if ($file->getExtension() == 'js') {
+            if ($file->getExtension() == 'js' && stripos($file->getFileName(), config('ninja.app_version')) !== false) {
                 if (str_contains($file->getFileName(), 'index-')) {
                     $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
                 } else {
@@ -62,7 +59,7 @@ class ReactBuilder extends Command
                 }
             }
 
-            if (str_contains($file->getFileName(), '.css')) {
+            if (str_contains($file->getFileName(), '.css' && stripos($file->getFileName(), config('ninja.app_version')) !== false)) {
                 $includes .= '<link rel="stylesheet" href="/react/'.$file->getFileName().'">'."\n";
             }
         }

app/Http/Controllers/Auth/LoginController.php

@@ -418,6 +418,8 @@ class LoginController extends BaseController
             ->setReturnType(Model\User::class)
             ->execute();
 
+            nlog($user);
+
         if ($user) {
             $account = request()->input('account');
 
@@ -437,15 +439,15 @@ class LoginController extends BaseController
             }
 
             //If this is a result user/email combo - lets add their OAuth details details
-            if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
-                if (!$existing_login_user->account) {
-                    return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
-                }
+            // if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
+            //     if (!$existing_login_user->account) {
+            //         return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+            //     }
 
-                Auth::login($existing_login_user, true);
+            //     Auth::login($existing_login_user, true);
 
-                return $this->existingLoginUser($user->getId(), 'microsoft');
-            }
+            //     return $this->existingLoginUser($user->getId(), 'microsoft');
+            // }
 
 
             // Signup!

config/ninja.php

@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.14'),
-    'app_tag' => env('APP_TAG','5.7.14'),
+    'app_version' => env('APP_VERSION','5.7.15'),
+    'app_tag' => env('APP_TAG','5.7.15'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

resources/views/portal/ninja2020/components/livewire/documents-table.blade.php

@@ -94,8 +94,8 @@
                             <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
                                 <input type="checkbox" class="form-checkbox cursor-pointer" onchange="appendToElement('multiple-downloads', '{{ $document->hashed_id }}')" />
                             </td>
-                            <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                                {{ Illuminate\Support\Str::limit($document->name, 40) }}
+                            <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500 truncate">
+                                {{ $document->name }}
                             </td>
 
                             <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">