TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-small-issue

Browse Source
This commit is contained in:
raishvaria
2019-11-12 09:24:06 +05:30
parent 6b8fd9f267 0fbc26bbe1
commit a68fd4f71e
17 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/estimates/Create.vue
View File

@ -582,7 +582,7 @@ export default {
},
openTemplateModal () {
this.openModal({
'title': 'Choose a template',
'title': this.$t('general.choose_template'),
'componentName': 'EstimateTemplate',
'data': this.estimateTemplates
})

2
resources/assets/js/views/estimates/Tax.vue
View File

@ -159,7 +159,7 @@ export default {
},
openTaxModal () {
this.openModal({
'title': 'Add Tax',
'title': this.$t('settings.tax_types.add_tax'),
'componentName': 'TaxTypeModal'
})
}

2
resources/assets/js/views/invoices/Create.vue
View File

@ -591,7 +591,7 @@ export default {
},
openTemplateModal () {
this.openModal({
'title': 'Choose a template',
'title': this.$t('general.choose_template'),
'componentName': 'InvoiceTemplate',
'data': this.invoiceTemplates
})

2
resources/assets/js/views/invoices/Edit.vue
View File

@ -500,7 +500,7 @@ export default {
},
openTemplateModal () {
this.openModal({
'title': 'Choose a template',
'title': this.$t('general.choose_template'),
'componentName': 'InvoiceTemplate',
'data': this.invoiceTemplates
})

2
resources/assets/js/views/invoices/Tax.vue
View File

@ -156,7 +156,7 @@ export default {
},
openTaxModal () {
this.openModal({
'title': 'Add Tax',
'title': this.$t('settings.tax_types.add_tax'),
'componentName': 'TaxTypeModal'
})
}

6
resources/assets/js/views/settings/TaxTypes.vue
View File

@ -161,15 +161,15 @@ export default {
async removeTax (id, index) {
let response = await this.deleteTaxType(id)
if (response.data.success) {
window.toastr['success'](this.$t('settings.sales_taxes.deleted_message'))
window.toastr['success'](this.$t('settings.tax_types.deleted_message'))
this.id = null
this.$refs.table.refresh()
return true
}window.toastr['success'](this.$t('settings.sales_taxes.already_in_use'))
}window.toastr['success'](this.$t('settings.tax_types.already_in_use'))
},
openTaxModal () {
this.openModal({
'title': 'Add Tax',
'title': this.$t('settings.tax_types.add_tax'),
'componentName': 'TaxTypeModal'
})
this.$refs.table.refresh()