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

Merge branch 'master-date-refactor' into 'master'

Browse Source 
Refactor Date Issue

See merge request mohit.panjvani/crater-web!652
This commit is contained in:
Mohit Panjwani
2020-12-22 07:24:03 +00:00
parent d07b63c365 9227973a7a
commit 09f74eb37c
9 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/assets/js/components/base/BaseDatePicker.vue
View File

@ -18,8 +18,6 @@
import { mapGetters } from 'vuex'
import SwDatePicker from '@bytefury/spacewind/src/components/SwDatePicker'
import moment from 'moment'
const fromMomentDate = (date, format = 'YYYY-MM-DD') =>
moment(new Date(date), format)
export default {
components: {
@ -78,9 +76,11 @@ export default {
watch: {
value(val) {
if (val && !this.enableTime) {
this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD')
this.date = moment(new Date(val), 'YYYY-MM-DD').format('YYYY-MM-DD')
} else {
this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD H:m:s')
this.date = moment(new Date(val), 'YYYY-MM-DD').format(
'YYYY-MM-DD H:m:s'
)
}
},
enableTime(val) {
@ -118,11 +118,13 @@ export default {
)
}
if (this.value && !this.enableTime) {
this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format('YYYY-MM-DD')
this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
'YYYY-MM-DD'
)
return true
}
if (this.value) {
this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format(
this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
'YYYY-MM-DD HH:mm:SS'
)
}
@ -130,7 +132,6 @@ export default {
methods: {
onDateChange(date) {
this.$emit('input', date)
this.$emit('change', date)
},
},
}

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

@ -77,7 +77,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.newEstimate.estimate_date.$touch()"
@input="$v.newEstimate.estimate_date.$touch()"
/>
</sw-input-group>
@ -92,7 +92,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.newEstimate.expiry_date.$touch()"
@input="$v.newEstimate.expiry_date.$touch()"
/>
</sw-input-group>

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

@ -110,7 +110,7 @@
:calendar-button="true"
class="mt-2"
calendar-button-icon="calendar"
@change="$v.formData.expense_date.$touch()"
@input="$v.formData.expense_date.$touch()"
/>
</sw-input-group>

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

@ -76,7 +76,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.newInvoice.invoice_date.$touch()"
@input="$v.newInvoice.invoice_date.$touch()"
/>
</sw-input-group>
@ -91,7 +91,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.newInvoice.due_date.$touch()"
@input="$v.newInvoice.due_date.$touch()"
/>
</sw-input-group>

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

@ -59,7 +59,7 @@
:calendar-button="true"
class="mt-1"
calendar-button-icon="calendar"
@change="$v.formData.payment_date.$touch()"
@input="$v.formData.payment_date.$touch()"
/>
</sw-input-group>

8
resources/assets/js/views/reports/ExpensesReport.vue
View File

@ -29,7 +29,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.from_date.$touch()"
@input="$v.formData.from_date.$touch()"
/>
</sw-input-group>
@ -44,7 +44,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.to_date.$touch()"
@input="$v.formData.to_date.$touch()"
/>
</sw-input-group>
</div>
@ -164,13 +164,13 @@ export default {
}
},
dateRangeUrl () {
dateRangeUrl() {
return `${this.siteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
}
},
},
watch: {

8
resources/assets/js/views/reports/ProfitLossReport.vue
View File

@ -29,7 +29,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.from_date.$touch()"
@input="$v.formData.from_date.$touch()"
/>
</sw-input-group>
@ -44,7 +44,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.to_date.$touch()"
@input="$v.formData.to_date.$touch()"
/>
</sw-input-group>
</div>
@ -163,13 +163,13 @@ export default {
}
},
dateRangeUrl () {
dateRangeUrl() {
return `${this.siteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
}
},
},
watch: {

18
resources/assets/js/views/reports/SalesReports.vue
View File

@ -28,7 +28,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.from_date.$touch()"
@input="$v.formData.from_date.$touch()"
/>
</sw-input-group>
@ -43,7 +43,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.to_date.$touch()"
@input="$v.formData.to_date.$touch()"
/>
</sw-input-group>
</div>
@ -182,21 +182,21 @@ export default {
}
},
customerDateRangeUrl () {
customerDateRangeUrl() {
return `${this.customerSiteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
},
itemDateRangeUrl () {
itemDateRangeUrl() {
return `${this.itemsSiteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
}
},
},
watch: {

8
resources/assets/js/views/reports/TaxReport.vue
View File

@ -28,7 +28,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.from_date.$touch()"
@input="$v.formData.from_date.$touch()"
/>
</sw-input-group>
@ -43,7 +43,7 @@
:calendar-button="true"
calendar-button-icon="calendar"
class="mt-2"
@change="$v.formData.to_date.$touch()"
@input="$v.formData.to_date.$touch()"
/>
</sw-input-group>
</div>
@ -152,13 +152,13 @@ export default {
}
},
dateRangeUrl () {
dateRangeUrl() {
return `${this.siteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
}
},
},
watch: {