Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8398 from turbo124/v5-develop

Browse Source 
v5.5.98
This commit is contained in:
David Bomba 2023-03-23 08:58:08 +11:00 committed by GitHub
commit c6f7d14096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.97 5.5.98

4
config/ninja.php
View File

@ -14,8 +14,8 @@ 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', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.97', 'app_version' => '5.5.98',
'app_tag' => '5.5.97', 'app_tag' => '5.5.98',
'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', ''), 'api_secret' => env('API_SECRET', ''),

57
database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
View File

@ -1,8 +1,10 @@
<?php <?php
use Illuminate\Database\Migrations\Migration; use App\Libraries\MultiDB;
use Illuminate\Database\Schema\Blueprint; use App\Models\CompanyUser;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
return new class extends Migration return new class extends Migration
{ {
@ -40,7 +42,56 @@ return new class extends Migration
}); });
if (config('ninja.db.multi_db_enabled')) {
foreach (MultiDB::$dbs as $db) {
CompanyUser::on($db)->where('is_admin',0)->cursor()->each(function ($cu){
$permissions = $cu->permissions;
if (!$permissions || strlen($permissions) == 0) {
$permissions = 'view_reports';
$cu->permissions = $permissions;
$cu->save();
} else {
$permissions_array = explode(',', $permissions);
$permissions_array[] = 'view_reports';
$modified_permissions_string = implode(",", $permissions_array);
$cu->permissions = $modified_permissions_string;
$cu->save();
}
});
}
} else {
CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
$permissions = $cu->permissions;
if (!$permissions || strlen($permissions) == 0) {
$permissions = 'view_reports';
$cu->permissions = $permissions;
$cu->save();
} else {
$permissions_array = explode(',', $permissions);
$permissions_array[] = 'view_reports';
$modified_permissions_string = implode(",", $permissions_array);
$cu->permissions = $modified_permissions_string;
$cu->save();
}
});
}
} }