diff --git a/resources/assets/vue/components/bookings/elements/BillingComponent.vue b/resources/assets/vue/components/bookings/elements/BillingComponent.vue index cf388a47..ba1ce85c 100644 --- a/resources/assets/vue/components/bookings/elements/BillingComponent.vue +++ b/resources/assets/vue/components/bookings/elements/BillingComponent.vue @@ -92,26 +92,19 @@ export default { 'INVOICE + PO + DO', 'INVOICE + PO + DO + SDO' ], - selectedDocumentStatus: false, - isValidationEnabled: true + selectedDocumentStatus: false } }, validations: { parameters: { startDate: { - required: function() { - return this.isValidationEnabled ? required : null; - } + required }, endDate: { - required: function() { - return this.isValidationEnabled ? required : null; - } + required }, type: { - required: function() { - return this.isValidationEnabled ? required : null; - } + required }, supplier: {}, } @@ -120,13 +113,7 @@ export default { submitSearch(){ if(!this.validate()){ return; } if(window.LARAVEL_VAPOR_ENABLED){ - this.isValidationEnabled = !this.isValidationEnabled; - let type = this.parameters.type; - let startDate = this.parameters.startDate; - let endDate = this.parameters.endDate; - let supplier = this.parameters.supplier; - this.parameters = null; - this.submit(this.route('documents.download')+'?type='+type+'&startDate='+startDate+'&endDate='+endDate+'&supplier='+supplier, 'get', this.section, false, false); + this.submit(this.route('documents.download')+'?type='+this.parameters.type+'&startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate+'&supplier='+this.parameters.supplier, 'get', this.section, false, false); } else{ window.open(route('documents.download')+'?type='+this.parameters.type+'&startDate='+this.parameters.startDate+'&endDate='+this.parameters.endDate+'&supplier='+this.parameters.supplier, '_blank'); diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js index d940941c..4048415a 100644 --- a/resources/assets/vue/general/mixins/request.js +++ b/resources/assets/vue/general/mixins/request.js @@ -8,7 +8,7 @@ export default { this.$store.dispatch('crudRequest', { endpoint: url, method: method, - parameters: this.parameters + parameters: method === 'get' ? null : this.parameters }).then(response => { let statusCode = response.status, success = response.ok;