Compare commits

...

1175 Commits

Author SHA1 Message Date
Carlos Satorres f8b41101d3 Merge pull request 'fix: improve method into dev' (!1356) from fix_reload_icon into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1356
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-02-07 14:19:32 +00:00
Javier Segarra d060e88ebb fix: improve method into dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1354
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-02-07 14:15:28 +00:00
Jorge Penadés b75578b6fb Merge pull request '#8388 fixInvoiceIn' (!1321) from 8388-fixInvoiceIn into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1321
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-07 13:51:46 +00:00
Jorge Penadés 8380808ffa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 14:49:43 +01:00
Jon Elias b1f0cc7f1d Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!1351) from Fix-ItemFixedPriceNameFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1351
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-07 12:44:37 +00:00
Jon Elias 94849d0cdf Merge branch 'dev' into Fix-ItemFixedPriceNameFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 12:43:23 +00:00
Jon Elias 0692de7bfb fix: fixed item name filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 13:41:34 +01:00
Jorge Penadés f01e5b824e fix: refs #8388 adjust table cell properties and remove unused styles in InvoiceInVat.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 10:41:42 +01:00
Jorge Penadés d9897b3ea2 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 10:05:30 +01:00
Jorge Penadés de6020626f Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1346
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-07 09:03:52 +00:00
Jorge Penadés 05f6e1ec20 Merge branch '7119-showCountryName' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 10:02:46 +01:00
Jorge Penadés 0adb86d4f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName 2025-02-07 10:02:37 +01:00
Javier Segarra 86b77c2022 Merge pull request '#7601 - Different agency fot future tickets' (!1342) from 7601_futureAgency into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1342
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-07 08:36:18 +00:00
Javier Segarra 0901c57b12 Merge branch 'dev' into 7601_futureAgency
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 08:32:53 +00:00
Carlos Satorres 154a893580 Merge pull request 'fix: refs #6426 create constants' (!1228) from 6426-refactorConstants into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1228
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-07 08:22:54 +00:00
Carlos Satorres 780e7839f4 Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 08:21:56 +00:00
Alex Moreno 89df2e837c Merge pull request 'refactor: #8322 changed supplier component to use VnSection/VnCardBeta' (!1216) from 8322-Supplier into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1216
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-07 07:20:47 +00:00
Alex Moreno c72d4e9f04 fix: refs #8322 supplier use cardBeta correctly
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 08:19:51 +01:00
Javier Segarra 2550add549 Merge branch 'dev' into 7601_futureAgency
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 07:07:48 +00:00
Alex Moreno 1a420abfb2 Merge branch 'dev' of https: refs #8322//gitea.verdnatura.es/verdnatura/salix-front into 8322-Supplier
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 07:39:47 +01:00
Alex Moreno fc44424dda Merge branch 'dev' into 7119-showCountryName
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 06:00:54 +00:00
Javier Segarra 4994a94369 Merge pull request '#7058 LeftMenu vitest' (!1153) from 7058_leftMenu_vitest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1153
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-02-06 21:45:16 +00:00
Javier Segarra 48e40cdc46 Merge branch 'dev' into 7058_leftMenu_vitest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 21:44:27 +00:00
Jorge Penadés 5e17af2fae feat: refs #7119 show country name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 16:19:38 +01:00
Javier Segarra e8a90faa62 feat: add agency icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 12:33:26 +00:00
Alex Moreno 07eacdcebf fix: refs #6426 constants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 12:42:00 +01:00
Carlos Satorres 117ce937fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 11:58:01 +01:00
Carlos Satorres 64a52e0183 fix: refs #6426 outLayout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 11:57:27 +01:00
Alex Moreno 063ac0cb7b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 11:00:10 +01:00
Alex Moreno 671018ea2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-02-06 10:59:30 +01:00
Jorge Penadés 63a8f0f3c7 Merge pull request '#6919 syncData' (!941) from 6919-syncData into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #941
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-06 09:39:48 +00:00
Jorge Penadés f9ba0642e1 Merge pull request '#7524 dynamic fetch' (!1339) from 7524-hotfix-removeLimit into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1339
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-06 09:32:44 +00:00
Jorge Penadés f991aa0aa8 Merge branch '6919-syncData' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 10:32:02 +01:00
Jorge Penadés 848d00a8b3 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-02-06 10:32:00 +01:00
Jorge Penadés 6732effe0c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-removeLimit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:30:16 +01:00
Alex Moreno c6758c3346 Merge pull request 'fix: use userFilter to keep includes' (!1340) from hotFix_use_userFilter into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1340
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-06 09:26:02 +00:00
Jorge Penadés 85c4d79443 Merge pull request '#7119 add VehicleList page and routing configuration' (!1129) from 7119-createVehicle into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1129
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-06 09:24:15 +00:00
Jorge Penadés f37294f229 Merge branch '7119-createVehicle' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 10:20:43 +01:00
Jorge Penadés 017f435da6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-02-06 10:20:29 +01:00
Alex Moreno ae36d676f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-02-06 10:13:40 +01:00
Alex Moreno a1555a4c54 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 10:13:36 +01:00
Alex Moreno ab2d3fc4dc fix: use userFilter to keep includes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:12:52 +01:00
Jorge Penadés 80337c61df fix: refs #7524 dynamic fetch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:09:30 +01:00
Carlos Satorres 5d7bfec177 Merge branch '6426-refactorConstants' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 09:53:13 +01:00
Carlos Satorres ded1dae481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants 2025-02-06 09:53:09 +01:00
Alex Moreno a88696d590 Merge pull request 'fix(VnLog): load filters' (!1338) from hotFix_VnLog_filters into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-06 08:48:26 +00:00
Carlos Satorres 502f41993a Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 08:47:50 +00:00
Alex Moreno 2ed9323f0f fix(VnLog): load filters
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 08:23:46 +01:00
Javier Segarra a06cfa12a4 Merge pull request 'perf: keyshortcut directive' (!1315) from improve_shortcut_directive into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1315
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-02-06 07:14:22 +00:00
Javier Segarra 841195eca0 Merge branch 'dev' into improve_shortcut_directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 22:06:08 +00:00
Javier Segarra 698edfbe72 feat: refs #7058 expect parent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 23:03:43 +01:00
Javier Segarra 97dfeca20d fix: refs #7058 remove comment 2025-02-05 23:00:23 +01:00
Carlos Satorres 5cb2b326f1 Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 15:08:25 +00:00
Javier Segarra b5b52dcda0 Merge branch 'dev' into 7058_leftMenu_vitest
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 12:56:00 +00:00
Javier Segarra 7ece059610 test: refs #7058 clean comments
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-05 13:55:47 +01:00
Javier Segarra fcdc69d7c8 test: refs #7058 pass both tests 2025-02-05 13:48:29 +01:00
Alex Moreno a338dbed70 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 13:48:06 +01:00
Alex Moreno 676ce400ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:47:58 +01:00
Alex Moreno 1b52468e14 fix: translation
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 13:47:44 +01:00
Jose Antonio Tubau 3aa5bdac92 Merge pull request 'feat: refs #8304 added remove option to operator' (!1195) from 8304-workerChangesAndFixes into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1195
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:25:26 +00:00
Jon Elias 883eb7d57a Merge pull request 'Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334)' (!1335) from warmfix_ticketSummary_width into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1335
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-05 12:24:58 +00:00
Jose Antonio Tubau c6cf2ed144 Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:23:23 +00:00
Javier Segarra cf7bcdae7a Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334)
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #1334
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:21:39 +00:00
Javier Segarra c8943e43fd Merge pull request 'Fx[MonitorTicket]: Fixed summary dialog width' (!1334) from Fix-MonitorTicketSummaryDialog into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1334
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-05 12:19:14 +00:00
Javier Segarra b0b04ad017 Merge branch 'dev' into Fix-MonitorTicketSummaryDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:18:28 +00:00
Javier Segarra 0d2aada01f Merge branch 'dev' into improve_shortcut_directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:18:00 +00:00
Jon Elias 4848a89ca2 fix: fixed summary dialog width
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 13:17:31 +01:00
Carlos Satorres 018327a9ec Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 11:51:30 +00:00
Carlos Satorres 896626a1fd Merge branch '6426-refactorConstants' of https://gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 12:51:06 +01:00
Carlos Satorres b45e529879 fix: refs #6426 fix constants 2025-02-05 12:51:04 +01:00
Alex Moreno 2eb38382f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:16:02 +01:00
Alex Moreno 65b5094e23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:15:56 +01:00
Alex Moreno 5696a44c1b fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:15:30 +01:00
Alex Moreno 5078559668 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:04:33 +01:00
Alex Moreno a25744c4a4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:04:16 +01:00
Alex Moreno 6e8f2754e5 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:00:34 +01:00
Alex Moreno 82cc153c98 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 12:00:19 +01:00
Alex Moreno 93ece4bf07 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:58:30 +01:00
Alex Moreno 4b66a8dea5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:52:04 +01:00
Alex Moreno f7db8d671c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:49:58 +01:00
Alex Moreno 43284e3b79 fix: empty order
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:49:53 +01:00
Alex Moreno 0b7f2895a7 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 11:42:29 +01:00
Alex Moreno 2f6adfc515 Merge branch 'dev' into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 10:22:15 +00:00
Alex Moreno 7364f055b7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:16:29 +01:00
Alex Moreno 924d921b70 test: fix VnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 11:16:21 +01:00
Alex Moreno 54962fbb56 fix: workerSummary 2025-02-05 11:16:02 +01:00
Javier Segarra 5e2158daf4 test: refs #7058 chnges requested
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-05 08:29:08 +01:00
Javier Segarra 629b89fe2f Merge branch 'dev' into 7058_leftMenu_vitest 2025-02-05 08:09:33 +01:00
Jon Elias f132912da7 Merge pull request '#6242: Show all ticket problems' (!1331) from 6242-AddHasRoundingField into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1331
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:51:40 +00:00
Jon Elias f88fb130c6 Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 06:50:36 +00:00
Alex Moreno 23ae5d7b4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 07:40:30 +01:00
Alex Moreno 9ff1d3fa83 Merge pull request 'fix: update selector for buyLabel button in myEntry.spec.js' (!1329) from fix-myEntryTest into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1329
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:40:02 +00:00
Alex Moreno b5ae9ab0c5 Merge branch 'test' into fix-myEntryTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-05 06:37:11 +00:00
Alex Moreno 0ecdaf89e7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-05 07:25:36 +01:00
Alex Moreno 8c6a61a165 Merge pull request 'Warmfix[Wagon]: Fixed wagons e2e' (!1330) from Fix-WagonModuleE2E into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1330
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:20:32 +00:00
Alex Moreno a476bc2d6b Merge branch 'test' into Fix-WagonModuleE2E
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-05 06:18:50 +00:00
Jon Elias dbc1eee2e4 fix: fixed wagons e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-04 15:39:34 +01:00
Jose Antonio Tubau 01344d693e fix: update selector for buyLabel button in myEntry.spec.js
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-04 15:03:36 +01:00
Alex Moreno 419353e18b build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-04 14:44:31 +01:00
Alex Moreno 06ceaf3820 Merge pull request '8524-devToTest' (!1328) from 8524-devToTest into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1328
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-04 13:44:04 +00:00
Alex Moreno 616725b956 fix: refs #8524 parking test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-04 14:37:41 +01:00
Alex Moreno 684418c550 test: refs #8524 fix
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-04 14:25:20 +01:00
Alex Moreno 217942dfd0 fix: refs #8524 parking section router
gitea/salix-front/pipeline/pr-test Build queued... Details
2025-02-04 14:25:04 +01:00
Alex Moreno 421970ba45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-04 13:02:21 +01:00
Alex Moreno a3177f126e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-04 13:01:50 +01:00
Jose Antonio Tubau 5c5a6069ce Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 12:01:41 +00:00
PAU ROVIRA ROSALENY 2eb555f12f Merge pull request 'fix: #8422 fixed ItemTag e2e test not working' (!1301) from 8422-e2eItemTag into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1301
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-04 09:25:38 +00:00
Jon Elias c254c89bd8 Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 07:43:15 +00:00
PAU ROVIRA ROSALENY 87e0b1661b Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 06:04:26 +00:00
PAU ROVIRA ROSALENY 108edae586 Merge pull request 'feat: #7065 created unit tests for UserPanel' (!1260) from 7065-testUserPanel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1260
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-04 06:03:49 +00:00
PAU ROVIRA ROSALENY c65ac9f4db Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 06:02:39 +00:00
Jose Antonio Tubau ff28df13f8 Merge pull request 'fix: refs #8418 adjusted route for button click' (!1305) from 8418-fixTestMyEntry into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1305
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-04 06:01:44 +00:00
PAU ROVIRA ROSALENY 885437bb2e Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 06:00:00 +00:00
Javier Segarra cc9a4af169 Merge pull request 'HOTFIX: orderList column created' (!1327) from hotfix_column_created_orderList into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1327
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-03 16:21:08 +00:00
Javier Segarra ac57141c0e fix: orderList column created
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-03 16:19:33 +00:00
Jose Antonio Tubau eabe29ed5c Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-03 13:30:05 +00:00
Jose Antonio Tubau ca01ceacde fix: refs #8304 add visibility condition for notes in WorkerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 14:29:44 +01:00
Jorge Penadés 4ad8bfc210 feat: refs #7119 update icon for inactive vehicles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 14:25:21 +01:00
Jorge Penadés edbdf221ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 14:22:21 +01:00
Alex Moreno e71278d7c8 Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-03 12:55:51 +00:00
Jose Antonio Tubau 535fa77986 fix: refs #8418 correct casing in translation keys for supplier reference and issued date labels
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 13:19:26 +01:00
Jose Antonio Tubau 5b4fdcc443 Merge branch 'dev' into 8418-fixTestMyEntry
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 12:14:37 +00:00
Jose Antonio Tubau de19f2b54c refactor: refs #8418 update data-cy attribute for print labels button in EntryBuysTableDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 13:14:11 +01:00
Jorge Penadés 13f09f13d2 fix: refs #8388 update translation for VAT and Transaction fields in invoice booking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 13:04:38 +01:00
Jose Antonio Tubau 59fc86bfe9 Merge pull request 'fix: refs #7322 handle null responses in client, agency and address fetching' (!1313) from 7322-fixDestructuringErrorTicketSection into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1313
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-03 11:58:52 +00:00
Jose Antonio Tubau a4201368d7 Merge branch 'dev' into 7322-fixDestructuringErrorTicketSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 11:42:11 +00:00
Jorge Penadés 5147967bc0 feat: refs #8388 add validation for missing VAT and Transaction fields in invoice booking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 12:26:43 +01:00
Jorge Penadés e3706094c2 fix: refs #8388 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 12:03:39 +01:00
Jose Antonio Tubau 278788ead3 test: refs #7322 update getAgencies unit test to include filter parameters for enhanced API call validation
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-03 11:59:13 +01:00
PAU ROVIRA ROSALENY 11cfca5d80 fix: refs #7065 removed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
unnecessary code
2025-02-03 11:43:48 +01:00
Jose Antonio Tubau f2ef6c1c4e refactor: refs #7322 update API functions to accept filters for enhanced data retrieval
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-03 11:33:51 +01:00
PAU ROVIRA ROSALENY b4b096ef9e Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 10:31:07 +00:00
Jorge Penadés 778d8fbb67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-03 11:06:39 +01:00
Jon Elias d5f2dd8f06 Merge pull request 'Hotfix: Fixed VnPaginate' (!1322) from Hotfix-OrderCatalogPaginate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1322
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-03 08:49:28 +00:00
Carlos Satorres e18a1a6176 Merge pull request 'fix: fix grid two' (!1323) from fix-6553workerBusiness into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1323
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-03 08:32:52 +00:00
Carlos Satorres 4ddc07406a fix: fix grid two
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 09:29:08 +01:00
Javier Segarra 035a42a895 Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 08:27:28 +00:00
Jon Elias a1bba4496d fix: deleted catalog limit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-03 08:48:32 +01:00
Jon Elias 855da2b7bf fix: fixed VnPaginate
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-03 08:46:44 +01:00
Jorge Penadés 97df1d8fd2 feat: refs #8388 add total amount calculation and update invoice insertion logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 18:43:09 +01:00
Jorge Penadés f18da15262 feat: refs #8388 enhance invoice booking validation and user confirmation messages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 18:07:20 +01:00
Jorge Penadés c2042276ae fix: refs #8388 locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 16:14:09 +01:00
Jorge Penadés d8073e78ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 16:02:33 +01:00
Jorge Penadés 66665ba5dd feat: refs #8388 if is number check startsWith wip 2025-01-31 16:01:44 +01:00
Jorge Penadés c83854c4c6 fix: refs #8388 update locale 2025-01-31 14:56:27 +01:00
Jorge Penadés 359e67c734 refactor: refs #8388 improve filter and search functionality 2025-01-31 14:46:42 +01:00
Jorge Penadés 290a7273d0 fix: refs #8388 update the right row 2025-01-31 14:19:48 +01:00
Jorge Penadés 8d0d19d4c7 fix: refs #8388 update the right row 2025-01-31 14:17:08 +01:00
Jorge Penadés 6a7fcd1afe feat: refs #8388 add setCursor 2025-01-31 13:44:30 +01:00
Jon Elias 909e6674d6 Merge pull request 'Fix[VnPaginate]: Fixed paginate' (!1319) from Fix-OrderCatalogPaginate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1319
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-31 12:31:25 +00:00
Jon Elias 0fe63abba6 fix: fixed pagiante
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 13:01:28 +01:00
Jorge Penadés 42b86f05ce fix: refs #8388 improve table column widths 2025-01-31 12:53:38 +01:00
PAU ROVIRA ROSALENY 83e7a5f66a Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 10:21:14 +00:00
PAU ROVIRA ROSALENY 5ae5cec9f9 Merge pull request 'feat: #8410 added new feature to module searchbar' (!1272) from 8410-improveModuleSearchbar into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1272
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-31 10:02:49 +00:00
PAU ROVIRA ROSALENY a09f430c60 Merge branch 'dev' into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 10:01:28 +00:00
Jon Elias 0fcd969c97 Merge pull request 'Fix[ItemType]: Fixed list and e2e' (!1303) from Fix-ItemTypeE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1303
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-31 09:34:54 +00:00
Jon Elias e710d45011 Merge branch 'dev' into Fix-ItemTypeE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:33:06 +00:00
Jorge Penadés 4d23c9f24b fix: refs #6919 tests #8316
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 10:29:47 +01:00
Jorge Penadés 84651c8a17 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-31 10:27:50 +01:00
Carlos Satorres ccff995680 Merge pull request '6553-workerBusiness' (!1311) from 6553-workerBusiness into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1311
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-31 09:20:10 +00:00
Carlos Satorres d94cd801cc Merge branch 'dev' into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:16:02 +00:00
Jose Antonio Tubau 45a77a86f1 refactor: refs #8304 improve required attribute handling in VnNotes using computed property
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 10:11:10 +01:00
PAU ROVIRA ROSALENY 4eebfd8769 Merge branch 'dev' into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:10:21 +00:00
PAU ROVIRA ROSALENY 39d6e818f5 Merge branch '8410-improveModuleSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-31 10:09:51 +01:00
PAU ROVIRA ROSALENY f69ed548f0 fix: refs #8410 removed unused ref 2025-01-31 10:09:48 +01:00
Jon Elias f6439ed356 Merge pull request 'Fix[InvoiceInDescriptor]: Fixed descriptor E2E' (!1316) from Fix-InvoiceInDescriptorE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1316
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-31 09:07:25 +00:00
Jon Elias fea59a729e Merge branch 'dev' into Fix-InvoiceInDescriptorE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:04:54 +00:00
Jorge Penadés 194e7a3eb4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-31 10:00:57 +01:00
Jose Antonio Tubau 645f3f3cb9 refactor: refs #8418 update selector to use cy.dataCy instead cy.get
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:36:37 +01:00
Jose Antonio Tubau fb902b54bc refactor: refs #8304 simplify actionsChildCount computation and update saveUrl assignment in WorkerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:29:20 +01:00
PAU ROVIRA ROSALENY 5526987472 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 08:28:37 +00:00
Jon Elias c2a6dd7979 fix: fixed descriptor e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 09:26:14 +01:00
PAU ROVIRA ROSALENY 1744524949 Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 08:18:08 +00:00
PAU ROVIRA ROSALENY 5b2987c95e Merge branch 'dev' into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 08:18:04 +00:00
PAU ROVIRA ROSALENY bd2db2ef58 Merge pull request 'fix: #8425 fixed zoneWarehouse e2e test not working' (!1304) from 8423-e2eZoneWarehouse into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1304
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-31 07:49:19 +00:00
Jon Elias 4246275759 refactor: request changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 07:56:40 +01:00
Jose Antonio Tubau 858d2f842a Merge branch '7322-fixDestructuringErrorTicketSection' of https://gitea.verdnatura.es/verdnatura/salix-front into 7322-fixDestructuringErrorTicketSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 07:55:55 +01:00
Jose Antonio Tubau 5250e59389 test: refs #7322 add unit tests for getAgencies to validate agency retrieval logic 2025-01-31 07:55:53 +01:00
Jose Antonio Tubau b10cb9f09f refactor: refs #7322 update getAgencies to handle client and return default agency 2025-01-31 07:55:32 +01:00
PAU ROVIRA ROSALENY bcc4e5ba44 Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 06:52:55 +00:00
PAU ROVIRA ROSALENY 2f80bc90af fix: refs #8422 optimized get and dataCy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 07:52:09 +01:00
Jon Elias f70dd41a37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ItemTypeE2E 2025-01-31 06:40:35 +01:00
PAU ROVIRA ROSALENY 023593eb45 Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 05:21:12 +00:00
Jon Elias 67872aca10 Merge pull request '#8419: Modified list and fixed e2e' (!1302) from 8419-FixInvoiceInCorrectiveE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1302
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-31 05:10:56 +00:00
Jon Elias 59ca61c96f Merge branch 'dev' into 8419-FixInvoiceInCorrectiveE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 05:06:59 +00:00
PAU ROVIRA ROSALENY e5a449c80c Merge branch '8410-improveModuleSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 06:01:20 +01:00
PAU ROVIRA ROSALENY 0de8af81d3 fix: refs #8410 removed unused code 2025-01-31 06:01:17 +01:00
PAU ROVIRA ROSALENY 6cd0df04e6 Merge branch 'dev' into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-31 04:52:20 +00:00
PAU ROVIRA ROSALENY e13f46613f Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 04:51:53 +00:00
Javier Segarra 8e761f711d test: fix vitest test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 20:33:29 +01:00
Javier Segarra 65a8a78622 feat: improve test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 20:30:03 +01:00
Javier Segarra c067006d08 feat: modify directive 2025-01-30 20:29:54 +01:00
Javier Segarra af940c67c6 perf: replace shortcut=+ by v-shortcut=+ 2025-01-30 20:29:45 +01:00
Javier Segarra 89cdd466b1 perf: keyshortcut directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 18:04:43 +00:00
Jorge Penadés 311a40deef fix: refs #6919 test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 18:36:09 +01:00
Jorge Penadés 58ec845402 fix: refs #6919 test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 17:57:52 +01:00
Jorge Penadés 169389b5b8 test: refs #6919 fix typos in useArrayData tests and add new test cases for single record handling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 17:51:18 +01:00
Jorge Penadés 78da5f5393 test: refs #6919 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 17:29:36 +01:00
Jorge Penadés d5373ecbd6 test: refs #6919 fix tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 17:28:03 +01:00
Jorge Penadés f26290a952 chore: refs #6919 remove unused searchbar-props
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 16:47:55 +01:00
Jorge Penadés ca7ae30991 refactor: refs #6919 remove unnecessary title attribute from RoadmapDescriptor component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 16:43:02 +01:00
Jorge Penadés d4a93484c4 fix: refs #6919 update import statement for RouteFilter to include file extension
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 16:34:21 +01:00
Jorge Penadés 399f2fd8fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 16:27:31 +01:00
Jorge Penadés b083dada83 refactor: refs #6919 replace userFilter prop with filter in multiple components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 16:25:43 +01:00
Jorge Penadés f3042b0326 Merge pull request 'feat: add inactive car icon' (!1314) from updateIcons into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1314
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-30 15:07:17 +00:00
Jorge Penadés b383efd99a feat: add inactive car icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 15:38:14 +01:00
Jorge Penadés 19fd0ee71b Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 15:30:37 +01:00
Jon Elias 22ae08863b Merge pull request '#8409: Added VnSelectSupplier' (!1274) from 8409-VnSelectSupplier into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1274
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-30 14:20:06 +00:00
Jon Elias 76ebb3beb4 Merge pull request 'Hotfix[ItemRequest]: Deleted duplicate request' (!1290) from Hotfix-PurchaseRequestDuplicate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1290
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-30 14:09:59 +00:00
Jorge Penadés ffcf52a490 fix: refs #6919 remove unnecessary title attribute from TicketDescriptor component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 14:45:29 +01:00
Jon Elias abbfe7bc4a Merge branch 'master' into Hotfix-PurchaseRequestDuplicate
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-30 13:42:31 +00:00
Jorge Penadés 56d1c0ca30 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 14:01:06 +01:00
PAU ROVIRA ROSALENY 374118133a fix: refs #8410 removed unused condition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 14:00:16 +01:00
Jon Elias 788c6e8b61 Merge branch 'dev' into 8409-VnSelectSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 12:53:56 +00:00
Jon Elias 7547461282 Merge branch '8409-VnSelectSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 8409-VnSelectSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 13:52:23 +01:00
Jon Elias ed211ba14b refactor: refs #8409 deleted unused variable 2025-01-30 13:52:22 +01:00
PAU ROVIRA ROSALENY 860f92cb42 fix: refs #8410 simplified searchModule function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 13:51:12 +01:00
PAU ROVIRA ROSALENY b2414f861b Merge branch '8410-improveModuleSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 13:28:59 +01:00
PAU ROVIRA ROSALENY 42e46a88fb fix: refs #8410 removed ref from searching boolean 2025-01-30 13:28:54 +01:00
Jorge Penadés c0e3a14e8b Merge branch '8410-improveModuleSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 13:12:22 +01:00
Jorge Penadés 7759a49f3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar 2025-01-30 13:12:00 +01:00
PAU ROVIRA ROSALENY 0d7d60a1e8 Merge branch '8410-improveModuleSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 13:06:31 +01:00
PAU ROVIRA ROSALENY 3e8b35e2e1 refactor: refs #8410 restructured code 2025-01-30 13:06:28 +01:00
PAU ROVIRA ROSALENY 47603d1315 Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 11:40:16 +00:00
PAU ROVIRA ROSALENY 983b91fbdd Merge branch 'dev' into 8410-improveModuleSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 11:39:46 +00:00
PAU ROVIRA ROSALENY f6fc19f210 Merge branch '8423-e2eZoneWarehouse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 12:38:54 +01:00
PAU ROVIRA ROSALENY ed0f33dbc5 fix: refs #8423 used dataCy to get data-cy 2025-01-30 12:38:50 +01:00
Jorge Penadés c144da665e feat: refs #7119 add navigation to VehicleList in VehicleDescriptor component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 11:26:09 +01:00
Jorge Penadés e86c8f6263 fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 11:10:27 +01:00
Jorge Penadés 9c861f7544 fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 11:09:17 +01:00
Jorge Penadés 262ab78305 feat: refs #7119 add delete functionality for vehicles with Cypress test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 10:55:52 +01:00
Jorge Penadés 223e14a850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 10:25:17 +01:00
Jorge Penadés 2b474cab67 Merge pull request 'hotfix: refs #8198 ensure warehouseFk is a number when set from query' (!1308) from 8198-hotfix-parseQueryParam into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1308
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-30 09:05:04 +00:00
Jose Antonio Tubau 4d163c7e8f Merge branch 'dev' into 7322-fixDestructuringErrorTicketSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 08:12:15 +00:00
Jose Antonio Tubau de39839140 fix: refs #7322 handle null responses in client, agency and address fetching
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 09:07:08 +01:00
Carlos Satorres c97b5bffd2 Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 07:57:30 +00:00
Carlos Satorres 962ae4ca96 Merge branch 'dev' into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 07:49:58 +00:00
Jon Elias caffb672bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ItemTypeE2E 2025-01-30 08:44:47 +01:00
Jon Elias 6522df24b4 Merge pull request 'Fix[invoiceOutE2E]: Fixed InvoiceOutList e2e' (!1310) from Fix-InvoiceOutListE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1310
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-30 07:42:55 +00:00
Javier Segarra b90f6b037c Merge branch 'dev' into Fix-InvoiceOutListE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 07:19:47 +00:00
Jon Elias 71b5b8d47a fix: fixed InvoiceOutList e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-30 08:10:26 +01:00
Jorge Penadés 2d85ce32f9 fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 18:32:35 +01:00
Jorge Penadés eabb71834f fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 18:31:53 +01:00
Jorge Penadés ceb0c1fc75 fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 18:25:34 +01:00
Jorge Penadés 03bef91066 test: refs #7119 improve PIT completion by adding API interception
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 18:02:25 +01:00
Jorge Penadés 2ee2002876 test: refs #7119 await fetching data
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 17:46:33 +01:00
Jorge Penadés a3beba5906 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 16:40:20 +01:00
Javier Segarra 68d1e1662e Merge pull request '#7826 - Fix' (!1285) from 7826_fix into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1285
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-29 15:40:16 +00:00
Javier Segarra dd3059b609 Merge branch 'dev' into 7826_fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:19:55 +00:00
Javier Segarra ae0f08b2c6 Merge pull request '#7405 vueDocs' (!1284) from 7405-vueDocs into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1284
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-29 15:19:32 +00:00
Javier Segarra ebf2345fea Merge branch 'dev' into 7405-vueDocs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:18:40 +00:00
Javier Segarra 96b05de066 Merge branch 'dev' into 7826_fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:18:03 +00:00
Javier Segarra b7a841d998 Merge pull request '#7134 - supplierBalance' (!1306) from 7134-supplierBalance into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-29 15:16:49 +00:00
Javier Segarra 8c680b375a Merge branch 'dev' into 7405-vueDocs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 16:16:24 +01:00
Javier Segarra dc65f7ad20 Merge branch 'dev' into 7826_fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:14:34 +00:00
Javier Segarra b87191c4d9 Merge branch 'dev' into 7134-supplierBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:13:41 +00:00
Jorge Penadés 1e2c86c74f feat: refs #7119 enable model usage and disable right search in VehicleList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 16:07:34 +01:00
Jorge Penadés 5e89b773ff fix: refs #7119 update import for VnCard component and enhance VehicleDescriptor URL binding
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 15:58:54 +01:00
Jorge Penadés ed73a1459b Merge branch '7119-createVehicle' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 14:49:16 +01:00
Jorge Penadés 4d4598adf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-01-29 14:48:50 +01:00
Jorge Penadés ef129eb542 fix: refs #8198 correct date comparison in getBadgeAttrs function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-29 14:38:58 +01:00
Jon Elias b55ddf4cec feat: refs #6242 added e2e to verify the icons shown 2025-01-29 14:37:41 +01:00
Jon Elias 264881274d Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-29 12:34:28 +01:00
Jorge Penadés 8660b1bea4 fix: refs #8198 ensure warehouseFk is a number when set from query
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-29 12:24:26 +01:00
Alex Moreno 4050c2d3d0 Merge branch '7119-createVehicle' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 12:08:45 +01:00
Alex Moreno 6ff774f1b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-01-29 12:08:40 +01:00
Alex Moreno f3854d9682 fix: routeCard use customUrl
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-29 12:08:27 +01:00
Alex Moreno c9adf048cc fix: rightAdvancedMenu
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-29 12:03:45 +01:00
Jon Elias 8ada6bd3e3 Merge branch 'dev' into 8409-VnSelectSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 10:59:52 +00:00
PAU ROVIRA ROSALENY c104240b1e Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 10:58:24 +00:00
Jon Elias 613ebc0eb4 refactor: refs #8409 use defineModel instead or defineProps
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 11:58:19 +01:00
Alex Moreno 0a88479a9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-01-29 11:56:57 +01:00
Jorge Penadés d3cc62d910 Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 11:52:04 +01:00
Jose Antonio Tubau 74a6b20590 feat: refs #8418 add data-cy attribute for print labels button in EntryBuysTableDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 11:48:36 +01:00
Carlos Satorres d6338f1988 Merge pull request '7917-freelancerRoute' (!1307) from 7917-freelancerRoute into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1307
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-29 10:37:11 +00:00
PAU ROVIRA ROSALENY 8d2d73be46 Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 10:34:28 +00:00
Javier Segarra 2fb7db051c Merge branch 'dev' into 7134-supplierBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 08:55:44 +00:00
Javier Segarra 2be0f515c8 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance 2025-01-29 09:54:19 +01:00
Carlos Satorres 6d1767207c Merge branch 'dev' into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 08:05:27 +00:00
Carlos Satorres 19769b1a8b Merge pull request 'fix: refs #8352 fix rightPanel vnLog' (!1280) from 8352-fixVnLog into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1280
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-29 08:05:07 +00:00
Carlos Satorres 2baa7c02f0 Merge branch 'dev' into 8352-fixVnLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 08:03:22 +00:00
Jose Antonio Tubau 3652e28a61 Merge branch '8418-fixTestMyEntry' of https://gitea.verdnatura.es/verdnatura/salix-front into 8418-fixTestMyEntry
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 08:49:44 +01:00
Jose Antonio Tubau 10c9bfe266 refactor: refs #8418 remove commented issue reference from myEntry.spec.js 2025-01-29 08:49:41 +01:00
Javier Segarra 45b9cffc10 Merge pull request 'warmfix_customerList_test' (!1293) from warmfix_customerList_test into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1293
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-29 07:44:35 +00:00
Javier Segarra 179c3daba8 Merge branch 'test' into warmfix_customerList_test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-29 07:41:28 +00:00
Jose Antonio Tubau 990ed74fef Merge branch 'dev' into 8418-fixTestMyEntry
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 07:36:14 +00:00
Jose Antonio Tubau 5c280867e2 fix: refs #8418 adjusted route for button click
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-29 08:35:37 +01:00
PAU ROVIRA ROSALENY 9c790f734c Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 07:32:46 +00:00
PAU ROVIRA ROSALENY 2dbda38ae7 Merge branch '8423-e2eZoneWarehouse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-29 08:32:07 +01:00
PAU ROVIRA ROSALENY 95f96d7ebd fix: refs #8423 removed data-cy usage 2025-01-29 08:31:40 +01:00
Javi Gallego 88e040411f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-29 07:49:07 +01:00
PAU ROVIRA ROSALENY a013152a09 Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-29 06:45:51 +00:00
Javi Gallego c30070f212 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-29 07:38:33 +01:00
Javi Gallego 36554f9f32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-29 07:35:08 +01:00
Javi Gallego 63fc09ad1c fix: update setupNodeEvents to use async/await for plugin import 2025-01-29 07:35:04 +01:00
Javier Segarra d749f52771 Merge branch 'dev' into 7134-supplierBalance 2025-01-28 22:43:22 +00:00
Javier Segarra 01c4553e5f Merge branch 'dev' into 7134-supplierBalance 2025-01-28 23:38:45 +01:00
Javier Segarra c86731d9e8 test: remove only
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 23:35:35 +01:00
Javier Segarra e156629775 feat: new command
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 23:33:39 +01:00
Javier Segarra f38e184ab9 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 22:28:59 +00:00
Jorge Penadés 53aff479e6 refactor: refs #6919 update imports in CustomerDescriptor component to include onMounted lifecycle hook
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 18:32:56 +01:00
Jorge Penadés a167c983d7 fix: refs #6919 reset form data correctly in FormModel component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 18:22:11 +01:00
Jorge Penadés cc193ce160 refactor: refs #6919 update translation keys in ItemTypeCard and ShelvingList components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 18:12:32 +01:00
Jorge Penadés 533f8cfa93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-28 18:07:36 +01:00
Jorge Penadés 1d80d75e6a fix: refs #6919 refactor FormModel component state management and data handling
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 18:01:20 +01:00
Jose Antonio Tubau e1c70f9302 Merge pull request 'fix: refs #8420 ensure search bar is visible before typing and enable details test' (!1298) from 8420-fixE2eTestInvoiceInList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1298
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-28 14:03:09 +00:00
PAU ROVIRA ROSALENY e644eec1fa Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 13:47:43 +00:00
PAU ROVIRA ROSALENY 1a3446dd07 Merge branch 'dev' into 8423-e2eZoneWarehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 13:47:19 +00:00
Jon Elias a8b28de2a4 fix: fixed list and e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 14:39:28 +01:00
Jon Elias db99a22254 fix: refs #8419 modified list and fixed e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 14:36:47 +01:00
Jorge Penadés abe894c8bd Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 14:33:34 +01:00
Jose Antonio Tubau 0d9bb8af1d Merge branch 'dev' into 8420-fixE2eTestInvoiceInList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 13:18:19 +00:00
PAU ROVIRA ROSALENY 7748df1384 fix: refs #8423 fixed zoneWarehouse e2e test not working
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-28 14:09:35 +01:00
Jorge Penadés 30f61f970b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7405-vueDocs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 13:44:30 +01:00
Jorge Penadés 23aa972a85 feat: refs #7119 add vehicle routing and summary components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 13:37:07 +01:00
Carlos Satorres 804fb28e11 Merge branch 'dev' into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 12:16:49 +00:00
Carlos Satorres 0c6da68962 Merge branch 'dev' into 7917-freelancerRoute 2025-01-28 11:43:21 +00:00
Carlos Satorres 39d31ec330 fix: refs #8352 fix right
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 12:40:50 +01:00
PAU ROVIRA ROSALENY d1a27126d8 Merge branch 'dev' into 8422-e2eItemTag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 11:40:18 +00:00
PAU ROVIRA ROSALENY b8ffc8c26c fix: refs #8422 fixed ItemTag e2e test not working 2025-01-28 12:39:28 +01:00
Carlos Satorres 4132bb2b46 fix: refs #8352 fix datacy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 12:37:03 +01:00
Carlos Satorres 067ecbf2dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8352-fixVnLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 12:28:37 +01:00
Alex Moreno ff813dc97a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 12:15:08 +01:00
Alex Moreno ad5056a783 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 12:12:08 +01:00
Alex Moreno 5c761ca111 fix: scroll
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 12:12:00 +01:00
Carlos Satorres 4034320ff7 fix: refs #6553 fix qScrollArea 2025-01-28 11:59:04 +01:00
Carlos Satorres c64aad02e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-28 11:55:37 +01:00
Jon Elias 802af41a10 Merge pull request 'Fix[customereSummaryTable]: Added witdth when opening ticket summary' (!1299) from Fix-ticketDescriptorWidth into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1299
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-28 10:51:25 +00:00
Javier Segarra fa5bdfc5f6 Merge branch 'dev' into Fix-ticketDescriptorWidth
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 10:50:34 +00:00
Jon Elias 9991c4a462 fix: added witdth when opening summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 11:48:20 +01:00
PAU ROVIRA ROSALENY fb43ff5b74 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 10:43:49 +00:00
Jorge Penadés 0a6c38f959 Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 11:43:36 +01:00
PAU ROVIRA ROSALENY b2a345cf58 Merge pull request 'feat: #8258 added hover and description to uppercase button' (!1294) from warmfix_uppercaseButtonHover into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1294
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-28 10:36:16 +00:00
PAU ROVIRA ROSALENY 19994e0772 Merge branch 'test' into warmfix_uppercaseButtonHover
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 10:35:12 +00:00
Jorge Penadés 02494d4bed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7405-vueDocs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 11:34:42 +01:00
Jorge Penadés 01e9ae2dce chore: refs #7405 remove VitePress cache files and update .gitignore
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 11:25:52 +01:00
Javi Gallego c67baccaea fix: update query parameters for thermograph routing
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 11:08:22 +01:00
Carlos Satorres 879373209e refactor: entriesTotals
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 10:54:59 +01:00
PAU ROVIRA ROSALENY 5f45434d89 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 09:37:47 +00:00
Jose Antonio Tubau c4dcac8c00 fix: refs #8420 ensure search bar is visible before typing and enable details test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 10:22:22 +01:00
PAU ROVIRA ROSALENY c8cd14f991 fix: refs #7065 made consts for repeated values
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 10:07:51 +01:00
Jon Elias 55ac9e9329 Merge pull request 'Hotfix[ItemType]: Fixed itemType translations' (!1297) from Hotfix-ItemType into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1297
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-28 08:58:07 +00:00
Jose Antonio Tubau cc07d42de8 Merge pull request 'fix: refs #8316 fix broken localizations for entry descriptor menu and items filter panel' (!1288) from 8316-fixEntryLocalizations into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1288
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-28 07:51:23 +00:00
Jose Antonio Tubau f385dd4e83 Merge branch 'test' into 8316-fixEntryLocalizations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 07:50:15 +00:00
Javier Segarra 3a8c35521e Merge branch 'dev' into 7134-supplierBalance 2025-01-28 08:47:54 +01:00
Jon Elias 15487bfbf2 fix: item type translations
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-28 08:42:31 +01:00
Alex Moreno 01e726c6f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 08:23:45 +01:00
Alex Moreno b26bdd861b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-28 08:23:44 +01:00
Jon Elias 511f7ea283 Merge pull request 'Fix_TicketSummary[Address]: Show new field' (!1282) from Fix-TicketSummaryAddress into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1282
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-28 07:18:53 +00:00
Jon Elias 4ecce6af0a Merge branch 'dev' into Fix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 07:13:25 +00:00
Alex Moreno 0f1d13e961 fix: use rightMenu
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 08:04:41 +01:00
Alex Moreno 5d6c14f4d7 fix(fixedPrice): hotFix subtoolbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-28 08:01:01 +01:00
PAU ROVIRA ROSALENY 8146aa5231 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 06:59:18 +00:00
Jose Antonio Tubau f9c874df2c Merge branch 'test' into 8316-fixEntryLocalizations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 06:52:45 +00:00
PAU ROVIRA ROSALENY 2f19f093cb feat: #8258 added hover and description to uppercase button
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 06:49:39 +00:00
Jose Antonio Tubau 6a17f87050 refactor: refs #8316 update Spanish translations for ItemsFilterPanel
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 07:46:16 +01:00
Alex Moreno afee23b99d Merge pull request '8452-testToMaster' (!1292) from 8452-testToMaster into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1292
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-01-28 06:44:16 +00:00
Jon Elias 2f283d1a78 Merge branch 'dev' into Fix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-28 06:28:55 +00:00
Alex Moreno a0a7ef6734 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8452-testToMaster
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-28 07:17:43 +01:00
Alex Moreno 8b916016c6 Merge pull request 'warmifx: Customer_filters' (!1131) from warmifx_customer_filters into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-28 06:17:30 +00:00
Jose Antonio Tubau 9121929359 Merge branch 'test' into 8316-fixEntryLocalizations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-28 06:07:31 +00:00
Javier Segarra e923ebcc72 Merge branch 'test' into warmifx_customer_filters
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 18:05:16 +00:00
Javier Segarra db2844efdb Merge branch 'test' into warmfix_customerList_test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 19:01:21 +01:00
Javier Segarra a5adc7550c style: customerDescriptor
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 19:00:46 +01:00
Javier Segarra 0910425c5c feat: add addressFk 2025-01-27 19:00:27 +01:00
Javier Segarra ff61a5931b test: fix clientList spec 2025-01-27 19:00:07 +01:00
Javi Gallego de6b4f1951 Merge pull request '8381-thermographTravel' (!1244) from 8381-thermographTravel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1244
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 15:21:40 +00:00
Javi Gallego d64c9e2a34 Merge branch 'dev' into 8381-thermographTravel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 16:20:04 +01:00
Alex Moreno d3e6462aed build: refs #8452 add change log
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-27 15:24:08 +01:00
Alex Moreno a5ea756bc2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 14:39:28 +01:00
Alex Moreno b0420ee2b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-27 14:37:57 +01:00
Javier Segarra ba3f6a79e6 style: customerList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 14:31:54 +01:00
Javier Segarra b266c44d34 fix: sage params
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 14:30:59 +01:00
Javier Segarra 8cbb97af29 Merge branch 'test' into warmifx_customer_filters
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 14:08:59 +01:00
Javier Segarra 0916afbe37 fix: changel i18n 2025-01-27 14:04:37 +01:00
Javier Segarra 9dd216269a fix: vnSelectWorker fix template
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-01-27 14:03:38 +01:00
Javier Segarra d1ba6e580f fix: params
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-01-27 13:52:44 +01:00
Javier Segarra 13cd59c6bb fix: socialName filter 2025-01-27 13:52:37 +01:00
Jon Elias 9565f97c4f fix: deleted duplicate request
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-27 13:37:14 +01:00
Jon Elias 3aa8acf02a fix: refs #8409 deleted code due to merge
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 13:26:08 +01:00
Jon Elias 0db556a97b fix: refs #8409 deleted code of merge
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 13:21:38 +01:00
Jon Elias 8642089bc7 Merge branch 'dev' of https: refs #8409//gitea.verdnatura.es/verdnatura/salix-front into 8409-VnSelectSupplier 2025-01-27 13:21:27 +01:00
Robert Ferrús 73f421f19e Merge pull request 'feat: refs #8387 crudModel' (!1206) from 8387-itemTagCrudModelFront into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1206
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 11:38:12 +00:00
Robert Ferrús 2cc04da76c feat: refs #8387 refs#8387 change request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 12:27:58 +01:00
Carlos Satorres 822058b491 fix: refs #6426 constants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 11:37:50 +01:00
Carlos Satorres e413acf85d Merge branch 'dev' of https: refs #6426//gitea.verdnatura.es/verdnatura/salix-front into 6426-refactorConstants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 11:33:58 +01:00
Robert Ferrús a5ea7ab104 Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 10:26:39 +00:00
Carlos Satorres 23f889af07 Merge branch 'dev' of https: refs #7917//gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-27 11:18:42 +01:00
Robert Ferrús a34c6e1ecf Merge pull request '6822-createEntryTransferOption' (!1267) from 6822-createEntryTransferOption into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1267
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 10:08:34 +00:00
Robert Ferrús a251053a84 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 10:06:20 +00:00
Alex Moreno 24266b53d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 10:24:37 +01:00
Alex Moreno 6b87402a6a refactor: advancedMenu button inside searchbar 2025-01-27 10:24:35 +01:00
Jon Elias 5927a60de2 Merge pull request '#8450: Added new icon's version' (!1266) from 8450-AddIconsV1-76 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1266
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 09:13:59 +00:00
Jon Elias b69f3a08be Merge branch 'dev' into 8450-AddIconsV1-76
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 09:11:33 +00:00
Robert Ferrús 9472f13695 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 09:01:22 +00:00
Alex Moreno d292395bb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 10:00:17 +01:00
Jon Elias 9c50079bfc Merge pull request '#7317: Deleted warnings' (!1261) from 7317-SupplierWarnings into dev
gitea/salix-front/pipeline/head Build queued... Details
Reviewed-on: #1261
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 09:00:14 +00:00
Alex Moreno 02da97a8df fix(VnSection): destroy data when unmounted 2025-01-27 10:00:09 +01:00
Jon Elias 7121dc4e0d Merge branch 'dev' into 7317-SupplierWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:56:33 +00:00
Jon Elias 2027c365fa Merge pull request '#8120: Compact summaryPopup' (!1200) from 8120-CompactSummaryPopup into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1200
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 08:54:07 +00:00
Alex Moreno f2832d71de Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:44:23 +00:00
Jon Elias 376323652b Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:44:07 +00:00
Jon Elias 932457fcde Merge pull request '#8351: Deleted skip and fixed TicketList e2e' (!1275) from 8351-FixTicketsE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1275
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 08:41:48 +00:00
Jon Elias 6696bc8841 Merge branch 'dev' into 8351-FixTicketsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:39:24 +00:00
Alex Moreno 6fee57be87 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1145) from 8316-invoiceInCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1145
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 08:39:04 +00:00
Alex Moreno e7628d3e4b fix: refs #8316 filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 09:36:19 +01:00
Jon Elias 3334349163 Merge branch 'dev' into 8351-FixTicketsE2E
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:35:59 +00:00
Alex Moreno b47d022f94 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:32:19 +00:00
Alex Moreno 431a68a0ad Merge branch 'dev' into 7317-SupplierWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:29:14 +00:00
Jose Antonio Tubau 8d4dc5d9e1 fix: refs #8316 fix broken localizations for entry descriptor menu and items filter panel
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-27 09:17:19 +01:00
Robert Ferrús 9deb5bceea Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:05:51 +00:00
Jon Elias 2b3ca85af4 Merge pull request 'Fix: Deleted duplicate request' (!1242) from Fix-ItemRequestDuplicate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1242
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 08:00:48 +00:00
Jon Elias f6494a077e Merge branch 'dev' into Fix-ItemRequestDuplicate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:59:55 +00:00
Robert Ferrús 75ba4d4fd9 feat: refs #8387 changes request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:57:24 +01:00
Alex Moreno 764bd3915e Merge pull request 'refactor: #8322 changed Route component to use VnSection/VnCardBeta' (!1141) from 8322-route into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1141
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 07:41:38 +00:00
Alex Moreno 45982a8a7d Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:40:42 +00:00
Alex Moreno 8bb0923c8b Merge branch 'dev' into Fix-ItemRequestDuplicate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:30:41 +00:00
Alex Moreno 83ab3eb31e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 08:29:52 +01:00
Alex Moreno 1322dad63d fix(VnCardBeta): add userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 08:29:42 +01:00
Alex Moreno 2cd4058c1e Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:24:18 +00:00
Alex Moreno a1eda5350f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 08:23:23 +01:00
Alex Moreno 198db0df49 fix(VnCardBeta): add userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-27 08:23:09 +01:00
Alex Moreno be3f853b14 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:17:21 +00:00
Alex Moreno 6a9bbd93e8 feat: refs #8322 fix route.js and unify with /roadmap
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 08:16:29 +01:00
Robert Ferrús 421b54cebe Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:10:56 +00:00
Robert Ferrús eaf5f491eb Merge pull request '6629-addressObservation' (!1286) from 6629-addressObservation into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1286
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 07:02:10 +00:00
Alex Moreno f7e0fbf728 feat: refs #8322 fix route.js and unify with /agency
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 07:46:11 +01:00
Robert Ferrús 26643fb158 Merge branch 'dev' into 6629-addressObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 06:33:49 +00:00
Alex Moreno 34bf15c573 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 06:32:34 +00:00
Javier Segarra 0aa9975535 perf: refs #7826 code onError
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-26 23:49:40 +01:00
Javier Segarra 24c62b4533 perf: refs #7826 improve condition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-26 03:16:25 +01:00
Javier Segarra 94d471e20f Merge branch 'dev' into 7826_fix 2025-01-26 03:08:54 +01:00
Javier Segarra 0c714d2c04 feat: refs #7826 add error handling and refresh icon to NavBar 2025-01-25 09:20:07 +01:00
Jorge Penadés cbcb2f2c71 feat: refs #7405 add navigation links and documentation for useArrayData composable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 18:00:02 +01:00
Jorge Penadés 04a6a49565 chore: refs #7405 remove examples documentation 2025-01-24 17:51:47 +01:00
Jorge Penadés 8d8944afb3 feat: refs #7405 add initial documentation and components for Lilium 2025-01-24 17:51:30 +01:00
Jorge Penadés 1069960d98 fix: refs #7119 rollback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 16:39:32 +01:00
Jorge Penadés 5e5f1fe88b feat: refs #7119 disable column filter for description in VehicleList component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 16:37:41 +01:00
Jorge Penadés cc0c73a91a feat: refs #7119 update VehicleList and routing for RouteCard with nested components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 16:13:59 +01:00
Jorge Penadés a06696df01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 16:08:56 +01:00
Jose Antonio Tubau 22ed652b9e Merge pull request 'feat: refs #7322 add address selection for ticket transfer' (!1224) from 7322-addSelectAddressOnTicketTransfer into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1224
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-24 14:48:05 +00:00
Jose Antonio Tubau 023a3b541a Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 14:47:15 +00:00
Javier Segarra c556a8b82d Merge pull request 'fix: use right endpoint for CustomerList' (!1283) from hotfix_customerExtendedList into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-24 14:41:20 +00:00
Javier Segarra fb5b347bb6 fix: use right endpoint for CustomerList
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-24 15:38:47 +01:00
Jose Antonio Tubau fceb5dd5fd refactor: refs #8304 improving attrs handling and simplify logic in VnNotes, VnSubToolbar, and WorkerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 14:38:37 +01:00
Jon Elias d4d03c160b fix: modified front to show new field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 13:49:39 +01:00
Jorge Penadés aa1aaa98ff feat: refs #7119 add VehicleCard route with nested VehicleSummary and VehicleBasicData components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 13:44:17 +01:00
Jon Elias 51c1e8a2e1 Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-24 13:35:35 +01:00
Robert Ferrús 935b382ef2 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 12:17:30 +00:00
Robert Ferrús b2e54e1f7f feat: refs #6822 change request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 13:16:17 +01:00
Jorge Penadés 9baa32f6d2 refactor: refs #7119 remove Vehicle module and update router configuration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 13:08:56 +01:00
Alex Moreno 8b4dc73a2c Merge branch 'dev' into 6629-addressObservation 2025-01-24 11:30:13 +00:00
Jon Elias 13b0becb6e Merge branch 'dev' of https: refs #8409//gitea.verdnatura.es/verdnatura/salix-front into 8409-VnSelectSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 12:16:05 +01:00
Jorge Penadés 282ca08605 refactor: refs #7119 remove VehicleSearchbar component and update locale keys for search functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 11:58:23 +01:00
Jose Antonio Tubau 559bf0db02 refactor: refs #8304 restore correct classes on QToolbar and add null safety in actions.value check
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:56:42 +01:00
Robert Ferrús c465286718 Merge pull request 'feat: refs #8077 sumDefaulter' (!1239) from 8077-sumDefaulterFrontFix into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1239
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-24 10:55:37 +00:00
Robert Ferrús fb18d5eace Merge branch 'dev' into 8077-sumDefaulterFrontFix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:47:56 +00:00
Alex Moreno 3ef82599ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 11:47:24 +01:00
Alex Moreno f7b1d7bd37 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 11:47:13 +01:00
Robert Ferrús 9269d17e85 Merge branch 'dev' into 8077-sumDefaulterFrontFix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:46:14 +00:00
Jose Antonio Tubau 74eb296285 fix: refs #8304 update VnSubToolbar to correctly toggle full-width class based on actionsChildCount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:45:54 +01:00
Alex Moreno 658747d479 fix: empty store.order
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 11:45:03 +01:00
Jorge Penadés cd82a208cc Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:35:33 +01:00
Alex Moreno 16ca18c945 Merge pull request 'fix: refs #8347 remove skip, fix unpaid' (!1273) from 8347-fixCustomerUnpaidTest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1273
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-24 10:28:57 +00:00
Alex Moreno 4476df4608 Merge branch 'dev' into 8347-fixCustomerUnpaidTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:28:04 +00:00
Javier Segarra 5ec1d7d311 feat: refs #8304 workerCalendar remove extra VnNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:11:52 +01:00
Javier Segarra d4d4bed74b feat: refs #8304 workerCalendar Teleport
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:11:02 +01:00
Javier Segarra eaaeb028e3 Merge branch '8304-workerChangesAndFixes' of https: refs #8304//gitea.verdnatura.es/verdnatura/salix-front into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 11:09:45 +01:00
Javier Segarra 71967591d3 test: refs #8304 improve test 2025-01-24 11:07:53 +01:00
Javier Segarra 012b401414 feat: refs #8304 remove st-default 2025-01-24 11:07:39 +01:00
Jorge Penadés d86548f70e feat: refs #7119 add notification for successful vehicle removal and update locale files
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 11:06:45 +01:00
Jorge Penadés d40b6fb06b feat: refs #7119 implement async delete functionality for vehicle items
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 10:53:28 +01:00
Jorge Penadés 2e4610847d feat: refs #7119 add vehicle parameters and improve filter functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 10:46:44 +01:00
Alex Moreno ae96349cff Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:39:41 +01:00
Alex Moreno a8a74cdb48 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1146) from 8316-invoiceOutCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1146
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-24 09:35:18 +00:00
Alex Moreno 28905063b2 fix: refs #8316 filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:34:01 +01:00
Alex Moreno 661f7bacd6 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:28:20 +01:00
Alex Moreno cfcbb8bce5 Merge pull request 'refactor: #8322 changed Travel component to use VnSection/VnCardBeta' (!1220) from 8322-travel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1220
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-24 09:14:18 +00:00
Alex Moreno 1dc19a6eaa fix: refs #8322 filter and params
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:11:30 +01:00
Alex Moreno 6ff1ae96d5 Merge branch 'dev' into 8322-travel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 09:04:53 +00:00
Alex Moreno cbf7ef7ccf Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1150) from 8316-parkingCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1150
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-24 09:04:05 +00:00
Alex Moreno c6f613c5e5 fix: refs #8316 redirections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 10:02:23 +01:00
Jorge Penadés 55ab885ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 09:36:58 +01:00
Robert Ferrús 2ee3ba5251 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:31:13 +00:00
Jose Antonio Tubau 864e187a4e Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:20:55 +00:00
Alex Moreno 221dda174a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:08:25 +00:00
Alex Moreno 10448b9d77 Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1147
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-24 08:06:47 +00:00
Alex Moreno 6e588278d8 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:05:49 +00:00
Alex Moreno 1455d8ce02 fix: refs #8316 filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 09:04:01 +01:00
Alex Moreno e38e9b1dd7 fix: refs #8316 filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 09:01:54 +01:00
Alex Moreno 8e3fad60c0 fix: refs #8316 icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:59:47 +01:00
Carlos Satorres 227d3a8c88 fix: refs #8352 fix rightPanel vnLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:59:12 +01:00
Jon Elias 26bc5401f1 Merge pull request '#8339 - fix_preview' (!1277) from 8339_fix_preview into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1277
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-24 07:55:19 +00:00
Javier Segarra a3acb3b190 Merge branch 'dev' into 8339_fix_preview
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 07:51:20 +00:00
Alex Moreno 55d86d3153 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 08:40:50 +01:00
Alex Moreno e6279ff261 build: merge master in test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 08:38:24 +01:00
Jose Antonio Tubau 686bacd38a refactor: refs #8304 replace Teleport with RightMenu for WorkerCalendarFilter component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:36:20 +01:00
Alex Moreno d0176303da Merge pull request 'fix: order when is string' (!1279) from hotFix_fixOrderStringArray into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1279
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-24 07:32:58 +00:00
Javier Segarra 2c6d3de784 Merge branch 'master' into hotFix_fixOrderStringArray
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-24 07:25:46 +00:00
Javier Segarra c61e4d30f6 Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' (!1276) from hotfix_customerDescriptor_orderBtn into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1276
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-24 07:24:59 +00:00
Alex Moreno 5b448e5bb3 fix: order when is string
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-24 08:24:12 +01:00
Jose Antonio Tubau 878845627a Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 07:20:31 +00:00
Javier Segarra f0dc7b4a41 fix: import component
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-24 08:19:53 +01:00
Javier Segarra bddfd91de1 perf: refs #8339 minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 08:09:48 +01:00
Javier Segarra d9cc35280b feat: refs #8339 define global.spreview 2025-01-24 08:09:31 +01:00
Javier Segarra 58fd5a8326 perf: refs #8339 removew preview tag 2025-01-24 08:09:14 +01:00
Alex Moreno 23e1a58f28 fix: refs #8316 advanced-menu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 07:32:02 +01:00
Alex Moreno e53990d880 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 06:19:26 +00:00
Jon Elias 3a20752ed3 Merge branch '7317-SupplierWarnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 7317-SupplierWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 07:13:49 +01:00
Jon Elias 2298d4582f Merge branch 'dev' of https: refs #7317//gitea.verdnatura.es/verdnatura/salix-front into 7317-SupplierWarnings 2025-01-24 07:13:39 +01:00
Javier Segarra d5ea4fb46d perf: eslint
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-01-24 00:26:31 +01:00
Javier Segarra 00c90b29e9 fix: remove "Go to module index" i18n value
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-01-24 00:24:19 +01:00
Javier Segarra f4adedb4f1 fix: replace GoToUser by NewOrder 2025-01-24 00:23:31 +01:00
Jorge Penadés 9f815937a5 feat: refs #7119 add delivery points fetching and selection to VehicleBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 18:10:50 +01:00
Jorge Penadés 01dd584028 feat: refs #7119 remove delivery point references from VehicleFilter and VehicleList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 18:04:34 +01:00
Jorge Penadés 834f686475 feat: refs #7119 add delivery point localization and update vehicle forms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 18:02:57 +01:00
Jon Elias 867ac12042 Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 15:41:39 +00:00
Jon Elias 3453e1007b fix: refs #8120 ticket descriptor & summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 16:40:22 +01:00
Jon Elias c59bc170a6 refactor: refs #8351 put appropriate name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 16:07:04 +01:00
Jon Elias b67a6d5d75 refactor: refs #8351 deleted skip and fixed TicketList e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 15:49:00 +01:00
Jose Antonio Tubau 6601e2e0ae fix: refs #8304 remove unnecessary v-if condition from VnDmsList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 15:33:19 +01:00
Jose Antonio Tubau d45bf43f6e Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 15:05:24 +01:00
Jose Antonio Tubau 5bb165757a Merge pull request 'test: refs #7073 add unit tests for VnDms component' (!1198) from 7073-createTestToVnDms into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1198
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-23 13:55:32 +00:00
Jose Antonio Tubau 9b3ebff1c7 Merge branch 'dev' into 7073-createTestToVnDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 13:54:31 +00:00
Jose Antonio Tubau ff6e1c178d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7322-addSelectAddressOnTicketTransfer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 14:43:54 +01:00
Jose Antonio Tubau 99df3c5df2 refactor: refs #7322 extract repeated functions and create tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 14:28:21 +01:00
Jorge Penadés a53f41a0b7 feat: refs #7119 update VehicleSummary layout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 14:23:31 +01:00
Jon Elias ac998d33aa feat: refs #8409 added VnSelectSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 14:03:47 +01:00
Javier Segarra 31a5dd653c fix: refs #7826 init 2025-01-23 13:49:21 +01:00
Jose Antonio Tubau 3a2fca110c test: refs #8304 enhance VnNotes.spec.js with additional test cases and refactor setup functions
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 13:38:19 +01:00
Carlos Satorres c77a462cb6 fix: refs #8347 remove skip, fix unpaid
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 13:34:09 +01:00
Robert Ferrús a0f4b74422 Merge branch 'dev' into 8077-sumDefaulterFrontFix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 12:31:18 +00:00
Jorge Penadés 39180c1b3a feat: refs #7119 update VehicleSummary layout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 12:51:38 +01:00
PAU ROVIRA ROSALENY 6cba927ebc feat: refs #8410 added new feature to module searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 12:18:31 +01:00
PAU ROVIRA ROSALENY 5930985f0b Merge branch '8322-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 10:57:19 +01:00
PAU ROVIRA ROSALENY cd5654d91e Merge branch '8322-route' of https: refs #8322//gitea.verdnatura.es/verdnatura/salix-front into 8322-route 2025-01-23 10:57:16 +01:00
PAU ROVIRA ROSALENY f01ed28d95 feat: refs #8322 added RouteRoadmap and Agency 2025-01-23 10:56:37 +01:00
Jorge Penadés 37d8cc1b49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 10:53:11 +01:00
Jorge Penadés 4836b14e3e feat: refs #7119 update vehicle components and localization, add vehicle type selection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 10:52:50 +01:00
Robert Ferrús bf4faa88a1 Merge pull request 'feat: refs #8398 moveTicketsFuture' (!1223) from 8398-mergeSendCheckingPresence into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1223
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-23 09:50:56 +00:00
Carlos Satorres 1ee8b68fce fix: refs #6553 fix vnTable 2025-01-23 10:50:10 +01:00
Carlos Satorres b7e71044b0 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-23 10:27:57 +01:00
Carlos Satorres c8fe115fec fix: refs #6553 fix PR, fix vnTableCard 2025-01-23 10:25:07 +01:00
Robert Ferrús c3b4856125 feat: refs #6629 traduction message 2025-01-23 10:05:27 +01:00
Robert Ferrús b9c7baa136 Merge branch 'dev' into 6629-addressObservation 2025-01-23 08:24:23 +00:00
Robert Ferrús 961c9a6973 Merge branch 'dev' into 8398-mergeSendCheckingPresence
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 08:22:02 +00:00
Robert Ferrús 1b567f8fa0 Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix-front into 8077-sumDefaulterFrontFix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 09:19:39 +01:00
Robert Ferrús 2ffcb6dfe8 feat: refs #8077 changes request
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 09:14:54 +01:00
Jon Elias 8c46ee45c2 Merge pull request '#7184: Added myTeam filter at WorkerFilter' (!1271) from 7184-MyTeamFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-23 08:03:02 +00:00
Jon Elias 807567cede Merge branch 'dev' into 7184-MyTeamFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 07:59:45 +00:00
Jon Elias 4c7a730d08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-23 08:54:33 +01:00
Alex Moreno e024d37f77 Merge branch 'dev' into 6629-addressObservation 2025-01-23 07:33:40 +00:00
PAU ROVIRA ROSALENY 2070a142fd Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 07:28:36 +00:00
PAU ROVIRA ROSALENY c8bbb7c08b Merge branch '8322-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-route 2025-01-23 08:28:11 +01:00
Alex Moreno f9dd927292 Merge pull request '#8197 - advancedMenu' (!1248) from 8197-advancedMenu into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1248
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-23 07:27:36 +00:00
Alex Moreno a0895488b4 Merge branch 'dev' into 8197-advancedMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 07:20:05 +00:00
Alex Moreno f86dc7b60f fix: defineProps not import
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-23 08:19:42 +01:00
Alex Moreno 58edd511dc fix: refs #8197 improve code robustness by adding optional chaining and fixing syntax errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 08:18:24 +01:00
Jose Antonio Tubau 2068fa4795 Merge branch 'dev' into 7073-createTestToVnDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 07:08:58 +00:00
PAU ROVIRA ROSALENY 9f439a686f Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-23 06:34:20 +00:00
PAU ROVIRA ROSALENY b4741c9e6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-route 2025-01-23 07:33:46 +01:00
Alex Moreno fc886c2a8b Merge branch 'dev' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-advancedMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 07:33:45 +01:00
Alex Moreno a58f31f7d8 fix: change name
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-23 07:18:28 +01:00
Jon Elias 81718c0c4d feat: refs #7184 added myTeam filter at WorkerFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 16:35:13 +01:00
Jose Antonio Tubau adc9d1630b refactor: refs #8304 put year and contract selectors in the same line
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 16:32:41 +01:00
Jose Antonio Tubau 8599974437 feat: refs #8304 add required prop to VnNotes and update related components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 16:29:04 +01:00
Jose Antonio Tubau 3b4af9c749 Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 16:20:48 +01:00
Carlos Satorres 7144bb3871 fix: refs #6553 fix pr 2025-01-22 14:13:15 +01:00
Javier Segarra 3ef43531c3 Merge pull request 'style: perf max-width rule' (!1270) from hotfix_checbox_css into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1270
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-22 13:09:48 +00:00
Javier Segarra 0658785a9a style: perf max-width rule
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-22 13:03:23 +00:00
Jorge Penadés 0c59ca8e49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2025-01-22 12:42:15 +01:00
PAU ROVIRA ROSALENY a6adec0407 Merge pull request 'feat: #7103 created test for VnSearchbar' (!1256) from 7103-testVnSearchbar into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1256
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-22 11:15:20 +00:00
PAU ROVIRA ROSALENY d361ecd514 Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 11:13:37 +00:00
Alex Moreno 273d086154 Merge pull request 'feat: refs #7196 update vite and q-calendar' (!1264) from 7196-updateVite into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1264
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-22 11:05:56 +00:00
Alex Moreno a8870ec46a Merge branch 'dev' into 7196-updateVite
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 11:02:17 +00:00
PAU ROVIRA ROSALENY ffe17751d9 Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 10:43:41 +00:00
Javier Segarra 88ce527bf1 Merge pull request '#7308 - Warning inject' (!1065) from 7308_warning into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1065
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-22 10:41:32 +00:00
PAU ROVIRA ROSALENY f94c457263 Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 10:40:49 +00:00
PAU ROVIRA ROSALENY ea4a46d9c7 fix: refs #7103 used consts for repeated variables
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-22 11:40:25 +01:00
Alex Moreno 0b17da1b76 Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 11:11:42 +01:00
Alex Moreno 675820eff6 fix: refs #7196 not neccessary 2025-01-22 11:11:41 +01:00
Jon Elias 3b0d0afddb Merge pull request 'Warmfix[WorkerDescriptor]: link to DepartmentDescriptor' (!1269) from Warmfix-WorkerDescriptorLink into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-22 10:03:34 +00:00
Javier Segarra 48a1f89399 Merge branch 'dev' into 7196-updateVite
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 10:01:38 +00:00
Javier Segarra c19f49dcdd Merge branch 'dev' into 7308_warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 10:01:05 +00:00
Alex Moreno 650a5409b1 Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 10:58:01 +01:00
Alex Moreno 155b8b3743 fix: refs #7196 sass 2025-01-22 10:57:59 +01:00
Alex Moreno 1bbee11ec0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1142) from 8316-customerCardWithVnCardBeta into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1142
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-22 09:11:30 +00:00
Javier Segarra 8dc277ec2a Merge branch 'dev' into 7196-updateVite
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 08:58:28 +00:00
Alex Moreno 467cd8faf7 Merge branch 'dev' into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:42:53 +00:00
Jon Elias 6b84f24a08 Merge pull request 'Fix[VnLocation]: fixed label and warnings' (!1268) from Fix-VnLocationLabel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1268
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-22 08:41:17 +00:00
Jon Elias 82010f1684 Merge branch 'dev' into Fix-VnLocationLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:40:18 +00:00
Jon Elias bb2c3fef51 fix: department descriptor link
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-22 09:36:56 +01:00
Jon Elias f536d08317 fix: fixed VnLocation and warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 09:27:58 +01:00
Alex Moreno 18737878a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 09:27:41 +01:00
Alex Moreno ba8db3b73f Merge branch 'dev' into 7196-updateVite
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 08:26:55 +00:00
Jose Antonio Tubau d499565ca3 Merge pull request 'test: refs #7075 add unit tests for VnInput component' (!1209) from 7075-createTestToVnInput into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-22 08:23:39 +00:00
Jose Antonio Tubau 47cb1c2586 Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 08:18:58 +00:00
Alex Moreno 092745a069 perf: refs #7196 update eslint
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-22 09:13:30 +01:00
Alex Moreno 9cd56bb33d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 09:05:58 +01:00
Robert Ferrús 9d77c0bc93 Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 07:42:00 +00:00
Robert Ferrús 13290aa44b feat: refs #8077 changes request
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 08:34:13 +01:00
Javier Segarra 1ec91add8e Merge branch 'dev' into 7308_warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 06:45:37 +00:00
Robert Ferrús db54277bc0 Merge branch 'dev' into 8077-sumDefaulterFrontFix
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 06:35:30 +00:00
PAU ROVIRA ROSALENY d33909ad01 Merge branch '7103-testVnSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 07:30:31 +01:00
PAU ROVIRA ROSALENY 2aa7177449 fix: refs #7103 updated tests for new changes 2025-01-22 07:30:28 +01:00
PAU ROVIRA ROSALENY 4f31e7c553 Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 06:29:52 +00:00
Robert Ferrús 29f7bb1038 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-22 06:05:07 +00:00
Javier Segarra 1ba24b46db test: refs #7058 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 23:37:58 +01:00
Javier Segarra 14ac4f7de6 Merge branch 'dev' into 7058_leftMenu_vitest 2025-01-21 23:21:01 +01:00
Javier Segarra 390c530d39 Merge branch 'dev' into 7134-supplierBalance 2025-01-21 22:15:29 +00:00
Javier Segarra 023d232ab5 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance 2025-01-21 23:08:49 +01:00
Javier Segarra 44c7b87726 perf: refs #7134 use where to get only EUR currency 2025-01-21 23:08:42 +01:00
Javier Segarra ae19e8b3c6 perf: refs #7134 use map-key 2025-01-21 23:07:39 +01:00
Jon Elias c6a20d80d6 refactor: refs #6242 added new icons and modified taxDataChecked 2025-01-21 16:26:38 +01:00
Jon Elias 8ff78a0a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-21 16:22:31 +01:00
Jon Elias 9e254a0c33 feat: refs #8450 added new version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 15:29:48 +01:00
Alex Moreno fe7b37fd15 Merge pull request 'fix(VnSection): refs #8197 check route' (!1263) from 8197-better_check_route into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1263
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 14:11:35 +00:00
Javier Segarra 7d39211eeb Merge branch 'dev' into 8197-better_check_route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:57:29 +00:00
Javier Segarra b74ee04557 Merge branch 'dev' into 7134-supplierBalance 2025-01-21 13:56:21 +00:00
Javier Segarra 100e3b4d72 perf: refs #7134 format columns 2025-01-21 14:56:07 +01:00
Javier Segarra ea9e099523 perf: refs #7134 currencies fetch 2025-01-21 14:53:48 +01:00
Jon Elias 0659298b5f Merge branch 'dev' into 7317-SupplierWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:53:07 +00:00
Jose Antonio Tubau 5618c1f53a Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:51:53 +00:00
Jon Elias 4c1631478c refactor: refs #7317 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 14:51:45 +01:00
PAU ROVIRA ROSALENY 247701125c Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 13:50:37 +00:00
Jose Antonio Tubau 9cdcb63603 Merge pull request 'test: refs #8380 add unit tests for VnImg component' (!1218) from 8380-createTestToVnImg into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1218
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 13:49:52 +00:00
Jose Antonio Tubau d1168c3014 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:48:46 +00:00
PAU ROVIRA ROSALENY 95a673a8ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7103-testVnSearchbar 2025-01-21 14:48:35 +01:00
Jose Antonio Tubau 83064c3813 feat: refs #8304 add saveUrl prop to VnNotes and implement confirm update functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 14:44:07 +01:00
PAU ROVIRA ROSALENY 1f5823536f Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 13:41:45 +00:00
PAU ROVIRA ROSALENY 6758c0a4e0 Merge branch '7103-testVnSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7103-testVnSearchbar 2025-01-21 14:41:31 +01:00
PAU ROVIRA ROSALENY 5e6a83c001 fix: refs #7103 removed unused code on spies 2025-01-21 14:41:28 +01:00
PAU ROVIRA ROSALENY faf1d15283 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:37:15 +00:00
Alex Moreno 7054ad1d40 feat: refs #7196 update vite and q-calendar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 14:15:57 +01:00
Alex Moreno 979c96c5ac perf: refs #8197 perf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 14:11:03 +01:00
Alex Moreno 5b5eca0606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-better_check_route 2025-01-21 14:07:29 +01:00
Javier Segarra 58edb1007a Merge pull request 'fix: init' (!1262) from fix_quasar_lang into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1262
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 13:03:03 +00:00
Javier Segarra 00cea34dde perf: use util in OutLayout
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:55:20 +01:00
Alex Moreno 7bca8a4194 fix(VnSection): refs #8197 check route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:48:04 +01:00
Javier Segarra 21251a5167 fix: init
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:25:45 +01:00
Jon Elias 627289c58d feat: refs #7317 deleted warnings in fiscalData and dms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:22:40 +01:00
Alex Moreno 350dedd78d feat: refs #8316 add slots on VnTable from VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 13:19:46 +01:00
Jon Elias a1ef002a24 Merge pull request '#7305 deleted warnings' (!1196) from 7305-CustomerFiscalDataWarning into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1196
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 12:15:41 +00:00
Jon Elias 9cb0292361 Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:12:21 +00:00
Jon Elias 9383a3b4fb Merge pull request '#7068: Created VnVisibleColumns test' (!1250) from 7068-TableVisibleColumnsTest into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1250
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 12:11:44 +00:00
Jon Elias befbbf3f73 Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:10:56 +00:00
Alex Moreno aee29345a5 build: refs #8316 merge dev 2025-01-21 13:05:55 +01:00
PAU ROVIRA ROSALENY 3340a16541 Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 11:57:11 +00:00
PAU ROVIRA ROSALENY 5f75d3a0f1 feat: refs #7065 created unit tests for UserPanel 2025-01-21 12:56:30 +01:00
Alex Moreno ed5ce3c459 fix: refs #8322 add userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:50:30 +01:00
Javier Segarra 4e0967a26c Merge pull request 'HOTFIX: use clientFk to filter data' (!1258) from hotfix_customerConsumption_clientFk into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 11:45:10 +00:00
Alex Moreno 5c593697b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-travel 2025-01-21 12:45:00 +01:00
Javier Segarra b0c23b03fd Merge pull request 'update_quasar_version' (!1259) from update_quasar_version into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1259
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 11:40:25 +00:00
Jose Antonio Tubau f1b1163611 feat: refs #8304 add justInput prop to VnNotes for simplified note handling in workerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:28:18 +01:00
Javier Segarra 26e6ceb24d Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:22:14 +00:00
Robert Ferrús b969824474 Merge branch '8387-itemTagCrudModelFront' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 12:20:34 +01:00
Javier Segarra 61e410aa1d fix: use clientFk to filter data
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-21 11:16:38 +00:00
Jon Elias a6e57127f9 Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:16:24 +00:00
Robert Ferrús dbd5b8f95f Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:14:16 +00:00
Robert Ferrús 78745cf7ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront 2025-01-21 12:13:36 +01:00
Alex Moreno 57fb85d278 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:07:51 +00:00
Javier Segarra fe99bdf3fd Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:04:36 +00:00
Alex Moreno 1b394e3cac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 11:58:54 +01:00
Alex Moreno b35952928c build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 11:57:37 +01:00
Javi Gallego ab0343582e Merge branch 'dev' into 8381-thermographTravel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:56:08 +01:00
Alex Moreno 9f280c6089 Merge pull request 'perf: refs #8197 fix and imrpove filters' (!1234) from 8197-fix_filters into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1234
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-21 10:48:31 +00:00
Alex Moreno a2499f11e1 Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:45:42 +00:00
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1254
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-01-21 10:44:45 +00:00
Robert Ferrús d4a7a9374a Merge branch 'dev' into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:43:48 +00:00
Jon Elias 28db925645 refactor: refs #7068 adjust variables
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 11:05:24 +01:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-21 10:58:46 +01:00
Javier Segarra df7ab77225 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 09:53:29 +00:00
Jorge Penadés a0fc8a528c Merge pull request '#8087 hotfix-addFilterFields' (!1257) from 8087-hotfix-addFilterFields into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 09:52:21 +00:00
Robert Ferrús 3a95bdbbf7 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 09:48:11 +00:00
Jon Elias 96d1ef7f68 fix: refs #8448 e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-21 10:48:04 +01:00
Jorge Penadés 1cf9a46286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:47:48 +01:00
Jorge Penadés ae507167b7 feat: refs #8087 add additional filter fields to TravelCard component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-21 10:43:44 +01:00
PAU ROVIRA ROSALENY 9dd53855b5 Merge pull request 'feat: #8395 added total column in invoiceInVat' (!1243) from 8395-invoiceInVatTotal into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1243
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-21 09:10:48 +00:00
PAU ROVIRA ROSALENY 0f64477763 fix: refs #8395 update label for total column
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:08:26 +01:00
PAU ROVIRA ROSALENY 1fbcd0ccd5 Merge branch '8395-invoiceInVatTotal' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 10:04:21 +01:00
PAU ROVIRA ROSALENY 402b2882da feat: refs #8395 added computed to calculate and display amounts 2025-01-21 10:04:18 +01:00
PAU ROVIRA ROSALENY e169031c19 Merge branch 'dev' into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 09:03:26 +00:00
Robert Ferrús b1d18de23e Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 08:48:40 +00:00
PAU ROVIRA ROSALENY df403e35e6 Merge branch 'dev' into 7103-testVnSearchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 08:46:12 +00:00
PAU ROVIRA ROSALENY e8cee99b78 feat: refs #7103 created test for VnSearchbar 2025-01-21 09:45:47 +01:00
Carlos Satorres 836f40867c Merge pull request 'fix: refs #6896 hotfix search' (!1255) from 6896-hotfixOrdersSearch into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 08:25:53 +00:00
Jon Elias eb1c621066 Merge branch '7068-TableVisibleColumnsTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 09:06:55 +01:00
Jon Elias b36c53119c refactor: refs #7068 requested changes 2025-01-21 09:06:53 +01:00
Jon Elias d178a77bc6 Merge pull request 'Fix: Move dialog to descriptorMenu' (!1246) from Fix-InvoiceInDescriptorDialog into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1246
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-21 07:52:42 +00:00
Alex Moreno e9555a6017 Merge branch 'master' into 6896-hotfixOrdersSearch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-21 07:52:20 +00:00
Jon Elias 7c91869c8b Merge branch 'dev' into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 07:51:35 +00:00
Javi Gallego 23bff237a5 Merge branch 'dev' into 8381-thermographTravel 2025-01-21 07:52:20 +01:00
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:50:57 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 06:49:28 +00:00
Javi Gallego 590b4d9ca6 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:48:30 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 1feb26bd6d Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-21 06:37:59 +00:00
Alex Moreno 3cb21d7117 fix: use entryFilter
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:34:48 +01:00
Alex Moreno 824b60df57 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:33:09 +01:00
Alex Moreno 7357559c48 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-21 07:32:21 +01:00
Alex Moreno 44d3fa7634 Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1240
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-21 06:31:42 +00:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 22:13:30 +00:00
Javier Segarra 45caf8ac2f test: refs #7058 remove unnecesary tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 23:08:23 +01:00
Javier Segarra 29401f4d67 Merge branch 'dev' into 7058_leftMenu_vitest 2025-01-20 22:50:16 +01:00
Javier Segarra 3f753a97e7 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-20 21:46:57 +00:00
Javier Segarra fb2baa6180 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 21:39:42 +00:00
Javier Segarra 0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 21:33:13 +00:00
Javier Segarra bbac57845a Merge branch 'dev' into 8197-advancedMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 21:33:01 +00:00
Javier Segarra 0f8edae458 Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1241
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 17:30:10 +00:00
Jorge Penadés f8bcc74133 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 18:09:31 +01:00
Jorge Penadés 2a5942a9a9 feat: refs #7119 update vehicle selection to use active vehicles and refactor vehicle card component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 18:05:32 +01:00
Jorge Penadés 365597e5cf refactor: refs #7119 remove vehicle deletion
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 17:31:54 +01:00
Jorge Penadés e1b329db34 Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-20 14:42:57 +00:00
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 15:41:55 +01:00
Javi Gallego 1e5c56e19b fix: refs #8381 update travel data reference in TravelThermographs component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 15:22:41 +01:00
Alex Moreno ce0bfe12d7 Merge branch 'dev' into 8197-advancedMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 14:06:22 +00:00
Jose Antonio Tubau 9c6e41d2ae Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:49:54 +00:00
Jose Antonio Tubau 6f8b04a3ed Merge branch '8380-createTestToVnImg' of https://gitea.verdnatura.es/verdnatura/salix-front into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:47:06 +01:00
Jose Antonio Tubau 096f0c57ba refactor: refs #8380 remove unnecessary stubs in VnImg test wrapper 2025-01-20 14:47:04 +01:00
Jon Elias 84dd46b22c Merge branch 'dev' into Fix-TicketServicesSortByName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:45:43 +00:00
Jon Elias 5a5adbd165 fix: sort by name in description
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:42:51 +01:00
Jon Elias 7eadb62af7 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:39:33 +01:00
Jon Elias f1fb2f9904 fix: fixed rectificative class 2025-01-20 14:39:32 +01:00
Jorge Penadés d1a9e13a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 14:28:35 +01:00
Jorge Penadés 819a5e2d6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog 2025-01-20 14:18:33 +01:00
Carlos Satorres d8edd443c7 fix: refs #6896 hotfix search
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 14:11:42 +01:00
Jon Elias f7a3bdf997 Merge branch 'dev' into Fix-InvoiceInDescriptorDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 12:54:22 +00:00
Carlos Satorres a3fe097970 Merge pull request 'fix: refs #6898 hotfix filter' (!1252) from 6898-hotfixFiscalData into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1252
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 12:52:41 +00:00
Jon Elias 5ed5554495 refactor: move remaining data to descriptorMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:52:38 +01:00
Carlos Satorres 77857e9d31 Merge branch 'master' into 6898-hotfixFiscalData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:47:27 +00:00
Carlos Satorres c7b24adc5a fix: refs #6898 hotfix filter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 13:39:56 +01:00
Javier Segarra 1f2746ac18 Merge pull request 'Remove space checkbox when is not hover' (!1002) from hotfix_checbox_css into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1002
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-01-20 12:28:13 +00:00
Jorge Penadés ff14d81f51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 13:21:32 +01:00
Jorge Penadés bdae839e50 fix: refs #7936 toggle option
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:56:40 +01:00
Carlos Satorres 6d456f2352 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 12:38:49 +01:00
Javier Segarra c3203b18e7 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:17:58 +00:00
Carlos Satorres c333428389 Merge pull request 'fix: fix ticketSale quantity' (!1251) from hotfix-7356ticketSale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-20 11:11:48 +00:00
Carlos Satorres a3cdb18535 fix: fix use-like
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:04:59 +01:00
Jorge Penadés ae68f25c3c fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:55:49 +01:00
Jorge Penadés ff95882e42 fix: refs #7936 rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:51:53 +01:00
Jon Elias 773c917c20 Merge branch 'dev' into 7068-TableVisibleColumnsTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:43:34 +00:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:26:57 +01:00
Jon Elias efb0162f9c feat: refs #7068 created VnVisibleColumns unit test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 10:58:49 +01:00
Alex Moreno 58b8b2f7b0 fix: refs #8197 use rightMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 10:42:23 +01:00
Jorge Penadés 8843318b66 fix: refs #7936 update select model-value WIP
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 10:10:45 +01:00
Alex Moreno bb3ce4f862 fix: refs #8197 use RightMenu in subsections 2025-01-20 10:03:49 +01:00
Javier Segarra 6965c5ea78 Merge branch 'dev' into update_quasar_version 2025-01-20 08:57:16 +00:00
Javier Segarra 06d42ca876 feat: downgrade pnpm 2025-01-20 09:56:32 +01:00
Alex Moreno 83fb97ad9b feat: refs #8197 create advancedMenu and add in VnSection 2025-01-20 09:51:59 +01:00
Jon Elias ad2e502010 fix: move dialog to descriptorMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 08:44:48 +01:00
Jon Elias b447df7217 Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-20 07:07:30 +00:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 07:06:14 +00:00
Jon Elias 59783c3d3a Merge branch 'dev' into Fix-ItemRequestDuplicate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-20 07:04:09 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 08:01:46 +01:00
Robert Ferrús b78aa0f29b Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-19 07:58:25 +00:00
Robert Ferrús 6bc6797eba Merge branch 'dev' into 6629-addressObservation 2025-01-19 07:53:42 +00:00
Robert Ferrús e71018866e Merge branch 'dev' into 8398-mergeSendCheckingPresence
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-19 07:38:46 +00:00
Javi Gallego 579e675a22 refactor: refs #8381 update travel data handling in TravelThermographs component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 16:23:07 +01:00
Javi Gallego 9a29e7e2fd fix: refs #8381 update travel data fetching to use correct URL and include necessary fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 15:49:14 +01:00
Jose Antonio Tubau 957bc34f00 Merge branch 'dev' into 8316-parkingCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 14:00:24 +00:00
Javi Gallego 7e1482dd3a Merge branch 'dev' into 8381-thermographTravel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 14:59:56 +01:00
Javi Gallego 94c0fa2aa7 feat: refs #8381 add carrier field to travel thermographs and update localization 2025-01-17 14:59:52 +01:00
Jose Antonio Tubau fcb34c9309 refactor: refs #8316 added shelvingCardBeta and localizations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 14:58:23 +01:00
PAU ROVIRA ROSALENY dd88598072 Merge branch 'dev' into 8395-invoiceInVatTotal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:23:18 +00:00
Jose Antonio Tubau ae9c293e34 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-17 13:21:31 +00:00
Jose Antonio Tubau f4ac7c1539 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:15:26 +00:00
PAU ROVIRA ROSALENY 57804f9f2d feat: refs #8395 added total column in invoiceInVat
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-17 14:08:36 +01:00
Jose Antonio Tubau 9d32f6af3b refactor: refs #8316 add new localization keys and update existing ones for invoiceOut components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 14:08:14 +01:00
Jon Elias cce3162816 fix: deleted duplicate request
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-17 13:46:26 +01:00
Jon Elias 2c607ef8d9 refactor: refs #8120 change prop and classes' names
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:16:04 +01:00
Jose Antonio Tubau 0a7ac85729 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:00:53 +01:00
Jose Antonio Tubau f1fc1e6734 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-17 12:54:39 +01:00
Jose Antonio Tubau 508b6f226d Merge branch 'dev' into 8316-invoiceOutCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 11:50:09 +00:00
Jose Antonio Tubau 833c4e1392 refactor: refs #8316 add new localization keys and update existing ones for invoiceOut components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:48:03 +01:00
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-17 12:33:37 +01:00
Robert Ferrús 8d428bbd13 feat: refs #8077 change request
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-17 12:30:41 +01:00
Javier Segarra 7994f3c791 fix: remove departmentCode
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 11:13:37 +00:00
Robert Ferrús e25896fa77 feat: refs #8077 sumDefaulter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 12:11:14 +01:00
Jose Antonio Tubau 6b90a083cb Merge branch 'dev' into 7073-createTestToVnDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 10:35:06 +00:00
Jose Antonio Tubau 3305bb4222 Merge branch 'dev' into 8380-createTestToVnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 10:33:08 +00:00
Jose Antonio Tubau 3729834a86 refactor: refs #8316 add new localization keys and update existing ones for invoiceIn components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-17 10:55:00 +01:00
Javier Segarra 179f5a684f Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 09:09:11 +00:00
Javier Segarra 04bbf9e9d7 Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-17 09:05:46 +00:00
Alex Moreno a738fe1579 Merge branch 'dev' into 8197-fix_filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 06:16:53 +00:00
Alex Moreno 94c0cccb1e perf: refs #8197 default is object
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 07:16:24 +01:00
Alex Moreno d95350a8eb perf: refs #8197 fix and imrpove filters
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 13:32:12 +01:00
Javier Segarra a5a2feb8fd Merge branch 'dev' into 7308_warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 11:49:25 +00:00
Javier Segarra 3ab3f146d4 feat: add acl in description button
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 12:45:24 +01:00
Jorge Penadés b89293a9a3 Merge pull request 'fix: refs #7936 allow negative values' (!1226) from 7936-hotfix-allowNegative into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1226
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-16 11:37:55 +00:00
Robert Ferrús f3f4d03c16 refactor: refs #6822 transferEntry moved to descriptor menu 2025-01-16 12:27:24 +01:00
Robert Ferrús 70b872b912 Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix-front into 6822-createEntryTransferOption
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-16 12:12:42 +01:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 11:06:49 +00:00
Pablo Natek cc7f16b635 Merge pull request 'fix: refs #8407 close date and time popups on keydown' (!1229) from 8407-fixVnInputDate into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1229
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-01-16 11:01:35 +00:00
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 11:59:08 +01:00
Carlos Satorres 0338e0ea45 fix: refs #6426 create constants
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 10:42:58 +01:00
Robert Ferrús a6e3fd3480 Merge branch 'dev' into 8398-mergeSendCheckingPresence
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 08:59:19 +00:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 09:53:13 +01:00
PAU ROVIRA ROSALENY 5fef000e02 Merge branch 'dev' into 8322-travel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 08:50:00 +00:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-16 09:45:15 +01:00
PAU ROVIRA ROSALENY 89947f96cd Merge branch 'dev' into 8322-Supplier
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-16 08:45:09 +00:00
Jorge Penadés 6ca732986d Merge pull request 'hotfix: #7323 catch mail err' (!1225) from hotfix-7323-catchMailErr into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1225
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-16 08:38:06 +00:00
Javi Gallego 8c7747999d feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-16 09:09:05 +01:00
Alex Moreno b5a1d05ff0 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 08:11:06 +01:00
Alex Moreno b8c8610781 feat: refs #8316 parking inside shelving
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 08:06:16 +01:00
Jon Elias 802df02581 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-16 08:02:03 +01:00
Alex Moreno b41d5f19dc fix: refs #8316 translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 07:37:19 +01:00
Alex Moreno 885bd631ff Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 07:36:20 +01:00
Alex Moreno f645e8982c Merge branch '8316-parkingCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-16 07:35:27 +01:00
Robert Ferrús 8182bf7b91 feat: refs #8398 modify previous changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 07:29:37 +01:00
Alex Moreno a71da3a45d Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:25:48 +00:00
Javier Segarra 1befb353a9 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-16 06:12:01 +00:00
Javier Segarra 0da3bcdf40 Merge branch 'dev' into 7308_warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 20:10:05 +00:00
Javier Segarra 2d8dd46d15 fix: remove console
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-15 20:09:56 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 16:10:33 +01:00
Jose Antonio Tubau b5bdb975b8 test: refs #7075 add TODO for handling keydown behavior in VnInput component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 15:41:19 +01:00
Jose Antonio Tubau 36473d979b feat: refs #7322 add address selection for ticket transfer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 13:38:45 +01:00
Jon Elias d1be809b76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-15 12:55:20 +01:00
Robert Ferrús 764eef13c3 feat: refs #8398 moveTicketsFuture
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-15 12:32:46 +01:00
Alex Moreno 4c7a35f142 refactor: refs #8316 unify router item and itemType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 10:38:16 +01:00
Carlos Satorres 46cdd9e62b fix: refs #6553 fix user-filter 2025-01-15 10:36:39 +01:00
Carlos Satorres 3fc7f34899 fix: refs #6553 clean pr 2025-01-15 10:34:08 +01:00
Robert Ferrús 0b9788d38b feat: refs #8387 changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 10:33:49 +01:00
Carlos Satorres 38a180f92b fix: refs #6553 front advanced 2025-01-15 10:32:49 +01:00
Jon Elias 5b5dba868a fix: refs #6242 translation 2025-01-15 09:53:09 +01:00
Jon Elias b7061de689 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-15 09:45:12 +01:00
Jon Elias 1f76d572ce Merge pull request 'Hotfix[CustomerDescriptor]: Fixed icons in descriptor' (!1217) from Hotfix-CustomerDescriptorIcons into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1217
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-15 08:23:56 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 08:22:56 +00:00
Carlos Satorres 72f141315e fix: refs #6553 onBeforeMount 2025-01-15 09:21:16 +01:00
Carlos Satorres 55dda496f3 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-15 08:46:46 +01:00
Pablo Natek 4183ad3fa0 Merge pull request 'fix: update SIM serial number binding in WorkerPda.vue' (!1221) from hotFixWorkerPda into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1221
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 07:25:18 +00:00
Pablo Natek a7fd073886 fix: update SIM serial number binding in WorkerPda.vue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 08:23:44 +01:00
Javier Segarra 17f067144c Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 07:18:34 +00:00
PAU ROVIRA ROSALENY f8efb9e6e9 Merge branch 'dev' into 8322-travel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 07:14:51 +00:00
PAU ROVIRA ROSALENY c1e2e434ac refactor: refs #8322 changed Travel component to use VnSection/VnCardBeta 2025-01-15 08:14:33 +01:00
Alex Moreno 2c67041030 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 08:08:53 +01:00
Carlos Satorres 27f8a95e6f Merge pull request 'fix: hotfix 7366 6943' (!1215) from hotfix-7366-6943CreditBillingDataAWB into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1215
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 07:00:43 +00:00
Carlos Satorres 621d038133 Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 06:31:54 +00:00
Jose Antonio Tubau e884bab1ea test: refs #8380 add unit tests for VnImg component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-15 06:56:15 +01:00
Carlos Satorres 4dcebc99bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-15 06:31:07 +01:00
Jon Elias 9f0d9bca29 Merge branch 'master' into Hotfix-CustomerDescriptorIcons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 05:03:43 +00:00
Jon Elias 35e4f91154 fix: fixed icons in descriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-15 05:59:47 +01:00
PAU ROVIRA ROSALENY 584e299a8d Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 13:52:04 +00:00
PAU ROVIRA ROSALENY 656b736119 Merge branch 'dev' into 8322-Supplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 12:12:30 +00:00
PAU ROVIRA ROSALENY 8aaab2c25c refactor: refs #8322 changed supplier component to use VnSection/VnCardBeta 2025-01-14 13:12:04 +01:00
Carlos Satorres 64fcf3c824 fix: hotfix 7366 6943
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-14 11:36:46 +01:00
Jose Antonio Tubau bc53685765 Merge branch 'dev' into 8316-parkingCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 09:12:35 +00:00
Jose Antonio Tubau 771fec7177 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 09:11:27 +00:00
Jose Antonio Tubau bd905ded3a refactor: refs #8316 update prefix casing for InvoiceIn component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 10:01:18 +01:00
Jose Antonio Tubau ecfacd4100 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 09:52:56 +01:00
Jon Elias ad4a8beb0a Merge branch 'dev' into 7305-CustomerFiscalDataWarning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:53:18 +00:00
Jose Antonio Tubau f16e956a53 Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 07:45:54 +00:00
Jose Antonio Tubau 0a577e0524 Merge branch '7075-createTestToVnInput' of https://gitea.verdnatura.es/verdnatura/salix-front into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 08:45:23 +01:00
Jose Antonio Tubau d0e2093a1c test: refs #7075 update VnInput tests to include label and data-cy attribute 2025-01-14 08:45:21 +01:00
Jose Antonio Tubau 0fdff03715 refactor: refs #8316 remove unused ItemTypeSearchbar component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 07:48:18 +01:00
Carlos Satorres 3e8c090abd Merge branch '7917-freelancerRoute' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-14 07:23:45 +01:00
Carlos Satorres df1defa168 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-14 07:21:20 +01:00
Carlos Satorres 23fab7d224 Merge branch 'dev' into 7917-freelancerRoute 2025-01-14 06:18:31 +00:00
PAU ROVIRA ROSALENY 1966498d66 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 06:16:46 +00:00
Jon Elias 57e53e43c6 Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-14 07:14:47 +01:00
Jon Elias 1f622317e7 refactor: refs #6242 deleted v-for 2025-01-14 07:14:46 +01:00
Javier Segarra 0a8312a3a8 perf: vitest to 0.34.0
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 06:50:15 +01:00
Javier Segarra 6855a0efec revert: vitest to 0.31.1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 06:47:53 +01:00
Javier Segarra e751233233 perf: pnpm-lock
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 06:15:58 +01:00
Javier Segarra 449a790427 test: fix component 2025-01-14 06:15:40 +01:00
Javier Segarra eb008e8330 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-14 05:59:46 +01:00
Javier Segarra 9d90d041ee Merge branch 'dev' into 7058_leftMenu_vitest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-14 05:51:19 +01:00
Javier Segarra b2b36289c7 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance 2025-01-13 23:13:11 +01:00
Javier Segarra 06eb72764d feat: refs #7134 default currency parameter 2025-01-13 23:13:08 +01:00
Javier Segarra 3e4934fae1 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 22:05:39 +00:00
Javier Segarra 2f3c5245c0 perf: refs #7134 imports 2025-01-13 23:05:17 +01:00
Javier Segarra 5af5c518b5 fix: refs #7134 params filter 2025-01-13 23:03:58 +01:00
Javier Segarra 21cc6b3ecd test: refs #7134 remove conditions 2025-01-13 23:02:46 +01:00
Javier Segarra 252dd21492 fix: refs #7134 remove risk 2025-01-13 22:58:36 +01:00
Javier Segarra a8e1bdc684 revert: refs #7134 change 2025-01-13 22:55:57 +01:00
Javier Segarra edceac850d fix: refs #7134 minor change 2025-01-13 22:52:06 +01:00
Javier Segarra fce1068fbb fix: refs #7134 remove supplierRisk 2025-01-13 22:33:07 +01:00
Javier Segarra 1f1fc4d6b9 revert: refs #7134 customer changes 2025-01-13 19:20:10 +01:00
Javier Segarra 9fcea12580 fix: refs #7134 getRiskComposable 2025-01-13 19:17:54 +01:00
Jorge Penadés 6c3a271ee2 fix: refs #6919 use same data-key 2025-01-13 16:46:26 +01:00
Jorge Penadés 58d2c21e5b fix: refs #6919 use same data-key 2025-01-13 16:28:35 +01:00
Jorge Penadés ee00f7f5b5 fix: refs #6919 use same data-key 2025-01-13 16:25:15 +01:00
Jorge Penadés 011344b761 fix: refs #6919 use right data-key 2025-01-13 16:20:09 +01:00
Jon Elias 547e4847a7 Merge branch '8120-CompactSummaryPopup' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 16:19:26 +01:00
Jon Elias b52956d27d refactor: refs #8120 use only defineProps 2025-01-13 16:19:24 +01:00
Jorge Penadés 9ba7fec42f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-13 15:47:16 +01:00
Jose Antonio Tubau 1485166fdd Merge branch 'dev' into 7075-createTestToVnInput
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:05:49 +00:00
Jose Antonio Tubau 10767615de test: refs #7075 add unit tests for VnInput component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-13 15:05:15 +01:00
Robert Ferrús 51fb940adb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:32:02 +01:00
Robert Ferrús 65c2b24b78 feat: refs #8387 crudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:30:58 +01:00
Jorge Penadés bf85a0f1c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:19:42 +01:00
Carlos Satorres 57aa38c84c fix: refs #6553 front 2025-01-13 13:56:31 +01:00
Alex Moreno 074bb6c94c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:34:55 +01:00
Jorge Penadés ae137e8244 fix: refs #6919 update model references
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 13:25:42 +01:00
Alex Moreno d0e6c28ea2 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 13:15:49 +01:00
Alex Moreno e9645cf86c Merge branch '8316-customerCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:05 +01:00
Alex Moreno 06e04e1fb5 refactor: refs #8316 remove invoiceInSearchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 13:12:55 +01:00
Alex Moreno 168fe4c5b1 fix: refs #8316 user-filter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 13:10:59 +01:00
Jorge Penadés 13490719c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 12:58:18 +01:00
Javier Segarra 7f281b8630 perf: refs #7308 call 1 time useSession
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 12:30:07 +01:00
Carlos Satorres f8428a5591 Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-13 12:23:39 +01:00
Carlos Satorres 5a869f0722 fix: refs #6553 fix summary 2025-01-13 12:23:36 +01:00
Javier Segarra 70000e3eca Merge branch 'dev' into 7308_warning 2025-01-13 12:19:44 +01:00
Javier Segarra 6c96089445 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 11:55:04 +01:00
Jon Elias 29e8bb6344 Merge branch 'dev' into 6242-AddHasRoundingField 2025-01-13 10:41:13 +00:00
Jon Elias 390dd05a06 Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-13 11:38:46 +01:00
Jon Elias 21f0c80bc9 refactor: refs #6242 add TicketProblems component in descriptor 2025-01-13 11:38:45 +01:00
Jorge Penadés c1108945ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 11:38:13 +01:00
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:27:00 +01:00
Robert Ferrús 2246792404 feat: refs #6629 change values
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:24:11 +01:00
Jon Elias d75c48df0f Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:05:42 +00:00
Jon Elias 19e8b948ae feat: refs #8120 use new prop in the requierd modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:04:41 +01:00
Jon Elias 1091a762de Merge branch '8120-CompactSummaryPopup' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 11:01:27 +01:00
Jon Elias b48cc55f4b refactor: refs #8120 requested changes 2025-01-13 11:01:26 +01:00
Jorge Penadés e98cc7a92a feat: refs #6919 keep filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:59:54 +01:00
Jorge Penadés 285ba4ef7b fix: refs #6919 data-key descriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:41:23 +01:00
Jorge Penadés 3ad63ed354 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:35:49 +01:00
Alex Moreno fd589ff798 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-13 10:29:35 +01:00
Jon Elias 9cd8b2e8d6 Merge branch 'dev' into 8120-CompactSummaryPopup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:23:17 +00:00
Jon Elias 2aff1d3d06 feat: refs #8120 added new style to summary popups
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:20:28 +01:00
PAU ROVIRA ROSALENY 4b7b689a6c Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:04:18 +00:00
Jose Antonio Tubau 278faeb533 Merge branch 'dev' into 7073-createTestToVnDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:10:51 +00:00
Jose Antonio Tubau 5b6ad1a7c0 test: refs #7073 add test to defaultData if formInitialData has value
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-01-13 09:10:41 +01:00
Carlos Satorres f904c8cfd2 Merge branch 'dev' into 6553-workerBusiness 2025-01-13 07:47:34 +00:00
Jose Antonio Tubau e50b8f0094 Merge branch 'dev' into 8316-invoiceInCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:43:57 +01:00
Jose Antonio Tubau 3c87882805 refactor: refs #8316 restore filter for supplier and related entities in InvoiceInCard
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 08:41:45 +01:00
Carlos Satorres 0ae2bbca34 Merge branch 'dev' into 7917-freelancerRoute 2025-01-13 07:15:02 +00:00
Jose Antonio Tubau 86e0043fc7 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 08:07:27 +01:00
Jose Antonio Tubau 3e59d7881a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 06:40:04 +00:00
Jose Antonio Tubau eed06282d8 Merge branch 'dev' into 8316-invoiceOutCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 07:12:13 +01:00
Jose Antonio Tubau 34cfd57589 refactor: refs #8316 restore exprBuilder function to filter invoice data
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 07:02:11 +01:00
Jorge Penadés b94df214ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-10 18:45:01 +01:00
Jorge Penadés ccb558f4e9 refactor: refs #6919 update reload default value and extract InvoiceIn filter to a separate file
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 17:29:31 +01:00
Jose Antonio Tubau b26d1f7945 test: refs #7073 add unit tests for VnDms component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 14:59:29 +01:00
Jose Antonio Tubau 94d2fbb5ca fix: refs #8304 hide skeleton and table titles when no data is available
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 14:20:35 +01:00
Jon Elias 36f44179b2 feat: refs #7305 deleted warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 14:04:29 +01:00
Jose Antonio Tubau 628ed69bdb feat: refs #8304 added remove option to operator
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 13:07:01 +01:00
Jorge Penadés 3a8808452d fix: refs #6919 ticket
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 11:44:06 +01:00
Jorge Penadés 74f151800d chore: refs #6919 drop state
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 11:37:12 +01:00
Robert Ferrús f922bcb750 Merge branch 'dev' of https: refs #6629//gitea.verdnatura.es/verdnatura/salix-front into 6629-addressObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 11:34:15 +01:00
Jorge Penadés 105f149503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 11:24:20 +01:00
Robert Ferrús 5b10a3e60f feat: refs #6629 delete consolelog
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-10 11:17:01 +01:00
Carlos Satorres 8aba370063 Merge branch 'dev' into 6553-workerBusiness 2025-01-10 09:57:17 +00:00
Carlos Satorres 97140ae813 Merge branch 'dev' into 7917-freelancerRoute 2025-01-10 05:36:28 +00:00
Jorge Penadés 67b29c5d24 fix: refs #6919 roadmap
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-09 18:27:29 +01:00
Jorge Penadés caa50a16ce feat: refs #6919 sync basicdata agency
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 18:05:39 +01:00
Jorge Penadés 9084d918c0 fix: refs #6919 arrayData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 17:32:57 +01:00
Jorge Penadés a46d3affde refactor: refs #6919 fine tunning vnCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 17:11:55 +01:00
Jorge Penadés 9e06a48841 refactor: refs #6919 fine tunning vnCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 17:10:21 +01:00
Jorge Penadés b7f2a320c7 fix: refs #6919 item
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 16:36:27 +01:00
Jorge Penadés ad8618a51b fix: refs #6919 arrayData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 16:27:11 +01:00
Jorge Penadés 622c875dc5 fix: refs #6919 department
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 15:57:12 +01:00
Carlos Satorres b479ce83e0 fix: refs #6553 fix BeforeMount filters 2025-01-09 14:06:02 +01:00
Alex Moreno cceb906d65 fix: refs #8322 use userFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 13:57:09 +01:00
Alex Moreno f076df8f12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-route 2025-01-09 13:46:35 +01:00
Jorge Penadés 39f0873fb8 refactor: refs #6919 simplify WorkerBasicData component by removing unused imports and optimizing data fetching
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 12:41:24 +01:00
Carlos Satorres 3e16357878 fix: refs #6553 fix vnTable css 2025-01-09 12:37:02 +01:00
Jorge Penadés d23eb052f4 feat: refs #6919 add customUrl prop to VnCardBeta for flexible URL handling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 11:01:48 +01:00
Jorge Penadés 2462b5f38e fix: refs #6919 customer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 10:59:34 +01:00
Jose Antonio Tubau 37a71f7594 refactor: refs #8316 used VnSection and VnCardBeta on ItemCard
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-09 10:29:44 +01:00
Jorge Penadés c725dd446d Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-09 10:28:59 +01:00
Jon Elias fe4a681894 Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 09:17:02 +00:00
Jon Elias 4fe6b7584d Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-09 10:15:50 +01:00
Jon Elias fd68e997c5 refactor: refs #6242 forgotten translations 2025-01-09 10:15:48 +01:00
Carlos Satorres 66db2f0bd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-09 09:59:30 +01:00
Jon Elias c379491df0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-09 09:37:40 +01:00
Jon Elias a4e415f0ab Merge branch 'dev' into 6242-AddHasRoundingField
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-09 07:55:52 +00:00
Jon Elias 42c2401c24 refactor: refs #6242 modified ticket problems to display them in the same order 2025-01-09 08:54:10 +01:00
Carlos Satorres f139be4fcd fix: refs #6553 fix vnTable 2025-01-08 14:03:14 +01:00
Jose Antonio Tubau 663ca7c25d refactor: refs #8316 moved userFilter to array-data-props
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 13:08:24 +01:00
Jorge Penadés 8c77f6fe40 refactor: refs #6919 update data-key and state references to use 'Customer'
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 11:58:19 +01:00
Jorge Penadés 74dd49ffe0 feat: refs #6919 add customUrl prop to VnCard for dynamic URL handling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 11:47:41 +01:00
Jorge Penadés 52e1cfc828 chore: refs #6919 remove console logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:56:40 +01:00
Jorge Penadés 9ebb7b85b2 feat: refs #6919 add oneRecord opt
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:55:38 +01:00
Jorge Penadés 69a32231e2 refactor: refs #6919 simplify watch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:52:57 +01:00
Jorge Penadés 7f8c8b07c4 fix: refs #6919 alias
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:49:41 +01:00
Jorge Penadés 618d358256 fix: refs #6919 roles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:46:21 +01:00
Jorge Penadés d573389871 feat: refs #6919 add oneRecord option to data store and update related components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:20:36 +01:00
Carlos Satorres 3dbace5336 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-08 10:17:40 +01:00
PAU ROVIRA ROSALENY 4f2e4e1304 fix: refs #8322 moved filter inside array-data-props
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:14:15 +01:00
PAU ROVIRA ROSALENY e00d836b50 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 09:12:58 +00:00
PAU ROVIRA ROSALENY f2a8f724ce Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 06:13:44 +00:00
Jorge Penadés 43fc2e2312 refactor: refs #6919 update model naming and default values in Ticket components 2025-01-07 16:18:59 +01:00
Jorge Penadés 793084eb74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-07 15:48:04 +01:00
Jorge Penadés f4b1e18582 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-07 14:05:21 +01:00
Carlos Satorres 63fb45b22d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-07 12:48:15 +01:00
Carlos Satorres 916842ba93 fix: refs #6553 fix front and translations 2025-01-07 10:34:07 +01:00
PAU ROVIRA ROSALENY bf21c88f00 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 09:22:23 +00:00
Carlos Satorres 9ab6ac9718 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2025-01-07 06:44:19 +01:00
Javier Segarra 336a5ccafc feat: refs #7058 skip failed it to review
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-03 16:00:44 +01:00
Javier Segarra 42f113ccf6 test: refs #7058 getRoutes 2025-01-03 15:48:53 +01:00
Jose Antonio Tubau 1a90be0561 feat: refs #8316 added order param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 12:47:24 +01:00
Alex Moreno 0fba2ade32 Merge branch 'dev' into 8316-itemCardWithVnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 10:42:07 +00:00
PAU ROVIRA ROSALENY e0a9a5ca72 Merge branch 'dev' into 8322-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 09:37:03 +00:00
PAU ROVIRA ROSALENY a53ac3d6cc fix: refs #8322 fixed route creation url
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-03 07:21:31 +01:00
Javier Segarra cf6cf11179 test: refs #7134 remove comments 2025-01-02 14:52:17 +01:00
Javier Segarra 7b170f05bf fix: refs #7134 solve comments 2025-01-02 14:51:48 +01:00
Alex Moreno 268ddb027b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-02 08:45:52 +01:00
Carlos Satorres 5e0afd215f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2025-01-02 06:23:39 +01:00
Javier Segarra e5940ff785 revert: refs #7058 component changes 2024-12-31 18:14:01 +01:00
Javier Segarra 3c5b8d4fbf revert: refs #7058 component changes 2024-12-31 18:13:39 +01:00
Javier Segarra 072deeea5e test: refs #7058 addChildren 2024-12-31 17:48:53 +01:00
Javier Segarra b8856194c4 test: refs #7058 betaCard 2024-12-31 17:07:10 +01:00
Javier Segarra 94c9e1e84a test: refs #7058 getRoutes 2024-12-31 16:37:45 +01:00
Javier Segarra 4618ba87fa test: refs #7058 improve getRoutes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-31 14:13:50 +01:00
Javier Segarra 12715adbdb test: refs #7058 improve methods
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-31 14:03:03 +01:00
Javier Segarra 710532bc4e test: refs #7058 improve 2024-12-31 09:49:29 +01:00
Jorge Penadés dd90af9b6c feat: refs #7119 add VehicleNotes component and update routing to include notes section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 18:02:26 +01:00
Jorge Penadés 6f5aed2cbe fix: refs #7119 update VehicleList.vue to improve data formatting and add column filter for vehicle state
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 17:31:59 +01:00
Jorge Penadés f1f2b94747 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 15:57:37 +01:00
Javier Segarra 2bfc6606f0 test: refs #7058 improve test with computed properties 2024-12-30 12:35:07 +01:00
Javier Segarra 4cc895b69c test: refs #7058 improve test 2024-12-30 12:34:13 +01:00
Javier Segarra 6f31eeeeec test: refs #7058 init test 2024-12-30 12:33:46 +01:00
Jorge Penadés 9528f4572b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-30 09:30:50 +01:00
Jorge Penadés 5027b9a174 feat: refs #7119 update CardDescriptor streamline module navigation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 17:11:56 +01:00
Jorge Penadés b61badc723 feat: refs #7119 add PPE selection to VehicleBasicData and update VehicleFilter for PPE relation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 16:56:07 +01:00
Jorge Penadés be946a4f8b feat: refs #7119 add fuel and supplier-related fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 15:36:32 +01:00
Jose Antonio Tubau 7786c1ed64 chore: refs #8316 remove search and searchInfo entries from shelving in English and Spanish locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:31:15 +01:00
Jose Antonio Tubau 89cf61a750 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:10:42 +01:00
Jose Antonio Tubau 967e3334ae refactor: refs #8316 used VnSection and VnBetaCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:06:12 +01:00
Jose Antonio Tubau 531371543e refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:03:45 +01:00
Jose Antonio Tubau de7906bbf3 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 14:02:27 +01:00
Javier Segarra 0b767ff812 feat: refs #7134 order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:57:14 +01:00
Jose Antonio Tubau 37a87fa8e1 refactor: refs #8316 used VnSection and VnCardBeta
gitea/salix-front/pipeline/pr-test Build queued... Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:45:01 +01:00
PAU ROVIRA ROSALENY a0b19f8e79 refactor: refs #8322 changed Route component to use VnSection/VnCardBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:43:33 +01:00
Javier Segarra a86b9067e2 feat: refs #7134 add bank
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 13:26:49 +01:00
Javier Segarra 3aa8b568c4 feat: refs #7134 perf VnTable 2024-12-27 12:46:13 +01:00
Javier Segarra 7630e6dfe4 feat: refs #7134 unremovableParams 2024-12-27 12:46:05 +01:00
Javier Segarra 800eac4e24 feat: refs #7134 remove add btn 2024-12-27 12:45:49 +01:00
Jorge Penadés 062c306cf4 feat: refs #7119 add VehicleBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 12:21:21 +01:00
Javier Segarra 1a2046be74 Merge branch 'dev' into 7134-supplierBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 11:56:52 +01:00
Jorge Penadés 3807e74fe4 feat: refs #7119 enhance VehicleSummary and VehicleList components with summary view functionality
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 10:09:08 +01:00
Jorge Penadés 1e3aa0c8c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 09:50:34 +01:00
Javier Segarra aaa08b9d2b Merge branch 'dev' into 7308_warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-27 07:59:50 +01:00
Jorge Penadés 20ef8a5a12 refactor: refs #7119 remove auto-load attribute from VehicleList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 17:55:58 +01:00
Jorge Penadés 66555806f2 feat: refs #7119 add VehicleCard, VehicleDescriptor, and VehicleSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 17:49:21 +01:00
Jorge Penadés 2851291a27 feat: refs #7119 add VehicleSearchbar component and update localization for vehicle search
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 17:02:41 +01:00
Jorge Penadés 458e48d4c6 refactor: refs #7119 update vehicle state column name and add filtering options in VehicleList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 16:36:56 +01:00
Jorge Penadés d63941adca refactor: refs #7119 update vehicle list terminology and enhance data fetching for vehicle states
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 12:27:41 +01:00
Jorge Penadés d4f559f2c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 12:15:33 +01:00
Jorge Penadés 9b037e77ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-26 09:43:26 +01:00
Jorge Penadés f2ac15829d feat: refs #7119 add localization for vehicle fields and enhance VehicleList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 13:27:24 +01:00
Jorge Penadés 742fa231f1 feat: refs #7119 add vehicle list localization and update VehicleList component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 13:00:59 +01:00
Javier Segarra 2c86fb17f1 fix: fix some filters
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2024-12-24 12:16:46 +01:00
Javier Segarra 3ee8ff78ca fix: change url 2024-12-24 12:16:37 +01:00
Jorge Penadés 88c2640ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-createVehicle 2024-12-24 11:48:44 +01:00
Jorge Penadés 9afa5df0c7 feat: refs #7119 add VehicleList page and routing configuration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-24 10:31:37 +01:00
Carlos Satorres 950bd5f3a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-12-23 13:30:32 +01:00
Javier Segarra d92a09e228 Merge branch 'dev' into update_quasar_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:50:37 +01:00
Javier Segarra dae33e4df8 feat: update vitest to 1.0
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 10:22:40 +01:00
Javier Segarra 933e092da0 feat: update vue to 3.5 2024-12-23 10:21:56 +01:00
Carlos Satorres bbd2c86b61 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2024-12-23 09:44:13 +01:00
Carlos Satorres e09bd48e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2024-12-22 08:24:48 +01:00
Carlos Satorres 5893c0b9e9 Merge branch '7917-freelancerRoute' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2024-12-19 06:57:50 +01:00
Carlos Satorres 6b69884c2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute 2024-12-19 06:56:20 +01:00
Carlos Satorres 7619a5b4f5 fix: refs #6553 fix summary 2024-12-16 13:02:38 +01:00
Carlos Satorres 96e942af11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-12-16 11:28:53 +01:00
Carlos Satorres 3a060c9c6a Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-12-16 07:54:21 +01:00
Javier Segarra 9ae43244d9 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-13 11:40:05 +00:00
Jon Elias 9d1c375d59 refactor: refs #6242 added TicketProblems like list to sale and summary 2024-12-12 08:22:31 +01:00
Javier Segarra 8b3076640d test: refs #7308 fix axios.spec.js
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-10 15:36:35 +01:00
Javier Segarra 632f7bbdeb feat: refs #7308 remove warning 2024-12-10 15:36:25 +01:00
Javier Segarra 9121e79533 perf: refs #7134 use ForModelPopup 2024-12-09 14:20:03 +01:00
Javier Segarra 34d08e4bfe feat: refs #7134 minor changes 2024-12-05 14:54:27 +01:00
Javier Segarra db00be75ad Merge branch 'dev' into 7134-supplierBalance 2024-12-05 10:24:17 +01:00
Javier Segarra 4fc3e1fabb perf: refs #7134 #7134 fix filter panel 2024-12-05 09:10:55 +01:00
Javier Segarra a5f41871ae perf: refs #7134 #7134 fix filter panel 2024-12-04 19:40:37 +01:00
Javier Segarra 494482b6a8 perf: refs #7134 #7134 changes 2024-12-04 11:55:03 +01:00
Javier Segarra 034148841f fix: minor cli error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-04 09:18:37 +01:00
Javier Segarra 43e02ca00e feat: update quasar version 2024-12-04 09:18:23 +01:00
Jorge Penadés ebcb356230 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-02 13:42:14 +01:00
Carlos Satorres bc9b19e2df Merge branch 'dev' into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-02 09:42:47 +00:00
Javier Segarra c0d8bf3a48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-02 09:51:58 +01:00
Jon Elias cc464c631e fix: refs #6242 use $t in TicketProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 11:55:27 +01:00
Jon Elias 35201cb2d3 fix: refs #6242 conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-29 10:41:17 +01:00
Jon Elias b590c91892 Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2024-11-29 10:41:05 +01:00
Javier Segarra 0e35b2b2d5 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-28 08:39:29 +00:00
Robert Ferrús 85b3c3033a Merge branch 'dev' into 6629-addressObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-28 06:37:53 +00:00
Robert Ferrús 870081677e Merge branch 'dev' into 6629-addressObservation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-27 12:23:18 +00:00
Carlos Satorres 51a85343d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-27 10:39:05 +01:00
Javier Segarra 7f5d9c7180 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 06:58:52 +00:00
Javier Segarra aab98e3c45 Merge branch 'master' into hotfix_checbox_css
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 22:14:22 +00:00
Robert Ferrús 8a0b65998e feat: refs #6629 customerAddressEdit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 13:41:26 +01:00
Robert Ferrús b07286d43d feat: refs #6629 update 2024-11-26 13:06:41 +01:00
Robert Ferrús 00b15c1129 Merge branch 'dev' into 6629-addressObservation 2024-11-26 12:39:34 +01:00
Javier Segarra e3fa756b14 style: remove space from checkbox
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 11:36:05 +00:00
Javier Segarra c0be47a2e4 style: limit space QCheckbox when is children's QItemSection 2024-11-26 11:29:52 +00:00
Carlos Satorres cac9a9139f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 06:49:23 +01:00
Robert Ferrús f0f6a7e9a3 feat: refs #6629 addressObservation 2024-11-22 14:10:46 +01:00
Carlos Satorres 351dc012eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-22 10:29:17 +01:00
Javier Segarra 994a22a195 feat: refs #7134 use tableFooter 2024-11-21 12:47:33 +01:00
Javier Segarra e948253bea feat: refs #7134 vnTable setTableFooter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-21 12:44:38 +01:00
Javier Segarra 09804e06c7 feat: refs #7134 #7124 handle filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-20 14:28:47 +01:00
Javier Segarra 78e70f2b69 feat: refs #7134 #7124 handle columns 2024-11-20 14:28:41 +01:00
Javier Segarra 7325be2366 Merge branch 'dev' into 7134-supplierBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-20 11:21:23 +01:00
Jorge Penadés 386f2e3126 feat: refs #6919 sync account summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 12:15:58 +01:00
Carlos Satorres 640a7d4b14 Merge branch 'dev' of https: refs #7917//gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:44:29 +01:00
Jorge Penadés 06b61a52f6 chore: refs #6919 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:24:14 +01:00
Jorge Penadés 79d6f133a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:23:33 +01:00
Jorge Penadés 51b3283ff7 feat: refs #6919 sync zone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:22:32 +01:00
Jorge Penadés fc247ae413 feat: refs #6919 sync worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:07:14 +01:00
Jorge Penadés efcf3be585 feat: refs #6919 sync ticket
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 10:11:33 +01:00
Jorge Penadés 5b9f9d38a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 09:34:11 +01:00
Jorge Penadés 96e7bf78c5 feat: refs #6919 sync supplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 17:30:23 +01:00
Jorge Penadés 96e9d1a00a feat: refs #6919 sync shelving
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 17:13:42 +01:00
Jorge Penadés 617af7b7cb feat: refs #6919 sync alias
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 16:38:58 +01:00
Jorge Penadés a44ea9384a Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 16:25:51 +01:00
Jorge Penadés dcd681b656 feat: refs #6919 sync account
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-18 16:10:04 +01:00
Jorge Penadés 02a1554b21 feat: refs #6919 sync role
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-18 11:24:39 +01:00
Jorge Penadés 72ce3615d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 09:32:58 +01:00
Jorge Penadés 7962dbc26a feat: refs #6919 sync route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 17:27:16 +01:00
Jorge Penadés 1c86c874e0 feat: refs #6919 sync account wip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 16:59:02 +01:00
Jorge Penadés 4ecc8c213e feat: refs #6919 sync parking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 16:22:16 +01:00
Jorge Penadés 3477b24c93 feat: refs #6919 sync order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 16:03:30 +01:00
Jorge Penadés c2e4380f18 feat: refs #6919 sync item-type
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 13:01:47 +01:00
Jorge Penadés 71e469542a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 12:51:30 +01:00
Jorge Penadés f20660839a feat: refs #6919 sync item
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 12:45:22 +01:00
Carlos Satorres b57b60dd84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7917-freelancerRoute
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 12:41:26 +01:00
Jorge Penadés 8af09d46ed feat: refs #6919 sync invoice out
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 12:33:47 +01:00
Jorge Penadés 00b7883aed feat: refs #6919 sync department
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 11:54:27 +01:00
Jorge Penadés 0f48b6fa4d refactor: refs #6919 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 11:49:58 +01:00
Jorge Penadés 94c8f538ea feat: refs #6919 sync customer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 11:38:51 +01:00
Jorge Penadés fec9ef25bf fix: refs #6919 reactivity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 11:14:19 +01:00
Jorge Penadés 84f22cfeb8 feat: refs #6919 replace url id wip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-15 10:06:19 +01:00
Jorge Penadés b67489aae8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2024-11-15 09:29:04 +01:00
Jorge Penadés 565ec15589 feat: refs #6919 improve vn-card logic 2024-11-14 17:30:54 +01:00
Javier Segarra 3404bc6d0b feat: refs #7134 apply supplierBalanceFilter 2024-11-11 15:59:05 +01:00
Javier Segarra 218f45c289 feat: refs #7134 use VnAccountNumber
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-11 14:46:57 +01:00
Javier Segarra 7b8093c048 feat: refs #7134 #7134 split newPayment 2024-11-11 14:22:18 +01:00
Javier Segarra da99d82504 perf: refs #7134 #7134 global dialog newPayment and composable getRisk
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-11 11:55:28 +01:00
Javier Segarra 8d2ad235fb feat: refs #7134 #7134 Create new route 2024-11-11 11:54:53 +01:00
Javier Segarra 4d602aadfd feat: refs #7134 #7134 Create SupplierBalance layout 2024-11-11 11:53:28 +01:00
Jon Elias e18d129b32 fix: refs #6242 merge conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:56:33 +02:00
Jon Elias f6051ae15c refactor: refs #6242 modified front to show ticket problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-17 07:32:06 +02:00
Carlos Satorres 257ec7926e refs #7917 fix routeCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-08 12:18:18 +02:00
Jon Elias fdf6fd2bba feat: refs #6242 added rounding field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 14:05:35 +02:00
Carlos Satorres f903432e74 refs #6553 fix reactivateWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-13 13:46:53 +02:00
Carlos Satorres 04d30186c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-09-13 13:06:59 +02:00
Carlos Satorres f7fb18cf0a refs #6553 workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 15:02:21 +02:00
Carlos Satorres 02129591cf refs #6553 workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-10 08:42:56 +02:00
Carlos Satorres bf4d11545d
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 13:22:15 +02:00
Carlos Satorres 70847176ca refs #6553 fix business slot
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-06 07:15:25 +02:00
Carlos Satorres 97ce44242c refs #6553 fix business summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 13:58:14 +02:00
Carlos Satorres c75e4cbf95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 10:51:41 +02:00
Carlos Satorres 60e9accd99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 08:11:01 +02:00
Robert Ferrús 652e5c1838 feat: refs #6822 redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-17 10:26:00 +02:00
Robert Ferrús a149c37fb2 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-17 05:53:49 +00:00
Robert Ferrús 1bf754e81a Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-10 11:35:35 +00:00
Robert Ferrús 72d19b2347 Merge branch 'dev' into 6822-createEntryTransferOption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 10:01:41 +00:00
Robert Ferrús 017d7a866d feat: refs #6822
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-07-03 11:58:05 +02:00
Carlos Satorres 00cd6feb12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 10:19:53 +02:00
Carlos Satorres 8f925401d5 refs #6553 fix VnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 10:17:52 +02:00
Carlos Satorres 8363f813de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-06-21 12:42:19 +02:00
Carlos Satorres 68d1d0dbb0 refs #6553 function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-20 13:58:14 +02:00
Carlos Satorres 0e7abe5fa4 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-06-20 13:57:59 +02:00
Carlos Satorres 9c5620f340 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-20 13:35:46 +02:00
Carlos Satorres 41e1d365f3 refs #6553 fix relations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-19 08:06:03 +02:00
Carlos Satorres b6836fc59e Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness 2024-06-19 06:50:20 +02:00
Alex Moreno 81591b4f67 fix: use model
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 15:01:12 +02:00
Alex Moreno 83a0ec7eb8 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 14:55:25 +02:00
Alex Moreno 8d60754682 fix(WorkerBusiness): fix card label
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 14:50:01 +02:00
Alex Moreno ba57c2fcd9 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 11:53:14 +02:00
Carlos Satorres 8490f24438 refs #6553 fix reactivateWorker
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-10 09:23:33 +02:00
Carlos Satorres db3ff0416c refs #6553 fix names
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 14:31:08 +02:00
Carlos Satorres d7044cfdcc Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 10:39:35 +02:00
Carlos Satorres f4792d7921 fix: refs #6553 label css
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 10:35:14 +02:00
Carlos Satorres 960129f86c Merge branch 'dev' into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 13:52:40 +00:00
Carlos Satorres 6e261b7793 refs #6553 fix business summary traductions
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 14:38:48 +02:00
Carlos Satorres 4b44b9a979 Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix-front into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 10:32:53 +02:00
Carlos Satorres 8f1ddb08b3 refs #6553 filterBusiness 2024-05-31 10:32:51 +02:00
Carlos Satorres 330b1c1ec2 Merge branch 'dev' into 6553-workerBusiness
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 11:48:56 +00:00
Carlos Satorres 6205feaca4 refs #6553 fix front ibject
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:37:05 +02:00
Carlos Satorres 0e691436e9 refs #6553 fix front trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 14:20:49 +02:00
Carlos Satorres 81e6870f71 refs #6553 front section trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 16:59:59 +02:00
416 changed files with 12801 additions and 8519 deletions

View File

@ -1,4 +1,4 @@
module.exports = {
export default {
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
// This option interrupts the configuration hierarchy at this file
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
@ -58,7 +58,7 @@ module.exports = {
rules: {
'prefer-promise-reject-errors': 'off',
'no-unused-vars': 'warn',
"vue/no-multiple-template-root": "off" ,
'vue/no-multiple-template-root': 'off',
// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
},

8
.gitignore vendored
View File

@ -29,5 +29,9 @@ yarn-error.log*
*.sln
# Cypress directories and files
/tests/cypress/videos
/tests/cypress/screenshots
/test/cypress/videos
/test/cypress/screenshots
# VitePress directories and files
/docs/.vitepress/cache
/docs/.vuepress

View File

@ -1,23 +1,24 @@
const fs = require('fs');
const path = require('path');
import { existsSync, readFileSync, writeFileSync } from 'fs';
import { join, resolve } from 'path';
function getCurrentBranchName(p = process.cwd()) {
if (!fs.existsSync(p)) return false;
if (!existsSync(p)) return false;
const gitHeadPath = path.join(p, '.git', 'HEAD');
const gitHeadPath = join(p, '.git', 'HEAD');
if (!fs.existsSync(gitHeadPath))
return getCurrentBranchName(path.resolve(p, '..'));
if (!existsSync(gitHeadPath)) {
return getCurrentBranchName(resolve(p, '..'));
}
const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
const headContent = readFileSync(gitHeadPath, 'utf-8');
return headContent.trim().split('/')[2];
}
const branchName = getCurrentBranchName();
if (branchName) {
const msgPath = `.git/COMMIT_EDITMSG`;
const msg = fs.readFileSync(msgPath, 'utf-8');
const msgPath = '.git/COMMIT_EDITMSG';
const msg = readFileSync(msgPath, 'utf-8');
const reference = branchName.match(/^\d+/);
const referenceTag = `refs #${reference}`;
@ -26,8 +27,7 @@ if (branchName) {
if (splitedMsg.length > 1) {
const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
fs.writeFileSync(msgPath, finalMsg);
writeFileSync(msgPath, finalMsg);
}
}
}

View File

@ -1,4 +1,4 @@
module.exports = {
export default {
singleQuote: true,
printWidth: 90,
tabWidth: 4,

View File

@ -1,3 +1,157 @@
# Version 25.04 - 2025-01-28
### Added 🆕
- chore: add task comment by:jorgep
- chore: refs #8198 rollback by:jorgep
- chore: refs #8322 unnecessary prop by:alexm
- feat: refs #7055 added new test case by:provira
- feat: refs #7055 created FilterItemForm test by:provira
- feat: refs #7077 created test for VnInputTime by:provira
- feat: refs #7078 created test for VnJsonValue by:provira
- feat: refs #7087 added more test cases by:provira
- feat: refs #7087 added new test by:provira
- feat: refs #7087 created CardSummary test by:provira
- feat: refs #7088 created test for FetchedTags by:provira
- feat: refs #7202 added new field by:Jon
- feat: refs #7882 Added coords to create a address by:guillermo
- feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component by:jorgep
- feat: refs #7957 enhance search functionality and improve data filtering logic by:jorgep
- feat: refs #7957 open in new tab by:jorgep
- feat: refs #7957 simplify fn to by:jorgep
- feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements by:jorgep
- feat: refs #8117 filters and values added as needed by:jtubau
- feat: refs #8197 useHasContent and use in VnSection and RightMenu by:alexm
- feat: refs #8219 added invoice out e2e tests by:Jon
- feat: refs #8219 global invoicing e2e by:Jon
- feat: refs #8220 added barcodes e2e test by:Jon
- feat: refs #8220 created items e2e by:Jon
- feat: refs #8220 modified create item form and added respective e2e by:Jon
- feat: refs #8225 added account and invoiceOut modules by:Jon
- feat: refs #8225 added entry module and fixed translations by:Jon
- feat: refs #8225 added invoiceIn and travel module by:Jon
- feat: refs #8225 added moreOptions and use it in customer and ticket summary by:Jon
- feat: refs #8225 added route and shelving module by:Jon
- feat: refs #8225 added worker and zone modules by:Jon
- feat: refs #8225 use it in claim, item and order modules by:Jon
- feat: refs #8258 added button to pass to uppercase by:provira
- feat: refs #8258 added uppercase option to VnInput by:provira
- feat: refs #8258 added uppercase validation on supplier create by:provira
- feat: refs #8298 add price optimum input and update translations for bonus and price optimum by:jgallego
- feat: refs #8316 add entryFilter prop to VnTable component in EntryList by:jtubau
- feat: refs #8322 added department changes by:provira
- feat: refs #8372 workerPBX by:robert
- feat: refs #8381 add initial and final temperature fields to entry forms and summaries by:jgallego
- feat: refs #8381 add initial and final temperature labels in English and Spanish locales by:jgallego
- feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries by:jgallego
- feat: skip tests by:jorgep
- style: refs #7957 update VnSearchbar padding for improved layout by:jorgep
### Changed 📦
- perf: refs #8219 #8219 minor change by:Javier Segarra
- perf: refs #8220 on-fetch and added missing translations by:Jon
- perf: refs #8220 on-fetch by:Jon
- perf: refs #8220 translations by:Jon
- perf: refs #8220 use searchbar selector in e2e tests by:Jon
- perf: remove warning default value by:Javier Segarra
- refactor: redirect using params by:Jon
- refactor: refs #7077 removed some comments by:provira
- refactor: refs #7087 removed unused imports by:provira
- refactor: refs #7100 added const mockData by:jtubau
- refactor: refs #7100 delete unnecesary set prop by:jtubau
- refactor: refs #7100 refactorized with methods by:jtubau
- refactor: refs #7957 remove blank by:jorgep
- refactor: refs #8198 simplify data fetching and filtering logic by:jorgep
- refactor: refs #8198 simplify state management and data fetching in ItemDiary component by:jorgep
- refactor: refs #8219 modified e2e tests and fixed some translations by:Jon
- refactor: refs #8219 modified list test, created cypress download folder and added to gitignore by:Jon
- refactor: refs #8219 requested changes by:Jon
- refactor: refs #8219 use checkNotification command by:Jon
- refactor: refs #8220 added data-cy for e2e tests by:Jon
- refactor: refs #8220 requested changes by:Jon
- refactor: refs #8220 skip failling test and modifed tag test by:Jon
- refactor: refs #8225 requested changes by:Jon
- refactor: refs #8247 use new acl for sysadmin by:Jon
- refactor: refs #8316 added claimFilter by:jtubau
- refactor: refs #8316 added entryFilter by:jtubau
- refactor: refs #8316 add new localization keys and update existing ones for entry components by:jtubau
- refactor: refs #8316 moved localizations to local locale by:jtubau
- refactor: refs #8316 move order localization by:jtubau
- refactor: refs #8316 remove unused OrderSearchbar component by:jtubau
- refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList by:jtubau
- refactor: refs #8316 used VnSection and VnCardBeta by:jtubau
- refactor: refs #8322 changed translations by:provira
- refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta by:provira
- refactor: refs #8322 set department inside worker by:alexm
- refactor: skip intermitent failing test by:Jon
### Fixed 🛠️
- feat: refs #8225 added entry module and fixed translations by:Jon
- fix: added missing translations in InvoiceIn by:provira
- fix: changed invoiceIn for InvoiceIn by:provira
- fix: changed translations to only use "invoicein" by:provira
- fix: department descriptor link by:Jon
- fix: e2e tests by:Jon
- fix: entry summary view and build warnings by:Jon
- fix: fixed InvoiceIn filter translations by:provira
- fix: modified setData in customerDescriptor to show the icons by:Jon
- fix: redirect to TicketSale from OrderLines (origin/Fix-RedirectToTicketSale) by:Jon
- fix: redirect when confirming lines by:Jon
- fix: refs #7055 #7055 #7055 fixed some tests by:provira
- fix: refs #7077 removed unused imports by:provira
- fix: refs #7078 added missing case with array by:provira
- fix: refs #7087 fixed some tests by:provira
- fix: refs #7088 changed "vm.vm" to "vm" by:provira
- fix: refs #7088 changed wrapper to vm by:provira
- fix: refs #7699 add icons and hint by:carlossa
- fix: refs #7699 add pwd vnInput by:carlossa
- fix: refs #7699 fix component by:carlossa
- fix: refs #7699 fix password visibility by:carlossa
- fix: refs #7699 fix tfront clean code by:carlossa
- fix: refs #7699 fix vnChangePassword, clean VnInput by:carlossa
- fix: refs #7699 fix vnInputPassword by:carlossa
- fix: refs #7957 add missing closing brace by:jorgep
- fix: refs #7957 css by:jorgep
- fix: refs #7957 rollback by:jorgep
- fix: refs #7957 update data-cy by:jorgep
- fix: refs #7957 update visibility handling for clear icon in VnInput component by:jorgep
- fix: refs #7957 vn-searchbar test by:jorgep
- fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval by:jtubau
- fix: refs #8197 not use yet by:alexm
- fix: refs #8198 update query param by:jorgep
- fix: refs #8219 fixed e2e tests by:Jon
- fix: refs #8219 fixed summary and global tests by:Jon
- fix: refs #8219 forgotten dataCy by:Jon
- fix: refs #8219 global e2e by:Jon
- fix: refs #8219 requested changes by:Jon
- fix: refs #8220 itemTag test by:Javier Segarra
- fix: refs #8225 invoice in translations by:Jon
- fix: refs #8243 fixed SkeletonSummary by:provira
- fix: refs #8247 conflicts by:Jon
- fix: refs #8247 fixed acls and added lost options by:Jon
- fix: refs #8316 ref="claimFilterRef" by:alexm
- fix: refs #8316 userFilter by:alexm
- fix: refs #8316 use rightMenu by:alexm
- fix: refs #8316 use section-searchbar by:alexm
- fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice by:jtubau
- fix: refs #8322 unnecessary section by:alexm
- fix: refs #8338 fixed VnTable translations by:provira
- fix: refs #8338 removed chipLocale property/added more translations by:provira
- fix: refs #8448 e2e by:Jon
- fix: refs #8448 not use croppie by:alexm
- fix: remove departmentCode by:Javier Segarra
- fix: removed unused searchbar by:PAU ROVIRA ROSALENY
- fix: skip failling e2e by:Jon
- fix: sort by name in description by:Jon
- fix: translations by:Jon
- fix: use entryFilter by:alexm
- fix(VnCardBeta): add userFilter by:alexm
- refactor: refs #8219 modified e2e tests and fixed some translations by:Jon
- revert: revert header by:alexm
- test: fix expedition e2e by:alexm
# Version 25.00 - 2025-01-14
### Added 🆕

View File

@ -1 +1 @@
module.exports = { extends: ['@commitlint/config-conventional'] };
export default { extends: ['@commitlint/config-conventional'] };

View File

@ -1,9 +1,9 @@
const { defineConfig } = require('cypress');
import { defineConfig } from 'cypress';
// https://docs.cypress.io/app/tooling/reporters
// https://docs.cypress.io/app/references/configuration
// https://www.npmjs.com/package/cypress-mochawesome-reporter
module.exports = defineConfig({
export default defineConfig({
e2e: {
baseUrl: 'http://localhost:9000/',
experimentalStudio: true,
@ -30,9 +30,13 @@ module.exports = defineConfig({
testFiles: '**/*.spec.js',
supportFile: 'test/cypress/support/unit.js',
},
setupNodeEvents(on, config) {
require('cypress-mochawesome-reporter/plugin')(on);
// implement node event listeners here
setupNodeEvents: async (on, config) => {
const plugin = await import('cypress-mochawesome-reporter/plugin');
plugin.default(on);
return config;
},
viewportWidth: 1280,
viewportHeight: 720,
},
});

38
docs/.vitepress/config.js Normal file
View File

@ -0,0 +1,38 @@
import { defineConfig } from 'vitepress';
// https://vitepress.dev/reference/site-config
export default defineConfig({
title: 'Lilium',
description: 'Lilium docs',
themeConfig: {
// https://vitepress.dev/reference/default-theme-config
nav: [
{ text: 'Home', link: '/' },
{ text: 'Components', link: '/components/vnInput' },
{ text: 'Composables', link: '/composables/useArrayData' },
],
sidebar: [
{
items: [
{
text: 'Components',
collapsible: true,
collapsed: true,
items: [{ text: 'VnInput', link: '/components/vnInput' }],
},
{
text: 'Composables',
collapsible: true,
collapsed: true,
items: [
{ text: 'useArrayData', link: '/composables/useArrayData' },
],
},
],
},
],
socialLinks: [{ icon: 'github', link: 'https://github.com/vuejs/vitepress' }],
},
});

136
docs/components/vnInput.md Normal file
View File

@ -0,0 +1,136 @@
# VnInput
`VnInput` is a custom input component that provides various useful features such as validation, input clearing, and more.
## Props
### `modelValue`
- **Type:** `String | Number`
- **Default:** `null`
- **Description:** The value of the model bound to the component.
### `isOutlined`
- **Type:** `Boolean`
- **Default:** `false`
- **Description:** If `true`, the component is rendered with an outlined style.
### `info`
- **Type:** `String`
- **Default:** `''`
- **Description:** Additional information displayed alongside the component.
### `clearable`
- **Type:** `Boolean`
- **Default:** `true`
- **Description:** If `true`, the component shows a button to clear the input.
### `emptyToNull`
- **Type:** `Boolean`
- **Default:** `true`
- **Description:** If `true`, converts empty inputs to `null`.
### `insertable`
- **Type:** `Boolean`
- **Default:** `false`
- **Description:** If `true`, allows the insertion of new values.
### `maxlength`
- **Type:** `Number`
- **Default:** `null`
- **Description:** The maximum number of characters allowed in the input.
### `uppercase`
- **Type:** `Boolean`
- **Default:** `false`
- **Description:** If `true`, converts the input text to uppercase.
## Emits
### `update:modelValue`
- **Description:** Emits the updated model value.
- **Behavior:** This event is emitted whenever the input value changes. It is used to update the model value bound to the component.
### `update:options`
- **Description:** Emits the updated options.
- **Behavior:** This event is emitted when the component's options change. It is useful for components with dynamic options.
### `keyup.enter`
- **Description:** Emits an event when the Enter key is pressed.
- **Behavior:** This event is emitted whenever the Enter key is pressed while the input is focused. It can be used to handle specific actions when the input is confirmed.
### `remove`
- **Description:** Emits an event to remove the current value.
- **Behavior:** This event is emitted when the clear button (close icon) is clicked. It is used to handle the removal of the current input value.
## Functions
### `focus`
- **Description:** Focuses the input.
- **Behavior:** This function is exposed so it can be called from outside the component. It uses `vnInputRef.value.focus()` to focus the input.
### `handleKeydown`
- **Description:** Handles the `keydown` event of the input.
- **Behavior:** This function is called whenever a key is pressed while the input is focused. If the pressed key is `Backspace`, it does nothing. If `insertable` is `true` and the pressed key is a number, it calls `handleInsertMode`.
### `handleInsertMode`
- **Description:** Handles the insertion mode of values.
- **Behavior:** This function is called when `insertable` is `true` and a numeric key is pressed. It inserts the value at the cursor position and updates the input value. Then, it moves the cursor to the correct position.
### `handleUppercase`
- **Description:** Converts the input value to uppercase.
- **Behavior:** This function is called when the uppercase icon is clicked. It converts the current input value to uppercase.
## Usage
```vue
<template>
<VnInput
v-model="inputValue"
:isOutlined="true"
info="Additional information"
:clearable="true"
:emptyToNull="true"
:insertable="false"
:maxlength="50"
:uppercase="true"
@update:modelValue="handleUpdate"
@keyup.enter="handleEnter"
@remove="handleRemove"
/>
</template>
<script setup>
import { ref } from 'vue';
import VnInput from 'src/components/common/VnInput.vue';
const inputValue = ref('');
const handleUpdate = (value) => {
console.log('Updated value:', value);
};
const handleEnter = () => {
console.log('Enter pressed');
};
const handleRemove = () => {
console.log('Value removed');
};
</script>
```

View File

@ -0,0 +1,215 @@
# useArrayData
`useArrayData` is a composable function that provides a set of utilities for managing array data in a Vue component. It leverages Pinia for state management and provides various methods for fetching, filtering, and manipulating data.
## Usage
```javascript
import { useArrayData } from 'src/composables/useArrayData';
const {
fetch,
applyFilter,
addFilter,
getCurrentFilter,
setCurrentFilter,
addFilterWhere,
addOrder,
deleteOrder,
refresh,
destroy,
loadMore,
store,
totalRows,
updateStateParams,
isLoading,
deleteOption,
reset,
resetPagination,
} = useArrayData('myKey', userOptions);
```
## Parameters
### `key`
- **Type:** `String`
- **Description:** A unique key to identify the data store.
### `userOptions`
- **Type:** `Object`
- **Description:** An object containing user-defined options for configuring the data store.
## Methods
### `fetch`
Fetches data from the server.
#### Parameters
- **`options`** : An object with the following properties:
- `append` (Boolean): Whether to append the fetched data to the existing data.
- `updateRouter` (Boolean): Whether to update the router with the current filter.
#### Returns
- **`Promise`** : A promise that resolves with the fetched data.
### `applyFilter`
Applies a filter to the data.
#### Parameters
- **`filter`** : An object containing the filter criteria.
- **`params`** : Additional parameters for the filter.
- **`fetchOptions`** : Options for the fetch method.
#### Returns
- **`Promise`** : A promise that resolves with the filtered data.
### `addFilter`
Adds a filter to the existing filters.
#### Parameters
- **`filter`** : An object containing the filter criteria.
- **`params`** : Additional parameters for the filter.
#### Returns
- **`Promise`** : A promise that resolves with the updated filter and parameters.
### `getCurrentFilter`
Gets the current filter applied to the data.
#### Returns
- **`Object`** : The current filter and parameters.
### `setCurrentFilter`
Sets the current filter for the data.
#### Returns
- **`Object`** : The current filter and parameters.
### `addFilterWhere`
Adds a `where` clause to the existing filters.
#### Parameters
- **`where`** : An object containing the `where` clause.
#### Returns
- **`Promise`** : A promise that resolves when the filter is applied.
### `addOrder`
Adds an order to the existing orders.
#### Parameters
- **`field`** : The field to order by.
- **`direction`** : The direction of the order (`ASC` or `DESC`).
#### Returns
- **`Promise`** : A promise that resolves with the updated order.
### `deleteOrder`
Deletes an order from the existing orders.
#### Parameters
- **`field`** : The field to delete the order for.
#### Returns
- **`Promise`** : A promise that resolves when the order is deleted.
### `refresh`
Refreshes the data by re-fetching it from the server.
#### Returns
- **`Promise`** : A promise that resolves with the refreshed data.
### `destroy`
Destroys the data store for the given key.
### `loadMore`
Loads more data by incrementing the pagination.
#### Returns
- **`Promise`** : A promise that resolves with the additional data.
### `updateStateParams`
Updates the state parameters with the given data.
#### Parameters
- **`data`** : The data to update the state parameters with.
### `deleteOption`
Deletes an option from the store.
#### Parameters
- **`option`** : The option to delete.
### `reset`
Resets the store to its default state.
#### Parameters
- **`opts`** : An array of options to reset.
### `resetPagination`
Resets the pagination for the store.
## Computed Properties
### `totalRows`
- **Description:** The total number of rows in the data.
- **Type:** `Number`
### `isLoading`
- **Description:** Whether the data is currently being loaded.
- **Type:** `Boolean`
```vue
<script setup>
import { useArrayData } from 'src/composables/useArrayData';
const userOptions = {
url: '/api/data',
limit: 10,
};
const arrayData = useArrayData('myKey', userOptions);
</script>
```
```
```

13
docs/index.md Normal file
View File

@ -0,0 +1,13 @@
---
# https://vitepress.dev/reference/default-theme-home-page
layout: home
hero:
name: 'Lilium'
text: 'Lilium docs'
tagline: Powered by Verdnatura
actions:
- theme: brand
text: Docs
link: /components/vnInput
---

View File

@ -1,11 +1,12 @@
{
"name": "salix-front",
"version": "25.04.0",
"version": "25.08.0",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",
"private": true,
"packageManager": "pnpm@8.15.1",
"type": "module",
"scripts": {
"resetDatabase": "cd ../salix && gulp docker",
"lint": "eslint --ext .js,.vue ./",
@ -17,42 +18,47 @@
"test:unit:ci": "vitest run",
"commitlint": "commitlint --edit",
"prepare": "npx husky install",
"addReferenceTag": "node .husky/addReferenceTag.js"
"addReferenceTag": "node .husky/addReferenceTag.js",
"docs:dev": "vitepress dev docs",
"docs:build": "vitepress build docs",
"docs:preview": "vitepress preview docs"
},
"dependencies": {
"@quasar/cli": "^2.3.0",
"@quasar/extras": "^1.16.9",
"@quasar/cli": "^2.4.1",
"@quasar/extras": "^1.16.16",
"axios": "^1.4.0",
"chromium": "^3.0.3",
"croppie": "^2.6.5",
"moment": "^2.30.1",
"pinia": "^2.1.3",
"quasar": "^2.14.5",
"quasar": "^2.17.7",
"validator": "^13.9.0",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.1"
"vue": "^3.5.13",
"vue-i18n": "^9.3.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@intlify/unplugin-vue-i18n": "^0.8.1",
"@intlify/unplugin-vue-i18n": "^0.8.2",
"@pinia/testing": "^0.1.2",
"@quasar/app-vite": "^1.7.3",
"@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
"@quasar/app-vite": "^2.0.8",
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",
"cypress": "^13.6.6",
"cypress-mochawesome-reporter": "^3.8.2",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-cypress": "^2.13.3",
"eslint-plugin-vue": "^9.14.1",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-cypress": "^4.1.0",
"eslint-plugin-vue": "^9.32.0",
"husky": "^8.0.0",
"postcss": "^8.4.23",
"prettier": "^2.8.8",
"vitest": "^0.31.1"
"prettier": "^3.4.2",
"sass": "^1.83.4",
"vitepress": "^1.6.3",
"vitest": "^0.34.0"
},
"engines": {
"node": "^20 || ^18 || ^16",
@ -61,8 +67,8 @@
"bun": ">= 1.0.25"
},
"overrides": {
"@vitejs/plugin-vue": "^5.0.4",
"vite": "^5.1.4",
"@vitejs/plugin-vue": "^5.2.1",
"vite": "^6.0.11",
"vitest": "^0.31.1"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,14 @@
/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
import autoprefixer from 'autoprefixer';
// Uncomment the following line if you want to support RTL CSS
// import rtlcss from 'postcss-rtlcss';
export default {
plugins: [
// https://github.com/postcss/autoprefixer
require('autoprefixer')({
autoprefixer({
overrideBrowserslist: [
'last 4 Chrome versions',
'last 4 Firefox versions',
@ -18,10 +22,7 @@ module.exports = {
}),
// https://github.com/elchininet/postcss-rtlcss
// If you want to support RTL css, then
// 1. yarn/npm install postcss-rtlcss
// 2. optionally set quasar.config.js > framework > lang to an RTL language
// 3. uncomment the following line:
// require('postcss-rtlcss')
// If you want to support RTL CSS, uncomment the following line:
// rtlcss(),
],
};

6
proxy-serve.js Normal file
View File

@ -0,0 +1,6 @@
export default [
{
path: '/api',
rule: { target: 'http://0.0.0.0:3000' },
},
];

View File

@ -8,11 +8,11 @@
// Configuration for your app
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
const { configure } = require('quasar/wrappers');
const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
const path = require('path');
import { configure } from 'quasar/wrappers';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path';
module.exports = configure(function (/* ctx */) {
export default configure(function (/* ctx */) {
return {
eslint: {
// fix: true,
@ -179,7 +179,6 @@ module.exports = configure(function (/* ctx */) {
'render', // keep this as last one
],
},
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
pwa: {
workboxMode: 'generateSW', // or 'injectManifest'

View File

@ -1,6 +1,8 @@
{
"@quasar/testing-unit-vitest": {
"options": ["scripts"]
"options": [
"scripts"
]
},
"@quasar/qcalendar": {}
}

View File

@ -20,7 +20,7 @@ describe('Axios boot', () => {
describe('onRequest()', async () => {
it('should set the "Authorization" property on the headers', async () => {
const config = { headers: {} };
localStorage.setItem('token', 'DEFAULT_TOKEN');
const resultConfig = onRequest(config);
expect(resultConfig).toEqual(

View File

@ -3,9 +3,9 @@ import { useSession } from 'src/composables/useSession';
import { Router } from 'src/router';
import useNotify from 'src/composables/useNotify.js';
import { useStateQueryStore } from 'src/stores/useStateQueryStore';
import { getToken, isLoggedIn } from 'src/utils/session';
import { i18n } from 'src/boot/i18n';
const session = useSession();
const { notify } = useNotify();
const stateQuery = useStateQueryStore();
const baseUrl = '/api/';
@ -13,7 +13,7 @@ axios.defaults.baseURL = baseUrl;
const axiosNoError = axios.create({ baseURL: baseUrl });
const onRequest = (config) => {
const token = session.getToken();
const token = getToken();
if (token.length && !config.headers.Authorization) {
config.headers.Authorization = token;
config.headers['Accept-Language'] = i18n.global.locale.value;
@ -37,15 +37,15 @@ const onResponse = (response) => {
return response;
};
const onResponseError = (error) => {
const onResponseError = async (error) => {
stateQuery.remove(error.config);
if (session.isLoggedIn() && error.response?.status === 401) {
session.destroy(false);
if (isLoggedIn() && error.response?.status === 401) {
await useSession().destroy(false);
const hash = window.location.hash;
const url = hash.slice(1);
Router.push(`/login?redirect=${url}`);
} else if (!session.isLoggedIn()) {
} else if (!isLoggedIn()) {
return Promise.reject(error);
}

View File

@ -0,0 +1,2 @@
export const langs = ['en', 'es'];
export const decimalPlaces = 2;

View File

@ -1,6 +1,6 @@
export default {
mounted: function (el, binding) {
const shortcut = binding.value ?? '+';
mounted(el, binding) {
const shortcut = binding.value || '+';
const { key, ctrl, alt, callback } =
typeof shortcut === 'string'
@ -8,25 +8,24 @@ export default {
key: shortcut,
ctrl: true,
alt: true,
callback: () =>
document
.querySelector(`button[shortcut="${shortcut}"]`)
?.click(),
callback: () => el?.click(),
}
: binding.value;
if (!el.hasAttribute('shortcut')) {
el.setAttribute('shortcut', key);
}
const handleKeydown = (event) => {
if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
callback();
}
};
// Attach the event listener to the window
window.addEventListener('keydown', handleKeydown);
el._handleKeydown = handleKeydown;
},
unmounted: function (el) {
unmounted(el) {
if (el._handleKeydown) {
window.removeEventListener('keydown', el._handleKeydown);
}

View File

@ -14,7 +14,7 @@ const { t } = useI18n();
const bicInputRef = ref(null);
const state = useState();
const customer = computed(() => state.get('customer'));
const customer = computed(() => state.get('Customer'));
const countriesFilter = {
fields: ['id', 'name', 'code'],

View File

@ -1,6 +1,6 @@
<script setup>
import axios from 'axios';
import { computed, ref, watch } from 'vue';
import { computed, ref, useAttrs, watch } from 'vue';
import { useRouter, onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
@ -17,6 +17,7 @@ const quasar = useQuasar();
const stateStore = useStateStore();
const { t } = useI18n();
const { validate } = useValidator();
const $attrs = useAttrs();
const $props = defineProps({
model: {
@ -113,9 +114,11 @@ onBeforeRouteLeave((to, from, next) => {
});
async function fetch(data) {
resetData(data);
emit('onFetch', data);
return data;
const keyData = $attrs['key-data'];
const rows = keyData ? data[keyData] : data;
resetData(rows);
emit('onFetch', rows);
return rows;
}
function resetData(data) {
@ -146,7 +149,7 @@ function filter(value, update, filterOptions) {
(ref) => {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
@ -212,7 +215,7 @@ async function remove(data) {
if (preRemove.length) {
newData = newData.filter(
(form) => !preRemove.some((index) => index == form.$index)
(form) => !preRemove.some((index) => index == form.$index),
);
const changes = getChanges();
if (!changes.creates?.length && !changes.updates?.length)

View File

@ -84,7 +84,7 @@ const $props = defineProps({
},
reload: {
type: Boolean,
default: false,
default: true,
},
defaultTrim: {
type: Boolean,
@ -97,7 +97,7 @@ const $props = defineProps({
});
const emit = defineEmits(['onFetch', 'onDataSaved']);
const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value;
const componentIsRendered = ref(false);
const arrayData = useArrayData(modelValue);
@ -105,8 +105,8 @@ const isLoading = ref(false);
// Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
const isResetting = ref(false);
const hasChanges = ref(!$props.observeFormChanges);
const originalData = ref({});
const formData = computed(() => state.get(modelValue));
const originalData = computed(() => state.get(modelValue));
const formData = ref({});
const defaultButtons = computed(() => ({
save: {
dataCy: 'saveDefaultBtn',
@ -127,8 +127,6 @@ const defaultButtons = computed(() => ({
}));
onMounted(async () => {
originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
nextTick(() => (componentIsRendered.value = true));
// Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
@ -148,7 +146,7 @@ onMounted(async () => {
JSON.stringify(newVal) !== JSON.stringify(originalData.value);
isResetting.value = false;
},
{ deep: true }
{ deep: true },
);
}
});
@ -156,16 +154,24 @@ onMounted(async () => {
if (!$props.url)
watch(
() => arrayData.store.data,
(val) => updateAndEmit('onFetch', val)
(val) => updateAndEmit('onFetch', val),
);
watch(
originalData,
(val) => {
if (val) formData.value = JSON.parse(JSON.stringify(val));
},
{ immediate: true },
);
watch(
() => [$props.url, $props.filter],
async () => {
originalData.value = null;
state.set(modelValue, null);
reset();
await fetch();
}
},
);
onBeforeRouteLeave((to, from, next) => {
@ -197,7 +203,6 @@ async function fetch() {
updateAndEmit('onFetch', data);
} catch (e) {
state.set(modelValue, {});
originalData.value = {};
throw e;
}
}
@ -236,6 +241,7 @@ async function saveAndGo() {
}
function reset() {
formData.value = JSON.parse(JSON.stringify(originalData.value));
updateAndEmit('onFetch', originalData.value);
if ($props.observeFormChanges) {
hasChanges.value = false;
@ -254,13 +260,12 @@ function filter(value, update, filterOptions) {
(ref) => {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
function updateAndEmit(evt, val, res) {
state.set(modelValue, val);
originalData.value = val && JSON.parse(JSON.stringify(val));
if (!$props.url) arrayData.store.data = val;
emit(evt, state.get(modelValue), res);

View File

@ -31,7 +31,6 @@ const props = defineProps({
const route = useRoute();
const itemTypesOptions = ref([]);
const suppliersOptions = ref([]);
const tagOptions = ref([]);
const tagValues = ref([]);
const categoryList = ref(null);
@ -40,13 +39,13 @@ const selectedTypeFk = ref(getParamWhere(route.query.table, 'typeFk', false));
const selectedCategory = computed(() => {
return (categoryList.value || []).find(
(category) => category?.id === selectedCategoryFk.value
(category) => category?.id === selectedCategoryFk.value,
);
});
const selectedType = computed(() => {
return (itemTypesOptions.value || []).find(
(type) => type?.id === selectedTypeFk.value
(type) => type?.id === selectedTypeFk.value,
);
});
@ -134,13 +133,6 @@ const setCategoryList = (data) => {
<template>
<FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
<FetchData
url="Suppliers"
limit="30"
auto-load
:filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
@on-fetch="(data) => (suppliersOptions = data)"
/>
<FetchData
url="Tags"
:filter="{ fields: ['id', 'name', 'isFree'] }"
@ -290,7 +282,7 @@ const setCategoryList = (data) => {
<QItem class="q-mt-lg">
<QBtn
icon="add_circle"
shortcut="+"
v-shortcut="'+'"
flat
class="fill-icon-on-hover q-px-xs"
color="primary"
@ -349,4 +341,11 @@ es:
floramondo: Floramondo
salesPersonFk: Comprador
categoryFk: Categoría
Plant: Planta natural
Flower: Flor fresca
Handmade: Hecho a mano
Artificial: Artificial
Green: Verdes frescos
Accessories: Complementos florales
Fruit: Fruta
</i18n>

View File

@ -10,12 +10,13 @@ import routes from 'src/router/modules';
import LeftMenuItem from './LeftMenuItem.vue';
import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
import VnInput from './common/VnInput.vue';
import { useRouter } from 'vue-router';
const { t } = useI18n();
const route = useRoute();
const quasar = useQuasar();
const navigation = useNavigationStore();
const router = useRouter();
const props = defineProps({
source: {
type: String,
@ -40,7 +41,6 @@ const filteredItems = computed(() => {
return locale.includes(normalizedSearch);
});
});
const filteredPinnedModules = computed(() => {
if (!search.value) return pinnedModules.value;
const normalizedSearch = search.value
@ -71,7 +71,7 @@ watch(
items.value = [];
getRoutes();
},
{ deep: true }
{ deep: true },
);
function findMatches(search, item) {
@ -103,33 +103,40 @@ function addChildren(module, route, parent) {
}
function getRoutes() {
if (props.source === 'main') {
const modules = Object.assign([], navigation.getModules().value);
for (const item of modules) {
const moduleDef = routes.find(
(route) => toLowerCamel(route.name) === item.module
);
if (!moduleDef) continue;
item.children = [];
addChildren(item.module, moduleDef, item.children);
}
items.value = modules;
const handleRoutes = {
main: getMainRoutes,
card: getCardRoutes,
};
try {
handleRoutes[props.source]();
} catch (error) {
throw new Error(`Method is not defined`);
}
}
function getMainRoutes() {
const modules = Object.assign([], navigation.getModules().value);
if (props.source === 'card') {
const currentRoute = route.matched[1];
const currentModule = toLowerCamel(currentRoute.name);
let moduleDef = routes.find(
(route) => toLowerCamel(route.name) === currentModule
for (const item of modules) {
const moduleDef = routes.find(
(route) => toLowerCamel(route.name) === item.module,
);
if (!moduleDef) continue;
item.children = [];
if (!moduleDef) return;
if (!moduleDef?.menus) moduleDef = betaGetRoutes();
addChildren(currentModule, moduleDef, items.value);
addChildren(item.module, moduleDef, item.children);
}
items.value = modules;
}
function getCardRoutes() {
const currentRoute = route.matched[1];
const currentModule = toLowerCamel(currentRoute.name);
let moduleDef = routes.find((route) => toLowerCamel(route.name) === currentModule);
if (!moduleDef) return;
if (!moduleDef?.menus) moduleDef = betaGetRoutes();
addChildren(currentModule, moduleDef, items.value);
}
function betaGetRoutes() {
@ -174,6 +181,10 @@ function normalize(text) {
.replace(/[\u0300-\u036f]/g, '')
.toLowerCase();
}
const searchModule = () => {
const [item] = filteredItems.value;
if (item) router.push({ name: item.name });
};
</script>
<template>
@ -188,10 +199,11 @@ function normalize(text) {
filled
dense
autofocus
@keyup.enter.stop="searchModule()"
/>
</QItem>
<QSeparator />
<template v-if="filteredPinnedModules.size">
<template v-if="filteredPinnedModules.size && !search">
<LeftMenuItem
v-for="[key, pinnedModule] of filteredPinnedModules"
:key="key"
@ -215,11 +227,18 @@ function normalize(text) {
</LeftMenuItem>
<QSeparator />
</template>
<template v-for="item in filteredItems" :key="item.name">
<template v-for="(item, index) in filteredItems" :key="item.name">
<template
v-if="item.children && !filteredPinnedModules.has(item.name)"
v-if="
search ||
(item.children && !filteredPinnedModules.has(item.name))
"
>
<LeftMenuItem :item="item" group="modules">
<LeftMenuItem
:item="item"
group="modules"
:class="search && index === 0 ? 'searched' : ''"
>
<template #side>
<QBtn
v-if="item.isPinned === true"
@ -336,6 +355,9 @@ function normalize(text) {
.header {
color: var(--vn-label-color);
}
.searched {
background-color: var(--vn-section-hover-color);
}
</style>
<i18n>
es:

View File

@ -20,6 +20,7 @@ const appName = 'Lilium';
const pinnedModulesRef = ref();
onMounted(() => stateStore.setMounted());
const refresh = () => window.location.reload();
</script>
<template>
<QHeader color="white" elevated>
@ -64,6 +65,13 @@ onMounted(() => stateStore.setMounted());
<QSpace />
<div class="q-pl-sm q-gutter-sm row items-center no-wrap">
<div id="actions-prepend"></div>
<QIcon
name="refresh"
size="md"
color="red"
v-if="state.get('error')"
@click="refresh"
/>
<QBtn
:class="{ 'q-pa-none': quasar.platform.is.mobile }"
id="pinnedModules"

View File

@ -2,26 +2,9 @@
defineProps({ row: { type: Object, required: true } });
</script>
<template>
<span>
<span class="q-gutter-x-xs">
<QIcon
v-if="row.isTaxDataChecked === 0"
name="vn:no036"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
</QIcon>
<QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon>
<QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
</QIcon>
<QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
</QIcon>
<QIcon
v-if="row.risk"
v-if="row?.risk"
name="vn:risk"
:color="row.hasHighRisk ? 'negative' : 'primary'"
size="xs"
@ -30,10 +13,57 @@ defineProps({ row: { type: Object, required: true } });
{{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
</QTooltip>
</QIcon>
<QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
<QIcon
v-if="row?.hasComponentLack"
name="vn:components"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
</QIcon>
<QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
<QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
<QTooltip>
{{ $t('ticket.summary.hasItemDelay') }}
</QTooltip>
</QIcon>
<QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
<QTooltip>
{{ $t('salesTicketsTable.hasItemLost') }}
</QTooltip>
</QIcon>
<QIcon
v-if="row?.hasItemShortage"
name="vn:unavailable"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
</QIcon>
<QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
<QTooltip>
{{ $t('ticketList.rounding') }}
</QTooltip>
</QIcon>
<QIcon
v-if="row?.hasTicketRequest"
name="vn:buyrequest"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon>
<QIcon
v-if="!row?.isTaxDataChecked === 0"
name="vn:no036"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
</QIcon>
<QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
</QIcon>
<QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
</QIcon>
</span>

View File

@ -1,6 +1,9 @@
<script setup>
import quasarLang from 'src/utils/quasarLang';
import { onMounted, computed, ref } from 'vue';
import { Dark, Quasar } from 'quasar';
import { Dark } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import axios from 'axios';
@ -31,14 +34,7 @@ const userLocale = computed({
value = localeEquivalence[value] ?? value;
try {
/* @vite-ignore */
import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
Quasar.lang.set(lang.default);
});
} catch (error) {
//
}
quasarLang(value);
},
});

View File

@ -181,7 +181,7 @@ onMounted(() => {
watch(
() => $props.columns,
(value) => splitColumns(value),
{ immediate: true }
{ immediate: true },
);
const isTableMode = computed(() => mode.value == TABLE_MODE);
@ -212,7 +212,7 @@ function splitColumns(columns) {
// Status column
if (splittedColumns.value.chips.length) {
splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
(c) => !c.isId
(c) => !c.isId,
);
if (splittedColumns.value.columnChips.length)
splittedColumns.value.columns.unshift({
@ -314,7 +314,19 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
show-if-above
>
<QScrollArea class="fit">
<VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
<VnTableFilter
:data-key="$attrs['data-key']"
:columns="columns"
:redirect="redirect"
>
<template
v-for="(_, slotName) in $slots"
#[slotName]="slotData"
:key="slotName"
>
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</VnTableFilter>
</QScrollArea>
</QDrawer>
<CrudModel
@ -472,7 +484,9 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
"
:style="`visibility: ${
(btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
((btn.show && btn.show(row)) ?? true)
? 'visible'
: 'hidden'
}`"
@click="btn.action(row)"
/>
@ -486,7 +500,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
<QCard
bordered
flat
class="row no-wrap justify-between cursor-pointer"
class="row no-wrap justify-between cursor-pointer q-pa-sm"
@click="
(_, row) => {
$props.rowClick && $props.rowClick(row);
@ -567,7 +581,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
<!-- Actions -->
<QCardSection
v-if="colsMap.tableActions"
class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
@click="stopEventPropagation($event)"
>
<QBtn
@ -616,7 +629,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
size="md"
round
flat
shortcut="+"
v-shortcut="'+'"
:disabled="!disabledAttr"
/>
<QTooltip>
@ -634,7 +647,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
color="primary"
fab
icon="add"
shortcut="+"
v-shortcut="'+'"
data-cy="vnTableCreateBtn"
/>
<QTooltip self="top right">
@ -793,12 +806,15 @@ es:
.grid-two {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
max-width: 100%;
margin: 0 auto;
overflow: scroll;
white-space: wrap;
width: 100%;
grid-template-columns: 2fr 2fr;
.vn-label-value {
flex-direction: column;
white-space: nowrap;
.fields {
display: flex;
}
}
white-space: nowrap;
}
.w-80 {

View File

@ -27,7 +27,7 @@ function columnName(col) {
</script>
<template>
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
<template #body="{ params, orders }">
<template #body="{ params, orders, searchFn }">
<div
class="row no-wrap flex-center"
v-for="col of columns.filter((c) => c.columnFilter ?? true)"
@ -52,6 +52,7 @@ function columnName(col) {
<slot
name="moreFilterPanel"
:params="params"
:search-fn="searchFn"
:orders="orders"
:columns="columns"
/>
@ -62,5 +63,8 @@ function columnName(col) {
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</VnFilterPanel>
</template>

View File

@ -0,0 +1,121 @@
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnVisibleColumn from '../VnVisibleColumn.vue';
import { axios } from 'app/test/vitest/helper';
describe('VnVisibleColumns', () => {
let wrapper;
let vm;
beforeEach(() => {
wrapper = createWrapper(VnVisibleColumn, {
propsData: {
tableCode: 'testTable',
skip: ['skippedColumn'],
},
});
vm = wrapper.vm;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('setUserConfigViewData()', () => {
it('should initialize localColumns with visible configuration', () => {
vm.columns = [
{ name: 'columnMockName', label: undefined },
{ name: 'columnMockAddress', label: undefined },
{ name: 'columnMockId', label: undefined },
];
const configuration = {
columnMockName: true,
columnMockAddress: false,
columnMockId: true,
};
const expectedColumns = [
{ name: 'columnMockName', label: undefined, visible: true },
{ name: 'columnMockAddress', label: undefined, visible: false },
{ name: 'columnMockId', label: undefined, visible: true },
];
vm.setUserConfigViewData(configuration, false);
expect(vm.localColumns).toEqual(expectedColumns);
});
it('should skip columns based on props', () => {
vm.columns = [
{ name: 'columnMockName', label: undefined },
{ name: 'columnMockId', label: undefined },
{ name: 'skippedColumn', label: 'Skipped Column' },
];
const configuration = {
columnMockName: true,
skippedColumn: false,
columnMockId: true,
};
const expectedColumns = [
{ name: 'columnMockName', label: undefined, visible: true },
{ name: 'columnMockId', label: undefined, visible: true },
];
vm.setUserConfigViewData(configuration, false);
expect(vm.localColumns).toEqual(expectedColumns);
});
});
describe('toggleMarkAll()', () => {
it('should set all localColumns to visible=true', () => {
vm.localColumns = [
{ name: 'columnMockName', visible: false },
{ name: 'columnMockId', visible: false },
];
vm.toggleMarkAll(true);
expect(vm.localColumns.every((col) => col.visible)).toBe(true);
});
it('should set all localColumns to visible=false', () => {
vm.localColumns = [
{ name: 'columnMockName', visible: true },
{ name: 'columnMockId', visible: true },
];
vm.toggleMarkAll(false);
expect(vm.localColumns.every((col) => col.visible)).toBe(false);
});
});
describe('saveConfig()', () => {
it('should call setUserConfigViewData and axios.post with correct params', async () => {
const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
data: [{ id: 1 }],
});
vm.localColumns = [
{ name: 'columnMockName', visible: true },
{ name: 'columnMockId', visible: false },
];
await vm.saveConfig();
expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
creates: [
{
userFk: vm.user.id,
tableCode: vm.tableCode,
tableConfig: vm.tableCode,
configuration: {
columnMockName: true,
columnMockId: false,
},
},
],
});
});
});
});

View File

@ -0,0 +1,12 @@
export default function (initialFooter, data) {
const footer = data.reduce(
(acc, row) => {
Object.entries(initialFooter).forEach(([key, initialValue]) => {
acc[key] += row?.[key] !== undefined ? row[key] : initialValue;
});
return acc;
},
{ ...initialFooter }
);
return footer;
}

View File

@ -93,7 +93,7 @@ describe('FormModel', () => {
it('should call axios.patch with the right data', async () => {
const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
const { vm } = mount({ propsData: { url, model, formInitialData } });
const { vm } = mount({ propsData: { url, model } });
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
@ -106,6 +106,7 @@ describe('FormModel', () => {
const { vm } = mount({
propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
});
await vm.$nextTick();
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();
@ -119,7 +120,7 @@ describe('FormModel', () => {
});
const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
await vm.$nextTick();
vm.formData.mockKey = 'newVal';
await vm.$nextTick();
await vm.save();

View File

@ -1,9 +1,12 @@
import { vi, describe, expect, it, beforeAll } from 'vitest';
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import Leftmenu from 'components/LeftMenu.vue';
import * as vueRouter from 'vue-router';
import { useNavigationStore } from 'src/stores/useNavigationStore';
let vm;
let navigation;
vi.mock('src/router/modules', () => ({
default: [
{
@ -21,6 +24,16 @@ vi.mock('src/router/modules', () => ({
{
path: '',
name: 'CustomerMain',
meta: {
menu: 'Customer',
menuChildren: [
{
name: 'CustomerCreditContracts',
title: 'creditContracts',
icon: 'vn:solunion',
},
],
},
children: [
{
path: 'list',
@ -28,6 +41,13 @@ vi.mock('src/router/modules', () => ({
meta: {
title: 'list',
icon: 'view_list',
menuChildren: [
{
name: 'CustomerCreditContracts',
title: 'creditContracts',
icon: 'vn:solunion',
},
],
},
},
{
@ -44,51 +64,325 @@ vi.mock('src/router/modules', () => ({
},
],
}));
describe('Leftmenu', () => {
let vm;
let navigation;
beforeAll(() => {
vi.spyOn(axios, 'get').mockResolvedValue({
data: [],
});
vm = createWrapper(Leftmenu, {
propsData: {
source: 'main',
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
matched: [
{
path: '/',
redirect: {
name: 'Dashboard',
},
}).vm;
navigation = useNavigationStore();
navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
navigation.getModules = vi.fn().mockReturnValue({
value: [
name: 'Main',
meta: {},
props: {
default: false,
},
children: [
{
name: 'customer',
title: 'customer.pageTitles.customers',
icon: 'vn:customer',
module: 'customer',
path: '/dashboard',
name: 'Dashboard',
meta: {
title: 'dashboard',
icon: 'dashboard',
},
},
],
},
{
path: '/customer',
redirect: {
name: 'CustomerMain',
},
name: 'Customer',
meta: {
title: 'customers',
icon: 'vn:client',
moduleName: 'Customer',
keyBinding: 'c',
menu: 'customer',
},
},
],
query: {},
params: {},
meta: { moduleName: 'mockName' },
path: 'mockName/1',
name: 'Customer',
});
function mount(source = 'main') {
vi.spyOn(axios, 'get').mockResolvedValue({
data: [],
});
const wrapper = createWrapper(Leftmenu, {
propsData: {
source,
},
});
navigation = useNavigationStore();
navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
navigation.getModules = vi.fn().mockReturnValue({
value: [
{
name: 'customer',
title: 'customer.pageTitles.customers',
icon: 'vn:customer',
module: 'customer',
},
],
});
return wrapper;
}
describe('getRoutes', () => {
afterEach(() => vi.clearAllMocks());
const getRoutes = vi.fn().mockImplementation((props, getMethodA, getMethodB) => {
const handleRoutes = {
methodA: getMethodA,
methodB: getMethodB,
};
try {
handleRoutes[props.source]();
} catch (error) {
throw Error('Method not defined');
}
});
const getMethodA = vi.fn();
const getMethodB = vi.fn();
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
it('should call getMethodB when source is card', () => {
let props = { source: 'methodB' };
fn(props);
expect(getMethodB).toHaveBeenCalled();
expect(getMethodA).not.toHaveBeenCalled();
});
it('should call getMethodA when source is main', () => {
let props = { source: 'methodA' };
fn(props);
expect(getMethodA).toHaveBeenCalled();
expect(getMethodB).not.toHaveBeenCalled();
});
it('should call getMethodA when source is not exists or undefined', () => {
let props = { source: 'methodC' };
expect(() => fn(props)).toThrowError('Method not defined');
expect(getMethodA).not.toHaveBeenCalled();
expect(getMethodB).not.toHaveBeenCalled();
});
});
describe('Leftmenu as card', () => {
beforeAll(() => {
vm = mount('card').vm;
});
it('should get routes for card source', async () => {
vm.getRoutes();
});
});
describe('Leftmenu as main', () => {
beforeEach(() => {
vm = mount().vm;
});
it('should initialize with default props', () => {
expect(vm.source).toBe('main');
});
it('should filter items based on search input', async () => {
vm.search = 'cust';
await vm.$nextTick();
expect(vm.filteredItems[0].name).toEqual('customer');
expect(vm.filteredItems[0].module).toEqual('customer');
});
it('should filter items based on search input', async () => {
vm.search = 'Rou';
await vm.$nextTick();
expect(vm.filteredItems).toEqual([]);
});
it('should return pinned items', () => {
vm.items = [
{ name: 'Item 1', isPinned: false },
{ name: 'Item 2', isPinned: true },
];
expect(vm.pinnedModules).toEqual(
new Map([['Item 2', { name: 'Item 2', isPinned: true }]]),
);
});
it('should find matches in routes', () => {
const search = 'child1';
const item = {
children: [
{ name: 'child1', children: [] },
{ name: 'child2', children: [] },
],
};
const matches = vm.findMatches(search, item);
expect(matches).toEqual([{ name: 'child1', children: [] }]);
});
it('should not proceed if event is already prevented', async () => {
const item = { module: 'testModule', isPinned: false };
const event = {
preventDefault: vi.fn(),
stopPropagation: vi.fn(),
defaultPrevented: true,
};
await vm.togglePinned(item, event);
expect(event.preventDefault).not.toHaveBeenCalled();
expect(event.stopPropagation).not.toHaveBeenCalled();
});
it('should call quasar.notify with success message', async () => {
const item = { module: 'testModule', isPinned: false };
const event = {
preventDefault: vi.fn(),
stopPropagation: vi.fn(),
defaultPrevented: false,
};
const response = { data: { id: 1 } };
vi.spyOn(axios, 'post').mockResolvedValue(response);
vi.spyOn(vm.quasar, 'notify');
await vm.togglePinned(item, event);
expect(vm.quasar.notify).toHaveBeenCalledWith({
message: 'Data saved',
type: 'positive',
});
});
it('should return a proper formated object with two child items', async () => {
const expectedMenuItem = [
{
children: null,
name: 'CustomerList',
title: 'globals.pageTitles.list',
icon: 'view_list',
},
{
children: null,
name: 'CustomerCreate',
title: 'globals.pageTitles.createCustomer',
icon: 'vn:addperson',
},
];
const firstMenuItem = vm.items[0];
expect(firstMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
it('should handle a single matched route with a menu', () => {
const route = {
matched: [{ meta: { menu: 'customer' } }],
};
const result = vm.betaGetRoutes();
expect(result.meta.menu).toEqual(route.matched[0].meta.menu);
});
it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled();
});
it('should find direct child matches', () => {
const search = 'child1';
const item = {
children: [{ name: 'child1' }, { name: 'child2' }],
};
const result = vm.findMatches(search, item);
expect(result).toEqual([{ name: 'child1' }]);
});
it('should find nested child matches', () => {
const search = 'child3';
const item = {
children: [
{ name: 'child1' },
{
name: 'child2',
children: [{ name: 'child3' }],
},
],
};
const result = vm.findMatches(search, item);
expect(result).toEqual([{ name: 'child3' }]);
});
});
describe('normalize', () => {
beforeAll(() => {
vm = mount('card').vm;
});
it('should normalize and lowercase text', () => {
const input = 'ÁÉÍÓÚáéíóú';
const expected = 'aeiouaeiou';
expect(vm.normalize(input)).toBe(expected);
});
it('should handle empty string', () => {
const input = '';
const expected = '';
expect(vm.normalize(input)).toBe(expected);
});
it('should handle text without diacritics', () => {
const input = 'hello';
const expected = 'hello';
expect(vm.normalize(input)).toBe(expected);
});
it('should handle mixed text', () => {
const input = 'Héllo Wórld!';
const expected = 'hello world!';
expect(vm.normalize(input)).toBe(expected);
});
});
describe('addChildren', () => {
const module = 'testModule';
beforeEach(() => {
vm = mount().vm;
vi.clearAllMocks();
});
it('should add menu items to parent if matches are found', () => {
const parent = 'testParent';
const route = {
meta: {
menu: 'testMenu',
},
children: [{ name: 'child1' }, { name: 'child2' }],
};
vm.addChildren(module, route, parent);
expect(navigation.addMenuItem).toHaveBeenCalled();
});
it('should handle routes with no meta menu', () => {
const route = {
meta: {},
menus: {},
};
const parent = [];
vm.addChildren(module, route, parent);
expect(navigation.addMenuItem).toHaveBeenCalled();
});
it('should handle empty parent array', () => {
const parent = [];
const route = {
meta: {
menu: 'child11',
},
children: [
{
name: 'child1',
meta: {
menuChildren: [
{
name: 'CustomerCreditContracts',
title: 'creditContracts',
icon: 'vn:solunion',
},
],
},
},
],
};
vm.addChildren(module, route, parent);
expect(navigation.addMenuItem).toHaveBeenCalled();
});
});

View File

@ -0,0 +1,61 @@
import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import UserPanel from 'src/components/UserPanel.vue';
import axios from 'axios';
import { useState } from 'src/composables/useState';
describe('UserPanel', () => {
let wrapper;
let vm;
let state;
beforeEach(() => {
wrapper = createWrapper(UserPanel, {});
state = useState();
state.setUser({
id: 115,
name: 'itmanagement',
nickname: 'itManagementNick',
lang: 'en',
darkMode: false,
companyFk: 442,
warehouseFk: 1,
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should fetch warehouses data on mounted', async () => {
const fetchData = wrapper.findComponent({ name: 'FetchData' });
expect(fetchData.props('url')).toBe('Warehouses');
expect(fetchData.props('autoLoad')).toBe(true);
});
it('should toggle dark mode correctly and update preferences', async () => {
await vm.saveDarkMode(true);
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
expect(vm.user.darkMode).toBe(true);
vm.updatePreferences();
expect(vm.darkMode).toBe(true);
});
it('should change user language and update preferences', async () => {
const userLanguage = 'es';
await vm.saveLanguage(userLanguage);
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
expect(vm.user.lang).toBe(userLanguage);
vm.updatePreferences();
expect(vm.locale).toBe(userLanguage);
});
it('should update user data', async () => {
const key = 'name';
const value = 'itboss';
await vm.saveUserData(key, value);
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
});
});

View File

@ -0,0 +1,53 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore';
import { useHasContent } from 'src/composables/useHasContent';
import { watch } from 'vue';
const { t } = useI18n();
const stateStore = useStateStore();
const hasContent = useHasContent('#advanced-menu');
const $props = defineProps({
isMainSection: {
type: Boolean,
default: false,
},
});
watch(
() => $props.isMainSection,
(val) => {
if (stateStore) stateStore.rightAdvancedDrawer = val;
},
{ immediate: true },
);
</script>
<template>
<Teleport to="#searchbar-after" v-if="stateStore.isHeaderMounted()">
<QBtn
v-if="hasContent || $slots['advanced-menu']"
flat
@click="stateStore.toggleRightAdvancedDrawer()"
round
icon="tune"
color="white"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.advancedMenu') }}
</QTooltip>
</QBtn>
</Teleport>
<QDrawer
v-model="stateStore.rightAdvancedDrawer"
side="right"
:width="256"
:overlay="!isMainSection"
v-bind="$attrs"
>
<QScrollArea class="fit">
<div id="advanced-menu"></div>
<slot v-if="!hasContent" name="advanced-menu" />
</QScrollArea>
</QDrawer>
</template>

View File

@ -17,7 +17,7 @@ onMounted(() => {
});
</script>
<template>
<Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
<Teleport to="#actions-prepend" v-if="stateStore.isHeaderMounted()">
<div class="row q-gutter-x-sm">
<QBtn
v-if="hasContent || $slots['right-panel']"
@ -26,6 +26,7 @@ onMounted(() => {
round
dense
icon="dock_to_left"
data-cy="toggle-right-drawer"
>
<QTooltip bottom anchor="bottom right">
{{ t('globals.collapseMenu') }}

View File

@ -10,11 +10,11 @@ import LeftMenu from 'components/LeftMenu.vue';
import RightMenu from 'components/common/RightMenu.vue';
const props = defineProps({
dataKey: { type: String, required: true },
baseUrl: { type: String, default: undefined },
customUrl: { type: String, default: undefined },
url: { type: String, default: undefined },
filter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
idInWhere: { type: Boolean, default: false },
searchDataKey: { type: String, default: undefined },
searchbarProps: { type: Object, default: undefined },
redirectOnError: { type: Boolean, default: false },
@ -23,25 +23,20 @@ const props = defineProps({
const stateStore = useStateStore();
const route = useRoute();
const router = useRouter();
const url = computed(() => {
if (props.baseUrl) {
return `${props.baseUrl}/${route.params.id}`;
}
return props.customUrl;
});
const searchRightDataKey = computed(() => {
if (!props.searchDataKey) return route.name;
return props.searchDataKey;
});
const arrayData = useArrayData(props.dataKey, {
url: url.value,
filter: props.filter,
url: props.url,
userFilter: props.filter,
oneRecord: true,
});
onBeforeMount(async () => {
try {
if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
await arrayData.fetch({ append: false, updateRouter: false });
await fetch(route.params.id);
} catch {
const { matched: matches } = router.currentRoute.value;
const { path } = matches.at(-1);
@ -49,13 +44,17 @@ onBeforeMount(async () => {
}
});
if (props.baseUrl) {
onBeforeRouteUpdate(async (to, from) => {
if (to.params.id !== from.params.id) {
arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
await arrayData.fetch({ append: false, updateRouter: false });
}
});
onBeforeRouteUpdate(async (to, from) => {
const id = to.params.id;
if (id !== from.params.id) await fetch(id, true);
});
async function fetch(id, append = false) {
const regex = /\/(\d+)/;
if (props.idInWhere) arrayData.store.filter.where = { id };
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
else arrayData.store.url = props.url.replace(regex, `/${id}`);
await arrayData.fetch({ append, updateRouter: false });
}
</script>
<template>
@ -83,7 +82,7 @@ if (props.baseUrl) {
<QPage>
<VnSubToolbar />
<div :class="[useCardSize(), $attrs.class]">
<RouterView :key="route.path" />
<RouterView :key="$route.path" />
</div>
</QPage>
</QPageContainer>

View File

@ -1,6 +1,6 @@
<script setup>
import { onBeforeMount, computed } from 'vue';
import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
import { onBeforeMount } from 'vue';
import { useRouter, onBeforeRouteUpdate } from 'vue-router';
import { useArrayData } from 'src/composables/useArrayData';
import { useStateStore } from 'stores/useStateStore';
import useCardSize from 'src/composables/useCardSize';
@ -9,8 +9,8 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';
const props = defineProps({
dataKey: { type: String, required: true },
baseUrl: { type: String, default: undefined },
customUrl: { type: String, default: undefined },
url: { type: String, default: undefined },
idInWhere: { type: Boolean, default: false },
filter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
@ -20,38 +20,35 @@ const props = defineProps({
});
const stateStore = useStateStore();
const route = useRoute();
const router = useRouter();
const url = computed(() => {
if (props.baseUrl) {
return `${props.baseUrl}/${route.params.id}`;
}
return props.customUrl;
});
const arrayData = useArrayData(props.dataKey, {
url: url.value,
filter: props.filter,
url: props.url,
userFilter: props.filter,
oneRecord: true,
});
onBeforeMount(async () => {
const route = router.currentRoute.value;
try {
if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
await arrayData.fetch({ append: false, updateRouter: false });
await fetch(route.params.id);
} catch {
const { matched: matches } = router.currentRoute.value;
const { matched: matches } = route;
const { path } = matches.at(-1);
router.push({ path: path.replace(/:id.*/, '') });
}
});
if (props.baseUrl) {
onBeforeRouteUpdate(async (to, from) => {
if (to.params.id !== from.params.id) {
arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
await arrayData.fetch({ append: false, updateRouter: false });
}
});
onBeforeRouteUpdate(async (to, from) => {
const id = to.params.id;
if (id !== from.params.id) await fetch(id, true);
});
async function fetch(id, append = false) {
const regex = /\/(\d+)/;
if (props.idInWhere) arrayData.store.filter.where = { id };
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
else arrayData.store.url = props.url.replace(regex, `/${id}`);
await arrayData.fetch({ append, updateRouter: false });
}
</script>
<template>
@ -62,6 +59,6 @@ if (props.baseUrl) {
</Teleport>
<VnSubToolbar />
<div :class="[useCardSize(), $attrs.class]">
<RouterView :key="route.path" />
<RouterView :key="$route.path" />
</div>
</template>

View File

@ -17,7 +17,7 @@ import { useSession } from 'src/composables/useSession';
const route = useRoute();
const quasar = useQuasar();
const { t } = useI18n();
const rows = ref();
const rows = ref([]);
const dmsRef = ref();
const formDialog = ref({});
const token = useSession().getTokenMultimedia();
@ -102,7 +102,7 @@ const columns = computed(() => [
storage: 'dms',
collection: null,
resolution: null,
id: prop.row.file.split('.')[0],
id: Number(prop.row.file.split('.')[0]),
token: token,
class: 'rounded',
ratio: 1,
@ -202,7 +202,7 @@ const columns = computed(() => [
prop.row.id,
$props.downloadModel,
undefined,
prop.row.download
prop.row.download,
),
},
{
@ -299,11 +299,12 @@ defineExpose({
:url="$props.model"
:user-filter="dmsFilter"
:order="['dmsFk DESC']"
:auto-load="true"
auto-load
@on-fetch="setData"
>
<template #body>
<QTable
v-if="rows"
:columns="columns"
:rows="rows"
class="full-width q-mt-md"
@ -373,7 +374,7 @@ defineExpose({
v-if="
shouldRenderButton(
button.name,
props.row.isDocuware
props.row.isDocuware,
)
"
:is="button.component"
@ -388,6 +389,14 @@ defineExpose({
</div>
</template>
</QTable>
<div
v-else
class="info-row q-pa-md text-center"
>
<h5>
{{ t('No data to display') }}
</h5>
</div>
</template>
</VnPaginate>
<QDialog v-model="formDialog.show">
@ -404,7 +413,7 @@ defineExpose({
fab
color="primary"
icon="add"
shortcut="+"
v-shortcut
@click="showFormDialog()"
class="fill-icon"
>

View File

@ -75,6 +75,7 @@ const focus = () => {
defineExpose({
focus,
vnInputRef,
});
const mixinRules = [
@ -174,7 +175,11 @@ const handleUppercase = () => {
v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
@click="handleUppercase"
class="uppercase-icon"
/>
>
<QTooltip>
{{ t('Convert to uppercase') }}
</QTooltip>
</QIcon>
<slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon v-if="info" name="info">
@ -187,13 +192,26 @@ const handleUppercase = () => {
</div>
</template>
<style>
.uppercase-icon {
transition: color 0.3s, transform 0.2s;
cursor: pointer;
}
.uppercase-icon:hover {
color: #ed9937;
transform: scale(1.2);
}
</style>
<i18n>
en:
inputMin: Must be more than {value}
maxLength: The value exceeds {value} characters
inputMax: Must be less than {value}
es:
inputMin: Debe ser mayor a {value}
maxLength: El valor excede los {value} carácteres
inputMax: Debe ser menor a {value}
Convert to uppercase: Convertir a mayúsculas
</i18n>

View File

@ -105,6 +105,7 @@ const manageDate = (date) => {
:rules="mixinRules"
:clearable="false"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space
>
<template #append>

View File

@ -79,6 +79,7 @@ function dateToTime(newDate) {
style="min-width: 100px"
:rules="mixinRules"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
type="time"
hide-bottom-space
>

View File

@ -15,6 +15,7 @@ import FetchData from '../FetchData.vue';
import VnSelect from './VnSelect.vue';
import VnUserLink from '../ui/VnUserLink.vue';
import VnPaginate from '../ui/VnPaginate.vue';
import RightMenu from './RightMenu.vue';
const stateStore = useStateStore();
const validationsStore = useValidator();
@ -130,7 +131,7 @@ const actionsIcon = {
};
const validDate = new RegExp(
/^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
/T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
/T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
);
function castJsonValue(value) {
@ -192,7 +193,7 @@ function getLogTree(data) {
user: log.user,
userFk: log.userFk,
logs: [],
})
}),
);
}
// Model
@ -210,7 +211,7 @@ function getLogTree(data) {
id: log.changedModelId,
showValue: log.changedModelValue,
logs: [],
})
}),
);
nLogs = 0;
}
@ -267,7 +268,7 @@ async function applyFilter() {
filter.where.and.push(selectedFilters.value);
}
paginate.value.fetch(filter);
paginate.value.fetch({ filter });
}
function setDate(type) {
@ -282,7 +283,7 @@ function setDate(type) {
to = date.adjustDate(
to,
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
true
true,
);
switch (type) {
@ -365,7 +366,7 @@ async function clearFilter() {
dateTo.value = undefined;
userRadio.value = undefined;
Object.keys(checkboxOptions.value).forEach(
(opt) => (checkboxOptions.value[opt].selected = false)
(opt) => (checkboxOptions.value[opt].selected = false),
);
await applyFilter();
}
@ -378,7 +379,7 @@ watch(
() => router.currentRoute.value.params.id,
() => {
applyFilter();
}
},
);
</script>
<template>
@ -391,7 +392,7 @@ watch(
const changedModel = item.changedModel;
return {
locale: useCapitalize(
validations[changedModel]?.locale?.name ?? changedModel
validations[changedModel]?.locale?.name ?? changedModel,
),
value: changedModel,
};
@ -403,7 +404,7 @@ watch(
ref="paginate"
:data-key="`${model}Log`"
:url="`${model}Logs`"
:filter="filter"
:user-filter="filter"
:skeleton="false"
auto-load
@on-fetch="setLogTree"
@ -507,7 +508,7 @@ watch(
:title="
date.formatDate(
log.creationDate,
'DD/MM/YYYY hh:mm:ss'
'DD/MM/YYYY hh:mm:ss',
) ?? `date:'dd/MM/yyyy HH:mm:ss'`
"
>
@ -577,7 +578,7 @@ watch(
t(
`actions.${
actionsText[log.action]
}`
}`,
)
"
/>
@ -677,139 +678,144 @@ watch(
</div>
</template>
</VnPaginate>
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
<QList dense>
<QSeparator />
<QItem class="q-mt-sm">
<QInput
:label="t('globals.search')"
v-model="searchInput"
class="full-width"
clearable
clear-icon="close"
@keyup.enter="() => selectFilter('search')"
@focusout="() => selectFilter('search')"
@clear="() => selectFilter('search')"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
</QIcon>
</template>
</QInput>
</QItem>
<QItem>
<VnSelect
class="full-width"
:label="t('globals.entity')"
v-model="selectedFilters.changedModel"
option-label="locale"
option-value="value"
:options="actions"
@update:model-value="selectFilter('action')"
hide-selected
/>
</QItem>
<QItem class="q-mt-sm">
<QOptionGroup
size="sm"
v-model="userRadio"
:options="userTypes"
color="primary"
@update:model-value="selectFilter('userRadio')"
right-label
>
<template #label="{ label }">
{{ t(`Users.${label}`) }}
</template>
</QOptionGroup>
</QItem>
<QItem class="q-mt-sm">
<QItemSection v-if="userRadio !== null">
<RightMenu>
<template #right-panel>
<QList dense>
<QSeparator />
<QItem class="q-mt-sm">
<QInput
:label="t('globals.search')"
v-model="searchInput"
class="full-width"
clearable
clear-icon="close"
@keyup.enter="() => selectFilter('search')"
@focusout="() => selectFilter('search')"
@clear="() => selectFilter('search')"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
</QIcon>
</template>
</QInput>
</QItem>
<QItem>
<VnSelect
class="full-width"
:label="t('globals.user')"
v-model="userSelect"
option-label="name"
option-value="id"
:url="`${model}Logs/${$route.params.id}/editors`"
:fields="['id', 'nickname', 'name', 'image']"
sort-by="nickname"
@update:model-value="selectFilter('userSelect')"
:label="t('globals.entity')"
v-model="selectedFilters.changedModel"
option-label="locale"
option-value="value"
:options="actions"
@update:model-value="selectFilter('action')"
hide-selected
/>
</QItem>
<QItem class="q-mt-sm">
<QOptionGroup
size="sm"
v-model="userRadio"
:options="userTypes"
color="primary"
@update:model-value="selectFilter('userRadio')"
right-label
>
<template #option="{ opt, itemProps }">
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
<QItemSection class="col-3 items-center">
<VnAvatar :worker-id="opt.id" />
</QItemSection>
<QItemSection class="col-9 justify-center">
<span>{{ opt.name }}</span>
<span class="text-grey">{{ opt.nickname }}</span>
</QItemSection>
</QItem>
<template #label="{ label }">
{{ t(`Users.${label}`) }}
</template>
</VnSelect>
</QItemSection>
</QItem>
<QItem class="q-mt-sm">
<QInput
:label="t('globals.changes')"
v-model="changeInput"
class="full-width"
clearable
clear-icon="close"
@keyup.enter="selectFilter('change')"
@focusout="selectFilter('change')"
@clear="selectFilter('change')"
</QOptionGroup>
</QItem>
<QItem class="q-mt-sm">
<QItemSection v-if="userRadio !== null">
<VnSelect
class="full-width"
:label="t('globals.user')"
v-model="userSelect"
option-label="name"
option-value="id"
:url="`${model}Logs/${route.params.id}/editors`"
:fields="['id', 'nickname', 'name', 'image']"
sort-by="nickname"
@update:model-value="selectFilter('userSelect')"
hide-selected
>
<template #option="{ opt, itemProps }">
<QItem
v-bind="itemProps"
class="q-pa-xs row items-center"
>
<QItemSection class="col-3 items-center">
<VnAvatar :worker-id="opt.id" />
</QItemSection>
<QItemSection class="col-9 justify-center">
<span>{{ opt.name }}</span>
<span class="text-grey">{{ opt.nickname }}</span>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QItemSection>
</QItem>
<QItem class="q-mt-sm">
<QInput
:label="t('globals.changes')"
v-model="changeInput"
class="full-width"
clearable
clear-icon="close"
@keyup.enter="selectFilter('change')"
@focusout="selectFilter('change')"
@clear="selectFilter('change')"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip max-width="250px">{{
t('tooltips.changes')
}}</QTooltip>
</QIcon>
</template>
</QInput>
</QItem>
<QItem
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
v-for="(checkboxOption, index) in checkboxOptions"
:key="index"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip max-width="250px">{{
t('tooltips.changes')
}}</QTooltip>
</QIcon>
</template>
</QInput>
</QItem>
<QItem
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
v-for="(checkboxOption, index) in checkboxOptions"
:key="index"
>
<QCheckbox
size="sm"
v-model="checkboxOption.selected"
:label="t(`actions.${checkboxOption.label}`)"
@update:model-value="selectFilter"
/>
</QItem>
<QItem class="q-mt-sm">
<QInput
class="full-width"
:label="t('globals.date')"
@click="dateFromDialog = true"
@focus="(evt) => evt.target.blur()"
@clear="selectFilter('date', 'to')"
v-model="dateFrom"
clearable
clear-icon="close"
/>
</QItem>
<QItem class="q-mt-sm">
<QInput
class="full-width"
:label="t('to')"
@click="dateToDialog = true"
@focus="(evt) => evt.target.blur()"
@clear="selectFilter('date', 'from')"
v-model="dateTo"
clearable
clear-icon="close"
/>
</QItem>
</QList>
</Teleport>
<QCheckbox
size="sm"
v-model="checkboxOption.selected"
:label="t(`actions.${checkboxOption.label}`)"
@update:model-value="selectFilter"
/>
</QItem>
<QItem class="q-mt-sm">
<QInput
class="full-width"
:label="t('globals.date')"
@click="dateFromDialog = true"
@focus="(evt) => evt.target.blur()"
@clear="selectFilter('date', 'to')"
v-model="dateFrom"
clearable
clear-icon="close"
/>
</QItem>
<QItem class="q-mt-sm">
<QInput
class="full-width"
:label="t('globals.to')"
@click="dateToDialog = true"
@focus="(evt) => evt.target.blur()"
@clear="selectFilter('date', 'from')"
v-model="dateTo"
clearable
clear-icon="close"
/>
</QItem>
</QList>
</template>
</RightMenu>
<QDialog v-model="dateFromDialog">
<QDate
:years-in-month-view="false"
@ -1053,9 +1059,9 @@ en:
Deletes: Deletes
Accesses: Accesses
Users:
User: Usuario
All: Todo
System: Sistema
User: User
All: All
System: System
properties:
id: ID
claimFk: Claim ID

View File

@ -1,10 +1,10 @@
<script setup>
import RightMenu from './RightMenu.vue';
import RightAdvancedMenu from './RightAdvancedMenu.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnTableFilter from '../VnTable/VnTableFilter.vue';
import { onBeforeMount, computed, ref } from 'vue';
import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
import { useArrayData } from 'src/composables/useArrayData';
import { useRoute } from 'vue-router';
import { useRoute, useRouter } from 'vue-router';
import { useHasContent } from 'src/composables/useHasContent';
const $props = defineProps({
@ -47,16 +47,14 @@ const $props = defineProps({
});
const route = useRoute();
const router = useRouter();
let arrayData;
const sectionValue = computed(() => $props.section ?? $props.dataKey);
const isMainSection = computed(() => {
const isSame = sectionValue.value == route.name;
if (!isSame && arrayData) {
arrayData.reset(['userParams', 'userFilter']);
}
return isSame;
});
const isMainSection = ref(false);
const searchbarId = 'section-searchbar';
const advancedMenuSlot = 'advanced-menu';
const hasContent = useHasContent(`#${searchbarId}`);
onBeforeMount(() => {
@ -67,7 +65,27 @@ onBeforeMount(() => {
...$props.arrayDataProps,
navigate: $props.redirect,
});
checkIsMain();
});
onMounted(() => {
const unsubscribe = router.afterEach(() => {
checkIsMain();
});
onUnmounted(unsubscribe);
});
onUnmounted(() => {
if (arrayData) arrayData.destroy();
});
function checkIsMain() {
isMainSection.value = sectionValue.value == route.name;
if (!isMainSection.value && arrayData) {
arrayData.reset(['userParams', 'filter']);
arrayData.setCurrentFilter();
}
}
</script>
<template>
<slot name="searchbar">
@ -80,18 +98,25 @@ onBeforeMount(() => {
/>
<div :id="searchbarId"></div>
</slot>
<RightMenu>
<template #right-panel v-if="$slots['rightMenu'] || rightFilter">
<slot name="rightMenu">
<RightAdvancedMenu :is-main-section="isMainSection">
<template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
<slot :name="advancedMenuSlot">
<VnTableFilter
v-if="rightFilter && columns"
:data-key="dataKey"
:array-data="arrayData"
:columns="columns"
/>
>
<template #moreFilterPanel="{ params, orders, searchFn }">
<slot
name="moreFilterPanel"
v-bind="{ params, orders, searchFn }"
/>
</template>
</VnTableFilter>
</slot>
</template>
</RightMenu>
</RightAdvancedMenu>
<slot name="body" v-if="isMainSection" />
<RouterView v-else />
</template>

View File

@ -27,7 +27,7 @@ const $props = defineProps({
default: () => [],
},
optionLabel: {
type: [String],
type: [String, Function],
default: 'name',
},
optionValue: {
@ -171,7 +171,8 @@ onMounted(() => {
});
const arrayDataKey =
$props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
@ -220,7 +221,7 @@ async function fetchFilter(val) {
optionFilterValue.value ??
(new RegExp(/\d/g).test(val)
? optionValue.value
: optionFilter.value ?? optionLabel.value);
: (optionFilter.value ?? optionLabel.value));
let defaultWhere = {};
if ($props.filterOptions.length) {
@ -232,12 +233,15 @@ async function fetchFilter(val) {
} else defaultWhere = { [key]: getVal(val) };
const where = { ...(val ? defaultWhere : {}), ...$props.where };
$props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
const fetchOptions = { where, include, limit };
if (fields) fetchOptions.fields = fields;
if (sortBy) fetchOptions.order = sortBy;
const filterOptions = { where, include, limit };
if (fields) filterOptions.fields = fields;
if (sortBy) filterOptions.order = sortBy;
arrayData.resetPagination();
const { data } = await arrayData.applyFilter({ filter: fetchOptions });
const { data } = await arrayData.applyFilter(
{ filter: filterOptions },
{ updateRouter: false },
);
setOptions(data);
return data;
}
@ -269,7 +273,7 @@ async function filterHandler(val, update) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
}
},
);
}
@ -294,7 +298,7 @@ async function onScroll({ to, direction, from, index }) {
}
}
defineExpose({ opts: myOptions });
defineExpose({ opts: myOptions, vnSelectRef });
function handleKeyDown(event) {
if (event.key === 'Tab' && !event.shiftKey) {
@ -305,7 +309,7 @@ function handleKeyDown(event) {
if (inputValue) {
const matchingOption = myOptions.value.find(
(option) =>
option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
option[optionLabel.value].toLowerCase() === inputValue.toLowerCase(),
);
if (matchingOption) {
@ -317,11 +321,11 @@ function handleKeyDown(event) {
}
const focusableElements = document.querySelectorAll(
'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])',
);
const currentIndex = Array.prototype.indexOf.call(
focusableElements,
event.target
event.target,
);
if (currentIndex >= 0 && currentIndex < focusableElements.length - 1) {
focusableElements[currentIndex + 1].focus();

View File

@ -1,5 +1,5 @@
<script setup>
import { computed } from 'vue';
import { ref, computed } from 'vue';
import { useRole } from 'src/composables/useRole';
import { useAcl } from 'src/composables/useAcl';
@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
const emit = defineEmits(['update:modelValue']);
const value = defineModel({ type: [String, Number, Object] });
const select = ref(null);
const $props = defineProps({
rolesAllowedToCreate: {
type: Array,
@ -33,10 +34,13 @@ const isAllowedToCreate = computed(() => {
if ($props.acls.length) return acl.hasAny($props.acls);
return role.hasAny($props.rolesAllowedToCreate);
});
defineExpose({ vnSelectDialogRef: select });
</script>
<template>
<VnSelect
ref="select"
v-model="value"
v-bind="$attrs"
@update:model-value="(...args) => emit('update:modelValue', ...args)"

View File

@ -0,0 +1,34 @@
<script setup>
import VnSelect from 'components/common/VnSelect.vue';
const model = defineModel({ type: [String, Number, Object] });
</script>
<template>
<VnSelect
:label="$t('globals.supplier')"
v-bind="$attrs"
v-model="model"
url="Suppliers"
option-value="id"
option-label="nickname"
:fields="['id', 'name', 'nickname', 'nif']"
:filter-options="['id', 'name', 'nickname', 'nif']"
sort-by="name ASC"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
{{ scope.opt?.name }}
</QItemLabel>
<QItemLabel caption>
{{
`#${scope.opt?.id} , ${scope.opt?.nickname} (${scope.opt?.nif})`
}}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</template>

View File

@ -9,9 +9,9 @@ const $props = defineProps({
type: Boolean,
default: false,
},
hasInfo: {
type: Boolean,
default: false,
info: {
type: String,
default: undefined,
},
modelValue: {
type: [String, Number, Object],
@ -53,13 +53,14 @@ const url = computed(() => {
:fields="['id', 'name', 'nickname', 'code']"
:filter-options="['id', 'name', 'nickname', 'code']"
sort-by="nickname ASC"
data-cy="vnWorkerSelect"
>
<template #prepend v-if="$props.hasAvatar">
<VnAvatar :worker-id="value" color="primary" :title="title" />
<VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
</template>
<template #append v-if="$props.hasInfo">
<template #append v-if="$props.info">
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
<QTooltip>{{ $t($props.info) }}</QTooltip>
</QIcon>
</template>
<template #option="scope">
@ -72,7 +73,8 @@ const url = computed(() => {
{{ scope.opt.nickname }}
</QItemLabel>
<QItemLabel caption v-else>
#{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
#{{ scope.opt.id }}, {{ scope.opt.nickname }},
{{ scope.opt.code }}
</QItemLabel>
</QItemSection>
</QItem>

View File

@ -10,6 +10,10 @@ defineProps({
type: Object,
required: true,
},
width: {
type: String,
default: 'md-width',
},
});
defineEmits([...useDialogPluginComponent.emits]);
@ -17,7 +21,19 @@ defineEmits([...useDialogPluginComponent.emits]);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
</script>
<template>
<QDialog ref="dialogRef" @hide="onDialogHide" full-width>
<component :is="summary" :id="id" />
<QDialog ref="dialogRef" @hide="onDialogHide">
<component :is="summary" :id="id" :class="width" />
</QDialog>
</template>
<style lang="scss" scoped>
.md-width {
max-width: $width-md;
}
.lg-width {
max-width: $width-lg;
}
.xlg-width {
max-width: $width-xl;
}
</style>

View File

@ -0,0 +1,146 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
import VnDms from 'src/components/common/VnDms.vue';
class MockFormData {
constructor() {
this.entries = {};
}
append(key, value) {
if (!key) {
throw new Error('Key is required for FormData.append');
}
this.entries[key] = value;
}
get(key) {
return this.entries[key] || null;
}
getAll() {
return this.entries;
}
}
global.FormData = MockFormData;
describe('VnDms', () => {
let wrapper;
let vm;
let postMock;
const postResponseMock = { data: { success: true } };
const data = {
hasFile: true,
hasFileAttached: true,
reference: 'DMS-test',
warehouseFk: 1,
companyFk: 2,
dmsTypeFk: 3,
description: 'This is a test description',
files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
};
const expectedBody = {
hasFile: true,
hasFileAttached: true,
reference: 'DMS-test',
warehouseId: 1,
companyId: 2,
dmsTypeId: 3,
description: 'This is a test description',
};
beforeAll(() => {
wrapper = createWrapper(VnDms, {
propsData: {
url: '/test',
formInitialData: { id: 1, reference: 'test' },
model: 'Worker',
}
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
vi.spyOn(vm, '$emit');
});
beforeEach(() => {
postMock = vi.spyOn(axios, 'post').mockResolvedValue(postResponseMock);
vm.dms = data;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('mapperDms', () => {
it('should map DMS data correctly and add file to FormData', () => {
const [formData, params] = vm.mapperDms(data);
expect(formData.get('example.txt')).toBe(data.files);
expect(expectedBody).toEqual(params.params);
});
it('should map DMS data correctly without file', () => {
delete data.files;
const [formData, params] = vm.mapperDms(data);
expect(formData.getAll()).toEqual({});
expect(expectedBody).toEqual(params.params);
});
});
describe('getUrl', () => {
it('should returns prop url when is set', async () => {
expect(vm.getUrl()).toBe('/test');
});
it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {
await wrapper.setProps({ url: null });
expect(vm.getUrl()).toBe('dms/1/updateFile');
});
it('should returns url "props.model"/"route.params.id"/uploadFile when formInitialData is null', async () => {
await wrapper.setProps({ formInitialData: null });
vm.route.params.id = '123';
expect(vm.getUrl()).toBe('Worker/123/uploadFile');
});
});
describe('save', () => {
it('should save data correctly', async () => {
await vm.save();
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
});
});
describe('defaultData', () => {
it('should set dms with formInitialData', async () => {
const testData = {
hasFile: false,
hasFileAttached: false,
reference: 'defaultData-test',
warehouseFk: 2,
companyFk: 3,
dmsTypeFk: 2,
description: 'This is a test description'
}
await wrapper.setProps({ formInitialData: testData });
vm.defaultData();
expect(vm.dms).toEqual(testData);
});
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
await wrapper.setProps({ formInitialData: null });
vm.route.params.id= '111';
vm.defaultData();
expect(vm.dms.reference).toBe('111');
});
});
});

View File

@ -0,0 +1,91 @@
import { createWrapper } from 'app/test/vitest/helper';
import { vi, describe, expect, it } from 'vitest';
import VnInput from 'src/components/common/VnInput.vue';
describe('VnInput', () => {
let vm;
let wrapper;
let input;
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
wrapper = createWrapper(VnInput, {
props: {
modelValue: value,
isOutlined, emptyToNull, insertable,
maxlength: 101
},
attrs: {
label: 'test',
required: true,
maxlength: 101,
maxLength: 10,
'max-length':20
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
input = wrapper.find('[data-cy="test_input"]');
};
describe('value', () => {
it('should emit update:modelValue when value changes', async () => {
generateWrapper('12345', false, false, true)
await input.setValue('123');
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
});
it('should emit update:modelValue with null when input is empty', async () => {
generateWrapper('12345', false, true, true);
await input.setValue('');
expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('123', false, false, false);
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('123', true, false, false);
expect(vm.styleAttrs.outlined).toBe(true);
});
});
describe('handleKeydown', () => {
it('should do nothing when "Backspace" key is pressed', async () => {
generateWrapper('12345', false, false, true);
await input.trigger('keydown', { key: 'Backspace' });
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
expect(spyhandler).not.toHaveBeenCalled();
});
/*
TODO: #8399 REDMINE
*/
it.skip('handleKeydown respects insertable behavior', async () => {
const expectedValue = '12345';
generateWrapper('1234', false, false, true);
vm.focus()
await input.trigger('keydown', { key: '5' });
await vm.$nextTick();
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
expect(vm.value).toBe( expectedValue);
});
});
describe('focus', () => {
it('should call focus method when input is focused', async () => {
generateWrapper('123', false, false, true);
const focusSpy = vi.spyOn(input.element, 'focus');
vm.focus();
expect(focusSpy).toHaveBeenCalled();
});
});
});

View File

@ -1,51 +1,78 @@
import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
import {
describe,
it,
expect,
vi,
beforeAll,
afterEach,
beforeEach,
afterAll,
} from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import VnNotes from 'src/components/ui/VnNotes.vue';
import vnDate from 'src/boot/vnDate';
describe('VnNotes', () => {
let vm;
let wrapper;
let spyFetch;
let postMock;
let expectedBody;
const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
function generateExpectedBody() {
expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
}
async function setTestParams(text, observationType, type){
vm.newNote.text = text;
vm.newNote.observationTypeFk = observationType;
wrapper.setProps({ selectType: type });
}
beforeAll(async () => {
vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
let patchMock;
let expectedInsertBody;
let expectedUpdateBody;
const defaultOptions = {
url: '/test',
body: { name: 'Tony', lastName: 'Stark' },
selectType: false,
saveUrl: null,
justInput: false,
};
function generateWrapper(
options = defaultOptions,
text = null,
observationType = null,
) {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
wrapper = createWrapper(VnNotes, {
propsData: {
url: '/test',
body: { name: 'Tony', lastName: 'Stark' },
}
propsData: options,
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
});
vm.newNote.text = text;
vm.newNote.observationTypeFk = observationType;
}
function createSpyFetch() {
spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
}
function generateExpectedBody() {
expectedInsertBody = {
...vm.$props.body,
...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk },
};
expectedUpdateBody = { ...vm.$props.body, ...{ notes: vm.newNote.text } };
}
beforeEach(() => {
postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
postMock = vi.spyOn(axios, 'post');
patchMock = vi.spyOn(axios, 'patch');
});
afterEach(() => {
vi.clearAllMocks();
expectedBody = {};
expectedInsertBody = {};
expectedUpdateBody = {};
});
afterAll(() => {
vi.restoreAllMocks();
});
describe('insert', () => {
it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
await setTestParams( null, null, true );
it('should not call axios.post and vnPaginateRef.fetch when newNote.text is null', async () => {
generateWrapper({ selectType: true });
createSpyFetch();
await vm.insert();
@ -53,8 +80,9 @@ describe('VnNotes', () => {
expect(spyFetch).not.toHaveBeenCalled();
});
it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
await setTestParams( "", null, false );
it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
generateWrapper(null, '');
createSpyFetch();
await vm.insert();
@ -62,8 +90,9 @@ describe('VnNotes', () => {
expect(spyFetch).not.toHaveBeenCalled();
});
it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
await setTestParams( "Test Note", null, true );
it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
generateWrapper({ selectType: true }, 'Test Note');
createSpyFetch();
await vm.insert();
@ -71,37 +100,57 @@ describe('VnNotes', () => {
expect(spyFetch).not.toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
await setTestParams( "Test Note", null, false );
it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
generateWrapper(null, 'Test Note');
createSpyFetch();
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(spyFetch).toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {
await setTestParams( "Test Note", 1, false );
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
expect(spyFetch).toHaveBeenCalled();
});
it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
await setTestParams( "Test Note", 1, true );
generateWrapper({ selectType: true }, 'Test Note', 1);
createSpyFetch();
generateExpectedBody();
await vm.insert();
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
expect(spyFetch).toHaveBeenCalled();
});
});
describe('update', () => {
it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
generateWrapper({
url: '/business',
justInput: true,
saveUrl: '/saveUrlTest',
});
generateExpectedBody();
await vm.update();
expect(patchMock).toHaveBeenCalledWith(vm.$props.saveUrl, expectedUpdateBody);
});
it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
generateWrapper({
url: '/business',
body: { workerFk: 1110 },
justInput: true,
});
generateExpectedBody();
await vm.update();
expect(patchMock).toHaveBeenCalledWith(
`${vm.$props.url}/${vm.$props.body.workerFk}`,
expectedUpdateBody,
);
});
});
});

View File

@ -37,6 +37,10 @@ const $props = defineProps({
type: Object,
default: null,
},
width: {
type: String,
default: 'md-width',
},
});
const state = useState();
@ -55,10 +59,11 @@ onBeforeMount(async () => {
url: $props.url,
filter: $props.filter,
skip: 0,
oneRecord: true,
});
store = arrayData.store;
entity = computed(() => {
const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
const data = store.data ?? {};
if (data) emit('onFetch', data);
return data;
});
@ -69,7 +74,7 @@ onBeforeMount(async () => {
() => [$props.url, $props.filter],
async () => {
if (!isSameDataKey.value) await getData();
}
},
);
});
@ -80,7 +85,7 @@ async function getData() {
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
state.set($props.dataKey, data);
emit('onFetch', Array.isArray(data) ? data[0] : data);
emit('onFetch', data);
} finally {
isLoading.value = false;
}
@ -104,7 +109,7 @@ const iconModule = computed(() => route.matched[1].meta.icon);
const toModule = computed(() =>
route.matched[1].path.split('/').length > 2
? route.matched[1].redirect
: route.matched[1].children[0].redirect
: route.matched[1].children[0].redirect,
);
</script>
@ -128,9 +133,8 @@ const toModule = computed(() =>
</QTooltip>
</QBtn></slot
>
<QBtn
@click.stop="viewSummary(entity.id, $props.summary)"
@click.stop="viewSummary(entity.id, $props.summary, $props.width)"
round
flat
dense

View File

@ -15,6 +15,10 @@ const props = defineProps({
type: Object,
default: null,
},
userFilter: {
type: Object,
default: null,
},
entityId: {
type: [Number, String],
default: null,
@ -34,10 +38,12 @@ const isSummary = ref();
const arrayData = useArrayData(props.dataKey, {
url: props.url,
filter: props.filter,
userFilter: props.userFilter,
skip: 0,
oneRecord: true,
});
const { store } = arrayData;
const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
const entity = computed(() => store.data);
const isLoading = ref(false);
defineExpose({
@ -56,7 +62,7 @@ async function fetch() {
store.filter = props.filter ?? {};
isLoading.value = true;
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
emit('onFetch', Array.isArray(data) ? data[0] : data);
emit('onFetch', data);
isLoading.value = false;
}
</script>
@ -175,7 +181,7 @@ async function fetch() {
display: inline-block;
}
.header.link:hover {
color: lighten($primary, 20%);
color: rgba(var(--q-primary), 0.8);
}
.q-checkbox {
& .q-checkbox__label {
@ -203,4 +209,13 @@ async function fetch() {
.summaryHeader {
color: $white;
}
.cardSummary :deep(.q-card__section[content]) {
display: flex;
flex-wrap: wrap;
padding: 0;
> * {
flex: 1;
}
}
</style>

View File

@ -41,7 +41,7 @@ const card = toRef(props, 'item');
</div>
</div>
<div class="content">
<span class="link">
<span class="link" @click.stop>
{{ card.name }}
<ItemDescriptorProxy :id="card.id" />
</span>

View File

@ -1,7 +1,7 @@
<script setup>
import { computed } from 'vue';
import { useQuasar } from 'quasar';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
const $props = defineProps({
bordered: {

View File

@ -114,7 +114,7 @@ async function clearFilters() {
arrayData.resetPagination();
// Filtrar los params no removibles
const removableFilters = Object.keys(userParams.value).filter((param) =>
$props.unremovableParams.includes(param)
$props.unremovableParams.includes(param),
);
const newParams = {};
// Conservar solo los params que no son removibles
@ -162,13 +162,13 @@ const formatTags = (tags) => {
const tags = computed(() => {
const filteredTags = tagsList.value.filter(
(tag) => !($props.customTags || []).includes(tag.label)
(tag) => !($props.customTags || []).includes(tag.label),
);
return formatTags(filteredTags);
});
const customTags = computed(() =>
tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label)),
);
async function remove(key) {
@ -188,9 +188,15 @@ function formatValue(value) {
const getLocale = (label) => {
const param = label.split('.').at(-1);
const globalLocale = `globals.params.${param}`;
const moduleName = route.meta.moduleName;
const moduleLocale = `${moduleName.toLowerCase()}.${param}`;
if (te(globalLocale)) return t(globalLocale);
else if (te(t(`params.${param}`)));
else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
else if (te(moduleLocale)) return t(moduleLocale);
else {
const camelCaseModuleName =
moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
return t(`${camelCaseModuleName}.params.${param}`);
}
};
</script>

View File

@ -1,6 +1,6 @@
<script setup>
import axios from 'axios';
import { ref, reactive } from 'vue';
import { ref, reactive, useAttrs, computed } from 'vue';
import { onBeforeRouteLeave } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
@ -16,12 +16,22 @@ import VnSelect from 'components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
import VnInput from 'components/common/VnInput.vue';
const emit = defineEmits(['onFetch']);
const $attrs = useAttrs();
const isRequired = computed(() => {
return Object.keys($attrs).includes('required')
});
const $props = defineProps({
url: { type: String, default: null },
saveUrl: {type: String, default: null},
filter: { type: Object, default: () => {} },
body: { type: Object, default: () => {} },
addNote: { type: Boolean, default: false },
selectType: { type: Boolean, default: false },
justInput: { type: Boolean, default: false },
});
const { t } = useI18n();
@ -29,6 +39,13 @@ const quasar = useQuasar();
const newNote = reactive({ text: null, observationTypeFk: null });
const observationTypes = ref([]);
const vnPaginateRef = ref();
let originalText;
function handleClick(e) {
if (e.shiftKey && e.key === 'Enter') return;
if ($props.justInput) confirmAndUpdate();
else insert();
}
async function insert() {
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@ -41,8 +58,36 @@ async function insert() {
await axios.post($props.url, newBody);
await vnPaginateRef.value.fetch();
}
function confirmAndUpdate() {
if(!newNote.text && originalText)
quasar
.dialog({
component: VnConfirm,
componentProps: {
title: t('New note is empty'),
message: t('Are you sure remove this note?'),
},
})
.onOk(update)
.onCancel(() => {
newNote.text = originalText;
});
else update();
}
async function update() {
originalText = newNote.text;
const body = $props.body;
const newBody = {
...body,
...{ notes: newNote.text },
};
await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
}
onBeforeRouteLeave((to, from, next) => {
if (newNote.text)
if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
quasar.dialog({
component: VnConfirm,
componentProps: {
@ -53,6 +98,13 @@ onBeforeRouteLeave((to, from, next) => {
});
else next();
});
function fetchData([ data ]) {
newNote.text = data?.notes;
originalText = data?.notes;
emit('onFetch', data);
}
</script>
<template>
<FetchData
@ -62,8 +114,19 @@ onBeforeRouteLeave((to, from, next) => {
auto-load
@on-fetch="(data) => (observationTypes = data)"
/>
<QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
<QCardSection horizontal>
<FetchData
v-if="justInput"
:url="url"
:filter="filter"
@on-fetch="fetchData"
auto-load
/>
<QCard
class="q-pa-xs q-mb-lg full-width"
:class="{ 'just-input': $props.justInput }"
v-if="$props.addNote || $props.justInput"
>
<QCardSection horizontal v-if="!$props.justInput">
{{ t('New note') }}
</QCardSection>
<QCardSection class="q-px-xs q-my-none q-py-none">
@ -75,19 +138,19 @@ onBeforeRouteLeave((to, from, next) => {
v-model="newNote.observationTypeFk"
option-label="description"
style="flex: 0.15"
:required="true"
:required="isRequired"
@keyup.enter.stop="insert"
/>
<VnInput
v-model.trim="newNote.text"
type="textarea"
:label="t('Add note here...')"
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
filled
size="lg"
autogrow
@keyup.enter.stop="insert"
@keyup.enter.stop="handleClick"
:required="isRequired"
clearable
:required="true"
>
<template #append>
<QBtn
@ -95,7 +158,7 @@ onBeforeRouteLeave((to, from, next) => {
icon="save"
color="primary"
flat
@click="insert"
@click="handleClick"
class="q-mb-xs"
dense
data-cy="saveNote"
@ -106,6 +169,7 @@ onBeforeRouteLeave((to, from, next) => {
</QCardSection>
</QCard>
<VnPaginate
v-if="!$props.justInput"
:data-key="$props.url"
:url="$props.url"
order="created DESC"
@ -198,6 +262,11 @@ onBeforeRouteLeave((to, from, next) => {
}
}
}
.just-input {
padding-right: 18px;
margin-bottom: 2px;
box-shadow: none;
}
</style>
<i18n>
es:
@ -205,4 +274,6 @@ onBeforeRouteLeave((to, from, next) => {
New note: Nueva nota
Save (Enter): Guardar (Intro)
Observation type: Tipo de observación
New note is empty: La nueva nota esta vacia
Are you sure remove this note?: Estas seguro de quitar esta nota?
</i18n>

View File

@ -78,6 +78,10 @@ const props = defineProps({
type: String,
default: '',
},
keyData: {
type: String,
default: undefined,
},
});
const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@ -119,7 +123,7 @@ watch(
() => props.data,
() => {
store.data = props.data;
}
},
);
watch(
@ -128,12 +132,12 @@ watch(
if (!mounted.value) return;
emit('onChange', data);
},
{ immediate: true }
{ immediate: true },
);
watch(
() => [props.url, props.filter],
([url, filter]) => mounted.value && fetch({ url, filter })
([url, filter]) => mounted.value && fetch({ url, filter }),
);
const addFilter = async (filter, params) => {
await arrayData.addFilter({ filter, params });
@ -166,7 +170,7 @@ function emitStoreData() {
async function paginate() {
const { page, rowsPerPage, sortBy, descending } = pagination.value;
if (!props.url) return;
if (!arrayData.store.url) return;
isLoading.value = true;
await arrayData.loadMore();
@ -194,7 +198,7 @@ function endPagination() {
async function onLoad(index, done) {
if (!store.data || !mounted.value) return done();
if (store.data.length === 0 || !props.url) return done(false);
if (store.data.length === 0 || !arrayData.store.url) return done(false);
pagination.value.page = pagination.value.page + 1;
@ -255,7 +259,7 @@ defineExpose({
:disable="disableInfiniteScroll || !store.hasMoreData"
v-bind="$attrs"
>
<slot name="body" :rows="store.data"></slot>
<slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
<div v-if="isLoading" class="spinner info-row q-pa-md text-center">
<QSpinner color="primary" size="md" />
</div>

View File

@ -102,7 +102,7 @@ watch(
(val) => {
arrayData = useArrayData(val, { ...props });
store = arrayData.store;
}
},
);
onMounted(() => {
@ -113,23 +113,20 @@ onMounted(() => {
});
async function search() {
const staticParams = Object.keys(store.userParams ?? {}).length
? store.userParams
: store.defaultParams;
arrayData.resetPagination();
const filter = {
params: {
search: searchText.value,
},
filter: props.filter,
};
let filter = { params: { search: searchText.value } };
if (!props.searchRemoveParams || !searchText.value) {
filter.params = {
...staticParams,
search: searchText.value,
filter = {
params: {
...store.userParams,
search: searchText.value,
},
filter: store.filter,
};
} else {
arrayData.reset(['currentFilter', 'userParams']);
}
if (props.whereFilter) {
@ -179,6 +176,7 @@ async function search() {
>
<QTooltip>{{ t(props.info) }}</QTooltip>
</QIcon>
<div id="searchbar-after"></div>
</template>
</VnInput>
</QForm>

View File

@ -49,7 +49,7 @@ function formatNumber(number) {
<VnPaginate
:data-key="$props.url"
:url="$props.url"
:filter="filter"
:user-filter="filter"
order="smsFk DESC"
:offset="100"
:limit="5"

View File

@ -19,23 +19,26 @@ onMounted(() => {
const observer = new MutationObserver(
() =>
(hasContent.value =
actions.value?.childNodes?.length + data.value?.childNodes?.length)
actions.value?.childNodes?.length + data.value?.childNodes?.length),
);
if (actions.value) observer.observe(actions.value, opts);
if (data.value) observer.observe(data.value, opts);
});
onBeforeUnmount(() => stateStore.toggleSubToolbar());
const actionsChildCount = () => !!actions.value?.childNodes?.length;
onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
</script>
<template>
<QToolbar
id="subToolbar"
class="justify-end sticky"
v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
class="justify-end sticky"
>
<slot name="st-data">
<div id="st-data"></div>
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
</div>
</slot>
<QSpace />
<slot name="st-actions">

View File

@ -1,5 +1,5 @@
<script setup>
import { defineProps, ref } from 'vue';
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
const { t } = useI18n();

View File

@ -51,16 +51,6 @@ describe('CardSummary', () => {
expect(vm.store.filter).toEqual('cardFilter');
});
it('should compute entity correctly from store data', () => {
vm.store.data = [{ id: 1, name: 'Entity 1' }];
expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
});
it('should handle empty data gracefully', () => {
vm.store.data = [];
expect(vm.entity).toBeUndefined();
});
it('should respond to prop changes and refetch data', async () => {
const newUrl = 'CardSummary/35';
const newKey = 'cardSummaryKey/35';
@ -72,7 +62,7 @@ describe('CardSummary', () => {
expect(vm.store.filter).toEqual({ key: newKey });
});
it('should return true if route path ends with /summary' , () => {
it('should return true if route path ends with /summary', () => {
expect(vm.isSummary).toBe(true);
});
});

View File

@ -0,0 +1,89 @@
import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnImg from 'src/components/ui/VnImg.vue';
let wrapper;
let vm;
const isEmployeeMock = vi.fn();
function generateWrapper(storage = 'images') {
wrapper = createWrapper(VnImg, {
props: {
id: 123,
zoomResolution: '400x400',
storage,
}
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
vm.timeStamp = 'timestamp';
};
vi.mock('src/composables/useSession', () => ({
useSession: () => ({
getTokenMultimedia: () => 'token',
}),
}));
vi.mock('src/composables/useRole', () => ({
useRole: () => ({
isEmployee: isEmployeeMock,
}),
}));
describe('VnImg', () => {
beforeEach(() => {
isEmployeeMock.mockReset();
});
afterEach(() => {
vi.clearAllMocks();
});
describe('getUrl', () => {
it('should return /api/{storage}/{id}/downloadFile?access_token={token} when storage is dms', async () => {
isEmployeeMock.mockReturnValue(false);
generateWrapper('dms');
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/api/dms/123/downloadFile?access_token=token');
});
it('should return /no-user.png when role is not employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(false);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/no-user.png');
});
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is false and role is employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(true);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl();
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
});
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
isEmployeeMock.mockReturnValue(true);
generateWrapper();
await vm.$nextTick();
const url = vm.getUrl(true);
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
});
});
describe('reload', () => {
it('should update the timestamp', async () => {
generateWrapper();
const initialTimestamp = wrapper.vm.timeStamp;
wrapper.vm.reload();
const newTimestamp = wrapper.vm.timeStamp;
expect(initialTimestamp).not.toEqual(newTimestamp);
});
});
});

View File

@ -0,0 +1,71 @@
import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
describe('VnSearchbar', () => {
let vm;
let wrapper;
let applyFilterSpy;
const searchText = 'Bolas de madera';
const userParams = {staticKey: 'staticValue'};
beforeEach(async () => {
wrapper = createWrapper(VnSearchbar, {
propsData: {
dataKey: 'testKey',
filter: null,
whereFilter: null,
searchRemoveParams: true,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
vm.searchText = searchText;
vm.arrayData.store.userParams = userParams;
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
});
afterEach(() => {
vi.clearAllMocks();
});
it('search resets pagination and applies filter', async () => {
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
await vm.search();
expect(resetPaginationSpy).toHaveBeenCalled();
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { search: searchText },
});
});
it('search includes static params if searchRemoveParams is false', async () => {
wrapper.setProps({ searchRemoveParams: false });
await vm.$nextTick();
await vm.search();
expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText },
filter: {skip: 0},
});
});
it('updates store when dataKey changes', async () => {
expect(vm.store.userParams).toEqual(userParams);
wrapper.setProps({ dataKey: 'newTestKey' });
await vm.$nextTick();
expect(vm.store.userParams).toEqual({});
});
it('computes the "to" property correctly for redirection', () => {
vm.arrayData.store.searchUrl = 'searchParam';
vm.arrayData.store.currentFilter = { category: 'plants' };
const expectedQuery = JSON.stringify({
...vm.arrayData.store.currentFilter,
search: searchText,
});
expect(vm.to.query.searchParam).toBe(expectedQuery);
});
});

View File

@ -16,7 +16,7 @@ describe('useArrayData', () => {
vi.clearAllMocks();
});
it('should fetch and repalce url with new params', async () => {
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
@ -33,11 +33,11 @@ describe('useArrayData', () => {
});
expect(routerReplace.path).toEqual('mockSection/list');
expect(JSON.parse(routerReplace.query.params)).toEqual(
expect.objectContaining(params)
expect.objectContaining(params),
);
});
it('Should get data and send new URL without keeping parameters, if there is only one record', async () => {
it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
@ -56,7 +56,7 @@ describe('useArrayData', () => {
expect(routerPush.query).toBeUndefined();
});
it('Should get data and send new URL keeping parameters, if you have more than one record', async () => {
it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
@ -95,4 +95,25 @@ describe('useArrayData', () => {
expect(routerPush.path).toEqual('mockName/');
expect(routerPush.query.params).toBeDefined();
});
it('should return one record', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({
data: [
{ id: 1, name: 'Entity 1' },
{ id: 2, name: 'Entity 2' },
],
});
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
await arrayData.fetch({});
expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
});
it('should handle empty data gracefully if has to return one record', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
await arrayData.fetch({});
expect(arrayData.store.data).toBeUndefined();
});
});

View File

@ -33,10 +33,11 @@ export function useArrayData(key, userOptions) {
: JSON.parse(params?.filter ?? '{}');
delete params.filter;
store.userParams = { ...store.userParams, ...params };
store.userParams = params;
store.filter = { ...filter, ...store.userFilter };
if (filter?.order) store.order = filter.order;
}
setCurrentFilter();
});
if (key && userOptions) setOptions();
@ -56,6 +57,7 @@ export function useArrayData(key, userOptions) {
'navigate',
'mapKey',
'keepData',
'oneRecord',
];
if (typeof userOptions === 'object') {
for (const option in userOptions) {
@ -78,11 +80,7 @@ export function useArrayData(key, userOptions) {
cancelRequest();
canceller = new AbortController();
const { params, limit } = getCurrentFilter();
store.currentFilter = JSON.parse(JSON.stringify(params));
delete store.currentFilter.filter.include;
store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
const { params, limit } = setCurrentFilter();
let exprFilter;
if (store?.exprBuilder) {
@ -96,6 +94,9 @@ export function useArrayData(key, userOptions) {
if (params.filter.where || exprFilter)
params.filter.where = { ...params.filter.where, ...exprFilter };
if (!params?.filter?.order?.length) delete params?.filter?.order;
params.filter = JSON.stringify(params.filter);
store.isLoading = true;
@ -107,12 +108,16 @@ export function useArrayData(key, userOptions) {
store.hasMoreData = limit && response.data.length >= limit;
if (!append && !isDialogOpened() && updateRouter) {
if (updateStateParams(response.data)?.redirect) return;
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
}
store.isLoading = false;
canceller = null;
processData(response.data, { map: !!store.mapKey, append });
processData(response.data, {
map: !!store.mapKey,
append,
oneRecord: store.oneRecord,
});
return response;
}
@ -142,12 +147,12 @@ export function useArrayData(key, userOptions) {
}
}
async function applyFilter({ filter, params }) {
async function applyFilter({ filter, params }, fetchOptions = {}) {
if (filter) store.userFilter = filter;
store.filter = {};
if (params) store.userParams = { ...params };
const response = await fetch({});
const response = await fetch(fetchOptions);
return response;
}
@ -173,10 +178,9 @@ export function useArrayData(key, userOptions) {
async function addOrder(field, direction = 'ASC') {
const newOrder = field + ' ' + direction;
let order = store.order || [];
if (typeof order == 'string') order = [order];
const order = toArray(store.order);
let index = order.findIndex((o) => o.split(' ')[0] === field);
let index = getOrderIndex(order, field);
if (index > -1) {
order[index] = newOrder;
} else {
@ -193,16 +197,24 @@ export function useArrayData(key, userOptions) {
}
async function deleteOrder(field) {
let order = store.order ?? [];
if (typeof order == 'string') order = [order];
const index = order.findIndex((o) => o.split(' ')[0] === field);
const order = toArray(store.order);
const index = getOrderIndex(order, field);
if (index > -1) order.splice(index, 1);
store.order = order;
fetch({});
}
function getOrderIndex(order, field) {
return order.findIndex((o) => o.split(' ')[0] === field);
}
function toArray(str = []) {
if (!str) return [];
if (Array.isArray(str)) return str;
if (typeof str === 'string') return str.split(',').map((item) => item.trim());
}
function sanitizerParams(params, exprBuilder) {
for (const param in params) {
if (params[param] === '' || params[param] === null) {
@ -276,14 +288,14 @@ export function useArrayData(key, userOptions) {
}
function getCurrentFilter() {
if (!Object.keys(store.userParams).length)
store.userParams = store.defaultParams ?? {};
const filter = {
limit: store.limit,
...store.userFilter,
};
let userParams = { ...store.userParams };
Object.assign(filter, store.userFilter);
let where;
if (filter?.where || store.filter?.where)
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@ -291,16 +303,27 @@ export function useArrayData(key, userOptions) {
filter.where = where;
const params = { filter };
Object.assign(params, userParams);
Object.assign(params, store.userParams);
if (params.filter) params.filter.skip = store.skip;
if (store?.order && typeof store?.order == 'string') store.order = [store.order];
if (store.order?.length) params.filter.order = [...store.order];
if (store.order) params.filter.order = toArray(store.order);
else delete params.filter.order;
return { filter, params, limit: filter.limit };
}
function processData(data, { map = true, append = true }) {
function setCurrentFilter() {
const { params, limit } = getCurrentFilter();
store.currentFilter = JSON.parse(JSON.stringify(params));
delete store.currentFilter.filter.include;
store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
return { params, limit };
}
function processData(data, { map = true, append = true, oneRecord = false }) {
if (oneRecord) {
store.data = Array.isArray(data) ? data[0] : data;
return;
}
if (!append) {
store.data = [];
store.map = new Map();
@ -333,6 +356,7 @@ export function useArrayData(key, userOptions) {
applyFilter,
addFilter,
getCurrentFilter,
setCurrentFilter,
addFilterWhere,
addOrder,
deleteOrder,

View File

@ -29,8 +29,12 @@ export function useFilterParams(key) {
orders.value = orderObject;
}
function setUserParams(watchedParams) {
if (!watchedParams || Object.keys(watchedParams).length == 0) return;
function setUserParams(watchedParams = {}) {
if (Object.keys(watchedParams).length == 0) {
params.value = {};
orders.value = {};
return;
}
if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
if (typeof watchedParams?.filter == 'string')

View File

@ -5,7 +5,7 @@ export function useHasContent(selector) {
const hasContent = ref();
onMounted(() => {
container.value = document.querySelector(selector);
container.value = document?.querySelector(selector);
if (!container.value) return;
const observer = new MutationObserver(() => {

View File

@ -6,6 +6,7 @@ import axios from 'axios';
import { useRouter } from 'vue-router';
import useNotify from './useNotify';
import { useTokenConfig } from './useTokenConfig';
import { getToken, getTokenMultimedia } from 'src/utils/session';
const TOKEN_MULTIMEDIA = 'tokenMultimedia';
const TOKEN = 'token';
@ -15,19 +16,6 @@ export function useSession() {
let isCheckingToken = false;
let intervalId = null;
function getToken() {
const localToken = localStorage.getItem(TOKEN);
const sessionToken = sessionStorage.getItem(TOKEN);
return localToken || sessionToken || '';
}
function getTokenMultimedia() {
const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
return localTokenMultimedia || sessionTokenMultimedia || '';
}
function setSession(data) {
let keepLogin = data.keepLogin;
const storage = keepLogin ? localStorage : sessionStorage;

View File

@ -4,10 +4,10 @@ import { useQuasar } from 'quasar';
export function useSummaryDialog() {
const quasar = useQuasar();
function viewSummary(id, summary) {
function viewSummary(id, summary, width) {
quasar.dialog({
component: VnSummaryDialog,
componentProps: { id, summary },
componentProps: { id, summary, width },
});
}

View File

@ -1,6 +1,6 @@
// app global css in SCSS form
@import './icons.scss';
@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
body.body--light {
--vn-header-color: #cecece;
@ -212,6 +212,10 @@ select:-webkit-autofill {
justify-content: center;
}
.q-card__section[dense] {
padding: 0;
}
input[type='number'] {
-moz-appearance: textfield;
}
@ -310,6 +314,14 @@ input::-webkit-inner-spin-button {
.no-visible {
visibility: hidden;
}
.q-item > .q-item__section:has(.q-checkbox) {
max-width: fit-content;
}
.row > .column:has(.q-checkbox) {
max-width: fit-content;
}
.q-field__inner {
.q-field__control {
min-height: auto !important;

Binary file not shown.

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,10 @@
@font-face {
font-family: 'icon';
src: url('fonts/icon.eot?y0x93o');
src: url('fonts/icon.eot?y0x93o#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?y0x93o') format('truetype'),
url('fonts/icon.woff?y0x93o') format('woff'),
url('fonts/icon.svg?y0x93o#icon') format('svg');
src: url('fonts/icon.eot?uocffs');
src: url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
url('fonts/icon.ttf?uocffs') format('truetype'),
url('fonts/icon.woff?uocffs') format('woff'),
url('fonts/icon.svg?uocffs#icon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@ -25,8 +25,17 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-entry_lastbuys:before {
content: "\e91a";
.icon-inactive-car:before {
content: "\e978";
}
.icon-hasItemLost:before {
content: "\e957";
}
.icon-hasItemDelay:before {
content: "\e96d";
}
.icon-add_entries:before {
content: "\e953";
}
.icon-100:before {
content: "\e901";
@ -52,6 +61,9 @@
.icon-addperson:before {
content: "\e908";
}
.icon-agencia_tributaria:before {
content: "\e948";
}
.icon-agency:before {
content: "\e92a";
}
@ -189,6 +201,9 @@
.icon-entry:before {
content: "\e937";
}
.icon-entry_lastbuys:before {
content: "\e91a";
}
.icon-exit:before {
content: "\e938";
}

View File

@ -33,6 +33,11 @@ $dark-shadow-color: black;
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
$spacing-md: 16px;
$color-font-secondary: #777;
$width-xs: 400px;
$width-sm: 544px;
$width-md: 800px;
$width-lg: 1280px;
$width-xl: 1600px;
.bg-success {
background-color: $positive;
}

View File

@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
import getParamWhere from './getParamWhere';
import parsePhone from './parsePhone';
import isDialogOpened from './isDialogOpened';
import toCelsius from './toCelsius';
export {
getUpdatedValues,
@ -36,4 +37,5 @@ export {
dashIfEmpty,
dateRange,
getParamWhere,
toCelsius,
};

3
src/filters/toCelsius.js Normal file
View File

@ -0,0 +1,3 @@
export default function toCelsius(value) {
return value ? `${value}°C` : '';
}

View File

@ -2,12 +2,14 @@ globals:
lang:
es: Spanish
en: English
quantity: Quantity
language: Language
quantity: Quantity
entity: Entity
preview: Preview
user: User
details: Details
collapseMenu: Collapse left menu
collapseMenu: Collapse lateral menu
advancedMenu: Advanced menu
backToDashboard: Return to dashboard
notifications: Notifications
userPanel: User panel
@ -35,7 +37,6 @@ globals:
confirm: Confirm
assign: Assign
back: Back
downloadPdf: Download PDF
yes: 'Yes'
no: 'No'
noChanges: No changes to save
@ -59,6 +60,7 @@ globals:
downloadCSVSuccess: CSV downloaded successfully
reference: Reference
agency: Agency
entry: Entry
warehouseOut: Warehouse Out
warehouseIn: Warehouse In
landed: Landed
@ -67,11 +69,11 @@ globals:
amount: Amount
packages: Packages
download: Download
downloadPdf: Download PDF
selectRows: 'Select all { numberRows } row(s)'
allRows: 'All { numberRows } row(s)'
markAll: Mark all
requiredField: Required field
valueCantBeEmpty: Value cannot be empty
class: clase
type: Type
reason: reason
@ -81,6 +83,9 @@ globals:
warehouse: Warehouse
company: Company
fieldRequired: Field required
valueCantBeEmpty: Value cannot be empty
Value can't be blank: Value cannot be blank
Value can't be null: Value cannot be null
allowedFilesText: 'Allowed file types: { allowedContentTypes }'
smsSent: SMS sent
confirmDeletion: Confirm deletion
@ -130,6 +135,26 @@ globals:
medium: Medium
big: Big
email: Email
supplier: Supplier
ticketList: Ticket List
created: Created
worker: Worker
now: Now
name: Name
new: New
comment: Comment
observations: Observations
goToModuleIndex: Go to module index
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
maxTemperature: Max
minTemperature: Min
changePass: Change password
deleteConfirmTitle: Delete selected elements
changeState: Change state
raid: 'Raid {daysInForward} days'
isVies: Vies
pageTitles:
logIn: Login
addressEdit: Update address
@ -151,13 +176,14 @@ globals:
subRoles: Subroles
inheritedRoles: Inherited Roles
customers: Customers
customerCreate: New customer
createCustomer: Create customer
createOrder: New order
list: List
webPayments: Web Payments
extendedList: Extended list
notifications: Notifications
defaulter: Defaulter
customerCreate: New customer
createOrder: New order
fiscalData: Fiscal data
billingData: Billing data
consignees: Consignees
@ -193,27 +219,28 @@ globals:
claims: Claims
claimCreate: New claim
lines: Lines
photos: Photos
development: Development
photos: Photos
action: Action
invoiceOuts: Invoice out
negativeBases: Negative Bases
globalInvoicing: Global invoicing
invoiceOutCreate: Create invoice out
order: Orders
orderList: List
orderCreate: New order
catalog: Catalog
volume: Volume
shelving: Shelving
shelvingList: Shelving List
shelvingCreate: New shelving
invoiceIns: Invoices In
invoiceInCreate: Create invoice in
vat: VAT
labeler: Labeler
dueDay: Due day
intrastat: Intrastat
corrective: Corrective
order: Orders
orderList: List
orderCreate: New order
catalog: Catalog
volume: Volume
workers: Workers
workerCreate: New worker
department: Department
@ -226,10 +253,10 @@ globals:
wagonsList: Wagons List
wagonCreate: Create wagon
wagonEdit: Edit wagon
wagonCounter: Trolley counter
typesList: Types List
typeCreate: Create type
typeEdit: Edit type
wagonCounter: Trolley counter
roadmap: Roadmap
stops: Stops
routes: Routes
@ -238,21 +265,16 @@ globals:
routeCreate: New route
RouteRoadmap: Roadmaps
RouteRoadmapCreate: Create roadmap
RouteExtendedList: Router
autonomous: Autonomous
suppliers: Suppliers
supplier: Supplier
expedition: Expedition
services: Service
components: Components
pictures: Pictures
packages: Packages
tracking: Tracking
labeler: Labeler
supplierCreate: New supplier
accounts: Accounts
addresses: Addresses
agencyTerm: Agency agreement
travel: Travels
create: Create
extraCommunity: Extra community
travelCreate: New travel
history: Log
@ -260,14 +282,13 @@ globals:
items: Items
diary: Diary
tags: Tags
create: Create
buyRequest: Buy requests
fixedPrice: Fixed prices
buyRequest: Buy requests
wasteBreakdown: Waste breakdown
itemCreate: New item
barcode: Barcodes
tax: Tax
botanical: Botanical
barcode: Barcodes
itemTypeCreate: New item type
family: Item Type
lastEntries: Last entries
@ -283,13 +304,20 @@ globals:
formation: Formation
locations: Locations
warehouses: Warehouses
saleTracking: Sale tracking
roles: Roles
connections: Connections
acls: ACLs
mailForwarding: Mail forwarding
mailAlias: Mail alias
privileges: Privileges
observation: Notes
expedition: Expedition
saleTracking: Sale tracking
services: Service
tracking: Tracking
components: Components
pictures: Pictures
packages: Packages
ldap: LDAP
samba: Samba
twoFactor: Two factor
@ -298,30 +326,19 @@ globals:
ticketsMonitor: Tickets monitor
clientsActionsMonitor: Clients and actions
serial: Serial
business: Business
medical: Mutual
pit: IRPF
RouteExtendedList: Router
wasteRecalc: Waste recaclulate
operator: Operator
parking: Parking
supplier: Supplier
created: Created
worker: Worker
now: Now
name: Name
new: New
comment: Comment
observations: Observations
goToModuleIndex: Go to module index
vehicleList: Vehicles
vehicle: Vehicle
unsavedPopup:
title: Unsaved changes will be lost
subtitle: Are you sure exit without saving?
createInvoiceIn: Create invoice in
myAccount: My account
noOne: No one
maxTemperature: Max
minTemperature: Min
params:
description: Description
clientFk: Client id
salesPersonFk: Sales person
warehouseFk: Warehouse
@ -338,19 +355,19 @@ globals:
supplierFk: Supplier
supplierRef: Supplier ref
serial: Serial
amount: Importe
amount: Amount
awbCode: AWB
correctedFk: Rectified
correctingFk: Rectificative
daysOnward: Days onward
countryFk: Country
countryCodeFk: Country
companyFk: Company
changePass: Change password
setPass: Set password
deleteConfirmTitle: Delete selected elements
changeState: Change state
raid: 'Raid {daysInForward} days'
isVies: Vies
model: Model
fuel: Fuel
active: Active
inactive: Inactive
deliveryPoint: Delivery point
errors:
statusUnauthorized: Access denied
statusInternalServerError: An internal server error has ocurred
@ -370,7 +387,7 @@ login:
loginError: Invalid username or password
fieldRequired: This field is required
twoFactorRequired: Two-factor verification required
twoFactorRequired:
twoFactor:
validate: Validate
insert: Enter the verification code
explanation: >-
@ -446,65 +463,9 @@ ticket:
service: Service
attender: Attender
ok: Ok
consigneeStreet: Street
create:
address: Address
invoiceOut:
card:
issued: Issued
customerCard: Customer card
ticketList: Ticket List
summary:
issued: Issued
dued: Due
booked: Booked
taxBreakdown: Tax breakdown
taxableBase: Taxable base
rate: Rate
fee: Fee
tickets: Tickets
totalWithVat: Amount
globalInvoices:
errors:
chooseValidClient: Choose a valid client
chooseValidCompany: Choose a valid company
chooseValidPrinter: Choose a valid printer
chooseValidSerialType: Choose a serial type
fillDates: Invoice date and the max date should be filled
invoiceDateLessThanMaxDate: Invoice date can not be less than max date
invoiceWithFutureDate: Exists an invoice with a future date
noTicketsToInvoice: There are not tickets to invoice
criticalInvoiceError: 'Critical invoicing error, process stopped'
invalidSerialTypeForAll: The serial type must be global when invoicing all clients
table:
addressId: Address id
streetAddress: Street
statusCard:
percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
negativeBases:
clientId: Client Id
base: Base
active: Active
hasToInvoice: Has to Invoice
verifiedData: Verified Data
comercial: Comercial
errors:
downloadCsvFailed: CSV download failed
shelving:
list:
parking: Parking
priority: Priority
newShelving: New Shelving
summary:
recyclable: Recyclable
parking:
pickingOrder: Picking order
sector: Sector
row: Row
column: Column
searchBar:
info: You can search by parking code
label: Search parking...
department:
chat: Chat
bossDepartment: Boss Department
@ -516,6 +477,24 @@ department:
hasToSendMail: Send check-ins by email
departmentRemoved: Department removed
worker:
pageTitles:
workers: Workers
list: List
basicData: Basic data
summary: Summary
notifications: Notifications
workerCreate: New worker
department: Department
pda: PDA
notes: Notas
dms: My documentation
pbx: Private Branch Exchange
log: Log
calendar: Calendar
timeControl: Time control
locker: Locker
balance: Balance
medical: Medical
list:
department: Department
schedule: Schedule
@ -531,15 +510,24 @@ worker:
role: Role
sipExtension: Extension
locker: Locker
fiDueDate: FI due date
fiDueDate: DNI expiration date
sex: Sex
seniority: Seniority
seniority: Antiquity
fi: DNI/NIE/NIF
birth: Birth
isFreelance: Freelance
isSsDiscounted: SS Bonification
hasMachineryAuthorized: Machinery authorized
isDisable: Disable
business: Business
started: Started
ended: Ended
reasonEnd: Reason End
department: Departament
workerBusinessCategory: Worker Business Category
notes: Notes
workCenter: Center
professionalCategory: Professional Category
notificationsManager:
activeNotifications: Active notifications
availableNotifications: Available notifications
@ -598,6 +586,23 @@ worker:
sizeLimit: Size limit
isOnReservationMode: Reservation mode
machine: Machine
business:
tableVisibleColumns:
started: Start Date
ended: End Date
company: Company
reasonEnd: Reason for Termination
department: Department
professionalCategory: Professional Category
calendarType: Work Calendar
workCenter: Work Center
payrollCategories: Contract Category
occupationCode: Contribution Code
rate: Rate
businessType: Contract Type
amount: Salary
basicSalary: Transport Workers Salary
notes: Notes
wagon:
type:
submit: Submit
@ -630,6 +635,8 @@ wagon:
name: Name
supplier:
search: Search supplier
searchInfo: Search supplier by id or name
list:
payMethod: Pay method
account: Account
@ -696,6 +703,9 @@ supplier:
consumption:
entry: Entry
travel:
search: Search travel
searchInfo: You can search by travel id or name
id: Id
travelList:
tableVisibleColumns:
ref: Reference
@ -704,6 +714,7 @@ travel:
totalEntries: Total entries
totalEntriesTooltip: Total entries
daysOnward: Landed days onwards
awb: AWB
summary:
entryId: Entry Id
freight: Freight
@ -725,62 +736,7 @@ travel:
destination: Destination
thermograph: Thermograph
travelFileDescription: 'Travel id { travelId }'
item:
descriptor:
buyer: Buyer
color: Color
category: Category
available: Available
warehouseText: 'Calculated on the warehouse of { warehouseName }'
itemDiary: Item diary
list:
id: Identifier
stems: Stems
category: Category
typeName: Type
isActive: Active
userName: Buyer
weightByPiece: Weight/Piece
stemMultiplier: Multiplier
fixedPrice:
itemFk: Item ID
groupingPrice: Grouping price
packingPrice: Packing price
hasMinPrice: Has min price
minPrice: Min price
started: Started
ended: Ended
create:
priority: Priority
buyRequest:
requester: Requester
requested: Requested
attender: Atender
achieved: Achieved
concept: Concept
summary:
otherData: Other data
tax: Tax
botanical: Botanical
barcode: Barcode
completeName: Complete name
family: Familiy
stems: Stems
multiplier: Multiplier
buyer: Buyer
doPhoto: Do photo
intrastatCode: Intrastat code
ref: Reference
relevance: Relevance
weight: Weight (gram)/stem
units: Units/box
expense: Expense
generic: Generic
recycledPlastic: Recycled plastic
nonRecycledPlastic: Non recycled plastic
minSalesQuantity: Min sales quantity
genus: Genus
specie: Specie
carrier: Carrier
components:
topbar: {}
itemsFilterPanel:

View File

@ -5,9 +5,11 @@ globals:
language: Idioma
quantity: Cantidad
entity: Entidad
preview: Vista previa
user: Usuario
details: Detalles
collapseMenu: Contraer menú lateral
advancedMenu: Menú avanzado
backToDashboard: Volver al tablón
notifications: Notificaciones
userPanel: Panel de usuario
@ -53,11 +55,12 @@ globals:
today: Hoy
yesterday: Ayer
dateFormat: es-ES
noSelectedRows: No tienes ninguna línea seleccionada
microsip: Abrir en MicroSIP
noSelectedRows: No tienes ninguna línea seleccionada
downloadCSVSuccess: Descarga de CSV exitosa
reference: Referencia
agency: Agencia
entry: Entrada
warehouseOut: Alm. salida
warehouseIn: Alm. entrada
landed: F. entrega
@ -132,6 +135,26 @@ globals:
medium: Mediano/a
big: Grande
email: Correo
supplier: Proveedor
ticketList: Listado de tickets
created: Fecha creación
worker: Trabajador
now: Ahora
name: Nombre
new: Nuevo
comment: Comentario
observations: Observaciones
goToModuleIndex: Ir al índice del módulo
createInvoiceIn: Crear factura recibida
myAccount: Mi cuenta
noOne: Nadie
maxTemperature: Máx
minTemperature: Mín
changePass: Cambiar contraseña
deleteConfirmTitle: Eliminar los elementos seleccionados
changeState: Cambiar estado
raid: 'Redada {daysInForward} días'
isVies: Vies
pageTitles:
logIn: Inicio de sesión
addressEdit: Modificar consignatario
@ -154,17 +177,17 @@ globals:
inheritedRoles: Roles heredados
customers: Clientes
customerCreate: Nuevo cliente
createCustomer: Crear cliente
createOrder: Nuevo pedido
list: Listado
webPayments: Pagos Web
extendedList: Listado extendido
notifications: Notificaciones
defaulter: Morosos
createCustomer: Crear cliente
fiscalData: Datos fiscales
billingData: Forma de pago
consignees: Consignatarios
'address-create': Nuevo consignatario
address-create: Nuevo consignatario
notes: Notas
credits: Créditos
greuges: Greuges
@ -230,10 +253,10 @@ globals:
wagonsList: Listado vagones
wagonCreate: Crear tipo
wagonEdit: Editar tipo
wagonCounter: Contador de carros
typesList: Listado tipos
typeCreate: Crear tipo
typeEdit: Editar tipo
wagonCounter: Contador de carros
roadmap: Troncales
stops: Paradas
routes: Rutas
@ -242,8 +265,8 @@ globals:
routeCreate: Nueva ruta
RouteRoadmap: Troncales
RouteRoadmapCreate: Crear troncal
autonomous: Autónomos
RouteExtendedList: Enrutador
autonomous: Autónomos
suppliers: Proveedores
supplier: Proveedor
supplierCreate: Nuevo proveedor
@ -303,29 +326,19 @@ globals:
ticketsMonitor: Monitor de tickets
clientsActionsMonitor: Clientes y acciones
serial: Facturas por serie
business: Contratos
medical: Mutua
pit: IRPF
wasteRecalc: Recalcular mermas
operator: Operario
parking: Parking
supplier: Proveedor
created: Fecha creación
worker: Trabajador
now: Ahora
name: Nombre
new: Nuevo
comment: Comentario
observations: Observaciones
goToModuleIndex: Ir al índice del módulo
vehicleList: Vehículos
vehicle: Vehículo
unsavedPopup:
title: Los cambios que no haya guardado se perderán
subtitle: ¿Seguro que quiere salir sin guardar?
createInvoiceIn: Crear factura recibida
myAccount: Mi cuenta
noOne: Nadie
maxTemperature: Máx
minTemperature: Mín
params:
description: Descripción
clientFk: Id cliente
salesPersonFk: Comercial
warehouseFk: Almacén
@ -339,20 +352,15 @@ globals:
from: Desde
to: Hasta
supplierFk: Proveedor
supplierRef: Ref. proveedor
supplierRef: Nº factura
serial: Serie
amount: Importe
awbCode: AWB
daysOnward: Días adelante
packing: ITP
countryFk: País
countryCodeFk: País
companyFk: Empresa
changePass: Cambiar contraseña
setPass: Establecer contraseña
deleteConfirmTitle: Eliminar los elementos seleccionados
changeState: Cambiar estado
raid: 'Redada {daysInForward} días'
isVies: Vies
errors:
statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor
@ -445,13 +453,18 @@ ticket:
purchaseRequest: Petición de compra
service: Servicio
attender: Consignatario
consigneeStreet: Dirección
create:
address: Dirección
invoiceOut:
card:
issued: Fecha emisión
customerCard: Ficha del cliente
ticketList: Listado de tickets
order:
field:
salesPersonFk: Comercial
form:
clientFk: Cliente
addressFk: Dirección
agencyModeFk: Agencia
list:
newOrder: Nuevo Pedido
summary:
issued: Fecha
dued: Fecha límite
@ -462,47 +475,6 @@ invoiceOut:
fee: Cuota
tickets: Tickets
totalWithVat: Importe
globalInvoices:
errors:
chooseValidClient: Selecciona un cliente válido
chooseValidCompany: Selecciona una empresa válida
chooseValidPrinter: Selecciona una impresora válida
chooseValidSerialType: Selecciona una tipo de serie válida
fillDates: La fecha de la factura y la fecha máxima deben estar completas
invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
invoiceWithFutureDate: Existe una factura con una fecha futura
noTicketsToInvoice: No existen tickets para facturar
criticalInvoiceError: Error crítico en la facturación proceso detenido
invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
table:
addressId: Id dirección
streetAddress: Dirección fiscal
statusCard:
percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
negativeBases:
clientId: Id cliente
base: Base
active: Activo
hasToInvoice: Facturar
verifiedData: Datos comprobados
comercial: Comercial
errors:
downloadCsvFailed: Error al descargar CSV
shelving:
list:
parking: Parking
priority: Prioridad
newShelving: Nuevo Carro
summary:
recyclable: Reciclable
parking:
pickingOrder: Orden de recogida
row: Fila
column: Columna
searchBar:
info: Puedes buscar por código de parking
label: Buscar parking...
department:
chat: Chat
bossDepartment: Jefe de departamento
@ -514,6 +486,26 @@ department:
hasToSendMail: Enviar fichadas por mail
departmentRemoved: Departamento eliminado
worker:
pageTitles:
workers: Trabajadores
list: Listado
basicData: Datos básicos
summary: Resumen
notifications: Notificaciones
workerCreate: Nuevo trabajador
department: Departamentos
pda: PDA
notes: Notas
dms: Mi documentación
pbx: Centralita
log: Historial
calendar: Calendario
timeControl: Control de horario
locker: Taquilla
balance: Balance
business: Contrato
formation: Formación
medical: Mutua
list:
department: Departamento
schedule: Horario
@ -538,6 +530,15 @@ worker:
isSsDiscounted: Bonificación SS
hasMachineryAuthorized: Autorizado para maquinaria
isDisable: Deshabilitado
business: Contrato
started: Antigüedad
ended: Fin
reasonEnd: Motivo finalización
department: Departamento
workerBusinessCategory: Categoria profesional
notes: Notas
workCenter: Centro
professionalCategory: Categoria profesional
notificationsManager:
activeNotifications: Notificaciones activas
availableNotifications: Notificaciones disponibles
@ -584,6 +585,23 @@ worker:
debit: Debe
credit: Haber
concept: Concepto
business:
tableVisibleColumns:
started: Fecha inicio
ended: Fecha fin
company: Empresa
reasonEnd: Motivo finalización
department: Departamento
professionalCategory: Categoria profesional
calendarType: Calendario laboral
workCenter: Centro
payrollCategories: Categoria contrato
occupationCode: Cotización
rate: Tarifa
businessType: Contrato
amount: Salario
basicSalary: Salario transportistas
notes: Notas
operator:
numberOfWagons: Número de vagones
train: tren
@ -596,7 +614,6 @@ worker:
sizeLimit: Tamaño límite
isOnReservationMode: Modo de reserva
machine: Máquina
wagon:
type:
submit: Guardar
@ -627,6 +644,8 @@ wagon:
volume: Volumen
name: Nombre
supplier:
search: Buscar proveedor
searchInfo: Buscar proveedor por id o nombre
list:
payMethod: Método de pago
account: Cuenta
@ -634,6 +653,7 @@ supplier:
tableVisibleColumns:
nif: NIF/CIF
account: Cuenta
summary:
responsible: Responsable
verified: Verificado
@ -692,6 +712,9 @@ supplier:
consumption:
entry: Entrada
travel:
search: Buscar envío
searchInfo: Buscar envío por id o nombre
id: Id
travelList:
tableVisibleColumns:
ref: Referencia
@ -700,6 +723,7 @@ travel:
totalEntries:
totalEntriesTooltip: Entradas totales
daysOnward: Días de llegada en adelante
awb: AWB
summary:
entryId: Id entrada
freight: Porte
@ -721,62 +745,7 @@ travel:
destination: Destino
thermograph: Termógrafo
travelFileDescription: 'Id envío { travelId }'
item:
descriptor:
buyer: Comprador
color: Color
category: Categoría
available: Disponible
warehouseText: 'Calculado sobre el almacén de { warehouseName }'
itemDiary: Registro de compra-venta
list:
id: Identificador
stems: Tallos
category: Reino
typeName: Tipo
isActive: Activo
weightByPiece: Peso (gramos)/tallo
userName: Comprador
stemMultiplier: Multiplicador
fixedPrice:
itemFk: ID Artículo
groupingPrice: Precio grouping
packingPrice: Precio packing
hasMinPrice: Tiene precio mínimo
minPrice: Precio min
started: Inicio
ended: Fin
create:
priority: Prioridad
summary:
otherData: Otros datos
tax: IVA
botanical: Botánico
barcode: Código de barras
completeName: Nombre completo
family: Familia
stems: Tallos
multiplier: Multiplicador
buyer: Comprador
doPhoto: Hacer foto
intrastatCode: Código intrastat
ref: Referencia
relevance: Relevancia
weight: Peso (gramos)/tallo
units: Unidades/caja
expense: Gasto
generic: Genérico
recycledPlastic: Plástico reciclado
nonRecycledPlastic: Plástico no reciclado
minSalesQuantity: Cantidad mínima de venta
genus: Genus
specie: Specie
buyRequest:
requester: Solicitante
requested: Solicitado
attender: Comprador
achieved: Conseguido
concept: Concepto
carrier: Transportista
components:
topbar: {}
itemsFilterPanel:

View File

@ -2,7 +2,7 @@
import Navbar from 'src/components/NavBar.vue';
</script>
<template>
<QLayout view="hHh LpR fFf" v-shortcut>
<QLayout view="hHh LpR fFf">
<Navbar />
<RouterView></RouterView>
<QFooter v-if="$q.platform.is.mobile"></QFooter>

View File

@ -1,10 +1,12 @@
<script setup>
import { Dark, Quasar } from 'quasar';
import { computed } from 'vue';
import { computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
import { localeEquivalence } from 'src/i18n/index';
import quasarLang from 'src/utils/quasarLang';
import { langs } from 'src/boot/defaults/constants.js';
const { t, locale } = useI18n();
const userLocale = computed({
get() {
return locale.value;
@ -12,18 +14,9 @@ const userLocale = computed({
set(value) {
locale.value = value;
if (value === 'en') value = 'en-GB';
value = localeEquivalence[value] ?? value;
// FIXME: Dynamic imports from absolute paths are not compatible with vite:
// https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
try {
const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
Quasar.lang.set(lang.default);
});
} catch (error) {
//
}
quasarLang(value);
},
});
@ -35,7 +28,6 @@ const darkMode = computed({
Dark.set(value);
},
});
const langs = ['en', 'es'];
</script>
<template>

View File

@ -3,6 +3,7 @@ import { useI18n } from 'vue-i18n';
import { ref, computed } from 'vue';
import VnTable from 'components/VnTable/VnTable.vue';
import VnSection from 'src/components/common/VnSection.vue';
import exprBuilder from './Alias/AliasExprBuilder';
const tableRef = ref();
const { t } = useI18n();
@ -31,15 +32,6 @@ const columns = computed(() => [
create: true,
},
]);
const exprBuilder = (param, value) => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: { alias: { like: `%${value}%` } };
}
};
</script>
<template>

View File

@ -46,7 +46,7 @@ const killSession = async ({ userId, created }) => {
<VnPaginate
:data-key="urlPath"
ref="paginateRef"
:filter="filter"
:user-filter="filter"
:url="urlPath"
order="created DESC"
auto-load

View File

@ -0,0 +1,18 @@
export default (param, value) => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: {
or: [
{ name: { like: `%${value}%` } },
{ nickname: { like: `%${value}%` } },
],
};
case 'name':
case 'nickname':
return { [param]: { like: `%${value}%` } };
case 'roleFk':
return { [param]: value };
}
};

View File

@ -4,15 +4,16 @@ import { computed, ref } from 'vue';
import VnTable from 'components/VnTable/VnTable.vue';
import AccountSummary from './Card/AccountSummary.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import exprBuilder from './AccountExprBuilder.js';
import filter from './Card/AccountFilter.js';
import VnSection from 'src/components/common/VnSection.vue';
import FetchData from 'src/components/FetchData.vue';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
const filter = {
include: { relation: 'role', scope: { fields: ['id', 'name'] } },
};
const tableRef = ref();
const dataKey = 'AccountList';
const roles = ref([]);
const columns = computed(() => [
@ -117,25 +118,6 @@ const columns = computed(() => [
],
},
]);
function exprBuilder(param, value) {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: {
or: [
{ name: { like: `%${value}%` } },
{ nickname: { like: `%${value}%` } },
],
};
case 'name':
case 'nickname':
return { [param]: { like: `%${value}%` } };
case 'roleFk':
return { [param]: value };
}
}
</script>
<template>
<FetchData url="VnRoles" @on-fetch="(data) => (roles = data)" auto-load />

View File

@ -0,0 +1,8 @@
export default (param, value) => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
? { id: value }
: { alias: { like: `%${value}%` } };
}
};

View File

@ -1,21 +1,13 @@
<script setup>
import { useI18n } from 'vue-i18n';
import VnCardBeta from 'components/common/VnCardBeta.vue';
import AliasDescriptor from './AliasDescriptor.vue';
const { t } = useI18n();
</script>
<template>
<VnCardBeta
data-key="Alias"
base-url="MailAliases"
url="MailAliases"
:descriptor="AliasDescriptor"
search-data-key="AccountAliasList"
:searchbar-props="{
url: 'MailAliases',
info: t('mailAlias.searchInfo'),
label: t('mailAlias.search'),
searchUrl: 'table',
}"
/>
</template>

View File

@ -7,7 +7,6 @@ import { useQuasar } from 'quasar';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
@ -29,9 +28,6 @@ const entityId = computed(() => {
return $props.id || route.params.id;
});
const data = ref(useCardDescription());
const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
const removeAlias = () => {
quasar
.dialog({
@ -56,10 +52,8 @@ const removeAlias = () => {
ref="descriptor"
:url="`MailAliases/${entityId}`"
module="Alias"
@on-fetch="setData"
data-key="aliasData"
:title="data.title"
:subtitle="data.subtitle"
data-key="Alias"
title="alias"
>
<template #menu>
<QItem v-ripple clickable @click="removeAlias()">

View File

@ -1,13 +1,11 @@
<script setup>
import { ref, computed } from 'vue';
import { computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import { useArrayData } from 'src/composables/useArrayData';
const route = useRoute();
const { t } = useI18n();
@ -18,20 +16,15 @@ const $props = defineProps({
},
});
const { store } = useArrayData('Alias');
const alias = ref(store.data);
const entityId = computed(() => $props.id || route.params.id);
</script>
<template>
<CardSummary
ref="summary"
:url="`MailAliases/${entityId}`"
@on-fetch="(data) => (alias = data)"
data-key="MailAliasesSummary"
>
<template #header> {{ alias.id }} - {{ alias.alias }} </template>
<template #body>
<CardSummary ref="summary" :url="`MailAliases/${entityId}`" data-key="Alias">
<template #header="{ entity: alias }">
{{ alias.id }} - {{ alias.alias }}
</template>
<template #body="{ entity: alias }">
<QCard class="vn-one">
<QCardSection class="q-pa-none">
<router-link

View File

@ -69,7 +69,7 @@ const fetchAliases = () => paginateRef.value.fetch();
<VnPaginate
ref="paginateRef"
data-key="AliasUsers"
:filter="filter"
:user-filter="filter"
:url="urlPath"
:limit="0"
auto-load

View File

@ -1,46 +1,20 @@
<script setup>
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
import FormModel from 'components/FormModel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import { ref, watch } from 'vue';
const route = useRoute();
const { t } = useI18n();
const formModelRef = ref(null);
const accountFilter = {
where: { id: route.params.id },
fields: ['id', 'email', 'nickname', 'name', 'accountStateFk', 'packages', 'pickup'],
include: [],
};
watch(
() => route.params.id,
() => formModelRef.value.reset()
);
</script>
<template>
<FormModel
ref="formModelRef"
url="VnUsers/preview"
:url-update="`VnUsers/${route.params.id}/update-user`"
:filter="accountFilter"
model="Accounts"
auto-load
@on-data-saved="formModelRef.fetch()"
>
<FormModel :url-update="`VnUsers/${$route.params.id}/update-user`" model="Account">
<template #form="{ data }">
<div class="q-gutter-y-sm">
<VnInput v-model="data.name" :label="t('account.card.nickname')" />
<VnInput v-model="data.nickname" :label="t('account.card.alias')" />
<VnInput v-model="data.email" :label="t('globals.params.email')" />
<VnInput v-model="data.name" :label="$t('account.card.nickname')" />
<VnInput v-model="data.nickname" :label="$t('account.card.alias')" />
<VnInput v-model="data.email" :label="$t('globals.params.email')" />
<VnSelect
url="Languages"
v-model="data.lang"
:label="t('account.card.lang')"
:label="$t('account.card.lang')"
option-value="code"
option-label="code"
/>
@ -49,7 +23,7 @@ watch(
table="user"
column="twoFactor"
v-model="data.twoFactor"
:label="t('account.card.twoFactor')"
:label="$t('account.card.twoFactor')"
option-value="code"
option-label="code"
/>

View File

@ -1,8 +1,14 @@
<script setup>
import VnCardBeta from 'components/common/VnCardBeta.vue';
import AccountDescriptor from './AccountDescriptor.vue';
import filter from './AccountFilter.js';
</script>
<template>
<VnCardBeta data-key="AccountId" :descriptor="AccountDescriptor" />
<VnCardBeta
url="VnUsers/preview"
:id-in-where="true"
data-key="Account"
:descriptor="AccountDescriptor"
:filter="filter"
/>
</template>

View File

@ -1,36 +1,18 @@
<script setup>
import { ref, computed, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription';
import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
import VnImg from 'src/components/ui/VnImg.vue';
import filter from './AccountFilter.js';
import useHasAccount from 'src/composables/useHasAccount.js';
const $props = defineProps({
id: {
type: Number,
required: false,
default: null,
},
});
const $props = defineProps({ id: { type: Number, default: null } });
const route = useRoute();
const { t } = useI18n();
const entityId = computed(() => {
return $props.id || route.params.id;
});
const data = ref(useCardDescription());
const entityId = computed(() => $props.id || route.params.id);
const hasAccount = ref();
const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
const filter = {
where: { id: entityId },
fields: ['id', 'nickname', 'name', 'role'],
include: { relation: 'role', scope: { fields: ['id', 'name'] } },
};
onMounted(async () => {
hasAccount.value = await useHasAccount(entityId.value);
@ -43,10 +25,8 @@ onMounted(async () => {
:url="`VnUsers/preview`"
:filter="filter"
module="Account"
@on-fetch="setData"
data-key="AccountId"
:title="data.title"
:subtitle="data.subtitle"
data-key="Account"
title="nickname"
>
<template #menu>
<AccountDescriptorMenu :entity-id="entityId" />
@ -62,7 +42,7 @@ onMounted(async () => {
<QIcon name="vn:claims" />
</div>
<div class="text-grey-5" style="opacity: 0.4">
{{ t('account.imageNotFound') }}
{{ $t('account.imageNotFound') }}
</div>
</div>
</div>
@ -70,8 +50,8 @@ onMounted(async () => {
</VnImg>
</template>
<template #body="{ entity }">
<VnLv :label="t('account.card.nickname')" :value="entity.name" />
<VnLv :label="t('account.card.role')" :value="entity.role.name" />
<VnLv :label="$t('account.card.nickname')" :value="entity.name" />
<VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
</template>
<template #actions="{ entity }">
<QCardActions class="q-gutter-x-md">
@ -84,7 +64,7 @@ onMounted(async () => {
size="sm"
class="fill-icon"
>
<QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
<QTooltip>{{ $t('account.card.deactivated') }}</QTooltip>
</QIcon>
<QIcon
color="primary"
@ -95,7 +75,7 @@ onMounted(async () => {
size="sm"
class="fill-icon"
>
<QTooltip>{{ t('account.card.enabled') }}</QTooltip>
<QTooltip>{{ $t('account.card.enabled') }}</QTooltip>
</QIcon>
</QCardActions>
</template>

Some files were not shown because too many files have changed in this diff Show More