diff --git a/resources/assets/js/plugins/error.js b/resources/assets/js/plugins/error.js index 8a5973ca4..f23a6ad7f 100644 --- a/resources/assets/js/plugins/error.js +++ b/resources/assets/js/plugins/error.js @@ -17,13 +17,15 @@ export default class Errors { } get(field) { - if (this.errors[field]) { + if (this.has(field)) { return this.errors[field][0]; } } record(errors) { - this.errors = errors; + if (errors instanceof Object) { + this.errors = errors; + } } clear(field) { diff --git a/resources/assets/js/plugins/form.js b/resources/assets/js/plugins/form.js index e5ddaa3e7..9b8b17e34 100644 --- a/resources/assets/js/plugins/form.js +++ b/resources/assets/js/plugins/form.js @@ -104,7 +104,7 @@ export default class Form { if (!this[form_element.getAttribute('data-field')][name].push) { this[form_element.getAttribute('data-field')][name] = [this[form_element.getAttribute('data-field')][name]]; } - + if (form_element.checked) { this[form_element.getAttribute('data-field')][name].push(form_element.value); } @@ -171,7 +171,7 @@ export default class Form { this[name] = form_element.value; } } else { - + if (form_element.dataset.type != undefined) { if (form_element.dataset.type == 'multiple') { this[name] = []; @@ -383,7 +383,7 @@ export default class Form { } submit() { - FormData.prototype.appendRecursive = function(data, wrapper = null) { + FormData.prototype.appendRecursive = function(data, wrapper = null) { for (var name in data) { if (name == "previewElement" || name == "previewTemplate") { continue; @@ -427,7 +427,7 @@ export default class Form { } async asyncSubmit() { - FormData.prototype.appendRecursive = function(data, wrapper = null) { + FormData.prototype.appendRecursive = function(data, wrapper = null) { for (var name in data) { if (name == "previewElement" || name == "previewTemplate") { continue; @@ -497,7 +497,7 @@ export default class Form { if (error.request.status == 419) { window.location.href = ''; return; - } + } } if (typeof this.errors != "undefined") { diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 899bfd97d..a1be6d75b 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -120,12 +120,12 @@ const app = new Vue({ let item_index = this.form.items.indexOf(this.form.items[event.oldIndex]); let item = this.form.items.splice(item_index, 1)[0]; - this.form.items.splice(event.newIndex, 0, item); + this.form.items.splice(event.newIndex, 0, item); }, onRefFocus(ref) { let index = this.form.items.length - 1; - + if (typeof (this.$refs['items-' + index + '-' + ref]) !== 'undefined') { let first_ref = this.$refs['items-' + index + '-' + ref]; @@ -486,13 +486,13 @@ const app = new Vue({ } let selected_tax; - + this.dynamic_taxes.forEach(function(tax) { if (tax.id == this.tax_id) { selected_tax = tax; } }, this); - + if (selected_tax) { this.items[item_index].tax_ids.push({ id: selected_tax.id, @@ -677,7 +677,7 @@ const app = new Vue({ onFormCapture() { let form_html = document.querySelector('form'); - + if (form_html && form_html.getAttribute('id') == 'document') { form_html.querySelectorAll('input, textarea, select, ul, li, a').forEach((element) => { element.addEventListener('click', () => { @@ -839,9 +839,9 @@ const app = new Vue({ if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) { this.form.discount = oldVal; - + if (Number(newVal) == null) { - this.form.discount.replace(',', '.'); + this.form.discount.replace(',', '.'); } return; @@ -865,4 +865,4 @@ const app = new Vue({ } }, }, -}); \ No newline at end of file +});