3256-order_transactions #778

Merged

joan merged 11 commits from 3256-order_transactions into dev 2021-12-20 09:25:05 +00:00

Conversation 0 Commits 11 Files Changed 43 +1376 -601

carlosjr commented 2021-11-12 16:36:51 +00:00

Contributor

Copy Link

No description provided.

carlosjr added 2 commits 2021-11-12 16:36:53 +00:00

f62814e81e refactor(order): catalogFilter, confirm and filter transactions

266b1c8073 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions

carlosjr added 2 commits 2021-11-24 13:29:47 +00:00

c3da93bfd3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions

c4bc89ee29 refactor(entry): back unit tests refactor to transactions

carlosjr added 82 commits 2021-12-15 15:04:29 +00:00

9de3db1961 fix(client_summary): show 10 tickets at least

98195bf7b0 fix(route_tickets): dialog show the name of clients

fb6e443f03 feat(routes_tickets): button up when add tickets

a5ba02e2ec feat(route_tickets): update frontTest

cb81ad3722 delete unnecessay space

02d89e5774 feat(item): add field genericFk in basic-data

5931692fac test(item_basic-data): add genericFk e2e

aaa49bdf78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data

fc2e81826d export database

c03fe359b1 add acl

c3e311f076 Updated route acls

469f944e47 Merge branch '3368-export_database' of https://gitea.verdnatura.es/verdnatura/salix into 3368-export_database

09c2b813b5 ACL update

0fc52cbf1d Updated descriptor ACLs

4162f239cf Allow basic-data access for hhrr

ab3902ebd8 Restricted account creation

0838f34771 Show alias section for marketing

815826e891 refactor(ticket): modify transferSales.js for avoid unnecessary logs

5914e8e1ac fixed e2e by adding acls where needed

f96f22c231 misspelled word

b7b6f62343 Merge pull request '3301-refactor(ticket): modify transferSales.js for avoid unnecessary logs' (#805) from 3301-ticket_transferSales into dev ...

Reviewed-on: #805
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

cdbd1964a6 Merge branch 'dev' into 3368-export_database

ec939674b9 Merge pull request '3368-export_database' (#806) from 3368-export_database into dev ...

Reviewed-on: #806
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data

6afc694f6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles

6b6a1b4329 refactor(fonts): updated fonts and changed invoiceOut icon

74fbae6510 refactor(route_ticket): add style in a style.scss

ba29df16c0 Merge branch 'dev' into 3377-modifyStyles

9f8d2c7350 Merge pull request '3377-modifyStyles' (#798) from 3377-modifyStyles into dev ...

Reviewed-on: #798
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

eea9413628 fix(item_basic-data): controller, test e2e and model

2ab5c9818a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data

771100ccab remove unnecessary intro and comment

25371ef97b Translation fix

eb101ffc76 refactor(fonts): updated fonts and changed invoiceOut icon

c986fe9557 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

e13f2d4ae3 feat(route_ticket): add column province and change order other columns

bcca33bc33 Updated icons

d1add9ef84 sql changes

65053f5f28 feat(worker_time-control): add timestamp url param

442bf1940e delete last commit, uploaed by error

2f7295020c update column notificationEmail

b0cb7e1424 Updated fonts

9d6b870940 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

452d4557d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

e4d7d957eb Rectified icons

8ea3307230 feat(ticket_sale): allow multi-check for recalculatePrice

cff4c90651 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data

8bd1db2e97 remove unnecesary on-accept

49e9fcaa7c remove unnecesary on-accept

a19ce34aae Merge pull request '3384-item_basic-data add field genericFk' (#807) from 3384-item_basic-data into dev ...

Reviewed-on: #807
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

f93da5f60d Merge branch 'dev' into 3387-route_ticket

a82053854a Merge pull request 'feat(route_ticket): add column province and change order other columns' (#808) from 3387-route_ticket into dev ...

Reviewed-on: #808
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

51a608cb5a Merge branch 'dev' into 3325-notify_absence

df337360de Merge pull request 'update column notificationEmail' (#810) from 3325-notify_absence into dev ...

Reviewed-on: #810
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

07e092f9bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control

85e3b47408 test(worker_time-control): tested url parameter timestamp

594f258232 modify js date format

495510efed Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded

5c342ae463 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

1176b23bb9 Merge branch 'dev' into 2676-worker_time-control

68a3a4d1e0 Merge pull request '2676-worker_time-control add timestamp url param' (#809) from 2676-worker_time-control into dev ...

Reviewed-on: #809
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

85721dcf45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale

21bd625b3b add exceprion to half day absence

d760eba446 Merge branch 'dev' into 3275-worker_calendar

d5c0be5a9d refactor(ticket_sale): logic and tests

238577ec8f refactor: change ids by codes and add fixtures

cfdef6d090 Merge pull request 'feat(worker_calendar): add restrictions to add absence and to add hours recorded' (#812) from 3275-worker_calendar into dev ...

Reviewed-on: #812
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

decd4b5a95 separate sql procedures

c7e5c25a28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale

7acf7c5bea Changed duplicated button...

23e55a1a82 Merge pull request 'Duplicated bank entity creation button on supplier account' (#814) from supplier_account into dev ...

Reviewed-on: #814
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

77191b6182 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale

75e32feb16 refactor ticket_sale

bc2b2f37e8 Merge pull request '3372-ticket_sale multi-check for recalculatePrice' (#811) from 3372-ticket_sale into dev ...

Reviewed-on: #811
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>

8285a8a8e9 refactor(route.tickets): updated error description

2ebe6b5342 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman

b565d35a8b Merge pull request '3386-route_ticket_buscaman' (#816) from 3386-route_ticket_buscaman into dev ...

Reviewed-on: #816
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

f63426304f Removed font color

6aa3101e42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions

b4f1e66fed order module transactions

2bfc6a5987 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions

carlosjr added 1 commit 2021-12-16 09:57:11 +00:00

5a448234d6 transtaction commits on several endpoints

carlosjr added 1 commit 2021-12-17 09:42:44 +00:00

d83995e64e filter worker id refactor

carlosjr added 1 commit 2021-12-17 14:15:23 +00:00

7fbbe2fddd ctx was poluted by tests

carlosjr added 1 commit 2021-12-17 14:15:47 +00:00

d2db3054a5 Merge branch 'dev' into 3256-order_transactions

carlosjr changed title from WIP: 3256-order_transactions to 3256-order_transactions 2021-12-17 14:16:41 +00:00

carlosjr added the

CR / Tests passed

label 2021-12-17 14:16:54 +00:00

joan approved these changes 2021-12-20 09:24:44 +00:00

joan merged commit c2f3d35a07 into dev 2021-12-20 09:25:05 +00:00

joan deleted branch 3256-order_transactions 2021-12-20 09:25:05 +00:00

joan referenced this issue from a commit 2021-12-20 09:25:05 +00:00

Merge pull request '3256-order_transactions' (#778) from 3256-order_transactions into dev

Sign in to join this conversation.

Reviewers

No reviewers

joan

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

Subscribe

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#778

No description provided.