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

- fix invoice status not updating issue

Browse Source 
- date range selection issues on report for non-english languages
- fix invoice all tab issue (always showing draft even in all tab)
This commit is contained in:
Harsh Jagad
2022-02-24 05:22:32 +00:00
committed by Mohit Panjwani
parent 7202fdcbf2
commit 1322ed15dc
15 changed files with 268 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
resources/scripts/admin/views/reports/TaxReport.vue
View File

@ -8,6 +8,10 @@
<BaseMultiselect
v-model="selectedRange"
:options="dateRange"
value-prop="key"
track-by="key"
label="label"
object
@update:modelValue="onChangeDateRange"
/>
</BaseInputGroup>
@ -94,19 +98,49 @@ globalStore.downloadReport = downloadReport
const { t } = useI18n()
const dateRange = reactive([
t('dateRange.today'),
t('dateRange.this_week'),
t('dateRange.this_month'),
t('dateRange.this_quarter'),
t('dateRange.this_year'),
t('dateRange.previous_week'),
t('dateRange.previous_month'),
t('dateRange.previous_quarter'),
t('dateRange.previous_year'),
t('dateRange.custom'),
{
label: t('dateRange.today'),
key: 'Today',
},
{
label: t('dateRange.this_week'),
key: 'This Week',
},
{
label: t('dateRange.this_month'),
key: 'This Month',
},
{
label: t('dateRange.this_quarter'),
key: 'This Quarter',
},
{
label: t('dateRange.this_year'),
key: 'This Year',
},
{
label: t('dateRange.previous_week'),
key: 'Previous Week',
},
{
label: t('dateRange.previous_month'),
key: 'Previous Month',
},
{
label: t('dateRange.previous_quarter'),
key: 'Previous Quarter',
},
{
label: t('dateRange.previous_year'),
key: 'Previous Year',
},
{
label: t('dateRange.custom'),
key: 'Custom',
},
])
const selectedRange = ref(t('dateRange.this_month'))
const selectedRange = ref(dateRange[2])
const formData = reactive({
from_date: moment().startOf('month').format('YYYY-MM-DD').toString(),
@ -153,7 +187,9 @@ function getPreDate(type, time) {
}
function onChangeDateRange() {
switch (selectedRange.value) {
let key = selectedRange.value.key
switch (key) {
case 'Today':
formData.from_date = moment().format('YYYY-MM-DD')
formData.to_date = moment().format('YYYY-MM-DD')