#7553 modified TicketExpedition & changes in ticket section #571

Merged
jon merged 79 commits from 7553_FixTicketExpedition into dev 2024-09-25 05:51:16 +00:00
Member

Components:

  • VnTable: slots
  • CardDescriptor: deleted warning
  • ArrayData: fix problem with filter and store order

Changed to VnTable:

  • TicketExpedition
  • TicketPurchaseRequest
  • TicketSale
  • TicketAdvance
  • TicketList
  • TicketVolume
  • TicketComponent

Other changes:

  • Descriptor: added buttons like Salix.
  • DescriptorMenu: added options like Salix, and fixed translations.
  • TicketList: added missing buttons when one or more tickets are selected, added missing icons, chips and missing columns
  • Added translations needed
  • TicketSaleTracking: fixed styles
  • TicketService: error in param
  • ticketSummary: added missing purchase request table, qchips, icons and descriptors
  • TicketTracking: fixed styles
  • TicketVolume: fixed styles
  • TicketSale: fixed transfer ticket, fixed styles
  • ExpeditionNewTicket: added default param
  • TicketFilter: added filter param
Components: - VnTable: slots - CardDescriptor: deleted warning - ArrayData: fix problem with filter and store order Changed to VnTable: - TicketExpedition - TicketPurchaseRequest - TicketSale - TicketAdvance - TicketList - TicketVolume - TicketComponent Other changes: - Descriptor: added buttons like Salix. - DescriptorMenu: added options like Salix, and fixed translations. - TicketList: added missing buttons when one or more tickets are selected, added missing icons, chips and missing columns - Added translations needed - TicketSaleTracking: fixed styles - TicketService: error in param - ticketSummary: added missing purchase request table, qchips, icons and descriptors - TicketTracking: fixed styles - TicketVolume: fixed styles - TicketSale: fixed transfer ticket, fixed styles - ExpeditionNewTicket: added default param - TicketFilter: added filter param
jon added 1 commit 2024-07-26 07:56:26 +00:00
jon added 1 commit 2024-07-26 09:24:49 +00:00
jon added 1 commit 2024-07-26 09:25:40 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
7c5f5aee77
Merge branch 'dev' into 7553_FixTicketExpedition
jon changed title from WIP: #7553 modified TicketExpedition & minor changes in ticket section to #7553 modified TicketExpedition & minor changes in ticket section 2024-07-26 09:26:22 +00:00
jon requested review from jsegarra 2024-07-26 09:26:26 +00:00
jsegarra requested changes 2024-07-26 09:58:05 +00:00
Dismissed
jsegarra left a comment
Member

Porque no usamos VnTable en TicketPurchaseRequest?
En TicketPurchase, por lo que veo acabaran pidiendo que esté ordenado pro fecha de creacion desc

Porque no usamos VnTable en TicketPurchaseRequest? En TicketPurchase, por lo que veo acabaran pidiendo que esté ordenado pro fecha de creacion desc
@ -201,3 +204,4 @@
</span>
</QTd>
</template>
<template #body-cell-quantity="{ row }">
Member

Los campos de cantidad y precio tienen el mismo tamaño que descripción?
Propongo recortar el tamaño y asi ganar ancho en campos como el que he dicho
Igual pasa con la columna de borrar

Los campos de cantidad y precio tienen el mismo tamaño que descripción? Propongo recortar el tamaño y asi ganar ancho en campos como el que he dicho Igual pasa con la columna de borrar
jon marked this conversation as resolved
jon added 2 commits 2024-07-26 10:01:53 +00:00
jsegarra reviewed 2024-07-26 10:03:55 +00:00
@ -620,10 +619,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<template #body-cell-itemFk="{ row }">
Member

Podemos hacer que la columna articulo sea mas ancho para que quepan mas registros por filas?
Por ejemplo hay campos numéricos que tienen mucho ancho

Podemos hacer que la columna articulo sea mas ancho para que quepan mas registros por filas? Por ejemplo hay campos numéricos que tienen mucho ancho
jon marked this conversation as resolved
@ -410,3 +409,1 @@
{{ row.itemFk }}
</QBtn>
<ItemDescriptorProxy :id="row.itemFk" />
<span class="link">
Member

Podemos recortar la columna de acciones en favor de tener FetchedTags en una linea?

Podemos recortar la columna de acciones en favor de tener FetchedTags en una linea?
jon marked this conversation as resolved
jon added 1 commit 2024-08-02 11:55:59 +00:00
jon changed title from #7553 modified TicketExpedition & minor changes in ticket section to WIP: #7553 modified TicketExpedition & minor changes in ticket section 2024-08-19 09:29:14 +00:00
jon added 1 commit 2024-08-19 09:30:28 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
4a57c53c3d
fix: refs #7553 & #7356 migration
jon added 1 commit 2024-08-19 09:31:37 +00:00
jon added 1 commit 2024-08-19 11:03:46 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
574a2efc92
feat: refs #7553 added transferClient function
jon added 1 commit 2024-08-19 11:49:02 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
511d53d109
feat: refs #7553 added refund and add turn functions to descriptor
jon added 1 commit 2024-08-20 07:36:36 +00:00
jon added 1 commit 2024-08-20 08:02:32 +00:00
jon added 1 commit 2024-08-21 09:42:11 +00:00
jsegarra added 2 commits 2024-08-21 10:16:34 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
6218463e7e
perf: rename component
jon added 2 commits 2024-08-21 10:41:40 +00:00
jon added 1 commit 2024-08-21 11:18:51 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
ffa6ef57fe
fix: refs #7553 refs #7356 fix generatePdf function
jsegarra added 1 commit 2024-08-22 21:40:32 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
14961d0aec
fix: change order column by default
jsegarra added 1 commit 2024-08-23 08:35:00 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
390ab9cfd1
feat: CustomerConsumptionFilter
jsegarra added 1 commit 2024-08-27 09:58:31 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
071f3ba4d0
perf: TicketSummary issues
jsegarra added 1 commit 2024-08-27 10:04:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
b8dea8551d
perf: TicketTransferSale
jon changed title from WIP: #7553 modified TicketExpedition & minor changes in ticket section to WIP: #7553 modified TicketExpedition & changes in ticket section 2024-09-02 07:28:53 +00:00
jon added 1 commit 2024-09-02 09:24:12 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
45d9322892
feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes
jon added 1 commit 2024-09-02 09:25:18 +00:00
jon added 1 commit 2024-09-03 05:36:48 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
b622f6ef96
fix: refs #7553 fixed QChips like Salix
jon added 2 commits 2024-09-03 05:45:54 +00:00
jon added 1 commit 2024-09-03 10:54:53 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f35e33cf10
fix: refs #7553 fixed TicketTransfer
jon changed title from WIP: #7553 modified TicketExpedition & changes in ticket section to #7553 modified TicketExpedition & changes in ticket section 2024-09-03 11:42:04 +00:00
jon requested review from jsegarra 2024-09-03 11:44:05 +00:00
jsegarra requested changes 2024-09-03 12:02:42 +00:00
Dismissed
jsegarra left a comment
Member

El orden de la tabla no coincide image
Al abrir los modales, seria bueno tener una fecha por defecto
Tooltip del boton eleiminar, es obvio que sirve apra eso, sorry
Deberia estar el boton de refrescar?

El orden de la tabla no coincide ![image](/attachments/742eeaa0-5a61-422e-bce6-c0e9b0dad316) Al abrir los modales, seria bueno tener una fecha por defecto Tooltip del boton eleiminar, es obvio que sirve apra eso, sorry Deberia estar el boton de refrescar?
jon added 1 commit 2024-09-04 06:02:36 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
cb7d729b0f
fix: refs #7553 fixed details in summary and data-key in TicketList
jon added 1 commit 2024-09-04 06:18:18 +00:00
jon added 1 commit 2024-09-04 06:19:23 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4bc148f16b
Merge branch 'dev' into 7553_FixTicketExpedition
jon requested review from jsegarra 2024-09-04 06:59:15 +00:00
jon added 2 commits 2024-09-04 07:11:15 +00:00
jon reviewed 2024-09-04 07:12:18 +00:00
@ -31,6 +31,7 @@ const router = useRouter();
const { notify } = useNotify();
const newTicketFormData = reactive({});
const date = new Date();
Author
Member

He puesto esta fecha por defecto, no sé como lo verás

He puesto esta fecha por defecto, no sé como lo verás
jon marked this conversation as resolved
jon added 1 commit 2024-09-04 09:49:58 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1889aa85b5
refactor: refs #7553 deleted expedition code and slot in VnTable
jon added 1 commit 2024-09-04 12:12:35 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
f5eacea483
refactor: refs #7553 modified QDrawer and table columns
jon added 1 commit 2024-09-04 12:16:05 +00:00
jon added 1 commit 2024-09-05 12:32:30 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
db6f4fd15a
refactor: refs #7553 deleted logs
jon added 1 commit 2024-09-05 12:34:21 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
9f24a7bc29
Merge branch 'dev' into 7553_FixTicketExpedition
jsegarra requested changes 2024-09-05 18:51:05 +00:00
Dismissed
jsegarra left a comment
Member
He detectado algun errorcillo para el *ticket 17* Te lo ordeno por importancia 1. https://redmine.verdnatura.es/issues/7356#note-24 2. https://redmine.verdnatura.es/issues/7356#note-25 3. https://redmine.verdnatura.es/issues/7356#note-23
jon added 3 commits 2024-09-06 05:16:13 +00:00
jon requested review from jsegarra 2024-09-06 09:12:23 +00:00
jon added 1 commit 2024-09-06 11:59:58 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
0e5607d685
feat: refs #7553 ticket component to vntable and fixed minor errors
jon added 1 commit 2024-09-06 12:00:43 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
04f4521a59
Merge branch 'dev' into 7553_FixTicketExpedition
jon added 1 commit 2024-09-06 12:05:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4636e2f2e6
Merge branch 'dev' into 7553_FixTicketExpedition
jon added 2 commits 2024-09-09 06:10:14 +00:00
jon added 1 commit 2024-09-09 06:15:03 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
0b961050a0
refactor: refs #7553 rollback ticket advance due to slot problems
jon added 1 commit 2024-09-09 11:52:50 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
6248a4117d
refactor: refs #7553 requested changes
jon added 1 commit 2024-09-09 11:53:43 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8f8462db94
Merge branch 'dev' into 7553_FixTicketExpedition
jon added 2 commits 2024-09-10 09:47:52 +00:00
jon added 1 commit 2024-09-11 08:16:51 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ff7bcfb00a
refactor: refs #7553 modified ticket sale to create a row in the table
jon added 2 commits 2024-09-11 08:27:15 +00:00
jon added 1 commit 2024-09-12 08:14:55 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
6a5f31ff1e
fix: refs #7553 fixed conflicts
jon added 1 commit 2024-09-12 08:19:31 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4a1f5e922c
refactor: refs #7553 align ticket sale qdrawer fields
jon added 1 commit 2024-09-12 11:14:04 +00:00
jon added 1 commit 2024-09-12 11:23:01 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
bb1eb30a25
fix: refs #7553 changed fields in order in purchase request table
jon added 2 commits 2024-09-13 10:07:58 +00:00
jon added 1 commit 2024-09-13 11:01:15 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
6f9e46f7a0
fix: refs #7553 deleted log
jon added 2 commits 2024-09-18 09:50:08 +00:00
jsegarra requested changes 2024-09-18 22:37:15 +00:00
Dismissed
jsegarra left a comment
Member
Ver https://redmine.verdnatura.es/issues/7356#note-31
jon added 1 commit 2024-09-20 07:04:40 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
44d98865fe
fix: refs #7553 requested changes
jon added 1 commit 2024-09-20 07:08:22 +00:00
jon requested review from jsegarra 2024-09-20 07:09:18 +00:00
jon added 1 commit 2024-09-20 12:34:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
edea17340d
refactor: refs #7553 adjust ticket notes view in summary
jsegarra requested changes 2024-09-20 22:59:09 +00:00
Dismissed
@ -556,3 +562,4 @@
attender: Comprador
create:
client: Cliente
address: Dirección
Member

Consignatario

Consignatario
jon marked this conversation as resolved
@ -89,1 +100,4 @@
const data = ref(useCardDescription());
function ticketFilter(ticket) {
return JSON.stringify({ clientFk: ticket.clientFk });
Member

Creo que no se está ejecutando

Creo que no se está ejecutando
@ -162,0 +224,4 @@
:to="{
name: 'OrderList',
query: {
createForm: JSON.stringify({}),
Member

👀 {} en vez de clientFk: entity.clientFk

👀 {} en vez de clientFk: entity.clientFk
jon marked this conversation as resolved
@ -1,6 +1,6 @@
<script setup>
import axios from 'axios';
import { ref } from 'vue';
import { ref, toRefs } from 'vue';
Member

Revisate la traduccion "¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?" en salix, porque parece que en Lilium no existe. Fallo mio y de william

Revisate la traduccion "¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?" en salix, porque parece que en Lilium no existe. Fallo mio y de william
jon marked this conversation as resolved
@ -729,3 +780,4 @@
{{ toCurrency(row.quantity * row.price) }}
</template>
<template #bottom-row>
<QBtn
Member

El punto de desactivar creo que te lo has dejado. Usa el regisstro 19

El punto de desactivar creo que te lo has dejado. Usa el regisstro 19
jon marked this conversation as resolved
@ -107,1 +113,4 @@
]);
async function deleteService(row) {
const serviceId = row.id;
Member

Mmm..si le doy al mas, pero luego le doy al delete no tengo id.
Salta error porque ejecuta peticion de axios cuando deberia eliminar de la tabla, no?

Mmm..si le doy al mas, pero luego le doy al delete no tengo id. Salta error porque ejecuta peticion de axios cuando deberia eliminar de la tabla, no?
jon marked this conversation as resolved
@ -98,3 +98,2 @@
<template #body-cell-worker="{ row }">
<QTd @click.stop>
<QBtn flat color="primary">
<QTd>
Member

Aqui habia un cambio con respecto al orden de los filtros. Seguro que jorge sabe donde se hace porque lo hizo para InvoiceInSummary

Aqui habia un cambio con respecto al orden de los filtros. Seguro que jorge sabe donde se hace porque lo hizo para InvoiceInSummary
@ -251,0 +555,4 @@
<template #column-shippedDate="{ row }">
<span v-if="getDateColor(row.shipped)">
<QChip :class="getDateColor(row.shipped)" dense square>
{{ row.shippedDate }}
Member

falta añadir toDate, porque sigue mostrándolo mal a pesar de dar format en la declaraciones de columnas

falta añadir toDate, porque sigue mostrándolo mal a pesar de dar format en la declaraciones de columnas
jon marked this conversation as resolved
@ -252,3 +607,4 @@
<VnRow>
<VnSelect
url="Clients"
:fields="['id', 'name']"
Member

añadir order:id

añadir order:id
jon marked this conversation as resolved
jsegarra requested changes 2024-09-20 23:09:08 +00:00
Dismissed
jsegarra left a comment
Member

image

![image](/attachments/94bc7911-8770-4e2f-95f7-160aefe76fc3)
6.7 KiB
@ -87,10 +100,14 @@ const actions = {
Member

Para el evento remove, la seguynda notificacion deberia tener un tipo y no lo tiene, por tanto sale en gris y si tienes el tema oscuro...

Para el evento remove, la seguynda notificacion deberia tener un tipo y no lo tiene, por tanto sale en gris y si tienes el tema oscuro...
jon marked this conversation as resolved
jsegarra requested changes 2024-09-20 23:11:31 +00:00
Dismissed
jsegarra left a comment
Member

En la migración se olvidaron del pdfToTablet, vnconfirm restoreConfirmation y vnConfirm deleteConfirmation

En la migración se olvidaron del pdfToTablet, vnconfirm restoreConfirmation y vnConfirm deleteConfirmation
jsegarra requested changes 2024-09-20 23:15:35 +00:00
Dismissed
jsegarra left a comment
Member

En TicketDescriptorMenu revisamos el texto al generar PDF de la factura, porque las traducciones no corresponden

En TicketDescriptorMenu revisamos el texto al generar PDF de la factura, porque las traducciones no corresponden
jon added 1 commit 2024-09-23 08:21:38 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f025b4361e
refactor: refs #7553 last requested changes
jon added 1 commit 2024-09-23 08:22:23 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
0dd79ed708
Merge branch 'dev' into 7553_FixTicketExpedition
jon requested review from jsegarra 2024-09-23 08:28:13 +00:00
jsegarra requested changes 2024-09-23 11:10:55 +00:00
Dismissed
@ -385,1 +393,3 @@
const params = { sales: selectedValidSales.value, ticketId: store.data.id };
const params = { sales: selectedRows.value, ticketId: store.data.id };
params.sales.forEach((sale) => {
if (!sale.itemFk) {
Member

WTF?

WTF?
jon marked this conversation as resolved
jon added 2 commits 2024-09-23 11:51:30 +00:00
jon requested review from jsegarra 2024-09-23 11:52:27 +00:00
jon added 1 commit 2024-09-23 11:52:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4fc3f08f77
Merge branch 'dev' into 7553_FixTicketExpedition
jsegarra requested changes 2024-09-23 18:23:30 +00:00
Dismissed
@ -425,6 +433,13 @@ function handleOnDataSaved(_) {
@click="stateStore.toggleRightDrawer()"
/>
</template>
<!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles
Member

eliminamos

eliminamos
jon marked this conversation as resolved
@ -0,0 +47,4 @@
</QItemSection>
</QItem>
<QItem>
<!--It's required to include the relation category !! There's 413 records in production-->
Member

este com,entario sobra

este com,entario sobra
jon marked this conversation as resolved
@ -191,6 +199,7 @@ const getDateColor = (date) => {
formInitialData: {
Member

En la linea 195 el titulo del create no está traducido

En la linea 195 el titulo del create no está traducido
jon marked this conversation as resolved
@ -0,0 +144,4 @@
@on-fetch="(data) => (ticketUpdateActions = data)"
auto-load
/>
<QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
Member

Respectamos el width de 265.
Solo está 270 en el modulo de Tickets

Respectamos el width de 265. Solo está 270 en el modulo de Tickets
jon marked this conversation as resolved
jsegarra added 1 commit 2024-09-23 18:39:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
55e017b0cc
Merge branch 'dev' into 7553_FixTicketExpedition
jon added 2 commits 2024-09-24 08:36:11 +00:00
jon added 1 commit 2024-09-24 08:36:58 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
21f7613f21
Merge branch 'dev' into 7553_FixTicketExpedition
jon requested review from jsegarra 2024-09-24 08:40:13 +00:00
jsegarra approved these changes 2024-09-24 09:29:40 +00:00
Dismissed
jon added 1 commit 2024-09-24 09:37:20 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8315eb2b4c
Merge branch 'dev' into 7553_FixTicketExpedition
jon dismissed jsegarra’s review 2024-09-24 09:37:20 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jon requested review from jsegarra 2024-09-24 09:38:14 +00:00
jsegarra approved these changes 2024-09-24 09:38:41 +00:00
Dismissed
jon added 1 commit 2024-09-24 10:51:35 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
67a1c28670
Merge branch 'dev' into 7553_FixTicketExpedition
jon added 1 commit 2024-09-25 05:25:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
ff3ab83727
Merge branch 'dev' into 7553_FixTicketExpedition
jon dismissed jsegarra’s review 2024-09-25 05:25:09 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jon requested review from jsegarra 2024-09-25 05:42:29 +00:00
jsegarra added 1 commit 2024-09-25 05:50:25 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
c1087614c6
Merge branch 'dev' into 7553_FixTicketExpedition
jsegarra approved these changes 2024-09-25 05:50:40 +00:00
jon merged commit 4ff068aa8a into dev 2024-09-25 05:51:16 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#571
No description provided.