Merge pull request #4408 from turbo124/v5-develop

V5 develop

VERSION.txt

@@ -1 +1 @@
-5.0.30
+5.0.31

app/Http/Controllers/MigrationController.php

@@ -321,7 +321,7 @@ class MigrationController extends BaseController
                 ->storeAs(
                     'migrations',
                     $request->file($company->company_index)->getClientOriginalName(),
-                    'local'
+                    'public'
                 );
 
             if (app()->environment() == 'testing') {

app/Jobs/Util/Import.php

@@ -1107,12 +1107,20 @@ class Import implements ShouldQueue
 
             $old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
 
-            $this->ids['expense_categories'] = [
-                "expense_categories_{$old_user_key}" => [
-                    'old' => $resource['id'],
+
+            $key = "expense_categories_{$resource['id']}";
+
+            $this->ids['expense_categories'][$key] = [
+                'old' => $resource['id'],
                     'new' => $expense_category->id,
-                ],
             ];
+
+            // $this->ids['expense_categories'] = [
+            //     "expense_categories_{$old_user_key}" => [
+            //         'old' => $resource['id'],
+            //         'new' => $expense_category->id,
+            //     ],
+            // ];
         }
         
         ExpenseCategory::reguard();

app/Jobs/Util/StartMigration.php

@@ -85,7 +85,7 @@ class StartMigration implements ShouldQueue
         $this->company->save();
 
         $zip = new ZipArchive();
-        $archive = $zip->open(storage_path("app/{$this->filepath}"));
+        $archive = $zip->open(public_path("storage/{$this->filepath}"));
         $filename = pathinfo($this->filepath, PATHINFO_FILENAME);
 
         try {
@@ -93,14 +93,14 @@ class StartMigration implements ShouldQueue
                 throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.');
             }
 
-            $zip->extractTo(storage_path("app/migrations/{$filename}"));
+            $zip->extractTo(public_path("storage/migrations/{$filename}"));
             $zip->close();
 
             if (app()->environment() == 'testing') {
                 return true;
             }
 
-            $file = storage_path("app/migrations/$filename/migration.json");
+            $file = public_path("storage/migrations/$filename/migration.json");
 
             if (! file_exists($file)) {
                 throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');

config/ninja.php

@@ -12,7 +12,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/').'/',
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.0.30',
+    'app_version' => '5.0.31',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),