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

3569-refactor_isEditable-canEdit #1082

Merged
alexm merged 39 commits from 3569-refactor_isEditable-canEdit into dev 2022-11-15 11:10:11 +00:00
Conversation 0 Commits 39 Files Changed 27 +417 -151
alexm commented 2022-10-10 11:14:17 +00:00
Member
Copy Link
No description provided.
alexm added the
CR / Tests passed
 label 2022-10-10 11:14:17 +00:00
alexm added 9 commits 2022-10-10 11:14:19 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
5f39249edb fix(ticket): canEdit use aclFunc
gitea/salix/pipeline/head This commit is unstable Details
9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head There was a failure building this commit Details
376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
alexm added 1 commit 2022-10-10 11:26:56 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
99271f275f remove unnecessary isEditable
alexm requested review from juan 2022-10-10 11:36:25 +00:00
alexm changed title from WIP: 3569-refactor_isEditable-canEdit to 3569-refactor_isEditable-canEdit 2022-10-10 11:46:38 +00:00
alexm added 1 commit 2022-10-10 11:47:21 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
c7a06baa63 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
alexm added 1 commit 2022-10-11 05:43:27 +00:00
alexm changed title from 3569-refactor_isEditable-canEdit to WIP: 3569-refactor_isEditable-canEdit 2022-10-13 12:53:20 +00:00
alexm added 2 commits 2022-10-18 09:50:34 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
a5ceee07e9 use loopback
alexm added 3 commits 2022-10-19 06:22:49 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
508decaf0b try
alexm added 31 commits 2022-10-25 12:25:36 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d30065f90a Add vn-input-account tag and logic
gitea/salix/pipeline/head There was a failure building this commit Details
c2813e3633 Removed console logs and other debugging elements
gitea/salix/pipeline/head There was a failure building this commit Details
dff378632b Changed the logic
gitea/salix/pipeline/head There was a failure building this commit Details
7ac7189a8a added maxlength binding, finished logic on insert
gitea/salix/pipeline/head There was a failure building this commit Details
796988bb18 Removed e.stopPropagation
gitea/salix/pipeline/head There was a failure building this commit Details
5ca39c9dd3 Modified TextField to have a insertable option
gitea/salix/pipeline/head This commit looks good Details
9c7ec6fdc9 Implemented Insertable in the textfield class
gitea/salix/pipeline/head There was a failure building this commit Details
e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head This commit looks good Details
c212dfed88 removed package-lock
gitea/salix/pipeline/head This commit looks good Details
cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
e6481af3a9 delete: transaction
gitea/salix/pipeline/head There was a failure building this commit Details
b36acee458 Merge pull request '4153-supplier.fiscal-data' (!1068) from 4153-supplier.fiscal-data into dev 
Reviewed-on: #1068
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
dcd858c7d5 feat(print): 4690 - Puppeteer cluster
gitea/salix/pipeline/head There was a failure building this commit Details
192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
7d502c6f57 Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev 
Reviewed-on: #1086
gitea/salix/pipeline/head This commit looks good Details
aa13034ee6 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
3564cbe246 Merge pull request 'MASTER_4689-hotFix(route_index): fix driverRoutePdf' (!1095) from hotFix_driverRoutePdf2 into master 
Reviewed-on: #1095
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
c23d58da69 fix if not ticket
gitea/salix/pipeline/head There was a failure building this commit Details
cf0b750304 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
ceeab73cf2 Merge pull request '4091-dms_clean_fix2' (!1091) from 4091-dms_clean_fix2 into dev 
Reviewed-on: #1091
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
04be661b68 Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev 
Reviewed-on: #1094
gitea/salix/pipeline/head This commit looks good Details
25e934a591 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
e80754f280 Added new SQL version
gitea/salix/pipeline/head There was a failure building this commit Details
4520443734 fix: Intl polyfill for spanish locale
gitea/salix/pipeline/head This commit looks good Details
d60f6769b4 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
39b70ed75f Merge pull request '4153-supplier.fiscal-data' (!1096) from 4153-supplier.fiscal-data into dev 
Reviewed-on: #1096
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
alexm added 1 commit 2022-10-25 13:02:38 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
342832c475 try
alexm added 75 commits 2022-10-31 13:13:25 +00:00
gitea/salix/pipeline/head This commit is unstable Details
7895decf4e feat(notification): create models
gitea/salix/pipeline/head This commit looks good Details
9b48cbb078 feat(notification): send
gitea/salix/pipeline/head There was a failure building this commit Details
2b19688ca4 quit focus
gitea/salix/pipeline/head This commit looks good Details
d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit is unstable Details
b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit looks good Details
43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
c06d2970ae test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
e931414bb7 unnecessary code
gitea/salix/pipeline/head This commit is unstable Details
eec1d6df4a add translation
gitea/salix/pipeline/head This commit looks good Details
f81b2775a0 add fixture
gitea/salix/pipeline/head This commit looks good Details
012cd68c89 Added menu to create a new supplier, not working
gitea/salix/pipeline/head This commit looks good Details
24cb8e00bb creates notification sql in changes
gitea/salix/pipeline/head This commit looks good Details
c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head There was a failure building this commit Details
594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head This commit looks good Details
1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head This commit looks good Details
aef47d46b1 env test
gitea/salix/pipeline/head This commit looks good Details
c24b975f26 remove node_env
gitea/salix/pipeline/head There was a failure building this commit Details
9290cd6fb6 Finished back tests
gitea/salix/pipeline/head This commit looks good Details
047076f189 changed tests
gitea/salix/pipeline/head There was a failure building this commit Details
a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
db12ceb369 removed async from the redirect function
gitea/salix/pipeline/head Build queued... Details
73a69051a8 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
6a17a634d4 hotFix(receipt): add receiptPdf
gitea/salix/pipeline/head This commit looks good Details
a66c5e6798 acl
gitea/salix/pipeline/head This commit looks good Details
fe95c45c42 Merge pull request 'MASTER_hotFix(receipt): add receiptPdf' (!1100) from hotFix_receiptPdf into master 
Reviewed-on: #1100
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
931a891f71 fix: check client.email exists
gitea/salix/pipeline/head This commit looks good Details
5811a0f56e Merge pull request 'MASTER_hotfix: check if email exists' (!1103) from 4708-client.basic-data into master 
Reviewed-on: #1103
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
9089ba7346 requested changes
gitea/salix/pipeline/head This commit looks good Details
330af56d2f Intl polyfill
gitea/salix/pipeline/head There was a failure building this commit Details
76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
296a743d8a Fix test, remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
418ba65c2e Merge pull request '2612-create-supplier' (!1089) from 2612-create-supplier into dev 
Reviewed-on: #1089
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
6a2bc5b593 Disabled back tests
gitea/salix/pipeline/head There was a failure building this commit Details
51f95f0261 Fixed error
gitea/salix/pipeline/head There was a failure building this commit Details
714fe32552 Fix error
gitea/salix/pipeline/head This commit looks good Details
da78b39874 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
88dda4523f Merge pull request '4320-notificationQueue' (!1087) from 4320-notificationQueue into dev 
Reviewed-on: #1087
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9c9db3250e Merge pull request '4075-ticket_boxing' (!1070) from 4075-ticket_boxing into dev 
Reviewed-on: #1070
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit is unstable Details
b37c257885 feat(canEdit): use checkAccess
alexm added 1 commit 2022-10-31 14:07:34 +00:00
gitea/salix/pipeline/head This commit is unstable Details
e7047e982f fix e2e
alexm changed title from WIP: 3569-refactor_isEditable-canEdit to 3569-refactor_isEditable-canEdit 2022-10-31 14:12:24 +00:00
alexm added 2 commits 2022-10-31 14:13:28 +00:00
gitea/salix/pipeline/head This commit looks good Details
ac6fbd07a9 Upgraded node version
gitea/salix/pipeline/head This commit is unstable Details
d1ab159323 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
alexm added 3 commits 2022-11-02 12:48:48 +00:00
alexm added 1 commit 2022-11-03 08:39:23 +00:00
gitea/salix/pipeline/head This commit is unstable Details
e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
alexm changed title from 3569-refactor_isEditable-canEdit to WIP: 3569-refactor_isEditable-canEdit 2022-11-04 06:34:28 +00:00
joan added this to the v9.0.0 - November milestone 2022-11-04 08:24:40 +00:00
alexm added 5 commits 2022-11-07 08:19:33 +00:00
gitea/salix/pipeline/head This commit looks good Details
8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
524069f8e3 Merge pull request 'refs #4753 texto y fecha sms cambiados' (!1124) from 4753-ticket.sale-sms into dev 
Reviewed-on: #1124
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit is unstable Details
03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
alexm changed title from WIP: 3569-refactor_isEditable-canEdit to 3569-refactor_isEditable-canEdit 2022-11-07 08:31:34 +00:00
juan requested changes 2022-11-09 15:49:03 +00:00
modules/ticket/back/methods/sale/updateQuantity.js Outdated
@ -43,2 +43,3 @@
try {
const canEditSale = await models.Sale.canEdit(ctx, [id], myOptions);
if (isNaN(newQuantity))
throw new UserError(`The value should be a number`);
juan commented 2022-11-09 15:47:05 +00:00
Owner
Copy Link

Ja està definit com a number en la declaració de parámetres, perque tornes a comprobar-ho?

Ja està definit com a number en la declaració de parámetres, perque tornes a comprobar-ho?
alexm marked this conversation as resolved
alexm added 1 commit 2022-11-10 12:34:56 +00:00
alexm added 2 commits 2022-11-10 13:38:50 +00:00
gitea/salix/pipeline/head This commit is unstable Details
37d412bf3b refactor: delete unnecessary test
alexm requested review from juan 2022-11-10 13:39:20 +00:00
juan approved these changes 2022-11-14 15:15:27 +00:00
e2e/paths/05-ticket/02_expeditions_and_log.spec.js
@ -2,3 +2,3 @@
import getBrowser from '../../helpers/puppeteer';
describe('Ticket expeditions and log path', () => {
fdescribe('Ticket expeditions and log path', () => {
juan commented 2022-11-14 14:52:10 +00:00
Owner
Copy Link

T'has deixat un focus ací

T'has deixat un focus ací
alexm marked this conversation as resolved
alexm added 45 commits 2022-11-15 08:37:41 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
3f9ba6b853 Refactor to verdnatura.es and shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit Details
786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
b17fe0d18c refator code
gitea/salix/pipeline/head There was a failure building this commit Details
273a8cd7c7 refactor code
gitea/salix/pipeline/head There was a failure building this commit Details
1f2ea2c4d8 fix: incorrect number of params
gitea/salix/pipeline/head There was a failure building this commit Details
3243d35bd7 feat: send email
gitea/salix/pipeline/head This commit looks good Details
04f165d901 solved conflits
gitea/salix/pipeline/head This commit looks good Details
ab739f412f feat: add test
gitea/salix/pipeline/head This commit looks good Details
626355d251 fix: sustituido insert por insert ignore
gitea/salix/pipeline/head This commit looks good Details
892094f85c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
6858de83a3 feat: backTest
gitea/salix/pipeline/head This commit looks good Details
ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
7fc18c89df feat: error handlers
gitea/salix/pipeline/head This commit looks good Details
d34a4ae992 add translate
gitea/salix/pipeline/head This commit looks good Details
1bc8cf52d5 add translate
gitea/salix/pipeline/head This commit looks good Details
8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
4d81991d86 delete focus test
gitea/salix/pipeline/head This commit looks good Details
6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
1f05e6fb3b Label without header & footer
gitea/salix/pipeline/head There was a failure building this commit Details
ad741ba738 Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit Details
e4a02042a7 Merge pull request '4609-Refactor to verdnatura.es and shop.verdnatura.es' (!1072) from 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es into master 
Reviewed-on: #1072
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
c2b4187b97 refs #4609
gitea/salix/pipeline/head There was a failure building this commit Details
edc1f213c7 refs #4609 sharp updated
gitea/salix/pipeline/head This commit looks good Details
163d704d3b refs #4609 Jasmine updated
gitea/salix/pipeline/head This commit looks good Details
e7f26e8502 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
b044d74106 Removed prettier
gitea/salix/pipeline/head This commit looks good Details
676f2e1584 Removed prettier from config
gitea/salix/pipeline/head This commit looks good Details
163f7fd284 Added version 10503
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
500d12f5a0 Enabled back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
55f3d26dd0 Trigger jenkins build
gitea/salix/pipeline/head There was a failure building this commit Details
72400ebf02 change folder db
alexm added 1 commit 2022-11-15 08:43:28 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit
alexm added 1 commit 2022-11-15 09:20:36 +00:00
alexm added 1 commit 2022-11-15 09:39:02 +00:00
alexm requested review from vicent 2022-11-15 09:45:07 +00:00
vicent approved these changes 2022-11-15 11:08:38 +00:00
alexm merged commit b57a64227b into dev 2022-11-15 11:10:11 +00:00
alexm deleted branch 3569-refactor_isEditable-canEdit 2022-11-15 11:10:12 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
vicent
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
v9.0.0 - November
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#1082
No description provided.
Delete Branch "3569-refactor_isEditable-canEdit"

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?