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

Fixes for payment terms types (#3754)

Browse Source 
* Type Change for Payment Terms

* Fixes for payment terms casting
This commit is contained in:
David Bomba 2020-05-26 18:41:14 +10:00 committed by GitHub
parent 36abed4c7d
commit e038c624bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -411,7 +411,7 @@ class CompanySettings extends BaseSettings
'custom_value4' => 'string', 'custom_value4' => 'string',
'inclusive_taxes' => 'bool', 'inclusive_taxes' => 'bool',
'name' => 'string', 'name' => 'string',
'payment_terms' => 'integer', 'payment_terms' => 'string',
'payment_type_id' => 'string', 'payment_type_id' => 'string',
'phone' => 'string', 'phone' => 'string',
'postal_code' => 'string', 'postal_code' => 'string',
@ -479,7 +479,7 @@ class CompanySettings extends BaseSettings
$data->timezone_id = (string) config('ninja.i18n.timezone_id'); $data->timezone_id = (string) config('ninja.i18n.timezone_id');
$data->currency_id = (string) config('ninja.i18n.currency_id'); $data->currency_id = (string) config('ninja.i18n.currency_id');
$data->language_id = (string) config('ninja.i18n.language_id'); $data->language_id = (string) config('ninja.i18n.language_id');
$data->payment_terms = (int) config('ninja.i18n.payment_terms'); $data->payment_terms = (string) config('ninja.i18n.payment_terms');
$data->military_time = (bool) config('ninja.i18n.military_time'); $data->military_time = (bool) config('ninja.i18n.military_time');
$data->date_format_id = (string) config('ninja.i18n.date_format_id'); $data->date_format_id = (string) config('ninja.i18n.date_format_id');
$data->country_id = (string) config('ninja.i18n.country_id'); $data->country_id = (string) config('ninja.i18n.country_id');

2
config/ninja.php
View File

@ -54,7 +54,7 @@ return [
'datetime_format_id' => env('DEFAULT_DATETIME_FORMAT_ID', '1'), 'datetime_format_id' => env('DEFAULT_DATETIME_FORMAT_ID', '1'),
'locale' => env('DEFAULT_LOCALE', 'en'), 'locale' => env('DEFAULT_LOCALE', 'en'),
'map_zoom' => env('DEFAULT_MAP_ZOOM', 10), 'map_zoom' => env('DEFAULT_MAP_ZOOM', 10),
'payment_terms' => env('DEFAULT_PAYMENT_TERMS', -1), 'payment_terms' => env('DEFAULT_PAYMENT_TERMS', "-1"),
'military_time' => env('MILITARY_TIME', 0), 'military_time' => env('MILITARY_TIME', 0),
'first_day_of_week' => env('FIRST_DATE_OF_WEEK', 0), 'first_day_of_week' => env('FIRST_DATE_OF_WEEK', 0),
'first_month_of_year' => env('FIRST_MONTH_OF_YEAR', '2000-01-01') 'first_month_of_year' => env('FIRST_MONTH_OF_YEAR', '2000-01-01')