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

Merge pull request #2175 from bengu-thon-mai-mochi/regex-pattern

Browse Source 
Price inputs formatted in edit & create items page
This commit is contained in:
Cüneyt Şentürk 2021-07-02 17:39:46 +03:00 committed by GitHub
commit 26fde89cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
resources/assets/js/views/common/items.js vendored
View File

@ -29,20 +29,44 @@ const app = new Vue({
return { return {
form: new Form('item'), form: new Form('item'),
bulk_action: new BulkAction('items'), bulk_action: new BulkAction('items'),
regex_condition: [
'..',
'.,',
',.',
',,'
],
} }
}, },
watch: { watch: {
'form.sale_price': function (newVal, oldVal) { 'form.sale_price': function (newVal, oldVal) {
if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') == -1) { if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) {
this.form.sale_price = oldVal; this.form.sale_price = oldVal;
return;
}
for (let item of this.regex_condition) {
if (this.form.sale_price.includes(item)) {
const removeLastChar = newVal.length - 1
const inputShown = newVal.slice(0, removeLastChar)
this.form.sale_price = inputShown;
}
} }
}, },
'form.purchase_price': function (newVal, oldVal) { 'form.purchase_price': function (newVal, oldVal) {
if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') == -1) { if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) {
this.form.purchase_price = oldVal; this.form.purchase_price = oldVal;
return;
} }
}
}, for (let item of this.regex_condition) {
if (this.form.purchase_price.includes(item)) {
const removeLastChar = newVal.length - 1
const inputShown = newVal.slice(0, removeLastChar)
this.form.purchase_price = inputShown;
}
}
},
},
}); });