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

#6242 added rounding field #760

Open
jon wants to merge 22 commits from 6242-AddHasRoundingField into dev
pull from: 6242-AddHasRoundingField
merge into: verdnatura:dev
Conversation 1 Commits 22 Files Changed 8 +79 -186
jon commented 2024-09-25 12:05:57 +00:00
Member
Copy Link
No description provided.
jon added 1 commit 2024-09-25 12:05:57 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
fdf6fd2bba feat: refs #6242 added rounding field
alexm reviewed 2024-10-02 08:03:50 +00:00
alexm left a comment
Member
Copy Link

Para que funcionase habria que modificar esta parte de getSales para añadir el error "hasRounding". Y asi en el front poderlo poner.
image

De todas maneras yo le haria un refactor al back, para que te los pusiese todos juntos

Para que funcionase habria que modificar esta parte de getSales para añadir el error "hasRounding". Y asi en el front poderlo poner. ![image](/attachments/8939cf6b-df13-4df1-a8e1-784bd86eb7a0) De todas maneras yo le haria un refactor al back, para que te los pusiese todos juntos
image.png
30 KiB
alexm requested changes 2024-10-02 08:09:07 +00:00
Dismissed
src/pages/Monitor/Ticket/MonitorTickets.vue Outdated
@ -419,0 +423,4 @@
size="xs"
>
<QTooltip>
{{ t('ticketList.rounding') }}
alexm commented 2024-10-02 08:04:18 +00:00
Member
Copy Link

Seguirian sin poder saber que sale es

Seguirian sin poder saber que sale es
jon marked this conversation as resolved
src/pages/Ticket/Card/TicketDescriptor.vue Outdated
@ -103,2 +108,4 @@
return JSON.stringify({ clientFk: ticket.clientFk });
}
const getTicketData = async () => {
alexm commented 2024-10-02 08:04:53 +00:00
Member
Copy Link

Esta peticion no hace falta del todo

Esta peticion no hace falta del todo
jon marked this conversation as resolved
src/pages/Ticket/Card/TicketDescriptor.vue Outdated
@ -105,0 +116,4 @@
getSales();
};
const getSales = async () => {
alexm commented 2024-10-02 08:05:46 +00:00
Member
Copy Link

Si las sales se van a usar tanto en Descriptor como en Sales. Valoraria añadirlo al VnCard para tenerlo accesible en un arrayData

Si las sales se van a usar tanto en Descriptor como en Sales. Valoraria añadirlo al VnCard para tenerlo accesible en un arrayData
jon marked this conversation as resolved
src/pages/Ticket/Card/TicketDescriptor.vue Outdated
@ -105,0 +121,4 @@
if (data) {
sales.value = data;
await sales.value.map((sale) => {
alexm commented 2024-10-02 08:06:19 +00:00
Member
Copy Link

No hace falta hacer un map i un for, con uno de los dos es suficiente

No hace falta hacer un map i un for, con uno de los dos es suficiente
jon marked this conversation as resolved
src/pages/Ticket/Card/TicketSale.vue Outdated
@ -677,6 +702,11 @@ watch(
{{ t('ticketSale.hasComponentLack') }}
</QTooltip>
</QIcon>
<QIcon v-if="row.hasRounding" color="primary" name="sync_problem" size="xs">
alexm commented 2024-10-02 08:08:18 +00:00
Member
Copy Link

haciendo row.problems.hasRounding ya se podria sacar, no hace falta añadir codigo javascript

haciendo row.problems.hasRounding ya se podria sacar, no hace falta añadir codigo javascript
jon marked this conversation as resolved
src/pages/Ticket/Card/TicketSummary.vue Outdated
@ -102,2 +104,4 @@
return '#/ticket/' + entityId.value + '/' + section;
}
const getTicketData = async () => {
alexm commented 2024-10-02 08:09:04 +00:00
Member
Copy Link

Lo mismo de antes, no hace falta javascript y si estuviese en un arrayData de 1 peticion tenemos para 3 sitios

Lo mismo de antes, no hace falta javascript y si estuviese en un arrayData de 1 peticion tenemos para 3 sitios
jon marked this conversation as resolved
jon added 1 commit 2024-10-17 05:32:14 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f6051ae15c refactor: refs #6242 modified front to show ticket problems
jon added 1 commit 2024-10-24 10:56:41 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e18d129b32 fix: refs #6242 merge conflicts
jgallego requested changes 2024-11-13 08:27:39 +00:00
Dismissed
src/pages/Monitor/Ticket/MonitorTickets.vue Outdated
@ -369,3 +369,3 @@
<span>
<QIcon
v-if="row.isTaxDataChecked === 0"
v-if="row.isTaxDataChecked === 1"
jgallego commented 2024-11-13 08:27:31 +00:00
Owner
Copy Link

esto es confuso, añade un comentario que se arregla en la tarea #8116

esto es confuso, añade un comentario que se arregla en la tarea #8116
jon added 2 commits 2024-11-29 09:41:24 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
35201cb2d3 fix: refs #6242 conflicts
jon added 1 commit 2024-11-29 10:55:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
cc464c631e fix: refs #6242 use $t in TicketProblems
jon requested review from carlosap 2024-11-29 11:49:35 +00:00
jon changed title from WIP: #6242 added rounding field to #6242 added rounding field 2024-11-29 11:51:33 +00:00
jon added 1 commit 2024-12-12 07:22:38 +00:00
carlosap refused to review 2024-12-12 11:27:24 +00:00
jon requested review from alexm 2024-12-18 07:07:59 +00:00
alexm refused to review 2024-12-19 12:16:25 +00:00
jon added 1 commit 2025-01-09 07:54:23 +00:00
jon added 1 commit 2025-01-09 07:55:54 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
a4e415f0ab Merge branch 'dev' into 6242-AddHasRoundingField
jon added 3 commits 2025-01-09 09:15:57 +00:00
jon added 1 commit 2025-01-09 09:17:04 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
fe4a681894 Merge branch 'dev' into 6242-AddHasRoundingField
jon requested review from alexm 2025-01-10 05:37:27 +00:00
alexm requested changes 2025-01-13 09:41:55 +00:00
Dismissed
src/pages/Ticket/Card/TicketDescriptor.vue Outdated
@ -201,0 +198,4 @@
{{ t('salesTicketsTable.hasItemLost') }}
</QTooltip>
</QIcon>
<QIcon
alexm commented 2025-01-13 09:41:13 +00:00
Member
Copy Link

No se pot gastar TicketProblems=?

No se pot gastar TicketProblems=?
jon added 2 commits 2025-01-13 10:38:53 +00:00
jon added 1 commit 2025-01-13 10:41:15 +00:00
jon requested review from alexm 2025-01-13 10:42:22 +00:00
alexm reviewed 2025-01-13 13:24:35 +00:00
src/pages/Ticket/Card/TicketDescriptor.vue Outdated
@ -199,2 +169,2 @@
<QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
</QIcon>
<div v-for="problem in problems" :key="problem" class="q-gutter-x-xs">
<TicketProblems :row="problem" />
alexm commented 2025-01-13 13:24:35 +00:00
Member
Copy Link

Revisar

Revisar
jon marked this conversation as resolved
jon added 2 commits 2025-01-14 06:14:54 +00:00
alexm approved these changes 2025-01-14 08:30:28 +00:00
Dismissed
jon requested review from jgallego 2025-01-14 08:32:14 +00:00
jgallego requested changes 2025-01-14 12:44:24 +00:00
Dismissed
src/components/TicketProblems.vue Outdated
@ -36,0 +38,4 @@
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon>
<QIcon
v-if="row.isTaxDataChecked === 1"
jgallego commented 2025-01-14 12:41:39 +00:00
Owner
Copy Link

estaba en 0 y lo cambias a 1?

estaba en 0 y lo cambias a 1?
jgallego commented 2025-01-15 11:23:31 +00:00
Owner
Copy Link

@jon lo que hay que cambiar entonces que comparar siempre contra 0 o pones ===0 o !== 0 ya que no siempre el back devuelve 1 en los booleanos

@jon lo que hay que cambiar entonces que comparar **siempre** contra 0 o pones ===0 o !== 0 ya que no siempre el back devuelve 1 en los booleanos
src/pages/Monitor/locale/es.yml Outdated
@ -39,6 +39,7 @@ salesTicketsTable:
payMethod: Método de pago
department: Departamento
packing: ITP
hasItemLost: Pérdida de articulo
jgallego commented 2025-01-14 12:42:06 +00:00
Owner
Copy Link

Artículo perdido

Artículo perdido
jon marked this conversation as resolved
jon commented 2025-01-15 08:52:53 +00:00
Author
Member
Copy Link

@jgallego respecto al comentario del cambio del campo isTaxDataChecked, el campo está del revés.
P.E: en el ticket 10 en la bbdd solo tiene el problema marcado isTooLitle, pero en la vista aparece el problema de "not verified":
BBDD:
image
Lilium:
image

@jgallego respecto al comentario del cambio del campo isTaxDataChecked, el campo está del revés. P.E: en el ticket 10 en la bbdd solo tiene el problema marcado isTooLitle, pero en la vista aparece el problema de "not verified": BBDD: ![image](/attachments/1f6ea109-4418-4191-9000-468c1458dfc7) Lilium: ![image](/attachments/8cf3ac10-f931-4034-a353-0f9e08ff7aef)
image.png
3.9 KiB
image.png
3.6 KiB
jon added 2 commits 2025-01-15 08:53:17 +00:00
jon dismissed alexm’s review 2025-01-15 08:53:17 +00:00
Reason:

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

jon requested review from jgallego 2025-01-15 08:53:32 +00:00
jgallego requested changes 2025-01-15 11:23:40 +00:00
Dismissed
jgallego left a comment
Owner
Copy Link

.

.
jon added 2 commits 2025-01-21 15:26:52 +00:00
jon requested review from jgallego 2025-01-21 15:51:56 +00:00
jgallego approved these changes 2025-01-21 18:28:21 +00:00
jgallego left a comment
Owner
Copy Link

Esto se puede comprobar con e2e?

Esto se puede comprobar con e2e?
Some required checks are missing.
You are not authorized to merge this pull request.
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 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#760
No description provided.
Delete Branch "6242-AddHasRoundingField"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?