Merge pull request 'Ticket photos' (!534) from hyervoni/salix-front-mindshore:feature/TicketPhotos into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #534 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
5a09caa3b5
|
@ -7,7 +7,7 @@ import VnImg from 'src/components/ui/VnImg.vue';
|
||||||
import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
|
import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
|
||||||
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
||||||
|
|
||||||
import toCurrency from '../../../filters/toCurrency';
|
import { toCurrency } from 'filters/index';
|
||||||
|
|
||||||
const DEFAULT_PRICE_KG = 0;
|
const DEFAULT_PRICE_KG = 0;
|
||||||
|
|
||||||
|
@ -18,6 +18,10 @@ defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
isCatalog: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const dialog = ref(null);
|
const dialog = ref(null);
|
||||||
|
@ -28,7 +32,7 @@ const dialog = ref(null);
|
||||||
<QCard class="card shadow-6">
|
<QCard class="card shadow-6">
|
||||||
<div class="img-wrapper">
|
<div class="img-wrapper">
|
||||||
<VnImg :id="item.id" zoom-size="lg" class="image" />
|
<VnImg :id="item.id" zoom-size="lg" class="image" />
|
||||||
<div v-if="item.hex" class="item-color-container">
|
<div v-if="item.hex && isCatalog" class="item-color-container">
|
||||||
<div
|
<div
|
||||||
class="item-color"
|
class="item-color"
|
||||||
:style="{ backgroundColor: `#${item.hex}` }"
|
:style="{ backgroundColor: `#${item.hex}` }"
|
||||||
|
@ -50,11 +54,12 @@ const dialog = ref(null);
|
||||||
</template>
|
</template>
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
<div class="price">
|
<div class="price">
|
||||||
<p>
|
<p v-if="isCatalog">
|
||||||
{{ item.available }} {{ t('to') }}
|
{{ item.available }} {{ t('to') }}
|
||||||
{{ toCurrency(item.price) }}
|
{{ toCurrency(item.price) }}
|
||||||
</p>
|
</p>
|
||||||
<QIcon name="add_circle" class="icon">
|
<slot name="price" />
|
||||||
|
<QIcon v-if="isCatalog" name="add_circle" class="icon">
|
||||||
<QTooltip>{{ t('globals.add') }}</QTooltip>
|
<QTooltip>{{ t('globals.add') }}</QTooltip>
|
||||||
<QPopupProxy ref="dialog">
|
<QPopupProxy ref="dialog">
|
||||||
<OrderCatalogItemDialog
|
<OrderCatalogItemDialog
|
|
@ -555,6 +555,7 @@ ticket:
|
||||||
weeklyTickets: Weekly tickets
|
weeklyTickets: Weekly tickets
|
||||||
services: Service
|
services: Service
|
||||||
tracking: Tracking
|
tracking: Tracking
|
||||||
|
pictures: Pictures
|
||||||
list:
|
list:
|
||||||
nickname: Nickname
|
nickname: Nickname
|
||||||
state: State
|
state: State
|
||||||
|
|
|
@ -553,6 +553,7 @@ ticket:
|
||||||
weeklyTickets: Tickets programados
|
weeklyTickets: Tickets programados
|
||||||
services: Servicios
|
services: Servicios
|
||||||
tracking: Estados
|
tracking: Estados
|
||||||
|
pictures: Fotos
|
||||||
list:
|
list:
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
state: Estado
|
state: Estado
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
|
||||||
import { onMounted, onUnmounted, ref } from 'vue';
|
import { onMounted, onUnmounted, ref } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
|
import CatalogItem from 'components/ui/CatalogItem.vue';
|
||||||
import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
|
import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -77,7 +77,12 @@ function extractValueTags(items) {
|
||||||
<div v-if="rows && !rows?.length" class="no-result">
|
<div v-if="rows && !rows?.length" class="no-result">
|
||||||
{{ t('globals.noResults') }}
|
{{ t('globals.noResults') }}
|
||||||
</div>
|
</div>
|
||||||
<OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
|
<CatalogItem
|
||||||
|
v-for="row in rows"
|
||||||
|
:key="row.id"
|
||||||
|
:item="row"
|
||||||
|
is-catalog
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import CatalogItem from 'components/ui/CatalogItem.vue';
|
||||||
|
|
||||||
|
import { toCurrency } from 'filters/index';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const route = useRoute();
|
||||||
|
|
||||||
|
const salesFilter = {
|
||||||
|
include: {
|
||||||
|
relation: 'item',
|
||||||
|
scope: {
|
||||||
|
field: ['name', 'image'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
where: { ticketFk: route.params.id },
|
||||||
|
};
|
||||||
|
const sales = ref([]);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
ref="salesRef"
|
||||||
|
url="sales"
|
||||||
|
:filter="salesFilter"
|
||||||
|
@on-fetch="(data) => (sales = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<div class="pictures-list">
|
||||||
|
<CatalogItem v-for="(sale, index) in sales" :key="index" :item="sale.item">
|
||||||
|
<template #price>
|
||||||
|
<div class="q-mt-md full-width row justify-between items-center">
|
||||||
|
<span class="text-h6">{{ sale.quantity }}</span>
|
||||||
|
<span>{{ t('by') }}</span>
|
||||||
|
<span class="text-h6">{{ toCurrency(sale?.price) }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</CatalogItem>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.pictures-list {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
by: por
|
||||||
|
</i18n>
|
|
@ -24,6 +24,7 @@ export default {
|
||||||
'TicketTracking',
|
'TicketTracking',
|
||||||
'TicketBoxing',
|
'TicketBoxing',
|
||||||
'TicketSms',
|
'TicketSms',
|
||||||
|
'TicketPicture',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
children: [
|
children: [
|
||||||
|
@ -143,6 +144,24 @@ export default {
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
|
component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'picture',
|
||||||
|
name: 'TicketPicture',
|
||||||
|
meta: {
|
||||||
|
title: 'pictures',
|
||||||
|
icon: 'vn:photo',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'picture',
|
||||||
|
name: 'TicketPicture',
|
||||||
|
meta: {
|
||||||
|
title: 'pictures',
|
||||||
|
icon: 'vn:photo',
|
||||||
|
},
|
||||||
|
component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'observation',
|
path: 'observation',
|
||||||
name: 'TicketNotes',
|
name: 'TicketNotes',
|
||||||
|
|
Loading…
Reference in New Issue