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

Merge branch 'master'

Browse Source
This commit is contained in:
Mohit Panjwani
2019-12-12 20:42:17 +05:30
parent 34f7e33abc 387cb4490d
commit e28c89085d
14 changed files with 62 additions and 46 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 {
this.newEstimate.expiry_date = moment(today).add(7, 'days').toString()
this.itemList = response.data.items
this.estimatePrefix = response.data.estimate_prefix
this.estimateNumAttribute = response.data.nextEstimateNumber
this.estimateNumAttribute = response.data.nextEstimateNumberAttribute
}
this.initLoading = false
},

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

@ -582,7 +582,7 @@ export default {
this.newInvoice.due_date = moment(today).add(7, 'days').toString()
this.itemList = response.data.items
this.invoicePrefix = response.data.invoice_prefix
this.invoiceNumAttribute = response.data.nextInvoiceNumber
this.invoiceNumAttribute = response.data.nextInvoiceNumberAttribute
}
this.initLoading = false
},

4
resources/assets/js/views/layouts/LayoutBasic.vue
View File

@ -50,7 +50,7 @@ export default {
Layout.set('layout-default')
},
created() {
created () {
this.bootstrap().then((res) => {
this.setInitialCompany()
})
@ -59,7 +59,7 @@ export default {
methods: {
...mapActions(['bootstrap']),
...mapActions('company', ['setSelectedCompany']),
setInitialCompany() {
setInitialCompany () {
let selectedCompany = Ls.get('selectedCompany') !== null
if (selectedCompany) {

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

@ -309,7 +309,7 @@ export default {
} else {
let response = await this.fetchCreatePayment()
this.customerList = response.data.customers
this.paymentNumAttribute = response.data.nextPaymentNumber
this.paymentNumAttribute = response.data.nextPaymentNumberAttribute
this.paymentPrefix = response.data.payment_prefix
this.formData.payment_date = moment(new Date()).toString()
}