Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 03:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4408 from turbo124/v5-develop

Browse Source 
V5 develop
This commit is contained in:
David Bomba 2020-12-02 07:28:23 +11:00 committed by GitHub
commit 54fd048614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.30 5.0.31

2
app/Http/Controllers/MigrationController.php
View File

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

16
app/Jobs/Util/Import.php
View File

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

6
app/Jobs/Util/StartMigration.php
View File

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

2
config/ninja.php
View File

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