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

Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

Browse Source
This commit is contained in:
Burak Civan
2022-06-16 14:47:11 +03:00
parent 48cf229b3c 79f9703635
commit 7f4818c0f7
54 changed files with 1615 additions and 12642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/components/AkauntingCompanyEdit.vue
View File

@ -222,7 +222,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
})
.catch(error => {
@ -239,7 +239,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
},
};

4
resources/assets/js/components/AkauntingContactCard.vue
View File

@ -528,7 +528,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
})
.catch(error => {
@ -544,7 +544,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
closeIfClickedOutside(event) {

2
resources/assets/js/components/AkauntingEditItemColumns.vue
View File

@ -165,7 +165,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
},
};

4
resources/assets/js/components/AkauntingItemButton.vue
View File

@ -444,7 +444,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
})
.catch(error => {
@ -463,7 +463,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
closeIfClickedOutside(event) {

4
resources/assets/js/components/AkauntingSelect.vue
View File

@ -693,7 +693,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
})
.catch(error => {
@ -712,7 +712,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
addModal() {

11
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -5,6 +5,7 @@
:class="[
{'readonly': readonly},
{'disabled': disabled},
{'no-arrow': noArrow},
formClasses
]"
:error="formError">
@ -346,6 +347,12 @@ export default {
description: "Selectbox disabled status"
},
noArrow: {
type: Boolean,
default: false,
description: "Selectbox show arrow"
},
clearable: {
type: Boolean,
default: true,
@ -908,7 +915,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
})
.catch(error => {
@ -927,7 +934,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
addModal() {

6
resources/assets/js/components/AkauntingWidget.vue
View File

@ -253,7 +253,7 @@ export default {
onCancel() {
let documentClasses = document.body.classList;
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
this.display = false;
this.form.name = '';
@ -272,9 +272,9 @@ export default {
let documentClasses = document.body.classList;
if (val) {
documentClasses.add("overflow-hidden");
documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} else {
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
}
}

4
resources/assets/js/components/Modal.vue
View File

@ -110,9 +110,9 @@
show(val) {
let documentClasses = document.body.classList;
if (val) {
documentClasses.add("overflow-hidden");
documentClasses.add('overflow-y-hidden', 'overflow-overlay', '-ml-4');
} else {
documentClasses.remove("overflow-hidden");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
}
}
}

39
resources/assets/js/mixins/global.js vendored
View File

@ -85,7 +85,12 @@ export default {
"thousands_separator":",",
},
all_currencies: [],
content_loading: true
content_loading: true,
connect: {
show: false,
currency: {},
documents: [],
},
}
},
@ -627,7 +632,7 @@ export default {
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
}
})
@ -656,6 +661,34 @@ export default {
copy_badge.classList.remove('flex');
copy_html.classList.remove('hidden');
}, 800);
}
},
//connect transactions for account, document or etc.
onConnectTransactions(route) {
let dial_promise = Promise.resolve(window.axios.get(route));
dial_promise.then(response => {
this.connect.show = true;
this.connect.transaction = JSON.parse(response.data.transaction);
let currency = JSON.parse(response.data.currency);
this.connect.currency = {
decimal_mark: currency.decimal_mark,
precision: currency.precision,
symbol: currency.symbol,
symbol_first: currency.symbol_first,
thousands_separator: currency.thousands_separator,
};
this.connect.documents = JSON.parse(response.data.documents);
})
.catch(error => {
})
.finally(function () {
// always executed
});
},
}
}

34
resources/assets/js/views/banking/transactions.js vendored
View File

@ -29,42 +29,10 @@ const app = new Vue({
return {
form: new Form('transaction'),
bulk_action: new BulkAction('transactions'),
connect: {
show: false,
currency: {},
documents: [],
},
}
},
methods: {
onConnect(route) {
let dial_promise = Promise.resolve(window.axios.get(route));
dial_promise.then(response => {
this.connect.show = true;
this.connect.transaction = JSON.parse(response.data.transaction);
let currency = JSON.parse(response.data.currency);
this.connect.currency = {
decimal_mark: currency.decimal_mark,
precision: currency.precision,
symbol: currency.symbol,
symbol_first: currency.symbol_first,
thousands_separator: currency.thousands_separator,
};
this.connect.documents = JSON.parse(response.data.documents);
})
.catch(error => {
})
.finally(function () {
// always executed
});
},
async onEmail(route) {
let email = {
modal: false,
@ -110,7 +78,7 @@ const app = new Vue({
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
}
})

41
resources/assets/js/views/common/documents.js vendored
View File

@ -68,7 +68,13 @@ const app = new Vue({
dynamic_taxes: [],
show_discount: false,
show_discount_text: true,
delete_discount: false
delete_discount: false,
regex_condition: [
'..',
'.,',
',.',
',,'
],
}
},
@ -488,11 +494,14 @@ const app = new Vue({
onChangeDiscountType(type) {
this.form.discount_type = type;
this.onAddTotalDiscount();
this.onCalculateTotal();
},
onChangeLineDiscountType(item_index, type) {
this.items[item_index].discount_type = type;
this.onCalculateTotal();
},
@ -669,7 +678,7 @@ const app = new Vue({
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
}
})
@ -787,7 +796,7 @@ const app = new Vue({
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
}
})
@ -844,7 +853,7 @@ const app = new Vue({
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
documentClasses.remove('overflow-y-hidden', 'overflow-overlay', '-ml-4');
},
}
})
@ -1062,5 +1071,27 @@ const app = new Vue({
}
this.page_loaded = true;
}
},
watch: {
'form.discount': function (newVal, oldVal) {
if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) {
this.form.discount = oldVal;
this.form.discount = this.form.discount.replace(',', '.');
return;
}
for (let item of this.regex_condition) {
if (this.form.discount.includes(item)) {
const removeLastChar = newVal.length - 1;
const inputShown = newVal.slice(0, removeLastChar);
this.form.discount = inputShown;
}
}
this.form.discount = this.form.discount.replace(',', '.');
},
},
});

19
resources/assets/js/views/modules/apps.js vendored
View File

@ -82,12 +82,15 @@ const app = new Vue({
html: ''
},
addToCartLoading: false,
loadMoreLoading: false,
}
},
methods: {
addToCart(alias, subscription_type) {
this.addToCartLoading = true;
let add_to_cart_promise = Promise.resolve(axios.get(url + '/apps/' + alias + '/' + subscription_type +'/add'));
add_to_cart_promise.then(response => {
@ -95,25 +98,15 @@ const app = new Vue({
this.$notify({
message: response.data.message,
timeout: 0,
icon: "fas fa-bell",
icon: "shopping_cart_checkout",
type: 'success'
});
}
if (response.data.error) {
this.installation.status = 'exception';
this.installation.html = '<div class="text-red">' + response.data.message + '</div>';
}
// Set steps
if (response.data.data) {
this.installation.steps = response.data.data;
this.installation.steps_total = this.installation.steps.length;
this.next();
}
this.addToCartLoading = false;
})
.catch(error => {
this.addToCartLoading = false;
});
},