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

fix: refs #6404 change db language on local #2534

Merged
pablone merged 3 commits from 6404-fixSaturdayDelivery into master 2024-06-03 15:40:28 +00:00
Conversation 0 Commits 3 Files Changed 1 +2 -2
pablone commented 2024-06-03 08:30:03 +00:00
Member
Copy Link
No description provided.
pablone added 1 commit 2024-06-03 08:30:03 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
b1a4b42028 fix: refs #6404 change db language on local
juan requested changes 2024-06-03 09:27:51 +00:00
Dismissed
back/methods/mrw-config/createShipment.js Outdated
@ -65,3 +65,3 @@
JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN mrwService ms ON ms.agencyModeCodeFk = am.code
LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped, '%a')
LEFT JOIN mrwServiceWeekday mw ON mw.weekdays = DATE_FORMAT(t.shipped + INTERVAL 1 DAY, '%a', 'en_en')
juan commented 2024-06-03 09:27:17 +00:00
Owner
Copy Link

1 << WEEKDAY(t.shipped) | weekdays

`1 << WEEKDAY(t.shipped) | weekdays`
pablone marked this conversation as resolved
db/dump/db.cnf Outdated
@ -9,1 +9,4 @@
binlog-ignore-db = PERCONA_SCHEMA
lc-messages = es_ES
lc_time_names = es_ES
juan commented 2024-06-03 09:27:47 +00:00
Owner
Copy Link

Mantener el idioma en Ingles, como estaba

Mantener el idioma en Ingles, como estaba
pablone marked this conversation as resolved
pablone added 1 commit 2024-06-03 10:39:03 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
b9b0651069 fix: refs #6404 fix agency service selection
juan approved these changes 2024-06-03 10:47:32 +00:00
pablone changed title from WIP: fix: refs #6404 change db language on local to fix: refs #6404 change db language on local 2024-06-03 15:34:20 +00:00
pablone added 1 commit 2024-06-03 15:34:38 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
2ee41b17dc Merge branch 'master' into 6404-fixSaturdayDelivery
pablone merged commit 6b234f4664 into master 2024-06-03 15:40:28 +00:00
pablone deleted branch 6404-fixSaturdayDelivery 2024-06-03 15:40:28 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
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#2534
No description provided.
Delete Branch "6404-fixSaturdayDelivery"

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?