verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 62 Releases Wiki Activity

8144-devToTest_2444 #852

Merged
carlossa merged 86 commits from 8144-devToTest_2444 into test 2024-10-22 08:55:44 +00:00
Conversation 0 Commits 86 Files Changed 52 +13 -3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d5a8cba6f - Show all commits

16
src/pages/Customer/components/CustomerSummaryTable.vue
View File

@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
import { date } from 'quasar'; import { date } from 'quasar';
import { toDateFormat } from 'src/filters/date.js'; import { toDateFormat } from 'src/filters/date.js';
import { toCurrency } from 'src/filters'; import { dashIfEmpty, toCurrency } from 'src/filters';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue'; import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
@ -101,8 +101,6 @@ const columns = computed(() => [
align: 'left', align: 'left',
name: 'itemPackingTypeFk', name: 'itemPackingTypeFk',
label: t('ticketSale.packaging'), label: t('ticketSale.packaging'),
format: (row, dashIfEmpty) =>
dashIfEmpty(row?.ticketSales[0]?.item.itemPackingTypeFk),
}, },
{ {
align: 'right', align: 'right',
@ -221,6 +219,18 @@ const setShippedColor = (date) => {
</QBadge> </QBadge>
<span v-else> {{ toDateFormat(row.shipped) }}</span> <span v-else> {{ toDateFormat(row.shipped) }}</span>
</template> </template>
<template #column-itemPackingTypeFk="{ row }">
<span>
{{
dashIfEmpty(
row?.ticketSales
.map((sale) => sale.item?.itemPackingTypeFk || '-')
.filter((value) => value !== '-')
.join(', ')
)
}}
</span>
</template>
</VnTable> </VnTable>
</template> </template>