Merge branch 'fix-alert' into 'master'

refactor sweet-alert and add related icons in alert

See merge request mohit.panjvani/crater-web!11
This commit is contained in:
Mohit Panjwani
2019-11-13 05:46:19 +00:00
7 changed files with 46 additions and 18576 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -307,7 +307,9 @@ export default {
send_invoice: 'Send Invoice', send_invoice: 'Send Invoice',
invoice_template: 'Invoice Template', invoice_template: 'Invoice Template',
template: 'Template', template: 'Template',
mark_as_sent: 'Mark as Sent', mark_as_sent: 'Mark as sent',
invoice_mark_as_sent: 'This invoice will be marked as sent',
confirm_send: 'This invoice will be sent via email to the customer',
invoice_date: 'Invoice Date', invoice_date: 'Invoice Date',
record_payment: 'Record Payment', record_payment: 'Record Payment',
add_new_invoice: 'Add New Invoice', add_new_invoice: 'Add New Invoice',

View File

@ -312,6 +312,8 @@ export default {
invoice_template: 'Plantilla de factura', invoice_template: 'Plantilla de factura',
template: 'Modelo', template: 'Modelo',
mark_as_sent: 'Marcar como enviado', mark_as_sent: 'Marcar como enviado',
invoice_mark_as_sent: 'Esta factura se marcará como enviada',
confirm_send: 'Estas facturas se enviarán por correo electrónico al cliente.',
invoice_date: 'Fecha de la factura', invoice_date: 'Fecha de la factura',
record_payment: 'Registro de pago', record_payment: 'Registro de pago',
add_new_invoice: 'Añadir nueva factura', add_new_invoice: 'Añadir nueva factura',

View File

@ -312,6 +312,8 @@ export default {
invoice_template: 'Modèle de facture', invoice_template: 'Modèle de facture',
template: 'Modèle', template: 'Modèle',
mark_as_sent: 'Marquer comme envoyé', mark_as_sent: 'Marquer comme envoyé',
invoice_mark_as_sent: 'Cette facture sera marquée comme envoyé',
confirm_send: 'Cette facture sera envoyée par courrier électronique au client.',
invoice_date: 'Date de facturation', invoice_date: 'Date de facturation',
record_payment: 'Record de paiement', record_payment: 'Record de paiement',
add_new_invoice: 'Ajouter une nouvelle facture', add_new_invoice: 'Ajouter une nouvelle facture',

View File

@ -247,13 +247,13 @@
{{ $t('invoices.view') }} {{ $t('invoices.view') }}
</router-link> </router-link>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item> <v-dropdown-item v-if="row.status == 'DRAFT'">
<a class="dropdown-item" href="#" @click="sendInvoice(row.id)" > <a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
<font-awesome-icon icon="paper-plane" class="dropdown-item-icon" /> <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
{{ $t('invoices.send_invoice') }} {{ $t('invoices.send_invoice') }}
</a> </a>
</v-dropdown-item> </v-dropdown-item>
<v-dropdown-item v-if="row.status === 'DRAFT'"> <v-dropdown-item v-if="row.status == 'DRAFT'">
<a class="dropdown-item" href="#" @click="sentInvoice(row.id)"> <a class="dropdown-item" href="#" @click="sentInvoice(row.id)">
<font-awesome-icon icon="check-circle" class="dropdown-item-icon" /> <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
{{ $t('invoices.mark_as_sent') }} {{ $t('invoices.mark_as_sent') }}
@ -384,6 +384,14 @@ export default {
'fetchCustomers' 'fetchCustomers'
]), ]),
async sendInvoice (id) { async sendInvoice (id) {
swal({
title: this.$t('general.are_you_sure'),
text: this.$t('invoices.confirm_send'),
icon: '/assets/icon/paper-plane-solid.svg',
buttons: true,
dangerMode: true
}).then(async (Send_Invoice) => {
if (Send_Invoice) {
const data = { const data = {
id: id id: id
} }
@ -392,8 +400,18 @@ export default {
if (response.data) { if (response.data) {
window.toastr['success'](this.$tc('invoices.send_invoice')) window.toastr['success'](this.$tc('invoices.send_invoice'))
} }
}
})
}, },
async sentInvoice (id) { async sentInvoice (id) {
swal({
title: this.$t('general.are_you_sure'),
text: this.$t('invoices.invoice_mark_as_sent'),
icon: '/assets/icon/check-circle-solid.svg',
buttons: true,
dangerMode: true
}).then(async (MarkAsSend_Invoice) => {
if (MarkAsSend_Invoice) {
const data = { const data = {
id: id id: id
} }
@ -402,6 +420,8 @@ export default {
if (response.data) { if (response.data) {
window.toastr['success'](this.$tc('invoices.mark_as_sent')) window.toastr['success'](this.$tc('invoices.mark_as_sent'))
} }
}
})
}, },
getStatus (val) { getStatus (val) {
this.filters.status = { this.filters.status = {

View File

@ -111,6 +111,7 @@ code, .code {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.swal-icon--custom { .swal-icon--custom {
height: 50px !important; height: 50px !important;
} }