diff --git a/resources/assets/js/views/.DS_Store b/resources/assets/js/views/.DS_Store deleted file mode 100644 index 45f4ec022..000000000 Binary files a/resources/assets/js/views/.DS_Store and /dev/null differ diff --git a/resources/assets/js/views/common/.DS_Store b/resources/assets/js/views/common/.DS_Store deleted file mode 100644 index c2f451993..000000000 Binary files a/resources/assets/js/views/common/.DS_Store and /dev/null differ diff --git a/resources/assets/js/views/common/items.js b/resources/assets/js/views/common/items.js index 6da8dcaa4..bedf1cf25 100644 --- a/resources/assets/js/views/common/items.js +++ b/resources/assets/js/views/common/items.js @@ -41,16 +41,15 @@ const app = new Vue({ watch: { '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; + return; } - if (newVal.search('^(?=.*?[0-9])[0-9.,]+$') == 0) { - for (let item of this.regex_condition) { - if (this.form.sale_price.includes(item)) { - this.splice_value = this.form.sale_price.replace(item, ''); - this.form.sale_price = this.splice_value; - } + for (let item of this.regex_condition) { + if (this.form.sale_price.includes(item)) { + this.splice_value = this.form.sale_price.replace(item, ''); + this.form.sale_price = this.splice_value; } } }, diff --git a/resources/views/components/documents/script.blade.php b/resources/views/components/documents/script.blade.php index 3042802d1..f433150ec 100644 --- a/resources/views/components/documents/script.blade.php +++ b/resources/views/components/documents/script.blade.php @@ -10,7 +10,7 @@