verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge pull request 'fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version' (!1811) from warmFix_ticketAdvance_salesPerson into test
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1811
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Alex Moreno 2023-10-24 12:11:14 +00:00
parent 201241e2dc 22fdcef7bb
commit 59aa738f38
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/234003/00-ticket_canAdvance_zone.sql
View File

@ -72,7 +72,7 @@ BEGIN
FROM ( FROM (
SELECT SELECT
s.ticketFk, s.ticketFk,
t.workerFk, c.salesPersonFk workerFk,
t.shipped, t.shipped,
t.totalWithVat, t.totalWithVat,
st.name futureState, st.name futureState,
@ -86,6 +86,7 @@ BEGIN
z.name futureZoneName, z.name futureZoneName,
st.classColor st.classColor
FROM ticket t FROM ticket t
JOIN client c ON c.id = t.clientFk
JOIN sale s ON s.ticketFk = t.id JOIN sale s ON s.ticketFk = t.id
JOIN saleVolume sv ON sv.saleFk = s.id JOIN saleVolume sv ON sv.saleFk = s.id
JOIN item i ON i.id = s.itemFk JOIN item i ON i.id = s.itemFk

2
front/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:stretch-slim FROM debian:bookworm-slim
EXPOSE 80 EXPOSE 80
ENV TZ Europe/Madrid ENV TZ Europe/Madrid