From 35a12fd4d130d1052cd3c97d04c9aef74b0ee415 Mon Sep 17 00:00:00 2001 From: bansarishukla Date: Wed, 13 Nov 2019 19:33:31 +0530 Subject: [PATCH 1/2] fix translation issues in french and fix issues in estimate action --- resources/assets/js/plugins/fr.js | 12 +++++++++- resources/assets/js/views/estimates/Index.vue | 16 ++++++------- resources/assets/js/views/estimates/View.vue | 24 +++++++++++++------ resources/assets/js/views/invoices/View.vue | 2 +- .../js/views/reports/ExpensesReport.vue | 1 - .../assets/js/views/settings/TaxTypes.vue | 12 ++-------- 6 files changed, 39 insertions(+), 28 deletions(-) diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js index f16962cc..d656e2df 100644 --- a/resources/assets/js/plugins/fr.js +++ b/resources/assets/js/plugins/fr.js @@ -552,7 +552,17 @@ export default { right: 'Droite', left: 'La gauche', action: 'action', - add_currency: 'Ajouter une devise', + add_currency: 'Ajouter une devise' + }, + mail: { + host: 'Mail Host', + port: 'Port mail', + driver: 'Pilote de courrier', + password: 'Mot de passe mail', + username: "Mail Nom d'utilisateur", + mail_config: 'Configuration du courrier', + encryption: 'Chiffrement du courrier', + mail_config_desc: "Les détails ci-dessous seront utilisés pour mettre à jour l'environnement de messagerie. Aussi, vous pouvez modifier les détails à tout moment après la connexion." }, pdf: { title: 'Paramètre PDF', diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue index c52c9fea..29cb5574 100644 --- a/resources/assets/js/views/estimates/Index.vue +++ b/resources/assets/js/views/estimates/Index.vue @@ -261,13 +261,13 @@ {{ $t('estimates.send_estimate') }} - + {{ $t('estimates.mark_as_accepted') }} - + {{ $t('estimates.mark_as_rejected') }} @@ -514,8 +514,8 @@ export default { icon: '/assets/icon/envelope-solid.svg', buttons: true, dangerMode: true - }).then(async (willDelete) => { - if (willDelete) { + }).then(async (willConvertInToinvoice) => { + if (willConvertInToinvoice) { let res = await this.convertToInvoice(id) if (res.data) { window.toastr['success'](this.$t('estimates.conversion_message')) @@ -562,8 +562,8 @@ export default { icon: '/assets/icon/check-circle-solid.svg', buttons: true, dangerMode: true - }).then(async (willDelete) => { - if (willDelete) { + }).then(async (willMarkAsSent) => { + if (willMarkAsSent) { const data = { id: id } @@ -582,8 +582,8 @@ export default { icon: '/assets/icon/paper-plane-solid.svg', buttons: true, dangerMode: true - }).then(async (sendEstimate) => { - if (sendEstimate) { + }).then(async (willSendEstimate) => { + if (willSendEstimate) { const data = { id: id } diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue index d02a346a..69f7817e 100644 --- a/resources/assets/js/views/estimates/View.vue +++ b/resources/assets/js/views/estimates/View.vue @@ -222,12 +222,22 @@ export default { return true }, async onMarkAsSent () { - this.isRequestOnGoing = true - let response = await this.markAsSent({id: this.estimate.id}) - this.isRequestOnGoing = false - if (response.data) { - window.toastr['success'](this.$tc('estimates.mark_as_sent')) - } + swal({ + title: this.$t('general.are_you_sure'), + text: this.$t('estimates.confirm_mark_as_sent'), + icon: '/assets/icon/check-circle-solid.svg', + buttons: true, + dangerMode: true + }).then(async (willMarkAsSent) => { + if (willMarkAsSent) { + this.isRequestOnGoing = true + let response = await this.markAsSent({id: this.estimate.id}) + this.isRequestOnGoing = false + if (response.data) { + window.toastr['success'](this.$tc('estimates.mark_as_sent')) + } + } + }) }, async removeEstimate (id) { this.selectEstimate([parseInt(id)]) @@ -235,7 +245,7 @@ export default { swal({ title: 'Deleted', text: 'you will not be able to recover this estimate!', - icon: 'error', + icon: '/assets/icon/trash-solid.svg', buttons: true, dangerMode: true }).then(async (willDelete) => { diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue index a14d2373..1e1e79a7 100644 --- a/resources/assets/js/views/invoices/View.vue +++ b/resources/assets/js/views/invoices/View.vue @@ -242,7 +242,7 @@ export default { swal({ title: 'Deleted', text: 'you will not be able to recover this invoice!', - icon: 'error', + icon: '/assets/icon/trash-solid.svg', buttons: true, dangerMode: true }).then(async (willDelete) => { diff --git a/resources/assets/js/views/reports/ExpensesReport.vue b/resources/assets/js/views/reports/ExpensesReport.vue index ea94af8b..5097ee26 100644 --- a/resources/assets/js/views/reports/ExpensesReport.vue +++ b/resources/assets/js/views/reports/ExpensesReport.vue @@ -196,7 +196,6 @@ export default { return true }, downloadReport () { - this.url += '&download=true' setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/settings/TaxTypes.vue b/resources/assets/js/views/settings/TaxTypes.vue index 338b9b51..5911e268 100644 --- a/resources/assets/js/views/settings/TaxTypes.vue +++ b/resources/assets/js/views/settings/TaxTypes.vue @@ -28,17 +28,9 @@ class="mb-3" > - - + show="name" + /> Date: Thu, 14 Nov 2019 11:59:11 +0530 Subject: [PATCH 2/2] change in expense report --- resources/assets/js/views/reports/ExpensesReport.vue | 1 + resources/assets/js/views/settings/TaxTypes.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/assets/js/views/reports/ExpensesReport.vue b/resources/assets/js/views/reports/ExpensesReport.vue index 5097ee26..ea94af8b 100644 --- a/resources/assets/js/views/reports/ExpensesReport.vue +++ b/resources/assets/js/views/reports/ExpensesReport.vue @@ -196,6 +196,7 @@ export default { return true }, downloadReport () { + this.url += '&download=true' setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/settings/TaxTypes.vue b/resources/assets/js/views/settings/TaxTypes.vue index 5911e268..52eb5c48 100644 --- a/resources/assets/js/views/settings/TaxTypes.vue +++ b/resources/assets/js/views/settings/TaxTypes.vue @@ -28,6 +28,7 @@ class="mb-3" >