diff --git a/VERSION.txt b/VERSION.txt index ce167bcd29b2..59cff2f9dcf7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.97 \ No newline at end of file +5.5.98 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 54a33c338a54..ca9e12160b21 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.5.97', - 'app_tag' => '5.5.97', + 'app_version' => '5.5.98', + 'app_tag' => '5.5.98', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php index 710f59e8c6ea..b488dcbbf1fb 100644 --- a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php +++ b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php @@ -1,8 +1,10 @@ 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(); + } + }); + + + + } + }