diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index a7633f77e..b4ad6f405 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -193,6 +193,28 @@ export default { onChangeColorInput() { this.color = this.form.color; + }, + + onChangeRate() { + this.form.rate = this.form.rate.replace(',', '.'); + }, + + onChangeCode(code) { + axios.get(url + '/settings/currencies/config', { + params: { + code: code + } + }) + .then(response => { + this.form.rate = response.data.rate; + this.form.precision = response.data.precision; + this.form.symbol = response.data.symbol; + this.form.symbol_first = response.data.symbol_first; + this.form.decimal_mark = response.data.decimal_mark; + this.form.thousands_separator = response.data.thousands_separator; + }) + .catch(error => { + }); } } }) diff --git a/resources/assets/js/views/settings/currencies.js b/resources/assets/js/views/settings/currencies.js index b24624c76..a12b99393 100644 --- a/resources/assets/js/views/settings/currencies.js +++ b/resources/assets/js/views/settings/currencies.js @@ -33,7 +33,7 @@ const app = new Vue({ }, methods:{ - RateReplace(){ + onChangeRate() { this.form.rate = this.form.rate.replace(',', '.'); }, diff --git a/resources/assets/js/views/settings/taxes.js b/resources/assets/js/views/settings/taxes.js index 326d36f5d..6271d5a4a 100644 --- a/resources/assets/js/views/settings/taxes.js +++ b/resources/assets/js/views/settings/taxes.js @@ -33,7 +33,7 @@ const app = new Vue({ }, methods: { - taxRateReplace() { + onChangeTaxRate() { this.form.rate = this.form.rate.replace(',', '.'); }, } diff --git a/resources/views/auth/roles/edit.blade.php b/resources/views/auth/roles/edit.blade.php index 6130c405f..2ae971831 100644 --- a/resources/views/auth/roles/edit.blade.php +++ b/resources/views/auth/roles/edit.blade.php @@ -49,8 +49,8 @@ @foreach($permissions as $action => $action_permissions) @php $active_action_tab = ($action == 'read') ? 'active' : ''; @endphp
- {{trans('general.select_all')}} - {{trans('general.unselect_all')}} + {{ trans('general.select_all') }} + {{ trans('general.unselect_all') }} @stack('permissions_input_start') diff --git a/resources/views/settings/currencies/create.blade.php b/resources/views/settings/currencies/create.blade.php index 913ac42c9..0f8b9844b 100644 --- a/resources/views/settings/currencies/create.blade.php +++ b/resources/views/settings/currencies/create.blade.php @@ -21,7 +21,7 @@ {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, null, ['required' => 'required', 'change' => 'onChangeCode']) }} - {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'RateReplace', 'required' => 'required']) }} + {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }} {{ Form::textGroup('precision', trans('currencies.precision'), 'dot-circle') }} diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php index 43c7973d9..b2ef04495 100644 --- a/resources/views/settings/currencies/edit.blade.php +++ b/resources/views/settings/currencies/edit.blade.php @@ -22,7 +22,7 @@ {{ Form::selectGroup('code', trans('currencies.code'), 'code', $codes, $currency->code, ['required' => 'required', 'change' => 'onChangeCode']) }} - {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'RateReplace', 'required' => 'required']) }} + {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }} {{ Form::textGroup('precision', trans('currencies.precision'), 'dot-circle') }} diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php index 75959c0a3..1c327957e 100644 --- a/resources/views/settings/taxes/create.blade.php +++ b/resources/views/settings/taxes/create.blade.php @@ -19,7 +19,7 @@
{{ Form::textGroup('name', trans('general.name'), 'font') }} - {{ Form::textGroup('rate', trans('taxes.rate'), 'percent', ['@input' => 'taxRateReplace']) }} + {{ Form::textGroup('rate', trans('taxes.rate'), 'percent', ['@input' => 'onChangeTaxRate']) }} {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }} diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php index 44cbb61bc..542b5c984 100644 --- a/resources/views/settings/taxes/edit.blade.php +++ b/resources/views/settings/taxes/edit.blade.php @@ -20,7 +20,7 @@
{{ Form::textGroup('name', trans('general.name'), 'font') }} - {{ Form::textGroup('rate', trans('taxes.rate'), 'percent', ['@input' => 'taxRateReplace']) }} + {{ Form::textGroup('rate', trans('taxes.rate'), 'percent', ['@input' => 'onChangeTaxRate']) }} {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, $tax->type) }}