From aad96e781488bfec73be97bb72c1bc15fc81ae10 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 14 Dec 2019 10:03:41 +0300 Subject: [PATCH 1/3] Radio group partial is fixed. --- resources/assets/js/plugins/form.js | 2 +- resources/views/auth/users/create.blade.php | 2 +- resources/views/auth/users/edit.blade.php | 2 +- resources/views/banking/accounts/create.blade.php | 4 ++-- resources/views/banking/accounts/edit.blade.php | 4 ++-- resources/views/common/companies/create.blade.php | 2 +- resources/views/common/companies/edit.blade.php | 2 +- resources/views/common/items/create.blade.php | 2 +- resources/views/common/items/edit.blade.php | 2 +- resources/views/expenses/vendors/create.blade.php | 2 +- resources/views/expenses/vendors/edit.blade.php | 2 +- resources/views/incomes/customers/create.blade.php | 2 +- resources/views/incomes/customers/edit.blade.php | 2 +- resources/views/partials/form/radio_group.blade.php | 10 ++++++---- resources/views/settings/categories/create.blade.php | 2 +- resources/views/settings/categories/edit.blade.php | 2 +- resources/views/settings/currencies/create.blade.php | 4 ++-- resources/views/settings/currencies/edit.blade.php | 4 ++-- resources/views/settings/default/edit.blade.php | 2 +- resources/views/settings/schedule/edit.blade.php | 4 ++-- resources/views/settings/taxes/create.blade.php | 2 +- resources/views/settings/taxes/edit.blade.php | 2 +- 22 files changed, 32 insertions(+), 30 deletions(-) diff --git a/resources/assets/js/plugins/form.js b/resources/assets/js/plugins/form.js index fd0632213..2fc637f90 100644 --- a/resources/assets/js/plugins/form.js +++ b/resources/assets/js/plugins/form.js @@ -44,7 +44,7 @@ export default class Form { if (type == 'radio') { if (!this[name]) { - this[name] = form_element.getAttribute('value') || ''; + this[name] = (form_element.getAttribute('value') ? 1 : 0) || 0; } } else if (type == 'checkbox') { if (this[name]) { diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index 9fa229616..53d80ca38 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -49,7 +49,7 @@ {{ Form::checkboxGroup('roles', trans_choice('general.roles', 2), $roles, 'display_name') }} @endpermission - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index c6937ad0f..30098c248 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -50,7 +50,7 @@ {{ Form::checkboxGroup('roles', trans_choice('general.roles', 2), $roles, 'display_name') }} @endpermission - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $user->enabled) }} diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index 446787c86..0c9d5487e 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -31,9 +31,9 @@ {{ Form::textareaGroup('bank_address', trans('accounts.bank_address')) }} - {{ Form::radioGroup('default_account', trans('accounts.default_account')) }} + {{ Form::radioGroup('default_account', trans('accounts.default_account'), false) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php index e6138c2d8..d98347c13 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -32,9 +32,9 @@ {{ Form::textareaGroup('bank_address', trans('accounts.bank_address')) }} - {{ Form::radioGroup('default_account', trans('accounts.default_account')) }} + {{ Form::radioGroup('default_account', trans('accounts.default_account'), $account->default_account) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $account->enabled) }} diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php index 43246b39e..b3ec0a781 100644 --- a/resources/views/common/companies/create.blade.php +++ b/resources/views/common/companies/create.blade.php @@ -29,7 +29,7 @@ {{ Form::fileGroup('logo', trans('companies.logo')) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} diff --git a/resources/views/common/companies/edit.blade.php b/resources/views/common/companies/edit.blade.php index ebe67837b..ac4e79ac8 100644 --- a/resources/views/common/companies/edit.blade.php +++ b/resources/views/common/companies/edit.blade.php @@ -30,7 +30,7 @@ {{ Form::fileGroup('logo', trans('companies.logo')) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $company->enabled) }} diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php index 95af7ba87..6ad30c566 100644 --- a/resources/views/common/items/create.blade.php +++ b/resources/views/common/items/create.blade.php @@ -31,7 +31,7 @@ {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus') }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php index 1316d1b2a..f310e8171 100644 --- a/resources/views/common/items/edit.blade.php +++ b/resources/views/common/items/edit.blade.php @@ -32,7 +32,7 @@ {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $item->enabled) }} diff --git a/resources/views/expenses/vendors/create.blade.php b/resources/views/expenses/vendors/create.blade.php index 273ef5585..f12795d5f 100644 --- a/resources/views/expenses/vendors/create.blade.php +++ b/resources/views/expenses/vendors/create.blade.php @@ -35,7 +35,7 @@ {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} diff --git a/resources/views/expenses/vendors/edit.blade.php b/resources/views/expenses/vendors/edit.blade.php index 9f81fd6db..f56dc8133 100644 --- a/resources/views/expenses/vendors/edit.blade.php +++ b/resources/views/expenses/vendors/edit.blade.php @@ -36,7 +36,7 @@ {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $vendor->enabled) }} diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/incomes/customers/create.blade.php index 6cc6993eb..f17d6ecdd 100644 --- a/resources/views/incomes/customers/create.blade.php +++ b/resources/views/incomes/customers/create.blade.php @@ -34,7 +34,7 @@ {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} @stack('create_user_input_start')
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php index 3a2935a71..5fe0fbc07 100644 --- a/resources/views/incomes/customers/edit.blade.php +++ b/resources/views/incomes/customers/edit.blade.php @@ -33,7 +33,7 @@ {{ Form::textGroup('reference', trans('general.reference'), 'file', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $customer->enabled) }} @stack('create_user_input_start')
diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php index b2de8a3e9..be58af35d 100644 --- a/resources/views/partials/form/radio_group.blade.php +++ b/resources/views/partials/form/radio_group.blade.php @@ -6,15 +6,17 @@
-
diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php index 5eec10232..c27847776 100644 --- a/resources/views/settings/categories/create.blade.php +++ b/resources/views/settings/categories/create.blade.php @@ -36,7 +36,7 @@
@stack('color_input_end') - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php index e84518a9c..66f93b8b7 100644 --- a/resources/views/settings/categories/edit.blade.php +++ b/resources/views/settings/categories/edit.blade.php @@ -42,7 +42,7 @@ @stack('color_input_end') - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $category->enabled) }} diff --git a/resources/views/settings/currencies/create.blade.php b/resources/views/settings/currencies/create.blade.php index 058d0157f..669af1d83 100644 --- a/resources/views/settings/currencies/create.blade.php +++ b/resources/views/settings/currencies/create.blade.php @@ -33,9 +33,9 @@ {{ Form::textGroup('thousands_separator', trans('currencies.thousands_separator'), 'slash', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }} - {{ Form::radioGroup('default_currency', trans('currencies.default')) }} + {{ Form::radioGroup('default_currency', trans('currencies.default'), false) }} diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php index 04108f444..6b36cb64b 100644 --- a/resources/views/settings/currencies/edit.blade.php +++ b/resources/views/settings/currencies/edit.blade.php @@ -34,9 +34,9 @@ {{ Form::textGroup('thousands_separator', trans('currencies.thousands_separator'), 'slash', []) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $currency->enabled) }} - {{ Form::radioGroup('default_currency', trans('currencies.default')) }} + {{ Form::radioGroup('default_currency', trans('currencies.default'), $currency->default_currency) }} diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php index 791521747..6a3370011 100644 --- a/resources/views/settings/default/edit.blade.php +++ b/resources/views/settings/default/edit.blade.php @@ -30,7 +30,7 @@ {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }} - {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar')) }} + {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->use_gravatar) }} diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php index 33499b662..e3fc2ff94 100644 --- a/resources/views/settings/schedule/edit.blade.php +++ b/resources/views/settings/schedule/edit.blade.php @@ -18,11 +18,11 @@
- {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice')) }} + {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), $setting->send_invoice_reminder) }} {{ Form::textGroup('invoice_days', trans('settings.scheduling.invoice_days'), 'calendar', []) }} - {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill')) }} + {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), $setting->send_bill_reminder) }} {{ Form::textGroup('bill_days', trans('settings.scheduling.bill_days'), 'calendar', []) }} diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php index d9521e13a..3bd01e27d 100644 --- a/resources/views/settings/taxes/create.blade.php +++ b/resources/views/settings/taxes/create.blade.php @@ -23,7 +23,7 @@ {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), true) }}
diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php index 57b0d5748..dcd91c850 100644 --- a/resources/views/settings/taxes/edit.blade.php +++ b/resources/views/settings/taxes/edit.blade.php @@ -24,7 +24,7 @@ {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, $tax->type) }} - {{ Form::radioGroup('enabled', trans('general.enabled')) }} + {{ Form::radioGroup('enabled', trans('general.enabled'), $tax->enabled) }}
From a16291ecd6306e5c79916f785fb5e86169aea074 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 14 Dec 2019 12:37:32 +0300 Subject: [PATCH 2/3] Getting schedule settings caused a trouble. It is fixed by using get method. --- resources/views/settings/schedule/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php index e3fc2ff94..754e67d4e 100644 --- a/resources/views/settings/schedule/edit.blade.php +++ b/resources/views/settings/schedule/edit.blade.php @@ -18,11 +18,11 @@
- {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), $setting->send_invoice_reminder) }} + {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), $setting->get('send_invoice_reminder')) }} {{ Form::textGroup('invoice_days', trans('settings.scheduling.invoice_days'), 'calendar', []) }} - {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), $setting->send_bill_reminder) }} + {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), $setting->get('send_bill_reminder')) }} {{ Form::textGroup('bill_days', trans('settings.scheduling.bill_days'), 'calendar', []) }} From ff3452791536df17ca2327853efda0d7e7b1e3a2 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 14 Dec 2019 12:47:45 +0300 Subject: [PATCH 3/3] Getting default settings caused a trouble. It is fixed by using get method. --- resources/views/settings/default/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php index 6a3370011..4970769f3 100644 --- a/resources/views/settings/default/edit.blade.php +++ b/resources/views/settings/default/edit.blade.php @@ -30,7 +30,7 @@ {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }} - {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->use_gravatar) }} + {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->get('use_gravatar')) }}