7691-testToMaster #537

Merged

alexm merged 395 commits from 7691-testToMaster into master 2024-07-09 05:39:56 +00:00

Conversation 0 Commits 395 Files Changed 132 +8717 -2313

alexm commented 2024-07-08 12:50:48 +00:00

Member

Copy Link

No description provided.

alexm added 394 commits 2024-07-08 12:50:49 +00:00

161922da09 feat: refs #6825 create vnTable and add in CustomerExtendedList

e0379dd1bc feat: refs #6825 fix modes

ed3c9db919 feat: refs #6825 create vnTableColumn, cardActions

a75b33a824 feat: refs #6825 qchip color

0fe957db80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

b76b2fd8a0 feat: refs #6825 VnTableFilter and VnPanelFilter init

5ed2a82194 feat: refs #6739 transferInvoice new checkbox and functionality

6a6a47bc82 feat: refs #6825 right filter panel

7befca94bd refactor: refs #6739 new confirmation window

bc1a79ac68 refactor: refs #6739 updated transferInvoice function

93bd4e0281 Merge branch 'dev' into 6739-invoiceOut

1ba3a3151c feat: refs #6825 scroll for table mode

57e1a2cfdb Merge branch 'dev' into 6739-invoiceOut

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

21c657d58c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

a64d333995 refactor: refs #6739 requested changes

07bfe0512c Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

803c74908b Merge branch 'dev' into 6739-invoiceOut

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

9eac6b775a Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

4cb5b8c326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

c223bbe0ea fea(VnTable)t: refs #6825 create VnComponent, add rowClick and redirect

b97f7e6b42 6464

7e66fc38ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

546a5150ae fix: refs #7274 fix duplicate rows

77f058944a style: refs #6464 changed checkbox and qbtn styles

fef2704f3c Merge branch 'dev' into 6464-fixNegativeBases

059ec702c9 Merge branch 'dev' into 6739-invoiceOut

6f38aeba83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

598d116848 feat: refs #6825 share filters, create popup

d00801b066 feat: refs #6825 VnComponent mix component and attrs Form to create new row

a3a4e9b570 feat(VnTable): refs #6825 fix ellipsis and add titles

a411e1db09 Merge branch 'dev' into 6739-invoiceOut

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

2d1e1372a3 Merge branch 'dev' into 6464-fixNegativeBases

478fe23cec fix(VnTable): refs #6825 fix events and css

65c22a7103 feat(VnTable): refs #6825 VnTableChip component

a715122a66 feat(VnTable): refs #6825 dinamic columns

4ae580543b feat(VnTable): refs #6825 execute function when create

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

569df64d8d feat(VnTable): refs #6825 move to folder. fix checkboxs

1558b600be refactor: refs #5447 changed warehouse filter

c4441eed1f fix(VnTable): refs #6825 checkbox align and color

1183908942 Merge branch 'dev' into 5447-travelExtraCommunity

ac77fea3d7 feat(VnTable): refs #6825 remove field prop. Add actions in table

d50e2ada0f feat(VnTable): refs #6825 actions sticky

859cdd891a feat(VnTable): refs #6825 actions sticky

8414f5c12e fix: refs #5447 deleted console.log

ace9959bff Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity

2ec4e3540f fix(VnTable): refs #6825 fix click sticky column

89e1b3581a feat(VnTable): refs #6825 use checkbox if startsWith 'is' or 'has'

98159de257 refactor: refs #6896 end migration orders

8967abf1c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration

6e59f3ae12 refactor: refs #6896 fix qdrawer

d73b5b6f4c refactor: refs #6739 changed router.push

08ac9c5931 Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

f0b1919157 refactor: refs #6739 deleted useless const

b7fe50ba1d Merge branch 'dev' into 6739-invoiceOut

696f6b4c05 feat(VnTable): refs #6825 addInWhere

88c2af555c fix(ArrayData): refs #6825 router.replace and use filter.where

d4fbd99473 refs #7406 table formation

c865bc2ed4 refs #7406 fix props

e6ff13c09c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

ef52c9b0c0 refs #7406 routes trad

d207482e3a refs #7406 fix url

a4baa88cb4 fix(VnTable): refs #6825 VnInputDate

947496e0a1 refs #7406 fix components

d8512e2033 refs #7406 fix trad

0f1c91d36c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

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

ffe15da7cf refs #7406 fix VnTable columns

264d887fb4 refs #7406 fix Tb components create

92244ad96b feat(VnTable): refs #6825 merge where's

5965e70740 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

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

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

45a6c49907 refactor: refs #5447 fix request

b047c2c5e3 Merge branch 'dev' into 5447-travelExtraCommunity

e400b84fad Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

0bcc9f5aeb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

11f6601e17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

18e3e611e9 refactor: refs #6739 changed invoice functions' name

5d1934a73d Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

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

adf7c3a139 feat: refs #6896 new filters

93744fce65 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration

cb4a5f8d1b fix: refs #6825 css

bd53805e7d Merge branch 'dev' into 5447-travelExtraCommunity

68e49e2ffa fix: refs #7129 fix some issues on load and tools

04f92071fb Merge branch 'dev' into 6739-invoiceOut

f7fb23e869 Merge branch 'dev' into 5447-travelExtraCommunity

aa2601ac45 feat(WorkerFormation): add columnFilter

bbf847e1a0 feat(url): sepate filters

83d56e5d32 refactor: refs #5447 changed warehouse out filter behavior

20a07a90e8 Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity

e6577d402a Merge branch 'dev' into 5447-travelExtraCommunity

cbd3ab3da2 refactor: refs #5447 refactor filters

aa945df5f9 Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity

128904970b fix(url): filter

9db390e904 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

4b2d977542 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

15bb9f596c Merge branch 'dev' into 6464-fixNegativeBases

ed07b4d620 fix(url): redirect

1dd1a67657 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

2365ce6857 Merge branch 'dev' into 5447-travelExtraCommunity

83a4e9c75f Merge branch 'dev' into 6739-invoiceOut

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

4e2358d722 fix: point 3

fe2412f6d9 fix: point 1

25f4d1f654 fix: point 3

59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

14e27f193e feat: adapt tu VnTable → CrudModel

00da1c2808 feat: adapt tu VnTable → CrudModel

3dfe3226ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

89f6873b03 WIP

048685277f Merge branch 'dev' into 6825-vnTable

c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

d7237463ea feat(WorkerFormation): is-editable and use-model

c4cbd7f156 feat(VnTable): is-editable and use-model. fix: checkbox

d55c75089c Merge branch 'dev' into 7323_department_descriptor_routerLink

38610870ea feat: refs #7545 Deleted hasIncoterms client column

c596f68103 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

f2dddb5e30 Merge branch 'dev' into 7129-finishRouteMigration

d6f085dc3d Merge branch 'dev' into 7129-finishRouteMigration

975e8f06c0 WIP

531f4bb8cd Avoid firing request if quantity does not change

8c3262bcdf Add change state dropdown action

c017493cb8 refactor: refs #5447 fixed filter if continent not selected

b16b87fadd Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity

75a478ddc4 Merge branch 'dev' into 5447-travelExtraCommunity

42042ea3cd fix: SkeletonTable

20ae555e14 fix: refs #6464 fix error isLoading

f497d97c84 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

5eea790dee Merge branch 'dev' into 6464-fixNegativeBases

4f36da7598 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

bea756d7cb feat(vnTable): reload data when change url

98b13b23e4 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

cb87d2b419 fix(VnFilter): filter with params

6f723af338 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

b282ce540e remove unnecessay

fe69521b0b fix: refs #6739 changed checkbox field

8aec5bae81 Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

21506da779 Merge branch 'dev' into 6739-invoiceOut

f86bc9791b fix: fix warnings

20e0c84035 fix: refs #7129 fix module routes

ac56d6d9d7 feat: refs #7129 fix some code and add order

79a34db700 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

05d7a61468 fix: refs #7129 remove fix from claim lines

d9d54a351f fix(VnTable): showLabel

0666aeb166 Btn dropdown more actions

acc899b851 Transfer

c31e865faa Fix card searchbar routing

0ad6b260da fix(VnTable): create scss

6120c98580 fix(VnTable): warns

ef6a7001e8 Merge branch 'dev' into 7129-finishRouteMigration

1c6fab0158 fix(VnTable): duplicate fetch

bc31985a4d remove console.log

42008ef74b feat: refs #6896 created VnImg and added to order module

9c1e79ebee Merge branch 'dev' into 6896-EndOrderMigration

7c64df6600 refactor: refs #6896 fixed styles

fe47215bf7 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration

a479637ee6 feat: customerList is customerExtendedList

fb1bd5ca72 fix: bug replace

3394eb10b0 fix(VnFilterPanel): remove key

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

c807b5feb2 Weekly tickets

25ab5a1b9f refs #7409 front section

0ccfd9ae75 refs #7409 columns trad

06e8e819f4 WIP

6b7c76dde3 mini change

c289c247c4 undo change in sms dialog

c798874a9e Ticket future

84378187be Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance

dfbc7df54d perf: Remove div.col

1bb7f57e64 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

e369ea68d4 fix(VnTable): Qtable v-bind

ae18cffd30 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

a5f4f85c80 refactor: refs #6896 requested changes

8085e1e518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

3023280108 refactor: refs #6896 refactor VnImg

db67fd1e43 Merge branch 'dev' into 6896-EndOrderMigration

92cac607e4 test: front test for arrayData

bb208040bb Last changes

d488a2d523 small change

de0ef06d92 remove console.log

ac28a6728a refs #7409 change icon

40842f4ba6 test(arrayData) add front test

b5bf4bab54 feat(CustomerFIlter): use correct table

819d1230c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

2ea87ea920 fix: refs #7129 remove consoleLog

cbeebc8c9c Merge branch '7129-finishRouteMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishRouteMigration

825762d70e Merge branch 'dev' into 7129-finishRouteMigration

27a8c9684f build: increase version 2428

188bc3ff4f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

42807d6785 Merge branch 'dev' into 7545-hasIncoterms

577452df8a Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!439) from 7545-hasIncoterms into dev ...

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

b3a4dd3f79 Ticket purchase request

3fdad15f21 fix: comments

02f8288b22 feat(customerList): add searchbar

702b031650 feat(VnFilter): merge objects

0afd7f4ae1 Ticket tracking

d63d3a9c77 small change

45cf4498d3 Cancel button change

22bf0b4598 Search bar changes

4e7c09fa44 Add tooltip to button

79c606fc70 Add checkbox

b6ec10994a Change header titles style

6cd8a478fa Clean selectedTickets after moving tickets

a84c20f2ce refactor: refs #6896 changes requested in PR

e8e6a88066 feat: fixes #7196

6d5973f4b7 refs #6504 fix formModel claimFilter claimCard

a61196b04d Merge branch 'dev' into 6896-EndOrderMigration

11a82f3ae5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

f48c5deba1 Merge branch 'dev' into 7129-finishRouteMigration

47bcb73dab Merge pull request '7129-finishRouteMigration' (!447) from 7129-finishRouteMigration into dev ...

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

03be4bc0e6 refactors

304c7677bc Merge branch 'dev' into 6896-EndOrderMigration

5be23286d7 Merge branch 'dev' into 6739-invoiceOut

d0c3f61b73 Merge branch 'dev' into 6464-fixNegativeBases

f372fb1c65 Merge branch 'dev' into 5447-travelExtraCommunity

28b241bb77 Merge branch 'dev' into 6825-vnTable

2352b6aac4 fix: invoiceDueDay test

e8296d0edd Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable

0ba415c0ea small changes

00ebbbfc78 Ticket log

09545cb2c0 fix: WorkerNotificationsManager test

b60fa62c99 Merge pull request '#6896 end orders migration' (!400) from 6896-EndOrderMigration into dev ...

Reviewed-on: #400
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

1b3828ceba Merge branch 'dev' into 6825-vnTable

9f1dd4d74d WIP

47768faea4 Change model

bcda488aae Merge pull request '#6825 - VnTable V1' (!396) from 6825-vnTable into dev ...

Reviewed-on: #396
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

44b683b26b feat: #7196 eslint

633b13b076 Basic data form

0faa663169 fix: comments

159b386d2c fix: comment 4

f41161a28e refactor: refs #6977 use VnImg

ff75808a28 Merge branch 'dev' into 6977-ClonedURL

d23dbca7bf fix(EntryBuys): fix VnSubtoolbar

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

79bafdee20 Merge branch '7406-workerFormation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

87a9ee5ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance

0107c21789 refs #7409 fix trad

0f2f688f16 Merge branch 'dev' into 6504-fixCardClaim

9d38c1ff1c Merge pull request 'refs #6504 fix formModel claimFilter claimCard' (!464) from 6504-fixCardClaim into dev ...

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

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

9ce49bf108 fix: TravelLog

febc7f1f46 fix: notify icon style

63b8ca46a3 Merge branch 'dev' into feature/TicketLog

5cf183607d WIP

d083319f34 Merge pull request 'Ticket log' (!465) from hyervoni/salix-front-mindshore:feature/TicketLog into dev ...

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

01816613f2 Merge branch 'dev' into 7323_department_descriptor_routerLink

ec7b0c1416 Merge pull request '7323 # FIX Department descriptor and routerLink' (!435) from 7323_department_descriptor_routerLink into dev ...

Reviewed-on: #435
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

dfb67f6f2b refactor

3d9d41afcb Add deep true

3d0cbcfd12 remove form model expose

82cc844ddd refactor: refs #6977 refactor VnImg

da20abf34c Merge branch '6977-ClonedURL' of https://gitea.verdnatura.es/verdnatura/salix-front into 6977-ClonedURL

50d135f282 refactor: refs #6977 fix VnImg props

9169b793a9 fix: refs #7623 update add updateRoute prop in VnPaginate

0765166423 fix: refs #7623 disable router update

17e9d95702 Ticket notes

91df35fcae Ticket volume

cdf3a588af fix: refs #7623 updating skip param

fb12d4ddc0 WIP

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

ea7ee97867 proposals

5a66af341f fix: state translations

d10f6b4d6c replace value sale.itemFk

3c810254a4 fix: refs #7623 redirect

2ab105dda5 feat: refs #6826 added rol summary link

a705245783 refs #7406 fix pr

54d7263d13 Merge remote-tracking branch 'origin/dev' into feature/TicketSale

98510c1d38 Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale

0c42bba779 perf: remove ItemPicture

1eaa0c9ce2 perf: replace ItemPicture in favour of VnImg

d55d6ec06e Merge pull request 'master to test' (!483) from master into test ...

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

49b86672f5 Merge branch 'dev' into 7406-workerFormation

8e538fb463 WIP

239cdd74b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

c644abe571 Merge pull request '7406-workerFormation' (!405) from 7406-workerFormation into dev ...

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

8d921322c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

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

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

266657fab5 Fix total difference

9817ae8c2c fix: column hidden v-if

0816105e5f Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData

54e3eb6f0d Add required rule to VnInputTime and VnInputDate

b0cd40ab2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

ba8145eabb Add required rule to VnInputTime and VnInputDate

4de347d0e8 Rmove nav navigation and organize buttons

603cbde09f Merge branch 'dev' into feature/TicketSale

b47e20852e Merge pull request 'feature/TicketSale' (!445) from hyervoni/salix-front-mindshore:feature/TicketSale into dev ...

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

5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance

1a79f733f0 Merge pull request 'Tickets advance' (!462) from hyervoni/salix-front-mindshore:feature/TicketsAdvance into dev ...

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

049174232a Merge branch 'dev' into feature/TicketsFuture

0776db2e0f warmFix: correct id

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

3374b84f38 Merge branch 'dev' into feature/TicketsFuture

4c8912e779 Merge pull request 'Tickets future' (!461) from hyervoni/salix-front-mindshore:feature/TicketsFuture into dev ...

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

975c844d65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

31f8ab7c07 refactor: refs #6739 fix redirect transferInvoice

5aca8104be Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut

1538e7dc7e Merge pull request 'feat: refs #6739 transferInvoice new checkbox and functionality' (!352) from 6739-invoiceOut into dev ...

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

1e080d02ed Merge branch 'dev' into feature/WeeklyTickets

d29bf09535 remove warnings

0715e86530 Merge branch 'dev' into feature/WeeklyTickets

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

e733873933 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

121204fee4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

ca96e4e6e0 fix: refs #7623 bugs & tests

fbef6f3eb1 fix: refs #7623 test

6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance

a57df459a6 Add pay button

1529e2dd4f Add tooltip to add state button

6e6c6301d2 fix log view not refreshing when changing id param

1a2b4739c3 Merge branch 'dev' into feature/TicketBasicData

5419bc4d52 Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData

d60ddfac6f Merge pull request 'Ticket basic data' (!474) from hyervoni/salix-front-mindshore:feature/TicketBasicData into dev ...

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

c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest

4e4563d481 fix: merge dev

56560d4b50 fix: merge dev

22ccd4adfd Merge pull request 'Ticket purchase request' (!479) from hyervoni/salix-front-mindshore:feature/TicketPurchaseRequest into dev ...

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

7a2b334a64 Merge branch 'dev' into feature/TicketTracking

d409b9ea86 fix: WorkerSelect option format

ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets

151978160b fix: ticket order

2313f8ca0d Merge pull request 'Weekly tickets' (!459) from hyervoni/salix-front-mindshore:feature/WeeklyTickets into dev ...

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

120a119b38 Merge branch 'dev' into feature/TicketTracking

de2c3cc244 fix: refs #6826 fix roleDescriptor

752f3ace58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

6f2573880c refs #7409 fix balance and formation

c570f2058b Merge branch 'dev' into 7409-workerBalance

98b125281c Merge pull request '7409-workerBalance' (!451) from 7409-workerBalance into dev ...

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

cd01ba8fe1 changes

8ee4fa2e7d Resolve conflicts

ae73dd047f changes

fd03336c7a Resolve conflicts

92f9869a36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection

152bd5ff08 Merge pull request '#7623 add updateRoute prop in VnPaginate' (!475) from 7623-fix-redirection into dev ...

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

5b07f3015d small change

a8c3f1d9e5 Merge branch 'dev' into 7196-cjsToEsm

01e44753e4 Merge pull request 'feat: fixes #7196' (!463) from 7196-cjsToEsm into dev ...

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

f6e0cb41ce Merge branch 'dev' into 6464-fixNegativeBases

fd744158ac fix: refs 6464 deleted useless class in checkbox

95f70ba765 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases

ed642b299e feat: refs #7436 show checkbox

6d71aef9e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox

56e63852ed Merge pull request '#6464 correct negativeBases' (!373) from 6464-fixNegativeBases into dev ...

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

e7ad147d04 fix: refs #7433 skeleton

f78ae08550 fix: cypress.config to mjs

7c16137908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton

e610013038 Merge branch 'dev' into 7433-fixSkeleton

e8c349a550 Merge branch 'dev' into 7436-showQCheckbox

db4c3a6799 Changes

0a8dbe8e4d Revert "feat: fixes #7196" ...

This reverts commit e8e6a88066.

ba5af7258f Merge pull request 'Revert "feat: fixes #7196"' (!496) from 7196-revertCJS into dev ...

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

eb3eaaa4db fix: revert cypress mjs

b8aee9738d Merge branch 'dev' into 7433-fixSkeleton

2c5db9716d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton

2b7f3990ab Merge branch '7433-fixSkeleton' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton

86a016e375 Merge pull request '#7433 fix skeleton' (!493) from 7433-fixSkeleton into dev ...

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

97c84f7aaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox

e8ade1fd1d Merge branch '7436-showQCheckbox' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox

63a05130e3 chore: refs #7436 fix e2e

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

25e4494266 Merge branch 'dev' into 5447-travelExtraCommunity

946a2d4823 Merge branch 'dev' into feature/TicketService

6ee5fc954b fix: refs #6826 fix redirect

3722ad0995 Merge pull request '#5447 changed warehouse out filter' (!397) from 5447-travelExtraCommunity into dev ...

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

9664978733 Merge branch 'dev' into 6826-RolSummary

685267e177 Merge pull request '#6826 added rol summary link' (!481) from 6826-RolSummary into dev ...

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

4cf389e00c fixes: fix vnFilter params and redirect

128303939b fix(ticket router): typo

7b9e26528a feat(TicketService): use correct format

3b18375cdb fix(TicketService): pay use selected

84d6785a4c Merge branch 'dev' into 7436-showQCheckbox

ceaf8a8865 Merge pull request '#7436 show checkbox' (!492) from 7436-showQCheckbox into dev ...

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

a4a64eebb4 fix: refs #7129 fix e2e

b234760044 Merge branch 'dev' into 7129-fixe2e

ccb51b64de Merge pull request 'fix: refs #7129 fix e2e' (!502) from 7129-fixe2e into dev ...

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

731169053c test: fix vnSearchbar adapt to vnTable

ae71321339 fix: map selected

e34904ea70 Merge branch 'dev' into feature/TicketNotes

fc7f4fda49 Merge pull request 'Ticket notes' (!487) from hyervoni/salix-front-mindshore:feature/TicketNotes into dev ...

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

9bb75b8305 Merge branch 'dev' into feature/TicketVolume

6f7b678f8d Merge pull request 'Ticket volume' (!490) from hyervoni/salix-front-mindshore:feature/TicketVolume into dev ...

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

527c565ca9 Merge branch 'dev' into feature/TicketTracking

2aabe75343 Merge pull request 'Ticket tracking' (!485) from hyervoni/salix-front-mindshore:feature/TicketTracking into dev ...

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

0cbd7c9cae Merge branch 'dev' into feature/TicketService

62d58b479f Merge pull request 'Ticket service' (!494) from hyervoni/salix-front-mindshore:feature/TicketService into dev ...

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

d714788923 test: fix intermitent e2e

82234aa7ec test

6b3a1d81d5 Merge pull request '7658-devToTest_2428' (!508) from 7658-devToTest_2428 into test ...

Reviewed-on: #508
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

alexm added 1 commit 2024-07-08 12:58:41 +00:00

2b67b85179 add changlelog

guillermo approved these changes 2024-07-09 05:36:15 +00:00

alexm merged commit ac8c3d86fc into master 2024-07-09 05:39:56 +00:00

alexm deleted branch 7691-testToMaster 2024-07-09 05:39:56 +00:00

alexm referenced this issue from a commit 2024-07-09 05:39:58 +00:00

Merge pull request '7691-testToMaster' (!537) from 7691-testToMaster into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

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

No description provided.