8448-devToTest #1254

Merged

alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00

Conversation 0 Commits 365 Files Changed 192 +3953 -2654

alexm commented 2025-01-21 06:52:51 +00:00

Member

Copy Link

No description provided.

alexm added 363 commits 2025-01-21 06:52:51 +00:00

7fb1a9e6b5 feat: refs #8219 added invoice out e2e tests

65afec0487 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

454ba4cf7b fix: refs #8219 fixed e2e tests

f9d897cdde feat: refs #8219 global invoicing e2e

45d1cc6a5d fix: refs #8219 global e2e

8b3a9db781 feat: refs #8220 created items e2e

670c089125 refactor: refs #8219 modified e2e tests and fixed some translations

e9fc8b6888 Merge branch 'dev' into 8219-InvoiceOutE2E

10ddae3534 fix: refs #8219 fixed summary and global tests

248288fd89 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

cb1f717fe0 fix: refs #8219 requested changes

a8b7691ab0 fix: refs #8219 forgotten dataCy

c601083f8c perf: refs #8219 #8219 minor change

5793e7c662 Merge branch 'dev' into 8219-InvoiceOutE2E

2ab5ade072 Merge branch 'dev' of https: refs #8220//gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

859957cadc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

100ef4b7b9 refactor: refs #8220 added data-cy for e2e tests

732683c340 feat: refs #8220 added barcodes e2e test

c2a09868a1 feat: refs #8220 added barcodes e2e test

292171348c feat: refs #8220 modified create item form and added respective e2e

cb0422d83f feat: refs #7957 open in new tab

981f3e90c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

0cce5b93cd refactor: refs #7957 remove blank

ad38bad945 fix: refs #8219 merge conflicts

56308f40f2 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

a4062f188b refactor: refs #8219 requested changes

51ed58465d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

a6815f4e3d fix: refs #7957 rollback

6e655b37a1 fix: refs #7957 rollback

a2b3a493fd perf: refs #8220 use searchbar selector in e2e tests

e42a2c8bce Merge branch 'dev' into 8220-ItemsE2E

4cf13a83a4 fix: refs #7957 rollback

4a4cb1cf3f feat: refs #7957 enhance search functionality and improve data filtering logic

1e0e859726 fix: refs #7957 update visibility handling for clear icon in VnInput component

6858f4e44c fix: refs #7957 rollback

6bbd122029 fix: refs #7957 rollback

ed238d32ed feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements

bae7529f3d Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

6db44f158e fix: refs #7957 rollback

e08f718975 feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component

b1ad357bda feat: refs #7957 simplify fn to

efeb32fb28 fix: refs #7957 vn-searchbar test

4e98296dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

ea347338f4 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

de87acd5cc fix: refs #7957 add missing closing brace

0bd48d476b test: refs #7100 added test to vnNotes component

5049b05547 fix: refs #7699 add icons and hint

69451862bf test: refs #7100 modified test and added more cases

07afbc82ef refactor: refs #7100 delete unnecesary set prop

550340e720 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword

01f63ff239 fix: refs #7699 fix password visibility

0e57d18171 Merge remote-tracking branch 'origin/dev' into 7100-createVnNotesSpec

f0364124cc fix: refs #7699 add pwd vnInput

0d9ba62d37 fix: refs #7699 fix vnChangePassword, clean VnInput

f1d6ecd5ff Merge branch 'dev' into 7699-refactroViewPassword

7a2de50d7d feat: refs #8117 filters and values added as needed

81ddb119b7 Merge branch 'dev' into 8117-filtersAndValuesReviewed

788d7b09cf Merge branch 'dev' into 7100-createVnNotesSpec

f4ba551df4 fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval

77b642c5f8 Merge branch 'dev' of https: refs #8220//gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

face202918 Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

fc5578cb18 perf: refs #8220 on-fetch

2b1e1e9e1a Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

886c811b79 refactor: refs #8219 use checkNotification command

d6949ea0db Merge branch 'dev' into 8219-InvoiceOutE2E

0eedfdee4a perf: refs #8220 on-fetch and added missing translations

d20bdf63c9 perf: refs #8220 translations

42a4672008 Merge branch 'dev' into 8220-ItemsE2E

0bd07d197c refactor: refs #8316 used VnSection and VnCardBeta

a9a09ad0a3 refactor: refs #8316 used VnSection and VnCardBeta

0b15c28449 refactor: refs #8316 used VnSection and VnCardBeta

b03efbc977 refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta

4b80800182 Merge branch 'dev' into 8322-worker

2eb7b7af13 refactor: refs #8322 changed translations

771ecf1cc6 refactor: refs #7100 refactorized with methods

0a2f1fb073 Merge branch 'dev' into 7100-createVnNotesSpec

efa08495df Merge branch 'dev' into 8316-claimCardWithVnCardBeta

edc1ed1a2e Merge branch 'dev' into 8219-InvoiceOutE2E

8e0e15840b Merge branch 'dev' into 8220-ItemsE2E

90c5aefac3 fix: entry summary view and build warnings

582b4f68e0 Merge branch 'dev' into Fix-EntrySummary

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

843710255e refactor: refs #8220 requested changes

4c5319eacf Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

738bb76e10 fix: refs #8220 itemTag test

e0fca5d24b Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

5259b8200b fix: refs #8247 fixed acls and added lost options

832ba01a52 Merge branch 'dev' into 8247-EnableAccount

1cecea4aee feat: refs #7202 added new field

85bf4053bb feat: refs #7088 created test for FetchedTags

df1b1205cf feat: refs #7077 created test for VnInputTime

8eccf557f0 Merge branch 'dev' into 8322-worker

1941e896e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

13d9705f69 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

49198f794c refactor: refs #8220 skip failling test and modifed tag test

4c57e55f25 fix: refs #7699 fix vnInputPassword

9b0d1058c5 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword

93ba88f236 feat: refs #8322 added department changes

23afe3276c refactor: refs #7100 added const mockData

bf23895c03 Merge branch 'dev' into 7100-createVnNotesSpec

60f3ea838a fix: refs #7699 fix component

3cf4c5ed80 Merge branch 'dev' into 7699-refactroViewPassword

d1466746de feat: refs #7078 created test for VnJsonValue

cd6cc5c865 fix: refs #7699 fix vnInputPassword

009cf2322b Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword

a89fad0ae2 fix: refs #7699 fix tfront clean code

ae42142524 Merge branch 'dev' into 7699-refactroViewPassword

2e3e7c6a5d fix: refs #8316 use rightMenu

c9179c101e fix: e2e tests

551498e0a5 Merge branch 'dev' into Fix-IntegrationE2ETests

143d8bea4a refactor: skip intermitent failing test

55aa678bb7 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests

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

b156662fba Merge branch 'dev' into Fix-IntegrationE2ETests

f53906f9c9 Merge branch 'dev' into 8117-filtersAndValuesReviewed

a40da6b5d9 fix: refs #8338 fixed VnTable translations

50ace09482 Merge branch 'dev' into 8338-traduccionesVnTable

5fda8e0c89 Merge branch 'dev' into Fix-IntegrationE2ETests

c35a468e01 fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice

ac2336064b test: fix expedition e2e

81116b4b13 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests

4900935e73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests

388ad8d187 test: ticketExpedition working

8ca9668b0e Merge branch 'dev' into 8117-filtersAndValuesReviewed

4834b07d5d fix: refs #7078 added missing case with array

7502ed2da6 Merge branch 'dev' into 7078-testVnJsonValue

29614ce335 fix: refs #7088 changed wrapper to vm

09cc12667c Merge branch 'dev' into 7088-testFetchedTags

52f09357d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests

582e1de8df Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests

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

a14f3153b0 Merge branch 'dev' into 7078-testVnJsonValue

7eb62ce23c Merge branch 'dev' into 7088-testFetchedTags

1c787130b3 build: add new version

86e9594fe9 fix: skip failling e2e

bc2b8fff0f Merge branch 'dev' into Fix-IntegrationE2ETests

2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2

9e59383493 Merge pull request '#7202 added new field in InvoiceOut' (!1160) from 7202-AddCustomAgentFkColumn2 into dev ...

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

48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests

c27700db4d Merge pull request 'Fix: Broken E2E tests' (!1171) from Fix-IntegrationE2ETests into dev ...

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

e7f2d6ae7f Merge branch 'dev' into 8322-worker

04f1a805ab Merge branch 'dev' into Fix-EntrySummary

6250894355 Merge pull request 'Fix: EntrySummary view' (!1155) from Fix-EntrySummary into dev ...

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

e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable

3953721424 fix: refs #7699 fix component

8c2f102414 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword

07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations

30bdf42f3f Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

7b9731a4c8 fix: refs #7957 css

d925e3f8b4 fix: refs #7957 css

73c133c62b fix: refs #7957 css

245530b542 refactor: refs #8322 set department inside worker

5440d94df2 chore: refs #8322 unnecessary prop

02973cc7d6 fix: refs #8322 unnecessary section

62cdc2b4f7 Merge branch 'dev' into 8322-worker

5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E

548db113eb refactor: refs #8220 requested changes

f273540708 Merge pull request 'fix: #8338 fixed VnTable translations' (!1173) from 8338-traduccionesVnTable into dev ...

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

f04aeec21d fix: refs #7957 update data-cy

ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E

8e1f888134 Merge branch 'dev' into 8322-worker

16e4845d83 Merge pull request 'refactor: #8322 changed Worker component to use VnSection/VnCardBeta' (!1152) from 8322-worker into dev ...

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

33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E

c9c0a25ff9 Merge pull request '#8220 created items e2e' (!1039) from 8220-ItemsE2E into dev ...

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

b289ba3196 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

8f418dcb4b style: refs #7957 update VnSearchbar padding for improved layout

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

08d20d3e7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges

c0d909b3e8 Merge pull request 'feat: refs #7957 open in new tab' (!1086) from 7957-monitorChanges into dev ...

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

663a417a45 Merge branch 'dev' into 7078-testVnJsonValue

46cd5382c1 Merge pull request 'feat: #7078 created test for VnJsonValue' (!1168) from 7078-testVnJsonValue into dev ...

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

f0889f158d Merge branch 'dev' into 7088-testFetchedTags

6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice

eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed

79c7d66fe6 Merge branch 'dev' into 7100-createVnNotesSpec

2c8b120ce4 Merge pull request 'test: refs #7100 added test to vnNotes component' (!1121) from 7100-createVnNotesSpec into dev ...

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

57ce6d6ea3 Merge branch 'dev' into 8117-filtersAndValuesReviewed

bb9df49ef9 Merge pull request 'feat: refs #8117 filters and values added as needed' (!1132) from 8117-filtersAndValuesReviewed into dev ...

Reviewed-on: #1132
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>

cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice

666cdc7674 Merge pull request 'refactor: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice' (!1174) from 8317-buttonsToRightOnItemFixedPrice into dev ...

Reviewed-on: #1174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>

f4b443f2b0 fix: translations

39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations

ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E

9fa2a77c96 refactor: refs #8219 modified list test, created cypress download folder and added to gitignore

0d3b1130f9 fix: refs #7088 changed "vm.vm" to "vm"

6499eeda01 Merge branch 'dev' into 7088-testFetchedTags

1e8e2aff72 Merge pull request '#8219 Added InvoiceOut e2e tests' (!1001) from 8219-InvoiceOutE2E into dev ...

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

11642c075c refactor: refs #8316 added claimFilter

03c23a133b Merge branch 'dev' into 7088-testFetchedTags

7f1684ddfc refactor: refs #8316 added entryFilter

dfd7ba9379 feat: refs #8258 added uppercase option to VnInput

96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword

3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum

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

5dc14b8dc1 feat: refs #7055 created FilterItemForm test

149cca37ef Merge branch 'dev' into 7055-testFilterItemForm

1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations

6fd9c84efe Merge pull request 'Fix: VnTableFilter translations' (!1183) from Fix-VnTableFilterTranslations into dev ...

Reviewed-on: #1183
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword

5b415a8398 Merge pull request 'fix: refs #7699 add icons and hint' (!1123) from 7699-refactroViewPassword into dev ...

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

58a4ef2ca8 Merge branch 'dev' into 7088-testFetchedTags

1142797114 Merge pull request 'feat: #7088 created test for FetchedTags' (!1162) from 7088-testFetchedTags into dev ...

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

f8a0940eba test: refs #7076 added new test for VnInputDate

93c059cdde Merge branch 'dev' into 7076-createTestVnInputDate

b466dfe034 feat: refs #7055 added new test case

92a130b5db Merge branch 'dev' into 7055-testFilterItemForm

e9ea70de19 fix: removed unused searchbar

a317006cc4 fix: refs #8316 ref="claimFilterRef"

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

343c1b538a Merge branch 'dev' into 8322-workerDepartment

c6a9c55ddc Merge pull request 'fix: removed unused searchbar' (!1190) from 8322-workerDepartment into dev ...

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

0057932bfa feat: refs #8372 workerPBX

27aa2969e8 fix: fixed InvoiceIn filter translations

3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs

f834f3b754 feat: refs #8258 added button to pass to uppercase

6cc400a975 Merge pull request 'fix: fixed InvoiceIn filter translations' (!1193) from invoiceInTranslations into dev ...

Reviewed-on: #1193
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary

1b986f4b4c feat: refs #8225 use it in claim, item and order modules

5d9227723e feat: refs #8225 added account and invoiceOut modules

774c714755 feat: refs #8225 added route and shelving module

300d64b076 feat: refs #8225 added entry module and fixed translations

69bcab0ec4 feat: refs #8225 added invoiceIn and travel module

ac1515e107 feat: refs #8225 added worker and zone modules

57c538c9c9 fix: refs #8225 invoice in translations

47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs

a28d9280a4 Merge branch 'dev' into 8372-workerPBX

6b8f6c464c Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev ...

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

bb6fae5d08 feat: refs #7087 created CardSummary test

e8105f312f Merge branch 'dev' into 7087-testCardSummary

6a01c9b746 Merge branch 'dev' into 7055-testFilterItemForm

c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component

7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList

a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta

e65b53fad0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev ...

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

bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta

1295f394f3 feat: refs #7087 added more test cases

5bd72c830d Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary

6c0181b2e4 Merge branch 'dev' into 7087-testCardSummary

413d567ffb refactor: refs #8225 requested changes

f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions

1af67db644 refactor: refs #8316 move order localization

7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev ...

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

bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions

330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev ...

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

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

2a121dbbb3 fix: added missing translations in InvoiceIn

49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn

eb92c69475 fix: changed invoiceIn for InvoiceIn

f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn

803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries

f0fc748c76 fix: changed translations to only use "invoicein"

221df5fa8c Merge pull request 'fix: added missing translations in InvoiceIn' (!1201) from traduccionesInvoiceIn into dev ...

Reviewed-on: #1201
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

7a5de9f708 Merge branch 'dev' into 7055-testFilterItemForm

50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests

c9c0e87e46 Merge branch 'dev' into 7087-testCardSummary

2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs

a22330b15e Merge branch 'dev' into 7077-testVnInputTime

671f308006 revert: revert header

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

34442c8577 Merge branch 'dev' into 7055-testFilterItemForm

b8344f3b22 Merge pull request 'feat: refs #7055 created FilterItemForm test' (!1187) from 7055-testFilterItemForm into dev ...

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

e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin

3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount

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

179571e3e9 Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount

6e5b703018 fix: refs #8247 conflicts

bd9c2ad4dc refactor: refs #8316 remove unused OrderSearchbar component

0dc0c9efd0 Merge branch 'test' into dev

702ae17d94 refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList

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

25dd028487 fix: modified setData in customerDescriptor to show the icons

8dc2955109 Merge branch 'dev' into Fix-CustomerIcons

ec44bfbc11 Merge branch 'dev' into 7076-createTestVnInputDate

a36c2ec32a Merge pull request 'test: refs #7076 added new test for VnInputDate' (!1188) from 7076-createTestVnInputDate into dev ...

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

4c4d5649ba Merge branch 'dev' into Fix-CustomerIcons

372a43b17e Merge pull request 'Fix: Fixed CustomerDescriptor' (!1212) from Fix-CustomerIcons into dev ...

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

3cc5595e14 refactor: refs #8198 simplify data fetching and filtering logic

5ce78ba473 Merge branch 'dev' into 8258-uppercaseInputs

698c20550f Merge branch 'dev' into 7077-testVnInputTime

df9e5f8059 refactor: refs #8198 simplify state management and data fetching in ItemDiary component

24b20605d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter

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

54867597aa feat: refs #7087 added new test

6ecbaf1a04 Merge branch '7087-testCardSummary' of https: refs #7087//gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary

d435a44faa Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary

8e4a92b6be Merge branch 'dev' into 7087-testCardSummary

76968fe6bd fix: refs #7087 fixed some tests

46bfd3b115 Merge branch 'dev' into 7077-testVnInputTime

6a88cad903 fix: refs #7077 removed unused imports

01b6e94008 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime

979353119a refactor: refs #7087 removed unused imports

7e0096cf30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta

c193ce33f6 Merge branch 'dev' into 8247-EnableAccount

6724818ebe Merge pull request '#8247: Fixed acls and added lost options' (!1159) from 8247-EnableAccount into dev ...

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

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

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

3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta

a153dd8860 fix: refs #8316 use section-searchbar

3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta

a95f6f56bd fix: refs #8316 userFilter

c6d7008ed5 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1149) from 8316-orderCardWithVnCardBeta into dev ...

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

0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs

80413eef3e refactor: refs #8316 moved localizations to local locale

ce7e529776 Merge branch 'dev' into 7077-testVnInputTime

a0f7905983 Merge branch 'dev' into 7087-testCardSummary

4b9453380a Merge pull request 'feat: #7087 created CardSummary test' (!1197) from 7087-testCardSummary into dev ...

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

82e6cc0790 refactor: refs #7077 removed some comments

f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime

8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime

8c7747999d feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries

71daac1c9d Merge pull request 'feat: #7077 created test for VnInputTime' (!1163) from 7077-testVnInputTime into dev ...

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

86169d980c feat: refs #7882 Added coords to create a address

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

64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter

39adfb3693 fix: refs #8198 update query param

4b3c78dd65 fix: refs #8243 fixed SkeletonSummary

e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary

31795ae40b test: refs #8198 skip tests

eed895b21c fix: redirect to TicketSale from OrderLines

21bcfdc997 feat: skip tests

b5ae3a1901 chore: refs #8198 rollback

fb530d8408 chore: refs #8198 rollback

b00e654fdd Merge pull request 'Fix: Redirect to TicketSale' (!1233) from Fix-RedirectToTicketSale into dev ...

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

98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary

972b377e13 fix: redirect when confirming lines

6b3c510057 Merge pull request 'fix: #8243 fixed SkeletonSummary' (!1230) from 8243-arreglarSkeletonSummary into dev ...

Reviewed-on: #1230
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs

c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components

872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta

7994f3c791 fix: remove departmentCode

dac99dc132 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev ...

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

e1a395b015 refactor: redirect using params

63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale

32909a96bd feat: refs #8258 added uppercase validation on supplier create

6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs

9d35dc08dd Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev ...

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

238817285d perf: remove warning default value

c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs

c43a8d0a38 Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev ...

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

7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam

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

7795fd1524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter

2f40b77f0b Merge pull request '#8198 keep section filter' (!1210) from 8198-keepSectionFilter into dev ...

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

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

18d4661bc3 chore: add task comment

1d3feef1e7 chore: add task comment

7d57b1ebe7 test: skip

91f10bba79 Merge pull request 'feat: skip tests' (!1235) from skipTests into dev ...

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

5a5adbd165 fix: sort by name in description

84dd46b22c Merge branch 'dev' into Fix-TicketServicesSortByName

c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam

0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev ...

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

0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName

c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode

44d3fa7634 Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev ...

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

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

3cb21d7117 fix: use entryFilter

45c4e08191 Merge branch 'dev' into 8381-entryTemperature

d21e11cc3d Merge branch 'dev' into 8381-entryTemperature

545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales

590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev ...

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

bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName

e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev ...

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

carlossa approved these changes 2025-01-21 07:01:07 +00:00

Dismissed

jon added 1 commit 2025-01-21 09:48:11 +00:00

96d1ef7f68 fix: refs #8448 e2e

jon dismissed carlossa’s review 2025-01-21 09:48:11 +00:00

Reason:

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

alexm added 1 commit 2025-01-21 09:58:54 +00:00

6c6e4ca950 fix: refs #8448 not use croppie

jon approved these changes 2025-01-21 10:00:56 +00:00

alexm merged commit f3fbfe41bb into test 2025-01-21 10:44:46 +00:00

alexm deleted branch 8448-devToTest 2025-01-21 10:44:46 +00:00

alexm referenced this issue from a commit 2025-01-21 10:44:47 +00:00

Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test

Sign in to join this conversation.

Reviewers

No reviewers

jon

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

3 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#1254

No description provided.