shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2590 Enhancement: During setup, it's impossible to modify the default currency

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-09-05 17:28:06 +03:00
parent 05aa6a84c3
commit cf565f55e0
3 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Wizard/Currencies.php
View File

@ -91,6 +91,8 @@ class Currencies extends Controller
{ {
$response = $this->ajaxDispatch(new UpdateCurrency($currency, $request)); $response = $this->ajaxDispatch(new UpdateCurrency($currency, $request));
$currency->default = setting('default.currency') == $currency->code;
if ($response['success']) { if ($response['success']) {
$message = trans('messages.success.updated', ['type' => $currency->name]); $message = trans('messages.success.updated', ['type' => $currency->name]);
} else { } else {

42
resources/assets/js/mixins/wizardAction.js vendored
View File

@ -27,8 +27,9 @@ export default {
this.model.name = ''; this.model.name = '';
this.model.rate = ''; this.model.rate = '';
this.model.select = ''; this.model.select = '';
this.model.default = false; this.model.default = 0;
this.model.default_currency = false; this.model.default_currency = 0;
this.model.enabled = 1;
} }
}, },
@ -40,8 +41,9 @@ export default {
if (this.model) { if (this.model) {
this.model.name = item.name ? item.name : ''; this.model.name = item.name ? item.name : '';
this.model.rate = item.rate ? item.rate : ''; this.model.rate = item.rate ? item.rate : '';
this.model.default = item.default ? item.default : false; this.model.enabled = 1;
this.model.default_currency = item.default ? item.default : false; this.model.default = item.default ? item.default : 0;
this.model.default_currency = item.default ? item.default : 0;
this.model.select = item.code ? item.code : ''; this.model.select = item.code ? item.code : '';
} }
}, },
@ -56,8 +58,8 @@ export default {
this.model.name = ''; this.model.name = '';
this.model.rate = ''; this.model.rate = '';
this.model.select = ''; this.model.select = '';
this.model.default = false; this.model.default = 0;
this.model.default_currency = false; this.model.default_currency = 0;
this.model.enabled = 1; this.model.enabled = 1;
}, },
@ -110,39 +112,57 @@ export default {
}); });
} }
if(plus_data == 'type') { if (plus_data == 'type') {
Object.assign(data, { Object.assign(data, {
['type']: 'normal', ['type']: 'normal',
}); });
} }
if (data.default_currency) { if (data.default_currency == 1) {
data.rate = 1; data.rate = 1;
} }
data.enabled = 1;
window.axios({ window.axios({
method: form_method, method: form_method,
url: form_url, url: form_url,
data: data, data: data,
}) })
.then(response => { .then(response => {
if(form_list.length != undefined) { if (form_list.length != undefined) {
if(form_method == 'POST') { if (form_method == 'POST') {
if (data.default_currency == 1) {
form_list.forEach(item => {
item.default = 0;
item.default_currency = 0;
});
}
form_list.push({ form_list.push({
"id": response.data.data.id, "id": response.data.data.id,
"name": response.data.data.name, "name": response.data.data.name,
"code": response.data.data.code, "code": response.data.data.code,
"rate": response.data.data.rate, "rate": response.data.data.rate,
"enabled": response.data.data.enabled != undefined ? response.data.data.enabled : 'true' "enabled": response.data.data.enabled != undefined ? response.data.data.enabled : 'true',
"default": response.data.data.default ? response.data.data.default : 0,
"default_currency": response.data.data.default ? response.data.data.default : 0
}); });
} }
if (form_method == 'PATCH') { if (form_method == 'PATCH') {
form_list.forEach(item => { form_list.forEach(item => {
if (data.default_currency == 1) {
item.default = 0;
item.default_currency = 0;
}
if (item.id == form_id) { if (item.id == form_id) {
item.name = response.data.data.name; item.name = response.data.data.name;
item.code = response.data.data.code; item.code = response.data.data.code;
item.rate = response.data.data.rate; item.rate = response.data.data.rate;
item.default = response.data.data.default ? response.data.data.default : 0;
item.default_currency = response.data.data.default ? response.data.data.default : 0;
} }
}); });
} }

9
resources/assets/js/views/wizard/Currencies.vue
View File

@ -127,11 +127,16 @@
<button <button
type="submit" type="submit"
:disabled="button_loading"
class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100"
:disabled="button_loading"
@click="onEditForm(item, $event)" @click="onEditForm(item, $event)"
> >
<i v-if="button_loading" class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i> <i
class="animate-submit delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-3.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit before:delay-[0.14s]after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"
v-if="button_loading"
>
</i>
<span :class="[{'opacity-0': button_loading}]"> <span :class="[{'opacity-0': button_loading}]">
{{ translations.currencies.save }} {{ translations.currencies.save }}
</span> </span>