#7897 - masterTest_24_36 #669

Merged

jsegarra merged 115 commits from 7897_masterTest_24_36 into master 2024-09-03 06:37:49 +00:00

Conversation 0 Commits 115 Files Changed 89 +1760 -1188

jsegarra commented 2024-09-02 17:32:56 +00:00

Member

Copy Link

No description provided.

jsegarra added 110 commits 2024-09-02 17:32:57 +00:00

7f376c8ea4 fix: refs #7717 fix catalog filter, searchbar redirect and search

eb2df02ad6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

02e1de083a fix: duplicate key

def3ca33a2 fix: refs #7717 fixed searchbar filter with rightmenu filters' applied

848b267112 Merge branch 'dev' into 7717_fixOrderCatalog

368b8404fa updates: OrderCatlago

ce6a94bab8 fix: refs #7717 fix catalog searchbar and worker tests(refs #7323)

1ac0a85969 updates

e013e5571d perf: use ref at component start

cc518d5a80 perf: refs #7717 right menu filter

3a9116987c Merge branch 'dev' into 7717_fixOrderCatalog

2de11d3ecf Merge branch 'dev' into 7717_fixOrderCatalog

d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style

4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog

4d7fe0fd86 fix: refs #7717 fix volume and lines redirect

be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

7e3bfce732 fix: refs #7717 fix basic data form & minor errors

610e7c150b Merge branch 'dev' into 7717_fixOrderCatalog

cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

68ce5880dd refactor: refs #7717 deleted useless code

b9a0f926ce Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

8a4f723732 Merge branch 'dev' into 7717_fixOrderCatalog

3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

6b69a16122 refs #7355 changes BasicData

df1b63da98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2

3eaa5c864d refs #7355 account fixes

40c3ba15e6 refs #7355 account acls roles cars

3f76b5496a fix: refs #7717 fix order sections

cc3216f1f3 Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

d3f50ec9b2 Merge branch 'dev' into 7717_fixOrderCatalog

6df6e53f30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

5741cca878 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

ee71ae9d24 feat(orderList): use orderFilter and fixed this

b21ba3dc2c refs #7355 account cards roles cards

dc7c686508 feat(orderList): correct create order

37244cdbc7 feat(orderBasicData): add notes

e11e51f432 fix: order description to vnTable

190579e7fd fix: orderCatalogFilter order

1e4a309a84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog

3222a7a42c fix(orderLines): reload when delete and redirect when confirm

94878b700b refs #7355 account cards loads

e0473b589c Merge pull request 'test to dev' (!616) from test into dev ...

Reviewed-on: #616
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

a46198e2d0 feat: add recover password and reset password

dc1accff7a test: add recover and reset password e2e

b828fd35b7 test: add two factor e2e

e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2

aae881c24a fix(account_card): redirection

405092f66d fix: account subsections cards

b5537d6ae5 Merge pull request '7355-accountMigration2' (!619) from 7355-accountMigration2 into dev ...

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

fdb508de97 delete cy.logs

3cbdf25410 delete name default

0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword

e9873a43b1 Merge pull request '7848-recoveryPassword' (!617) from 7848-recoveryPassword into dev ...

Reviewed-on: #617
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

895441a8e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

06c0f49128 feat: refs #7346 add seriaType option

ed29088d76 typo

2bea46b601 fix: test

4b2f4ffac1 fix(VnTable): orderBy v-model

fa0ca732fc feat(FormModel): trim data by default

00616939c6 Merge pull request 'feat(FormModel): trim data by default' (!625) from formModel_trimData into dev ...

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

74f335b22e fix: #6336 ClaimListStates

ca3406fbc0 Merge branch 'dev' into 7346-invoiceOutMultilple

f3d7590edf refactor: refs #7717 delete useless function and import

ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog

5230b8f722 Merge pull request '#7717 fix OrderCatalog' (!558) from 7717_fixOrderCatalog into dev ...

Reviewed-on: #558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

c19585fb1b fix: quasar build warnings

0eb699bcbe feat: refs #7346 formdata uses serialType

a5fc366081 Merge branch 'dev' into 6336_claim_fix_states

f9fd1c1f90 Merge pull request '#6336 - FIX ClaimList states' (!627) from 6336_claim_fix_states into dev ...

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

89eaf02800 feat: #7323 handle workerPhoto

3d5807463b feat: refs #7346 refactor

b71d24cf3d feat: refs #7346 sonarLint warnings

6197d283e4 Create ticket future filter

54eb567e39 perf: date fields

03ebf28712 Merge pull request '#7323 - Handle workerPhoto' (!633) from 7323_workerPhoto into dev ...

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

91e52432ea Merge branch 'dev' into feature/TicketFutureFilter

defb11a6d7 Merge branch 'dev' into 7346-invoiceOutMultilple

1984e1d0d8 feat: refs #7710 uses cloneAll

d0ccce2656 feat: refs #7346 elimino ===

6dc7d8f9a2 Merge pull request 'feat: refs #7346 add seriaType option' (!626) from 7346-invoiceOutMultilple into dev ...

Reviewed-on: #626
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

efc7df5a60 delivery traducido a Reparto

e7ce2a0ef6 Merge branch 'dev' into feature/TicketFutureFilter

6358fdb320 Merge pull request 'Create ticket future filter' (!638) from hyervoni/salix-front-mindshore:feature/TicketFutureFilter into dev ...

Reviewed-on: #638
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

fb0ed9c4ce para que no de el fallo de muchos registros

a14c0f3fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

b82449b174 Merge branch 'dev' into 7710-cloneWithTicketPackaging

b4d1a4dab4 Merge pull request '#7710 - uses cloneAll' (!640) from 7710-cloneWithTicketPackaging into dev ...

Reviewed-on: #640
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

89287c3ea3 Merge pull request '#7864 - Merge master into test' (!630) from master into test ...

Reviewed-on: #630
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

566a649c20 fix: refs #7524 use limit item Section

7c2a13db0b fix: refs #7524 use limit shelving Section

717c52fc02 fix: refs #7524 use id

2ae482ff8c Merge branch 'test' into dev

4d7a4be2c0 fix: refs #7524 use limit entry Section wip

4a81598883 fix: ticketDescriptorMenu

ceec78da17 test: ticketDescriptorMenu

61ae3edf18 Merge pull request '#7896 - 24.36 Dev To Test' (!648) from 7896_devToTest_2436 into test ...

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

3fce76f2e2 Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit

3051b13478 warmFix fields with wrong name

77c9311760 fix: refs #7524 use limit travels section

35829c743b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit

42e7629c40 fix: refs #7524 use limit ticket section

7bac607746 fix: refs #7524 add sort-by

d55bf0ff75 Merge pull request '#7524 useLimit' (!645) from 7524-useLimit into test ...

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

56d226b36b fix: refs #7524 dynamic fetching

63f5f85e8d Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test ...

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

e9da8d44f0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36

jsegarra requested review from jgallego 2024-09-02 17:34:47 +00:00

jsegarra added 1 commit 2024-09-03 06:05:09 +00:00

84076309a5 feat: update changelog.md

jsegarra changed title from WIP: #7897 - masterTest_24_36 to #7897 - masterTest_24_36 2024-09-03 06:05:43 +00:00

jsegarra added 2 commits 2024-09-03 06:08:05 +00:00

61721b84b9 Merge pull request '#7897 - Solve conflicts masterTest_24_36' (!670) from 7897_masterTest_24_36 into test ...

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

6e2630c69e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36

jsegarra added 1 commit 2024-09-03 06:16:08 +00:00

c4c4285b4b fix: remove unnecessary console.log

jgallego approved these changes 2024-09-03 06:21:49 +00:00

Dismissed

jsegarra added 1 commit 2024-09-03 06:31:32 +00:00

ecba084f8b feat: reduce changelog.md lines

jsegarra dismissed jgallego’s review 2024-09-03 06:31:33 +00:00

Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jsegarra requested review from jgallego 2024-09-03 06:33:09 +00:00

jgallego approved these changes 2024-09-03 06:34:36 +00:00

jsegarra merged commit e2bbe8cf3d into master 2024-09-03 06:37:49 +00:00

jsegarra referenced this issue from a commit 2024-09-03 06:37:51 +00:00

Merge pull request '#7897 - masterTest_24_36' (!669) from 7897_masterTest_24_36 into master

Sign in to join this conversation.

Reviewers

No reviewers

jgallego

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

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-front#669

No description provided.