1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 05:32:39 +01:00

Merge pull request #9650 from turbo124/v5-develop

v5.9.8
This commit is contained in:
David Bomba 2024-06-18 16:11:44 +10:00 committed by GitHub
commit 394bbb6a51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 3 deletions

View File

@ -1 +1 @@
5.9.7 5.9.8

View File

@ -21,6 +21,7 @@ use App\Models\Language;
use App\Models\Timezone; use App\Models\Timezone;
use App\Models\DateFormat; use App\Models\DateFormat;
use App\Models\PaymentTerm; use App\Models\PaymentTerm;
use App\Models\DatetimeFormat;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use App\DataMapper\EmailTemplateDefaults; use App\DataMapper\EmailTemplateDefaults;
@ -88,6 +89,10 @@ class StaticServiceProvider extends ServiceProvider
return Size::query()->orderBy('id')->get(); return Size::query()->orderBy('id')->get();
}); });
/** @return \Illuminate\Support\Collection<DatetimeFormat> */
app()->singleton('datetime_formats', function ($app) {
return DatetimeFormat::query()->orderBy('id')->get();
});
app()->singleton('templates', function ($app) { app()->singleton('templates', function ($app) {
return [ return [

View File

@ -143,6 +143,11 @@ class Statics
return $currency->name; return $currency->name;
})->values(); })->values();
$data['sizes'] = app('sizes');
$data['datetime_formats'] = app('datetime_formats');
$data['gateways'] = app('gateways');
$dat['timezones'] = app('timezones');
$data['templates'] = app('templates'); $data['templates'] = app('templates');
} }

View File

@ -17,8 +17,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' => env('APP_VERSION', '5.9.7'), 'app_version' => env('APP_VERSION', '5.9.8'),
'app_tag' => env('APP_TAG', '5.9.7'), 'app_tag' => env('APP_TAG', '5.9.8'),
'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),