From c5387f0eb01e6c7f25b41bca8d6ec08879ac8837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 26 Apr 2021 18:37:14 +0300 Subject: [PATCH] close #2005 Fixed: Default currency fields should be disabled for default currency --- public/css/akaunting-color.css | 10 ++++++++++ .../views/partials/form/radio_group.blade.php | 14 ++++++++++++++ resources/views/settings/currencies/edit.blade.php | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css index b213a338a..2e78bea52 100644 --- a/public/css/akaunting-color.css +++ b/public/css/akaunting-color.css @@ -930,6 +930,11 @@ button.bg-yellow:focus { box-shadow: none, 0 0 0 0 rgba(109, 162, 82, .5); } +.form-group.disabled .btn-group.btn-group-toggle.radio-yes-no .btn-success.active-disabled { + color: #ffffff !important; + border-color: #6da252 !important; + background-color: #6da252 !important; +} /*--Success Color Finish--*/ /*--Danger Color--*/ @@ -972,6 +977,11 @@ button.bg-yellow:focus { box-shadow: none, 0 0 0 0 rgba(239, 50, 50, .5); } +.form-group.disabled .btn-group.btn-group-toggle.radio-yes-no .btn-danger.active-disabled { + color: #ffffff !important; + border-color: #ef3232 !important; + background-color: #ef3232 !important; +} /*--Danger Color Finish--*/ /*--Warning Color--*/ diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php index 977d2f9bf..79f021b28 100644 --- a/resources/views/partials/form/radio_group.blade.php +++ b/resources/views/partials/form/radio_group.blade.php @@ -13,15 +13,29 @@
+ @if (empty($attributes['disabled'])) + @else + + @endif + @if (empty($attributes['disabled'])) + @else + + @endif
diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php index 43c08b6c9..7a5efc5c4 100644 --- a/resources/views/settings/currencies/edit.blade.php +++ b/resources/views/settings/currencies/edit.blade.php @@ -36,7 +36,7 @@ {{ Form::radioGroup('enabled', trans('general.enabled'), $currency->enabled) }} - {{ Form::radioGroup('default_currency', trans('currencies.default'), $currency->default_currency) }} + {{ Form::radioGroup('default_currency', trans('currencies.default'), $currency->default_currency, '', '', ['disabled' => (setting('default.currency') == $currency->code) ? 'disabled': false]) }}