verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge pull request 'test' (!1744) from test into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1744
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Javi Gallego 2023-09-14 07:32:24 +00:00
parent 5536e06ed1 0a1a36018b
commit e1b03172fb
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/changes/233601/00-createClaimReader.sql
View File

@ -1,4 +1,4 @@
INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`)
INSERT INTO `account`.`role` (`name`, `description`, `hasLogin`)
VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1);
INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
@ -10,7 +10,7 @@ INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
'buyer',
'deliveryBoss',
'handmadeBoss'
)
);
DELETE FROM `salix`.`ACL`
WHERE `model`= 'claim'
@ -28,5 +28,4 @@ INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`princip
INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer');
INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');
VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');

6
print/templates/email/printer-setup/locale/es.yml
View File

@ -8,8 +8,8 @@ description:
<a href='https://www.youtube.com/watch?v=qhb0kgQF3o8' title='Youtube' target='_blank'
style='color:#8dba25'>https://www.youtube.com/watch?v=qhb0kgQF3o8</a>. También
necesitarás el GoLabel, el programa para imprimir las cintas.
downloadFrom: Puedes descargarlo desde este enlace <a href='https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01'
title='Descargar GoLabel' target='_blank' style='color:#8dba25'>https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01</a>
downloadFrom: Puedes descargarlo desde este enlace <a href='https://cdn.verdnatura.es/public/GoLabel.zip'
title='Descargar GoLabel' target='_blank' style='color:#8dba25'>https://cdn.verdnatura.es/public/GoLabel.zip</a>
downloadDriver: En este enlace puedes descargar el driver de la impresora <a href='https://es.seagullscientific.com/support/downloads/drivers/godex/download/'
title='Descargar driver' target='_blank' style='color:#8dba25'>https://es.seagullscientific.com/support/downloads/drivers/godex/download/</a>
sections:
@ -40,4 +40,4 @@ help: Cualquier duda que te surja, no dudes en consultarla, <strong>¡estamos pa
atenderte!</strong>
salesPersonName: Soy tu comercial y mi nombre es
salesPersonPhone: Teléfono y whatsapp
salesPersonEmail: Dirección de e-mail
salesPersonEmail: Dirección de e-mail