232201_dev_to_test #1561

Merged

alexm merged 117 commits from 232201_dev_to_test into test 2023-05-25 07:43:18 +00:00

Conversation 0 Commits 117 Files Changed 56 +7700 -6159

alexm commented 2023-05-25 07:28:24 +00:00

Member

Copy Link

No description provided.

alexm added the

CR / Tests passed

label 2023-05-25 07:28:24 +00:00

alexm added 116 commits 2023-05-25 07:28:25 +00:00

c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required

e00edf0266 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

ac55dc4cc7 refs #5297 feat(worker_new): add payMethod

a89f400f10 use iban

404acdab6f refs #5638 fix: solucionado problema con el limit

7e63bc0004 refs #5297 quit fdescribe

2c6f71b4c4 Merge branch 'dev'

96b5749e1e refs #5297 cambio actual

0b2c91466e refs #5648 create vn-confirm

61d6f47162 refs #5599 remove returns

f4be69c85c refs #5599 select state.classColor

c59915f951 refs #5599 procedure

9a813c075c refs #5599 procedure y colorClass

e258e779b3 refs #5599 ticketFuture

2111ca0993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors

43a91194fd refs #5599 remove e2e

7bcb00c127 refs #5655 removed relation

35b6642095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors

fd85cd2d98 refs #5599 replace

0dea1dfd9e Merge branch 'dev'

b9ec6b93b6 Merge branch 'dev' into 5655-afinar-login

943e8b09c1 refs #5599 DELIMITER

9cbf3006a0 refs #5599 futureState

ea6837e33a refs #5579 export structure and data

3e33030b1d refs #5579 update mariadb version to 10.7.6

191fb72331 test jenkins

7f881409fc refs #5579 fix mockTime

c9af22780b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export

cc23fd1337 refs #5579 fix mockTimes and remove userLog_add

60bfb1b079 refs #5689 fix pixels

cd34ccad8f refs #5579 use variable

b1bbc22afc Merge branch 'dev' into 5579-db-export

a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states

36205e75be feat(232201): new version

7c76521b02 Merge pull request 'feat(232201): new version' (!1537) from 232201_dev_version into dev ...

Reviewed-on: #1537
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

b66362d313 refs #5638 fix: cambiado nombre de variable

c76b84d3cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states

9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'

463d209d77 refs #5638 refactor: eliminado if innecesario

d33a84c39f refs #5638 feat: updated backTest

703ab3439a refs #5638 fix: intermittent e2e

4bcb461d36 refs #3628 added check & date-picker

2591d2d115 refs #3628 added check & date-picker

cbbb571638 refs #3628 changelog

814568f2a9 refs #5297 errors solve, trad

d389860704 refs #5609 eliminadas peticiones duplicadas

ec02972efb refs #5609 mostrar filtro por defecto

8cf988b7d2 refs #5638 refactor: code

5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha

8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa

f81e9ec23e Merge pull request '5638-ticket.summary_states' (!1538) from 5638-ticket.summary_states into dev ...

Reviewed-on: #1538
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

23287e5ebf refs #5648 setTimeout

e9222dbcb7 Merge branch 'dev' into 5689-fixedPricesSize

a731cbf0cd Merge pull request 'refs #5689 fix pixels' (!1530) from 5689-fixedPricesSize into dev ...

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

1b19035d8d refs #5648 vn-confirm

9bc20493fe #refs #5648 e2e fix

6093cb4794 Merge branch 'dev' into 5648-sureClaim

e589e70e06 Merge branch 'dev' into 5655-afinar-login

c15e77f5c1 Merge pull request 'fixes #5655 Afinar login' (!1516) from 5655-afinar-login into dev ...

Reviewed-on: #1516
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

6d147e7af7 refs #5648 fix spaces

5e651d7b8c Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

fb4697e8fa Merge branch 'dev' into 5648-sureClaim

c42400a637 Merge branch 'dev' into 5579-db-export

a7c59f51b9 Merge branch 'dev' into 5599-ticketColors

3994e65040 refs #5648 spaces fix2

71ba45c580 Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

f030ecd2a7 Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev ...

Reviewed-on: #1526
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

da0aa57539 Merge branch 'test' into dev

0e11bfab0b refs #5581 ticketId != id

b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas

8ee581eb67 Merge branch 'dev' into 5648-sureClaim

ee8685329f Merge branch 'dev' into 5599-ticketColors

bf8d82f3c6 refs #5581 refresh model

ec1a203430 Merge pull request 'refs #5648 create vn-confirm' (!1508) from 5648-sureClaim into dev ...

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

0c673e43bc refs #5639 smart-tabla defaulter

d7d94796d6 Merge branch 'dev' into 5599-ticketColors

53e55de605 refs #5579 fix(route_index): order

9500e99b86 Merge branch 'dev' into 5579-fix-order

73c2ae9fdc refs #5581 changelog

64fbd5d2c7 Merge pull request 'refs #5579 fix(route_index): order' (!1551) from 5579-fix-order into dev ...

Reviewed-on: #1551

84abba5566 Merge branch 'dev' into 5599-ticketColors

766d809523 Merge pull request 'refs #5599 remove returns' (!1511) from 5599-ticketColors into dev ...

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

7fd2927ec9 refs #5639 smart-table country

db7d3b6868 refs #5639 payMethodFk

e2bea16e68 refs #5639 select country, paymethod

4f5bd95d21 refs #5639 order

2d06f42493 refs #5639 defaulterView

0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter

af1f92613f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

31b22b759d refs #5639 fix e2e selectors

0dda7791f6 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

3119ae4471 refs #5609 delete: console.log

97653d9b8f Merge branch 'dev' into 5581-transferir-lineas

b2f4c02b95 Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev ...

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

68c33efd9a refs #5609 fix: front test

1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter

e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

e43e0a8f9f Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev ...

Reviewed-on: #1554
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

0f66e56390 Merge pull request 'refs #5639 smart-tabla defaulter' (!1550) from 5639-seccionesFormaPagoYPais(MOROSOS) into dev ...

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

6294fc0435 refs #5297 back&e2e fix changes

a99b7cd4f1 Merge branch 'dev' into 5297-newWorker_iban_not_required

05fb0a7203 refs #5677 tickets without state fixed

856dcf18cb refs #5677 locations

133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign

49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto

d6a0db3fb8 Merge pull request '5297-newWorker_iban_not_required' (!1492) from 5297-newWorker_iban_not_required into dev ...

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

087fa137fd Merge branch 'dev' into 5677-fallo-saveSign

12aa9dee41 Merge pull request 'fixes #5677 Fallo portainer Ticket/SaveSign' (!1556) from 5677-fallo-saveSign into dev ...

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

74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto

de313b6418 refs #3628 Show what's before the inventory

0d223bb443 Merge pull request 'fixes #3628 item historical absoluto' (!1539) from 3628-item-historical-absoluto into dev ...

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

37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

c5a9eeed44 Merge pull request '232201_test_to_dev' (!1560) from 232201_test_to_dev into dev ...

Reviewed-on: #1560
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

alexm added 1 commit 2023-05-25 07:29:54 +00:00

33928aa406 refs #5730 correct folder

alexm requested review from vicent 2023-05-25 07:37:40 +00:00

vicent approved these changes 2023-05-25 07:40:39 +00:00

alexm merged commit 310536120e into test 2023-05-25 07:43:18 +00:00

alexm deleted branch 232201_dev_to_test 2023-05-25 07:43:19 +00:00

alexm referenced this issue from a commit 2023-05-25 07:43:20 +00:00

Merge pull request '232201_dev_to_test' (!1561) from 232201_dev_to_test into test

Sign in to join this conversation.

Reviewers

No reviewers

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

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

No description provided.