mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-28 20:21:10 -04:00
- fix invoice status not updating issue
- 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
committed by
Mohit Panjwani
Mohit Panjwani
parent
7202fdcbf2
commit
1322ed15dc
@ -8,6 +8,10 @@
|
||||
<BaseMultiselect
|
||||
v-model="selectedRange"
|
||||
:options="dateRange"
|
||||
value-prop="key"
|
||||
track-by="key"
|
||||
label="label"
|
||||
object
|
||||
@update:modelValue="onChangeDateRange"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
@ -97,19 +101,49 @@ const { t } = useI18n()
|
||||
globalStore.downloadReport = downloadReport
|
||||
|
||||
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])
|
||||
let range = ref(new Date())
|
||||
let url = ref(null)
|
||||
let siteURL = ref(null)
|
||||
@ -155,7 +189,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')
|
||||
|
||||
@ -8,6 +8,10 @@
|
||||
<BaseMultiselect
|
||||
v-model="selectedRange"
|
||||
:options="dateRange"
|
||||
value-prop="key"
|
||||
track-by="key"
|
||||
label="label"
|
||||
object
|
||||
@update:modelValue="onChangeDateRange"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
@ -95,18 +99,49 @@ const { t } = useI18n()
|
||||
globalStore.downloadReport = downloadReport
|
||||
|
||||
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])
|
||||
let url = ref(null)
|
||||
let siteURL = ref(null)
|
||||
let range = ref(new Date())
|
||||
@ -149,7 +184,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')
|
||||
|
||||
@ -8,6 +8,10 @@
|
||||
<BaseMultiselect
|
||||
v-model="selectedRange"
|
||||
:options="dateRange"
|
||||
value-prop="key"
|
||||
track-by="key"
|
||||
label="label"
|
||||
object
|
||||
@update:modelValue="onChangeDateRange"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
@ -109,21 +113,51 @@ const globalStore = useGlobalStore()
|
||||
globalStore.downloadReport = downloadReport
|
||||
|
||||
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(dateRange[2])
|
||||
const reportTypes = ref(['By Customer', 'By Item'])
|
||||
const selectedType = ref('By Customer')
|
||||
const selectedRange = ref(t('dateRange.this_month'))
|
||||
let range = ref(new Date())
|
||||
let url = ref(null)
|
||||
let customerSiteURL = ref(null)
|
||||
@ -178,7 +212,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')
|
||||
|
||||
@ -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')
|
||||
|
||||
Reference in New Issue
Block a user