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

8267-devToTest #3270

Merged
alexm merged 131 commits from 8267-devToTest into test 2024-12-03 12:18:21 +00:00
Conversation 0 Commits 131 Files Changed 87 +8 -4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 00412e3258 - Show all commits

8
db/versions/11359-navyPaniculata/00-firstScript.sql Normal file
View File

@ -0,0 +1,8 @@
DELETE FROM stateI18n
WHERE `name` IN ('Billed', 'Facturado', 'Assisted preparation', 'Preparación asistida', 'Shipped', 'Embarcado', 'Stowaway OK', 'Polizón OK');
UPDATE `state` SET nextStateFk = 43
WHERE nextStateFk IN (11, 27, 30, 32, 41);
DELETE FROM `state`
WHERE code IN ('INVOICED', 'ASSISTED_PREPARATION', 'BOARD', 'OK STOWAWAY', 'PARTIAL_PREPARATION');

4
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -342,7 +342,6 @@ module.exports = Self => {
'CHECKED', 'CHECKED',
'PACKING', 'PACKING',
'PACKED', 'PACKED',
'INVOICED',
'ON_DELIVERY', 'ON_DELIVERY',
'PREPARED', 'PREPARED',
'WAITING_FOR_PICKUP', 'WAITING_FOR_PICKUP',
@ -350,10 +349,7 @@ module.exports = Self => {
'PRINTED_BACK', 'PRINTED_BACK',
'LAST_CALL', 'LAST_CALL',
'PREVIOUS_PREPARATION', 'PREVIOUS_PREPARATION',
'ASSISTED_PREPARATION',
'BOARD',
'PRINTED STOWAWAY', 'PRINTED STOWAWAY',
'OK STOWAWAY',
'HALF_PACKED', 'HALF_PACKED',
'COOLER_PREPARATION' 'COOLER_PREPARATION'
]}}; ]}};