Compare commits

..

1111 Commits

Author SHA1 Message Date
Javier Segarra 4399217b4b Merge pull request 'InvoiceOut change columns order' (!1415) from minor_requested_changes_invoiceOutList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1415
2025-04-08 13:29:12 +00:00
Javier Segarra 3edd00d500 Merge pull request 'Add `vitest ui` as devDependency' (!1688) from vitest_ui into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1688
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 13:24:42 +00:00
Javier Segarra 6f938021bf Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-08 13:10:43 +00:00
Javier Segarra 7e56cb96ef Merge pull request '#8725 - submit_form_onClick' (!1564) from 8725_submit_form_onClick into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1564
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 12:58:50 +00:00
Javier Segarra 87925d3fad Merge branch 'dev' into vitest_ui
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:57:32 +00:00
Javier Segarra 36ff68900f Merge pull request 'test: #7356 Ticket e2e' (!1531) from 7356_e2e into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1531
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 12:31:23 +00:00
Javier Segarra 77e01ed55c Merge branch 'dev' into vitest_ui
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:14:30 +00:00
Javier Segarra a24bc6cc4b Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:09:48 +00:00
Alex Moreno 9d2c0bf211 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 13:34:01 +02:00
Alex Moreno 123ec41f32 fix(WorkerCalendarFilter): fix style year and contract filter
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 13:32:31 +02:00
Javier Segarra d6362d042d Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 11:31:00 +00:00
Javier Segarra 1b695be63f feat: add vitest ui devDependency
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-08 13:30:22 +02:00
Alex Moreno d3b413fc25 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 11:19:33 +00:00
Javier Segarra 1e1096a108 Merge pull request 'fix: FilterPanel when is multiline and VnTable vh on n toolbar' (!1657) from fix_itemFilter_multiLine into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1657
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 10:17:23 +00:00
Javier Segarra 9d31a75dfe Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 10:00:52 +00:00
Javier Segarra af0c30f798 test: refs #8725 add save action to form model popup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 11:57:21 +02:00
Javier Segarra 9cadb4a02b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick 2025-04-08 11:12:22 +02:00
Javier Segarra 3c6bed6d7e Merge pull request '#8446 - update_vitest_version to 2.0.0' (!1127) from update_vitest_version into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1127
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 08:09:34 +00:00
Javier Segarra af4a398a90 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 07:50:56 +00:00
Javier Segarra d91d5351c3 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 07:48:18 +00:00
Alex Moreno 15cbbab043 fix(WorkerPDA): fix translations
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:35:27 +02:00
Alex Moreno 2a3e8f293a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:28:17 +02:00
Alex Moreno ffd83e7e0f fix(WorkerPDA): use observation field
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:27:51 +02:00
Alex Moreno 72d9f9345c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 07:24:04 +02:00
Alex Moreno e0ba8ab742 refactor: rollback
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 07:22:12 +02:00
Javier Segarra 2cb151e181 fix: update pnpm-lock.yaml
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 17:43:06 +02:00
Javier Segarra 5e9fe20f08 Merge branch 'update_vitest_version' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 15:35:19 +02:00
Javier Segarra dc93d1d394 Merge branch 'dev' into update_vitest_version 2025-04-07 15:35:14 +02:00
Javier Segarra 1fc9dc1ca6 Merge branch 'dev' into fix_itemFilter_multiLine 2025-04-07 13:27:30 +00:00
Alex Moreno 2d129dde01 fix: enable Jenkins find changes
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:14:22 +02:00
Alex Moreno d142797b1f fix: update Jenkinsfile to remove unused module retrieval and modify cypressParallel.sh invocation
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:03:43 +02:00
Alex Moreno 2b5802a7fb fix: update cypressParallel.sh invocation to use an empty string for modules
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:01:51 +02:00
Alex Moreno 3549f172d6 fix: pass modules as argument to cypressParallel.sh in Jenkinsfile
gitea/salix-front/pipeline/head Build queued... Details
2025-04-07 14:01:37 +02:00
Alex Moreno d6363e4b45 fix: temporal fix
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:36:43 +02:00
Alex Moreno 22f1373c84 fix: handle empty changes in getChangedModules function
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:31:52 +02:00
Alex Moreno 488d48e9e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:13:58 +02:00
Alex Moreno 642589d054 Merge pull request 'ci: refs #8698 Jenkins changeset' (!1525) from 8698_jenkins_e2e_onlyChanges into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1525
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-07 11:13:38 +00:00
Alex Moreno 3fd3fef647 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:12:54 +02:00
Alex Moreno 582c7c8d40 Merge branch 'dev' into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 10:47:24 +00:00
Javier Segarra d55ec1c738 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-07 10:28:05 +00:00
Javier Segarra e8a3dc05dd fix: customer insurance grade
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 12:25:16 +02:00
Alex Moreno 455fd72db4 fix: refs #8698 update import path resolution to read jsconfig.json using fs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:20:40 +02:00
Javier Segarra d4053d74d2 Merge pull request '#8006 - eslint_rules' (!1454) from 8006_eslint_rules into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1454
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-07 10:02:42 +00:00
Alex Moreno e474e21309 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:44:24 +00:00
Javier Segarra eb5a0956a7 Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 09:41:33 +00:00
Alex Moreno 406b25103d Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 11:07:34 +02:00
Alex Moreno 12e4435709 fix: update Cypress parallel test execution to use a single instance
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 11:06:23 +02:00
Alex Moreno 830f506f5b fix: adjust Cypress parallel test execution to run with a single instance
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 11:06:02 +02:00
Alex Moreno c7f25d6909 feat: refs #8698 enhance module detection in Cypress tests and resolve import paths using jsconfig
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 10:37:45 +02:00
Alex Moreno c89fd0580f fix: refs #8698 update log message for E2E modules in Jenkinsfile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 09:10:21 +02:00
Alex Moreno 4db9adb20a feat: refs #8698 log modules found during Cypress test setup
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 09:09:49 +02:00
Alex Moreno f9bf2e7a3e Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 09:07:49 +02:00
Javier Segarra 6553a1a7fc Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 05:52:15 +00:00
Alex Moreno a3d828498b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 11:36:25 +02:00
Alex Moreno 4f821c86c1 fix: warnings
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 11:35:53 +02:00
Jon Elias 4857962955 Merge pull request 'Warmfix[CardSumary]: Use ellipsis property and fixed summary cards to flex correctly' (!1670) from Fix-SummaryCardsFlex into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1670
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-04 09:07:37 +00:00
Jon Elias 624eac7094 Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 10:45:36 +02:00
Jon Elias f50f747310 fix: skip failing e2e 2025-04-04 10:45:34 +02:00
Jon Elias 5110a46328 Merge branch 'test' into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-04 07:52:38 +00:00
Javier Segarra bcee01280c Merge branch 'warmfix_vnLinkPhone' into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 09:51:46 +02:00
Javier Segarra 3c4c27889e fix: correct data-cy for SendEmailNotificationDialogInput 2025-04-04 09:50:37 +02:00
Javier Segarra b7625f06bd Merge branch 'warmfix_ticketList_sortByShipped' into test 2025-04-04 09:50:02 +02:00
Alex Moreno 8f3ec13ccc fix: remove unnecessary width properties from Route tables
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 08:58:10 +02:00
Jon Elias 5eee9965bf Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-04-04 08:51:03 +02:00
Jon Elias e5f079121d refactor: undo skip due to its fix in other PR 2025-04-04 08:51:01 +02:00
Jon Elias a5d3babf1f Merge branch 'test' into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 06:23:39 +00:00
Alex Moreno dc6487475f Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 06:04:18 +00:00
Jon Elias f32d07ccaa fix: skip test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 07:44:36 +02:00
Jon Elias 1f5e4bd771 perf: use grid template instead of flex in card-group
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-04 06:58:24 +02:00
Javier Segarra 1a7a8dfc95 fix: add 'hour' translation to English locale for ticket list
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 20:10:05 +02:00
Javier Segarra 21c3384509 fix: use optional chaining for departmentFk in useRole composable
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 20:07:54 +02:00
Javier Segarra 2992ac2d0d fix: rename 'shipped' to 'shippedDate' and 'shippedHour' 2025-04-03 20:06:31 +02:00
Javier Segarra cb1e1aa594 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 09:37:15 +02:00
Javier Segarra 9b337062c8 Merge branch 'test' into warmfix_vnLinkPhone
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 05:38:38 +00:00
Alex Moreno 6ef3df2322 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-03 07:18:44 +02:00
Alex Moreno e9ef1c308e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-03 07:18:37 +02:00
Javier Segarra c08b3648f2 test: arrayData
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 01:36:30 +02:00
Javier Segarra d78460a438 test: add unit tests for useArrayDataStore and mock axios in axios.spec.js 2025-04-03 01:24:00 +02:00
Javier Segarra d406715a70 test: improve test 2025-04-03 00:56:54 +02:00
Javier Segarra fd036138e4 chore: update dependencies and configuration for vue-i18n and eslint 2025-04-03 00:40:52 +02:00
Javier Segarra e5005d08ed Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 22:33:45 +00:00
Javier Segarra 8523f85b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version 2025-04-03 00:32:24 +02:00
Jon Elias 7ef02c8797 refactor: deleted unnecessary code
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 16:18:48 +02:00
Jorge Penadés 20ed8001bf Merge pull request 'test: refs #8441 enable invoice deletion test in invoiceInDescriptor.spec.js' (!1671) from 8441-warmfix-includeTest into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1671
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 14:10:26 +00:00
Jorge Penadés c700521b37 Merge pull request 'fix: refs #5835 update icon for invoice button in InvoiceInDescriptor' (!1676) from 5835-hotfix-icon into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1676
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-02 14:06:43 +00:00
Jorge Penadés b2ce75d2f6 fix: refs #5835 update icon for invoice button in InvoiceInDescriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-02 15:54:55 +02:00
Jorge Penadés a5b27b3683 Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:49:36 +00:00
Jorge Penadés daa3289b58 Merge pull request 'refactor: refs #8326 conditionally render vn-card-content based on advancedSummary' (!1668) from 8326-warmfix-preventNull into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1668
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 13:26:48 +00:00
Javier Segarra 1c96090d02 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 15:25:49 +02:00
Javier Segarra 6df58d021a test: refs #7356 ticketSaleTracking 2025-04-02 15:25:27 +02:00
Jorge Penadés 8c132298bb Merge pull request 'fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files' (!1674) from 5835-hotfix-changeLocale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1674
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 13:11:10 +00:00
Jorge Penadés e444828e4e Merge branch 'test' into 8326-warmfix-preventNull
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:01:29 +00:00
Jorge Penadés ce72c78af7 Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:01:15 +00:00
Alex Moreno a472e35bcf Merge pull request 'fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy' (!1673) from 8449-fixes_2 into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1673
2025-04-02 13:01:01 +00:00
Jorge Penadés 832646638b fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-02 14:50:17 +02:00
Jorge Penadés cf05dc0d5b Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:44:13 +00:00
Jorge Penadés 5afc9ce983 Merge branch 'test' into 8326-warmfix-preventNull
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:43:56 +00:00
Alex Moreno 00ed955577 fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 14:39:23 +02:00
Javier Segarra a780786a2c style: select needs filled
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:27:07 +02:00
Alex Moreno 00e1e4441c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:21:02 +02:00
Alex Moreno 6fd01a4d09 fix: remove duplicate departmentFk entries in CustomerFilter.vue
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:20:58 +02:00
Alex Moreno a4b710352d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head Build queued... Details
2025-04-02 14:18:19 +02:00
Alex Moreno 4821390f22 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-04-02 14:18:12 +02:00
Pablo Natek 8b24874f72 Merge pull request 'refactor: improve layout and styling in ExtraCommunity.vue' (!1669) from warmFixExtraComunityFieldsDisplay into test
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 12:18:08 +00:00
Alex Moreno 425e2adcdb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-04-02 14:17:44 +02:00
Javier Segarra 21c9abf273 test: refs #7356 fix test ticketSale
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 13:30:50 +02:00
Javier Segarra 20f3525e50 revert: refs #7356 command dataCy proposal 2025-04-02 13:23:00 +02:00
Javier Segarra 97c55aa1ec Merge branch '7356_e2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e 2025-04-02 12:55:13 +02:00
Javier Segarra 600c16e822 Merge branch 'dev' into 7356_e2e 2025-04-02 12:54:51 +02:00
Javier Segarra d7866f9bdb build: refs #8006 disable no-void off
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 12:54:07 +02:00
Pablo Natek 6debb64b2b test: skip VnShortcuts and WorkerList test suites
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:52:51 +02:00
Javier Segarra 4bdd8a6494 build: refs #8006 disable no-void off 2025-04-02 12:49:49 +02:00
Javier Segarra 9989e752bc build: refs #8006 disable no-void off 2025-04-02 12:47:51 +02:00
Javier Segarra d3848a2343 build: refs #8006 disable no-void off 2025-04-02 12:46:09 +02:00
Javier Segarra 7deb9b1f16 build: refs #8006 disable no-void off 2025-04-02 12:45:27 +02:00
Javier Segarra e4196e7176 build: refs #8006 disable no-void off 2025-04-02 12:45:08 +02:00
Javier Segarra 6aceda51f5 build: refs #8006 disable no-void off 2025-04-02 12:42:39 +02:00
Javier Segarra 7a7463ebf1 build: refs #8006 disable no-void off 2025-04-02 12:42:03 +02:00
Jon Elias b5fa2bb18e fix: fixed cardSummary to use ellipsis and fixed summary cards to flex correctly
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:38:30 +02:00
Jorge Penadés 1e1715df1a test: refs #8441 enable invoice deletion test in invoiceInDescriptor.spec.js
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 12:37:16 +02:00
Javier Segarra 736471bcbe build: refs #8006 disable no-void off
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 12:36:34 +02:00
Alex Moreno 861bbb1574 Merge pull request 'chore: update Cypress parallel test execution to use 2 instances' (!1648) from enable-parallel-x2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1648
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-02 10:36:02 +00:00
Javier Segarra 736f3e1c00 build: refs #8006 disable prefer-destructuring off
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 12:35:00 +02:00
Alex Moreno 0af42130c1 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:07:19 +00:00
Pablo Natek 74033a7bdf refactor: improve layout and styling in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 11:51:03 +02:00
Javier Segarra 87e56d9ff1 fix: customer missing i18n
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 11:39:02 +02:00
Jorge Penadés 2e6963d505 refactor: refs #8326 conditionally render vn-card-content based on advancedSummary
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 11:38:44 +02:00
Javier Segarra e435674eda style: minor changes
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-02 11:34:19 +02:00
Javier Segarra 4b6696fdc9 style: add ellipsis support to CardSummary and related components
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 11:27:23 +02:00
Javier Segarra e150ffd9fc style: add ellipsis class to CardSummary
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 11:22:24 +02:00
Javier Segarra 8bc40c74f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into warmfix_vnLinkPhone 2025-04-02 11:21:47 +02:00
Javier Segarra 61ec951011 Merge pull request 'fix_vnLinkPhone' (!1659) from fix_vnLinkPhone into dev
Reviewed-on: #1659
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 11:15:54 +02:00
Javier Segarra a1490a798b fix: remove calculateTableHeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:32:42 +02:00
Javier Segarra f384dd6f04 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 10:28:40 +02:00
Javier Segarra 4caf496bd6 perf: use composable 2025-04-02 10:28:30 +02:00
Javier Segarra 6bf6ae0288 perf: rename filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:15:02 +02:00
Javier Segarra f13b168364 style: reduce height row 2025-04-02 10:13:24 +02:00
Javier Segarra c099b41e74 perf: move calc heightTable to filter 2025-04-02 10:13:12 +02:00
Javier Segarra 22b57f850c Merge pull request 'fix_vnLinkPhone' (!1659) from fix_vnLinkPhone into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1659
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 07:53:14 +00:00
Javier Segarra 046b6f8f28 Merge pull request 'fix: fixed CustomerTicket table order' (!1661) from hotfix-CustomerTicketOrder into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1661
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-02 05:47:20 +00:00
Javier Segarra d40bf0f2ca Merge branch 'dev' into 7356_e2e 2025-04-01 19:38:39 +02:00
Javier Segarra 34343188d2 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 16:17:45 +00:00
Javier Segarra a43ade9852 Merge branch 'master' into hotfix-CustomerTicketOrder
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 13:33:57 +00:00
Alex Moreno 9be4cdccc0 Merge pull request 'refactor: remove keepData property from components and update related logic' (!1664) from warmFix_remove_keepData into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1664
2025-04-01 13:22:09 +00:00
Javier Segarra f02fa732ee feat: remove unused vnLinkPhone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 15:10:49 +02:00
Alex Moreno 0a0e4dfca7 Merge branch 'test' into warmFix_remove_keepData
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 12:59:46 +00:00
Javier Segarra 8849b9ed97 Merge branch 'dev' into fix_vnLinkPhone
gitea/salix-front/pipeline/pr-dev Build queued... Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 14:52:22 +02:00
Javier Segarra 40cfe2a5cc style: add ellipsis class to CardSummary 2025-04-01 14:52:05 +02:00
Javier Segarra 02a78c662b perf: handle VnLinkMail and VnEmail 2025-04-01 14:51:49 +02:00
Javier Segarra 588876952a fix: customerSummary 2025-04-01 14:51:24 +02:00
Alex Moreno 3c4cbf82d2 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 12:28:20 +00:00
Alex Moreno c15e4dcf32 Merge pull request 'fix: simplify data fetching logic in VnCard.vue' (!1656) from fix_vnCard_url into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1656
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:27:37 +00:00
Jon Elias da21c0aad6 Merge pull request '#7995: Added hasAcl to check only one acl' (!1654) from 7995-CreateHasAcl into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1654
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:24:34 +00:00
Alex Moreno 0863df25fe Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:07:05 +00:00
Alex Moreno c09254d204 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 11:04:15 +00:00
Alex Moreno 06e5188146 refactor: remove keepData property from components and update related logic
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 13:02:49 +02:00
Jon Elias 26861e92b6 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:01:11 +00:00
Alex Moreno fb3c015f89 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:31 +02:00
Alex Moreno 590afaba93 fix: update condition for rendering QChip in VnOrder component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:26 +02:00
Jon Elias 3ddc6dc310 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 10:13:47 +00:00
Alex Moreno 79fbe2cc72 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:57:35 +00:00
Alex Moreno e6e4b49d44 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 09:57:20 +00:00
Alex Moreno c9416b5286 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:09 +02:00
Alex Moreno da148c5435 test: skip invoice deletion test and add spinner waits in VnShortcuts
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:05 +02:00
Jon Elias 27ec560fc5 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:31:33 +00:00
Javier Segarra 49fafa2b34 Merge pull request 'hotfix_ticketSale_handle_notifications' (!1660) from hotfix_ticketSale_handle_notifications into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1660
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-01 09:20:32 +00:00
Alex Moreno 246e4429bd refactor: update getArrayData function to accept entityId for improved data fetching
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-01 11:04:36 +02:00
Javier Segarra 98a4ac450d Merge branch 'master' into hotfix_ticketSale_handle_notifications
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 08:55:26 +00:00
PAU ROVIRA ROSALENY 35886999e4 fix: rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:54:41 +00:00
PAU ROVIRA ROSALENY 79fdaffbc8 fix: fixed CustomerTicket table order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:42:30 +00:00
Jon Elias 8c9c156817 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:34:39 +02:00
Jon Elias b00d89a4be perf: refs #7995 has acl function 2025-04-01 09:34:38 +02:00
Jorge Penadés e679282e57 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:22:14 +02:00
Alex Moreno 044c607405 chore: update version to 25.16.0 in package.json
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 08:32:58 +02:00
Jon Elias 9f05984e80 Merge pull request 'Hotfix[CustomerAddress]: Fixed buttons disabled when there are no changes' (!1641) from Hotfix-CustomerAddress into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 06:08:11 +00:00
Alex Moreno c4f895e060 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:39:06 +00:00
Alex Moreno 8e66be1874 Merge branch 'dev' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit is unstable Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:38:57 +00:00
Alex Moreno 40d59846fa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 07:28:11 +02:00
Alex Moreno 68a86e9fcd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 07:25:42 +02:00
Alex Moreno 7c5ce312cc Merge branch 'master' into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 05:20:59 +00:00
Jose Antonio Tubau 1c3eee9695 Merge pull request 'test: refs #8717 add integration test for agencyModes' (!1545) from 8717-reviewAndFixAgencySection into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1545
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 05:19:05 +00:00
Jose Antonio Tubau e9ebb3ad8a Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 04:44:23 +00:00
Javier Segarra 7dd28393dd perf: refs #8006 rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 00:47:02 +02:00
Javier Segarra 3c68220903 perf: refs #8006 handle rules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 00:32:32 +02:00
Javier Segarra d81a14737c Merge pull request 'fix: remove reserved ticket functionality from TicketProblems and TicketSaleMoreActions components' (!1600) from hotfix_remove_reserved into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1600
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-31 21:50:48 +00:00
Javier Segarra 1d5509313a test: refs #8006 use write variable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 23:47:18 +02:00
Javier Segarra a1ca92a135 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 21:39:09 +00:00
Javier Segarra 61cdf2c3c7 Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 21:38:47 +00:00
Javier Segarra d71029c7e9 feat: dashIfEmpty
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-31 15:15:37 +02:00
Javier Segarra 19121fbeb9 fix: roadmap 2025-03-31 15:15:29 +02:00
Javier Segarra dd739b1165 fix: customer vnLinkPhone 2025-03-31 15:15:17 +02:00
Javier Segarra 0208debdbe feat: worker vnLinkPhone 2025-03-31 15:15:07 +02:00
Javier Segarra f392502673 fix: workerSummary 2025-03-31 15:02:37 +02:00
Javier Segarra a81f8fcdaf feat: add noOne
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 14:43:15 +02:00
Javier Segarra 5ade9fd133 fix: add trycatch to handle notifications 2025-03-31 14:43:00 +02:00
Javier Segarra f2a20ce4bf test: refs #8006 config 2025-03-31 13:52:30 +02:00
Alex Moreno 95950b7485 refactor(VnCard): use prop.url when init
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:27:28 +02:00
Javier Segarra 9ef29e61bd Merge branch 'dev' into 8006_eslint_rules 2025-03-31 13:20:57 +02:00
Javier Segarra 426438051c test: refs #7356 update command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:20:41 +02:00
Javier Segarra 31ffdd4b61 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:20:02 +02:00
Alex Moreno a937b2d3ac Merge pull request '#8449 - vnLogFilter' (!1640) from 8449-vnLogFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1640
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 11:13:16 +00:00
Pablo Natek 767a6302e1 Merge pull request 'refactor: update TravelSummary and TravelList components for improved data fetching and summary view' (!1658) from hotFixTravelSummaryDialog into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-31 10:56:40 +00:00
Alex Moreno 2f6b98a0bf fix: refs #8449 update data-key attribute in VnTableFilter and related components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:50:32 +02:00
Alex Moreno 519ae66226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnCard_url 2025-03-31 12:39:05 +02:00
Javier Segarra a84c2a78c8 Merge branch 'dev' into 7356_e2e 2025-03-31 12:38:57 +02:00
Javier Segarra 50a8b97be5 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:36:17 +02:00
Javier Segarra 04dcd1136a fix: remove prop printing 2025-03-31 12:35:47 +02:00
Alex Moreno 497eb3a8bb refactor(VnLog): refs #8449 clear filters when has userParams
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-31 12:35:13 +02:00
Pablo Natek c3d51259c4 Merge branch 'master' into hotFixTravelSummaryDialog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 10:31:24 +00:00
Pablo Natek ba2084e906 refactor: update TravelSummary and TravelList components for improved data fetching and summary view 2025-03-31 12:30:16 +02:00
Javier Segarra 8c9a863d71 style: handle height based on number of toolbars
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:23:45 +02:00
Jose Antonio Tubau 1f41e3c8d1 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 10:17:23 +00:00
Javier Segarra 96bcc04d78 style: fix vnselect style with full-width 2025-03-31 11:59:08 +02:00
Alex Moreno 5066cd8179 Merge branch 'dev' of https: refs #8449//gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 11:44:02 +02:00
Alex Moreno ae5465687e Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:40:58 +00:00
Jon Elias 801e9687f7 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:32:47 +00:00
Jose Antonio Tubau c205693131 Merge pull request '8440-createVehicleNotes' (!1638) from 8440-createVehicleNotes into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1638
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 09:01:35 +00:00
Jose Antonio Tubau 2bd0e88e3b Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 08:39:35 +00:00
Javier Segarra 8c75ec41d8 Merge pull request '#8667: Modified ClientPayment' (!1622) from 8667-FixClientNewPayment into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1622
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-31 08:17:33 +00:00
Alex Moreno cad78aedd0 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 08:11:32 +00:00
Jon Elias 6cee67733d Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 07:54:41 +00:00
Pablo Natek 6dad310665 Merge pull request 'fix: adjust styles in ExtraCommunity.vue for better layout and readability' (!1655) from fixOverFlow into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1655
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-31 07:54:26 +00:00
Javier Segarra ddfed3a59d Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-31 07:51:58 +00:00
Jon Elias f8cc7b95ab refactor: refs #7995 modified hasAcl function
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 09:51:40 +02:00
Alex Moreno 36f142800f refactor: simplify data fetching logic in VnCard.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 09:51:36 +02:00
Pablo Natek 5b23a3ebc6 Merge branch 'dev' into fixOverFlow
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 07:26:10 +00:00
Alex Moreno 16cb224926 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 06:54:24 +00:00
Javi Gallego 9fdc8a1042 fix: update state color for 'managed' to 'loses' in ClaimList.vue
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-31 08:51:37 +02:00
Pablo Natek 668745981f Merge pull request 'fix: update filter in TravelCard to include route parameter' (!1651) from hotFix_travelCard_addWhere into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1651
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-03-31 06:36:19 +00:00
Jose Antonio Tubau 2d03b3a0b7 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 06:34:06 +00:00
Javier Segarra d60d7da33c fix: improve monitorClient.department
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-28 14:31:11 +01:00
Alex Moreno ea59cf8b0d Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 13:17:47 +00:00
Alex Moreno 17821917ea Merge branch 'master' into hotFix_travelCard_addWhere
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 13:17:34 +00:00
Jorge Penadés 6adf7a91cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl 2025-03-28 14:06:20 +01:00
Jorge Penadés 74a7b39108 Merge pull request 'refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests' (!1645) from 8718-hotfix-vnAccount into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1645
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-28 13:04:29 +00:00
Javier Segarra fe2024c26a Merge branch 'master' into 8718-hotfix-vnAccount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 12:28:15 +00:00
Jose Antonio Tubau 033fe3375f Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 13:20:04 +01:00
Jose Antonio Tubau 4fbcb82234 fix: refs #8717 update AgencyCard to include filter by agency ID and correct locale key casing 2025-03-28 13:20:02 +01:00
Benjamin Esteve c516ae1e12 Merge pull request 'refactor: refs #8673 replace VnPopup with inline display of evaNotes in ExtraCommunity.vue' (!1633) from 8673-viewEntryNotesField into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1633
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-03-28 11:55:33 +00:00
Benjamin Esteve 89d9c22c6a Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 11:34:12 +00:00
Javier Segarra cce3a0cef8 Merge branch 'test' into warmfix_monitorClients
gitea/salix-front/pipeline/pr-test This commit is unstable Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-28 12:03:29 +01:00
Javier Segarra 50fb8a31a6 test: fix test 2025-03-28 12:03:15 +01:00
Alex Moreno e05d3140a3 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 10:55:43 +00:00
Pablo Natek ff30ca898c fix: adjust styles in ExtraCommunity.vue for better layout and readability
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 11:07:34 +01:00
Pablo Natek 1a1a859edc Merge branch 'master' into hotFix_travelCard_addWhere
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 09:58:45 +00:00
Javier Segarra a49c8891a7 fix: params.departmentFk i18n and ticketFilter.groupedStates 2025-03-28 10:22:08 +01:00
Javier Segarra ec723a884b fix: vnMoreOptions label 2025-03-28 09:52:23 +01:00
Benjamin Esteve feec9a7100 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 08:36:52 +00:00
Alex Moreno ea694a606a Merge pull request 'feat: refs #8534 implement navigation and state query guards for improved routing control' (!1621) from 8534-wait_queries into dev
Reviewed-on: #1621
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-28 08:32:16 +00:00
Jon Elias c03a56f69f feat: refs #7995 added hasAcl to check only one acl 2025-03-28 09:28:24 +01:00
Benjamin Esteve cc41c90d8e Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 07:39:20 +00:00
Alex Moreno 7648fc6743 refactor: refs #8534 simplify stateQueryGuard usage and improve test structure
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 08:06:51 +01:00
Alex Moreno 5c2c761eb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries 2025-03-28 07:18:51 +01:00
Javier Segarra 687bd54e64 refactor: refs #8006 update ESLint rules and disable unused rules 2025-03-28 02:27:46 +01:00
Javier Segarra 0b614f15d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8006_eslint_rules 2025-03-28 02:21:32 +01:00
Javier Segarra 2a3e072b1b feat: add departmentFk to user data and filter clients by department
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-03-28 01:25:38 +01:00
Javier Segarra 4ae9b69e11 test: refs #7356 clean commands 2025-03-28 00:38:47 +01:00
Javier Segarra bdfc1fa309 test: refs #7356 clean commands 2025-03-28 00:25:27 +01:00
Javier Segarra 9492c71128 fix: refs #7356 remove bad code 2025-03-27 23:29:11 +01:00
Javier Segarra 39fcfb83a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e 2025-03-27 21:41:59 +01:00
Javier Segarra dcf0b906f4 Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/head This commit is unstable Details
2025-03-27 20:22:54 +00:00
Javier Segarra cb4c740319 Merge pull request 'hotfix_ticketSale_hasChanges' (!1650) from hotfix_ticketSale_hasChanges into master
Reviewed-on: #1650
2025-03-27 20:21:25 +00:00
Javier Segarra 195fc7efd2 Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-27 20:16:36 +00:00
Javier Segarra 7bc793cfb7 Merge branch 'dev' into 8717-reviewAndFixAgencySection 2025-03-27 20:15:57 +00:00
Javier Segarra 848341f9d9 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-27 19:44:05 +00:00
Javier Segarra 71755025a6 Merge branch 'master' into hotfix_remove_reserved 2025-03-27 19:42:57 +00:00
Jose Antonio Tubau 0aa4c1c527 test: refs #8717 skip RouteAutonomous test suite 2025-03-27 16:12:03 +01:00
Jose Antonio Tubau 34c18d2baa test: refs #8717 update invoice creation test to ensure save button visibility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 15:31:55 +01:00
Jon Elias c9e7411c90 Merge branch 'master' into hotfix_ticketSale_hasChanges
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 14:04:07 +00:00
Jon Elias 3fc56700e4 Merge branch 'Hotfix-CustomerAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 15:03:12 +01:00
Jon Elias 60899ef2d2 perf: clean payload 2025-03-27 15:03:11 +01:00
Alex Moreno c4ab00ffd2 fix: update filter in TravelCard to include route parameter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 14:56:22 +01:00
Alex Moreno f5dd0834b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-27 14:49:06 +01:00
Alex Moreno 69da78b655 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-27 14:48:58 +01:00
Alex Moreno 6e27edcf54 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-27 13:14:55 +00:00
Jose Antonio Tubau 1805e1e553 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:59:27 +00:00
Jon Elias dcd5d357ae Merge branch 'master' into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-27 12:37:30 +00:00
Jon Elias c743ad4ac1 Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:37:25 +00:00
Alex Moreno 985e8663a3 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 12:27:04 +00:00
Alex Moreno ea314073d2 chore: update Cypress parallel test execution to use 2 instances
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-27 13:26:42 +01:00
Javier Segarra 6e84341aea perf: add await
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-27 13:06:29 +01:00
Javier Segarra a91a0146fe fix: hasChanges 2025-03-27 13:03:21 +01:00
Benjamin Esteve c1536bd762 refactor: refs #8673 simplify evaNotes display logic in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:54:52 +01:00
Pablo Natek ba875ba5da Merge pull request 'fix: correct badge color logic in EntryList based on time difference' (!1646) from fixColorOnEntryList into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1646
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-27 11:46:54 +00:00
Alex Moreno 71c6741cf2 chore: update Cypress parallel test execution to use 6 instances
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-27 12:28:11 +01:00
Alex Moreno 696dbd4149 chore: update Cypress parallel test execution to use 4 instances
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-27 12:27:47 +01:00
Benjamin Esteve 0d1f2f33e0 refactor: refs #8673 enhance display of evaNotes in ExtraCommunity.vue with conditional rendering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:27:42 +01:00
Benjamin Esteve 0b6ee4ba70 Merge branch 'dev' of https: refs #8673//gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:13:11 +01:00
Pablo Natek e06201c3d0 Merge branch 'master' into fixColorOnEntryList
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 11:08:36 +00:00
Alex Moreno d94dafd667 chore: update Cypress parallel test execution to use 3 instances
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 11:43:00 +01:00
Pablo Natek 07cb49f7a1 fix: comment out checkBadgeDate function in entryList.spec.js for clarity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 11:41:51 +01:00
Pablo Natek 3caa4abe9e Merge pull request 'refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability' (!1647) from 8699-align-correctly-extra-comunity-columns into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1647
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-27 10:39:43 +00:00
Javier Segarra d45990c4a1 fix: monitorClients and monitorOrders descriptors
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-27 10:37:26 +01:00
Alex Moreno 446b679bca chore: update Cypress parallel test execution to use 2 instances
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 10:23:55 +01:00
Pablo Natek 169ebbe593 refactor: refs #8699 adjust alignment and sortable property for percentage column in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 09:43:00 +01:00
Pablo Natek 04b0bb1db9 refactor: refs #8699 remove sortable property from percentage column in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-27 09:40:36 +01:00
Alex Moreno 75a20f7ca7 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 08:39:31 +00:00
Pablo Natek 321493b6b6 refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 09:37:04 +01:00
Benjamin Esteve 4765fda63b Merge branch '8673-viewEntryNotesField' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 09:32:08 +01:00
Benjamin Esteve 04cc5e80f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 09:31:46 +01:00
Pablo Natek 5966fe5390 fix: correct badge color logic in EntryList based on time difference
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-27 09:09:50 +01:00
Javier Segarra 67e0791f34 fix: update order list tests to remove only and skip modifiers
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 09:03:40 +01:00
Benjamin Esteve e2baac843b Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 07:38:50 +00:00
Alex Moreno fff43b2260 Merge branch 'dev' into 8534-wait_queries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 06:54:00 +00:00
Alex Moreno a0313cb957 Merge branch '8534-wait_queries' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-27 07:53:18 +01:00
Alex Moreno 9d53418e21 fix: refs #8534 enhance stateQueryGuard to handle identical routes and improve test coverage 2025-03-27 07:53:17 +01:00
Javier Segarra a398f87f62 Merge pull request '#8772 - update VnLinkPhone for displaying phone numbers' (!1603) from 8772-align_linkPhone into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1603
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-27 06:24:19 +00:00
Javier Segarra a624d65178 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 21:28:04 +01:00
Javier Segarra 59c08be804 test: refs #7356 add waitRequest 2025-03-26 21:27:48 +01:00
Javier Segarra 229737c75c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 20:29:08 +01:00
Javier Segarra e0bac2c033 Merge branch 'dev' into 8772-align_linkPhone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 19:04:56 +00:00
Javier Segarra 90a49a8513 Merge pull request 'hotfix_rowClickActions' (!1643) from hotfix_rowClickActions into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1643
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-26 15:32:02 +00:00
Javier Segarra 28d7878b80 Merge branch 'master' into hotfix_rowClickActions
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 15:21:38 +00:00
Jorge Penadés b464344cd0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8718-hotfix-vnAccount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 16:02:08 +01:00
Jorge Penadés dd4e872fcc refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 16:00:50 +01:00
Jose Antonio Tubau 09bbb89376 Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 15:48:20 +01:00
Jose Antonio Tubau 8e35b49927 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection 2025-03-26 15:48:10 +01:00
Alex Moreno 40276baea6 Merge branch 'dev' into 8534-wait_queries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-26 14:02:15 +00:00
Alex Moreno d63c35192d fix: refs #8534 update stateQueryGuard to check route changes and improve loading state handling
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 15:01:23 +01:00
Alex Moreno ebdc835d97 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 14:41:55 +01:00
Alex Moreno 53aa46bfbf Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 14:41:51 +01:00
Alex Moreno 61083b54bf Merge pull request 'fix: update filter in EntryCard to include route parameter' (!1644) from hotFix_entryCard_addWhere into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1644
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-03-26 13:39:31 +00:00
Jon Elias e44b32f789 refactor: refs #8667 corrected function name and value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 14:27:37 +01:00
Alex Moreno bca84c54af fix: update filter in EntryCard to include route parameter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 14:19:09 +01:00
Jon Elias e353f7916a perf: clean payload
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 14:15:01 +01:00
Jon Elias a3b1095952 refactor: clean payload
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 13:51:03 +01:00
Javier Segarra 6528e76abb Merge branch 'master' into hotfix_rowClickActions
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 13:50:08 +01:00
Javier Segarra 59f250fd65 fix: refactor click handling for state column in MonitorTickets.vue 2025-03-26 13:49:48 +01:00
Javier Segarra 3e0c6e0214 feat: add row click functionality to open customer and order summary tabs 2025-03-26 13:33:40 +01:00
Alex Moreno b3661c1674 Merge branch 'dev' into 8534-wait_queries
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 12:33:04 +00:00
Alex Moreno 671d553e93 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 13:26:01 +01:00
Alex Moreno 522e900e55 test: enable previously skipped tests in route and ticket list
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 13:23:56 +01:00
Pablo Natek 0eda125579 Merge pull request 'feat: add rounded CC field to travel summary and translations' (!1639) from ccRoundedFix into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1639
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-26 12:16:30 +00:00
Benjamin Esteve 033ef0adb0 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 12:01:23 +00:00
Jon Elias 4ec43e326d Merge branch '8667-FixClientNewPayment' of https://gitea.verdnatura.es/verdnatura/salix-front into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 12:54:26 +01:00
Jon Elias 000ced3ca0 refactor: refs #8667 requested changes 2025-03-26 12:54:24 +01:00
Jon Elias 415d44a33a Merge pull request '#7358: Added chip in Navbar to show environment' (!1618) from 7358-AddChipInNavbar into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1618
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-26 11:44:56 +00:00
Pablo Natek dcc45cf3d4 test: skip TicketList test suite
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 12:38:53 +01:00
Jon Elias ae9cc49add refactor: manage every nullable option
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 12:32:22 +01:00
Jon Elias bbcdb1c361 Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 11:22:56 +00:00
Pablo Natek ef2ce0500e test: mark route cloning test as skipped for task 8814
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 12:05:32 +01:00
Jon Elias 3783cdeed4 fix: fixed buttons disabled when there are no changes
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 12:03:46 +01:00
Alex Moreno 7a273fb35f Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 10:53:48 +00:00
Alex Moreno 9918230096 fix(VnOrder): refs #8449 adjust padding for vertical alignment in table cells
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:50:44 +01:00
Alex Moreno 8c7dabd8fb fix(VnOrder): refs #8449 hover style
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:48:44 +01:00
Alex Moreno a7c23f4bbb feat(VnLogFilter): refs #8449 enable orders
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:45:11 +01:00
Benjamin Esteve 55503b0f65 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 10:36:15 +00:00
Benjamin Esteve ceb18df7ff Merge pull request 'feat: refs #8118 add VnDropdown component and integrate it into Claim and Ticket summaries' (!1517) from 8118-createComponentVnDropdown into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1517
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-26 10:32:29 +00:00
Jon Elias 97a143fa4d Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 10:21:23 +00:00
Benjamin Esteve bb77f771da Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 09:45:12 +00:00
Benjamin Esteve c20dd788d9 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 09:45:10 +00:00
Jorge Penadés 40418c421b Merge pull request '#8388 fix invoice-in' (!1587) from 8388-fixInvoiceIn into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1587
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-26 09:41:44 +00:00
Jorge Penadés c3299d967b 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-03-26 10:10:39 +01:00
Alex Moreno 1b280ef9fc refactor: rename cardDescriptor to vnDescriptor in localization files
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 10:03:53 +01:00
Alex Moreno 4e83c31d35 feat: refs #6994 create ParkingDescriptorProxy to VnLog
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 09:59:11 +01:00
Pablo Natek 1a1b399606 fix: move warning badge condition to the correct position in getBadgeAttrs function
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 09:57:40 +01:00
Pablo Natek eb4c05bc02 Merge branch 'ccRoundedFix' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 09:55:28 +01:00
Pablo Natek 42d613429f test: mark specific tests as skipped for tasks 8814 and 8779 2025-03-26 09:55:26 +01:00
Jose Antonio Tubau 1e89bdfe95 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 08:38:49 +00:00
Benjamin Esteve bd1a38fd0e Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:30:21 +00:00
Benjamin Esteve 243bf2062a Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:30:20 +00:00
Alex Moreno 382432636f Merge pull request 'fix(VnLog): refs #6994 simplify value binding and improve descriptor handling' (!1636) from 6994-fix_vnLogValue_whenIsString into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1636
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-26 08:29:35 +00:00
Alex Moreno 4179219f15 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:23:29 +00:00
Alex Moreno f78cd7c9bf feat(VnLogFilter): refs #8449 add showTagChips prop to control visibility of tag chips
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 09:22:58 +01:00
Javier Segarra 4b1a648509 fix: refs #8006 defaults 2025-03-26 09:22:25 +01:00
Alex Moreno 421b68a031 test: refs #8449 refactor e2e vnLog 2025-03-26 09:16:32 +01:00
Benjamin Esteve 22deec8c40 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:11:07 +00:00
Benjamin Esteve c85c84e50a Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:10:55 +00:00
Alex Moreno e4bb2938e2 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:07:23 +00:00
Benjamin Esteve e3084ea39c Merge pull request 'fix: refs #8790 format code and update default SMS message in SendSmsDialog component' (!1619) from 8790-smsPredefinedText into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1619
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-03-26 08:02:14 +00:00
Alex Moreno c867d6da52 test: refs #8449 refactor VnLog and VnLogFilter unit test 2025-03-26 08:56:37 +01:00
Alex Moreno 74b8bbc189 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 07:53:39 +00:00
Jose Antonio Tubau c5a05917c0 fix: refs #8717 enable RouteAutonomous tests and adjust notification check in RouteExtendedList
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-26 08:50:25 +01:00
Pablo Natek 117bc84ec9 Merge branch 'master' into ccRoundedFix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 07:42:47 +00:00
Benjamin Esteve ee0b5558ad Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 07:40:58 +00:00
Jon Elias 3984af23c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8667-FixClientNewPayment 2025-03-26 08:38:52 +01:00
Benjamin Esteve eef88a471e Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 07:38:51 +00:00
Benjamin Esteve c35b8fa293 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 07:38:34 +00:00
Jose Antonio Tubau cb8362c0fa Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:37:03 +01:00
Jose Antonio Tubau 4d0ababbde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection 2025-03-26 08:32:24 +01:00
Alex Moreno 209a3caac9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 08:32:00 +01:00
Alex Moreno bbc03ddcad fix: remove duplicated department selection from MonitorTicketFilter
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 08:30:20 +01:00
Alex Moreno f402350188 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 07:14:35 +00:00
Alex Moreno 659d73e11a test: skip RouteAutonomous tests temporarily
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 08:13:42 +01:00
Alex Moreno a9fd5894b5 fix(TicketSale): refs #8449 correct router.push to /log 2025-03-26 07:57:35 +01:00
Pablo Natek df396c08ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 07:48:23 +01:00
Pablo Natek 02e29c167a feat: add rounded CC field to travel summary and translations
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-26 07:46:39 +01:00
Alex Moreno 4a2b147320 feat(VnLogFilter): refs #8449 add changedModelValue filter 2025-03-26 07:38:07 +01:00
Alex Moreno 9666570cdd Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 06:29:21 +00:00
Alex Moreno be5550c31d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-26 07:22:36 +01:00
Javier Segarra 718042445f Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 22:57:28 +00:00
Javier Segarra 654834f04f Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 21:56:21 +00:00
Javier Segarra 943e0abb2a fix: refs #8006 update ESLint configuration and correct Vue import in Vitest config
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 22:31:40 +01:00
Javier Segarra e7a501f528 test: refs #7356 remove child class
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 22:27:45 +01:00
Javier Segarra 6e7e28226a feat: refs #8006 remove eslint.config
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 22:20:27 +01:00
Javier Segarra 1a284acdc5 feat: refs #8006 41 problems 2025-03-25 22:19:09 +01:00
Javier Segarra eb81b9b6ee feat: refs #8006 restart 2025-03-25 21:53:06 +01:00
Javier Segarra 240d671701 revert: refs #8006 clean branch 2025-03-25 21:50:38 +01:00
Javier Segarra f9f4b16d71 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 20:28:00 +00:00
Javier Segarra 3c16d516dc Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 20:27:48 +00:00
Javier Segarra dc35377f13 Merge branch 'dev' into 8006_eslint_rules 2025-03-25 19:59:48 +01:00
Javier Segarra 5a642f4c3a fix: refs #7356 update reference value in routeAutonomous test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:46:56 +01:00
Javier Segarra ec6f6c81c0 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:27:19 +01:00
Javier Segarra bb0351bd86 Merge branch 'dev' into 8772-align_linkPhone
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:03:04 +01:00
Jorge Penadés 73c6b7dea9 fix: refs #8388 update tooltip message in InvoiceInSummary to include total taxable base
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 17:34:10 +01:00
Jorge Penadés 4e728cfa40 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 17:32:34 +01:00
Jon Elias dc34bc70ad Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 15:05:52 +00:00
Javier Segarra ed95f0fad9 Merge pull request 'Add serve comand in README.md' (!1635) from update_readme into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1635
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 15:00:42 +00:00
Jose Antonio Tubau 5dd3b85012 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 14:56:04 +00:00
Jose Antonio Tubau 08992aabac Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 14:41:35 +00:00
Jon Elias ef3a2c0ee9 refactor: refs #7358 use location.hostname
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 15:10:57 +01:00
Alex Moreno 42646fd570 feat(VnLogFilter): refs #8449 add userType and creationDates 2025-03-25 15:02:07 +01:00
Alex Moreno 879296203c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter 2025-03-25 14:47:48 +01:00
Alex Moreno 492f77be08 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 13:44:34 +00:00
Javier Segarra 77543ff690 Merge branch 'dev' into update_readme
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 13:40:28 +00:00
Pablo Natek 77f0e7b492 Merge pull request 'fix: update default DMS code and improve filter handling in various components' (!1637) from someHotFixes into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1637
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 13:32:41 +00:00
Jon Elias 611e65a353 Merge branch '7358-AddChipInNavbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 14:20:40 +01:00
Jon Elias 90f6486fc1 refactor: refs #7358 use QBadge instead of QChip 2025-03-25 14:20:38 +01:00
Alex Moreno a6bd91c918 Merge pull request 'refactor: refs #8683 enhance sorting logic in VnSelect component' (!1522) from 8683-vnSelectSortByOptionLabel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 13:14:59 +00:00
Jose Antonio Tubau 9a2c7c8012 fix: refs #8717 streamline field filling logic in tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 14:02:13 +01:00
Pablo Natek 31205d40d3 fix: update default DMS code and improve filter handling in various components
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-25 14:01:29 +01:00
Benjamin Esteve 6e1a0266fd Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:45:43 +00:00
Benjamin Esteve 1e5932882c Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:45:41 +00:00
Benjamin Esteve 5bb5957a1f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:45:40 +00:00
Benjamin Esteve 15a55cfe26 Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 12:45:39 +00:00
Jon Elias f5bbada06b Merge pull request '#8326 Unify card names' (!1518) from 8326-UnifyCardTitles into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1518
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 12:43:44 +00:00
Benjamin Esteve 70c0e9d1ff Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:31:26 +00:00
Benjamin Esteve b7a511f44e Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:31:23 +00:00
Benjamin Esteve 55d6784987 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:31:20 +00:00
Benjamin Esteve 20b006e07b Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:31:18 +00:00
Jose Antonio Tubau 6766a6136a Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 12:17:44 +00:00
Jon Elias b4c467960e Merge branch '8326-UnifyCardTitles' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 13:11:23 +01:00
Jon Elias 8c870f177d fix: refs #8326 conflicts 2025-03-25 13:11:22 +01:00
Jon Elias 071145a998 Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:07:21 +00:00
Alex Moreno 63759d5b6c Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:06:13 +00:00
Alex Moreno 298f99a175 Merge branch 'dev' into update_readme
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:04:24 +00:00
Alex Moreno f01aa32be7 Merge branch 'dev' into 8772-align_linkPhone
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 12:03:19 +00:00
Alex Moreno 8bc68dd731 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 12:02:07 +00:00
Alex Moreno 4b53d9c1b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter 2025-03-25 12:57:16 +01:00
Alex Moreno c451c90de4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 12:54:38 +01:00
Alex Moreno 77df2d40ec fix(VnLog): refs #6994 simplify value binding and improve descriptor handling
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-25 12:51:21 +01:00
Alex Moreno 6dffa78235 fix(useDescriptorStore): correct file path for descriptor proxy imports
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 12:47:43 +01:00
Jose Antonio Tubau fa5d0d4ee8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-25 12:42:58 +01:00
Jon Elias 31c7b83ea5 Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:34:52 +00:00
Javier Segarra 79e6530d39 docs: add production serving instructions to README
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 12:23:49 +01:00
Benjamin Esteve 95b31dac4f Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:00:52 +00:00
Benjamin Esteve 97ed21f250 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:00:51 +00:00
Benjamin Esteve ec013d34d7 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:00:44 +00:00
Benjamin Esteve 2a3151b7ab Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:00:37 +00:00
Alex Moreno c0e9efc5d8 fix(useDescriptorStore): simplify async component import logic
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 11:54:14 +01:00
Jon Elias 7329d096d2 fix: refs #8667 balance field
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 11:50:53 +01:00
Benjamin Esteve 693b4f30e2 Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 10:42:13 +00:00
Benjamin Esteve cf7765c5bb Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 10:41:54 +00:00
Benjamin Esteve 75f31871d1 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 10:41:32 +00:00
Benjamin Esteve 969963fd5a Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 10:41:23 +00:00
Javier Segarra a519014685 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 11:41:07 +01:00
Javier Segarra af5a850311 fix: remove create prop departmentFk 2025-03-25 11:41:04 +01:00
Alex Moreno 9446202dee fix: update file path in useDescriptorStore to remove leading slash
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 11:30:09 +01:00
Jon Elias 375dbf3a9f Merge branch '8667-FixClientNewPayment' of https://gitea.verdnatura.es/verdnatura/salix-front into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 11:24:40 +01:00
Jon Elias c41756ebd2 refactor: refs #8667 requested changes 2025-03-25 11:24:38 +01:00
Benjamin Esteve 710aeb1ac2 Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 10:12:56 +00:00
Benjamin Esteve acd7539ee7 Merge branch 'dev' into 8673-viewEntryNotesField
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 10:12:44 +00:00
Benjamin Esteve 44ec056cfa Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 10:12:41 +00:00
Alex Moreno 4631c8717f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 10:09:34 +00:00
Carlos Andrés 68e37aca9f Merge pull request 'feat: refs #8529 invoiceIn move deductible field from head to lines' (!1399) from 8529-InvoiceIn-deductible-TAX-lines into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1399
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-25 09:50:59 +00:00
Javier Segarra aa869f2bd8 Merge pull request 'HOTFIX: use store instead formData' (!1634) from hotfix_ticket_basicdata into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1634
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 09:22:33 +00:00
Carlos Andrés e3926cd7c0 Merge branch 'dev' into 8529-InvoiceIn-deductible-TAX-lines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:17:31 +00:00
Javier Segarra 0014356b33 fix: use store instead formData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-25 10:08:58 +01:00
Benjamin Esteve 69138f9cf7 Merge branch '8683-vnSelectSortByOptionLabel' of https: refs #8683//gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 10:02:15 +01:00
Benjamin Esteve af04dd64e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-25 10:01:50 +01:00
Benjamin Esteve 97832a7da9 refactor: refs #8673 replace VnPopup with inline display of evaNotes in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:58:36 +01:00
Benjamin Esteve d7dc2bfb0d Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 08:45:36 +00:00
Benjamin Esteve b7376648cf Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 08:45:00 +00:00
Benjamin Esteve 2705bccb58 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 08:44:07 +00:00
Javier Segarra b22807f884 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 09:39:48 +01:00
Javier Segarra fbe3eae670 test: refs #7356 fix ticket*.spec.js 2025-03-25 09:39:30 +01:00
Jorge Penadés 0361958b47 test: refs #8388 remove exclusive focus from Invoice creation test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:37:46 +01:00
Jorge Penadés b962dd1185 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-03-25 09:36:09 +01:00
Jon Elias 96c0739af8 Merge branch 'dev' into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 08:23:49 +00:00
Javier Segarra 30eecdee2f Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 08:18:07 +00:00
Alex Moreno cd0a79b444 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 08:49:13 +01:00
Benjamin Esteve d66fe812dc Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-25 07:47:07 +00:00
Benjamin Esteve c83fc01847 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 07:46:50 +00:00
Benjamin Esteve 82a2ad8473 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 07:46:19 +00:00
Alex Moreno ca4e02a2bf chore: update changelog
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 08:39:19 +01:00
Alex Moreno be44ba939a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-25 08:13:25 +01:00
Jose Antonio Tubau 090c77dd91 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 07:13:20 +00:00
Alex Moreno 443ac77f5d feat(VnLog): refs #8449 use VnTableFilter 2025-03-25 08:08:58 +01:00
Alex Moreno d8e6972d38 Merge branch 'dev' into 8534-wait_queries
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 06:54:05 +00:00
Alex Moreno c6b36a64cb Merge pull request 'fix: refs #8602 disable use-like option in EntryBuys component' (!1632) from 8602-warmFix into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1632
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 06:36:22 +00:00
PAU ROVIRA ROSALENY 97ceffc96c Merge pull request 'feat: #8237 changed observation type to be SalesPerson by default' (!1623) from 8237-defaultObservationType into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1623
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-25 06:16:16 +00:00
PAU ROVIRA ROSALENY b0fbbddb06 Merge branch 'dev' into 8237-defaultObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 05:54:45 +00:00
Alex Moreno 4223680b60 Merge branch 'test' into 8602-warmFix
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-25 05:30:37 +00:00
Pablo Natek 8da61655e2 fix: refs #8602 disable use-like option in EntryBuys component
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-24 23:02:05 +01:00
Carlos Andrés 535fe011f6 feat: refs #8529 add isDeductible column and localization for InvoiceIn summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 17:51:29 +01:00
Jorge Penadés 65d21c9fe5 test: refs #8388 update invoice creation test to include spinner wait and company field validation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 16:15:17 +01:00
Carlos Andrés 34abab09bb Merge branch 'dev' into 8529-InvoiceIn-deductible-TAX-lines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 15:05:34 +00:00
Jorge Penadés 781709aa1c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 15:28:30 +01:00
Alex Moreno 9e96e4ecf1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 15:10:47 +01:00
Alex Moreno 075f81a104 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 15:10:38 +01:00
Alex Moreno a2594d2ab0 Merge pull request 'feat: implement onBeforeSave function to handle form data updates' (!1629) from hotFix_claim_basicData into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1629
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-24 14:10:27 +00:00
Javier Segarra 1be8e65fa1 revert: refs #7356 update default mapper logic to handle null values and refactor onBeforeSave function
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 15:02:18 +01:00
Jose Antonio Tubau 486f3e265f Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 13:56:30 +00:00
Jose Antonio Tubau d22afabe3f Merge branch 'dev' into 8440-createVehicleNotes 2025-03-24 13:56:10 +00:00
PAU ROVIRA ROSALENY 4197e7bbde Merge branch 'dev' into 8237-defaultObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 13:54:07 +00:00
Alex Moreno c58dcab452 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 14:53:25 +01:00
Alex Moreno 95b566993a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 14:53:13 +01:00
Alex Moreno ec456b5ac8 Merge branch 'master' into hotFix_claim_basicData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-24 13:52:52 +00:00
PAU ROVIRA ROSALENY e27fdf5d06 Merge branch 'dev' into 8237-defaultObservationType
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-24 13:52:21 +00:00
Javier Segarra 5ded8686e6 Merge branch 'dev' into 7356_e2e 2025-03-24 14:42:31 +01:00
Javier Segarra 2190a0c17d test: refs #7356 removing unused mapper functions and updating default mapper logic 2025-03-24 14:41:44 +01:00
Jose Antonio Tubau e0fbc7cfa7 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 13:40:59 +00:00
Jorge Penadés e36d36e2d5 Merge pull request 'feat: refs #6919 enhance filter in AccountSummary component to include entity ID' (!1628) from 6919-hotfix-whereClause into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1628
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 13:37:06 +00:00
Alex Moreno 6a97c368e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 14:27:54 +01:00
Alex Moreno 88c61c8a85 fix: warmFix quasar build async function
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-24 14:27:18 +01:00
Carlos Andrés b681b10eb7 Merge branch 'dev' of https: refs #8529//gitea.verdnatura.es/verdnatura/salix-front into 8529-InvoiceIn-deductible-TAX-lines
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:14:14 +01:00
PAU ROVIRA ROSALENY ca6ae9175d Merge branch '8237-defaultObservationType' of https://gitea.verdnatura.es/verdnatura/salix-front into 8237-defaultObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:07:09 +01:00
PAU ROVIRA ROSALENY 2a560e9548 Merge branch '8237-defaultObservationType' of https: refs #8237//gitea.verdnatura.es/verdnatura/salix-front into 8237-defaultObservationType 2025-03-24 14:07:02 +01:00
PAU ROVIRA ROSALENY 293d51b741 feat: refs #8237 #8237 modified fetch to find default select value by "code" 2025-03-24 14:06:38 +01:00
Jon Elias 80dc4ef409 Merge branch 'dev' into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 13:06:28 +00:00
Alex Moreno e1ef6f87f3 feat: implement onBeforeSave function to handle form data updates
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-24 14:01:43 +01:00
Pablo Natek 9f9f4555dc Merge pull request 'feat: refs #8638 add AWB field to travel and entry forms, update translations and styles' (!1620) from 8638-entryUpgradesForInvoiceInFixes into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1620
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 12:52:12 +00:00
Javier Segarra 1e049847a7 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:32:34 +00:00
Javier Segarra 73740822a3 test: refs #7356 update ticket tracking components and remove unused TicketCreateTracking.vue 2025-03-24 13:18:41 +01:00
Alex Moreno 0c67c31537 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-03-24 13:09:30 +01:00
Jorge Penadés ae228b7ed5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-hotfix-whereClause
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-24 12:42:03 +01:00
Benjamin Esteve 3587be3997 refactor: refs #8790 update SMS delay message and localization keys
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 12:41:40 +01:00
Jorge Penadés 798371682c feat: refs #6919 enhance filter in AccountSummary component to include entity ID
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-24 12:39:40 +01:00
Javier Segarra 69629147ad Merge branch 'dev' into 7356_e2e 2025-03-24 12:35:16 +01:00
Benjamin Esteve 0cfbd7906d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText 2025-03-24 12:28:55 +01:00
Benjamin Esteve 15436d6dff Merge branch '8683-vnSelectSortByOptionLabel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:27:29 +01:00
Benjamin Esteve 259ac39d6d Merge branch 'dev' of https: refs #8683//gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-24 12:27:16 +01:00
Benjamin Esteve 43701bd586 refactor: refs #8118 simplify dropdown change event handling in ClaimSummary and TicketSummary components
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:24:49 +01:00
Jorge Penadés 5591369ba1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:24:00 +01:00
Jose Antonio Tubau ba46d8bda4 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 11:21:01 +00:00
Pablo Natek dd1ec72bee Merge branch 'test' into 8638-entryUpgradesForInvoiceInFixes
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-24 11:19:25 +00:00
Benjamin Esteve 3c980a311a Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 12:09:08 +01:00
Benjamin Esteve b960dd776f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 12:09:02 +01:00
Benjamin Esteve 03e5e6387a Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-24 11:08:45 +00:00
Jon Elias 2143001c7c Merge branch '8326-UnifyCardTitles' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 12:08:27 +01:00
Jon Elias 53f6f5278f refactor: refs #8326 requested changes 2025-03-24 12:08:24 +01:00
Jose Antonio Tubau 9a786f3d4b Merge pull request 'test: refs #8621 add e2e tests for cmrList' (!1500) from 8621-createCmrListE2eTest into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1500
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-24 11:08:04 +00:00
Benjamin Esteve 0cfda5e8f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 12:07:58 +01:00
Benjamin Esteve 658dc8af0e Merge branch '8790-smsPredefinedText' of https://gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:07:11 +01:00
Benjamin Esteve 01089497ad Merge branch 'dev' of https: refs #8790//gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText 2025-03-24 12:07:10 +01:00
Javier Segarra 344ea9353e Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:46:37 +00:00
Jorge Penadés c852f963e9 Merge pull request 'fix: refs #8581 update invoiceInSerial test to correctly compare totals after filtering' (!1625) from 8581-fixInvoiceInSerialE2e into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1625
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 10:31:56 +00:00
Jose Antonio Tubau feabf9c7be refactor: refs #8717 use markRaw for cardDescriptor in VnCard component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 11:19:26 +01:00
Jorge Penadés 2fabff05be feat: refs #8388 add hasFile property handling in VnDms component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 11:15:59 +01:00
Jorge Penadés 028477ecbe feat: refs #8388 add hasFile prop to VnDms component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-24 11:12:15 +01:00
Jorge Penadés 97003e19ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 10:54:27 +01:00
Jorge Penadés 4caca33606 fix: refs #8581 update invoiceInSerial test to correctly compare totals after filtering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:44:01 +01:00
Jon Elias ac2fbad26b Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 09:33:22 +00:00
Jorge Penadés 13c547dd6a Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:02:37 +01:00
Jorge Penadés 56c5494bb2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 10:02:26 +01:00
Jon Elias be966abf51 Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 08:56:37 +00:00
Jose Antonio Tubau c9ec649a4d Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 08:56:32 +00:00
Jose Antonio Tubau fb00824ee3 refactor: refs #8717 change toModule prop type from String to Object
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:55:03 +01:00
Javier Segarra 17b784e4d1 test: rename account descriptor test and enable claim notes test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-24 09:46:10 +01:00
Jose Antonio Tubau 1a46576572 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:34:52 +01:00
Benjamin Esteve b850dfe36c Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:33:21 +00:00
Benjamin Esteve ac3bc5558d Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 08:33:00 +00:00
Benjamin Esteve a98a2012a2 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:32:44 +00:00
Alex Moreno 9ea935638b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-03-24 09:30:10 +01:00
Alex Moreno 61cc8f0813 fix: remove unused VnIconLink component from VnLog.vue 2025-03-24 09:30:09 +01:00
Jon Elias 072e4d4fa3 Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:25:13 +00:00
PAU ROVIRA ROSALENY 3fa0ff5b3d Merge branch 'dev' into 8237-defaultObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:24:05 +00:00
Javier Segarra f9f331e566 Merge pull request '#8131 - Filter fields style equals' (!1598) from 8131-filer-style into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 08:22:54 +00:00
PAU ROVIRA ROSALENY 933736e06b feat: refs #8237 changed observation type to be SalesPerson by default 2025-03-24 09:22:51 +01:00
Jose Antonio Tubau e28f30d7e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:22:14 +01:00
Jon Elias 9822ba6fc8 Merge branch 'dev' into 8667-FixClientNewPayment
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 08:11:00 +00:00
Javier Segarra 26f2044097 test: update order creation test and remove reserved ticket tests
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-24 09:08:18 +01:00
Jon Elias 4460b7110e refactor: refs #8667 modified client payment to be the same as Salix
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:07:59 +01:00
Javier Segarra 0fd36279fd Merge branch 'dev' into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:01:49 +00:00
Benjamin Esteve d427d4f215 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:58:49 +00:00
Benjamin Esteve 700931714c Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:58:39 +00:00
Benjamin Esteve 4747314342 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 07:57:43 +00:00
Jose Antonio Tubau 2775e0193b Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:56:13 +00:00
Jose Antonio Tubau 76e24eb1cf Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:54:51 +01:00
Alex Moreno a788fb970a Merge pull request '#8463 - CardDescriptor_useCard' (!1597) from 8463-CardDescriptor_useCard into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1597
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-03-24 07:47:48 +00:00
Benjamin Esteve add1ecea55 Merge branch 'dev' into 8790-smsPredefinedText
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 07:45:01 +00:00
Benjamin Esteve c116804006 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 07:44:15 +00:00
Benjamin Esteve 16279518f7 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:44:02 +00:00
Alex Moreno 3fd6eeda49 refactor: refs #8534 simplify title extraction logic and update Cypress command for warehouse selection
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-24 08:41:43 +01:00
Javier Segarra 977bd7341d Merge branch 'dev' into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:38:18 +00:00
Alex Moreno 72753cf685 Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:26:02 +00:00
Pablo Natek bfa375bacd feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-24 08:22:13 +01:00
Jose Antonio Tubau 5f48c9b887 refactor: refs #8717 eliminate warnings and add component on children routes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 08:13:06 +01:00
Alex Moreno a29153fea2 Merge pull request 'feat(WorkerPDA): refs #5926 send to docuware' (!1617) from 5926-signPdaPdf into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #1617
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-24 06:52:35 +00:00
Alex Moreno 2cdaff5ef5 Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 06:52:24 +00:00
Alex Moreno e662bef717 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries 2025-03-24 07:19:15 +01:00
Alex Moreno cdded9217a Merge branch 'dev' into 5926-signPdaPdf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 06:18:20 +00:00
Javier Segarra 31e8229cd3 chore: refs #8006 update vue-i18n and related dependencies to latest versions 2025-03-24 04:08:26 +01:00
Javier Segarra 96a3f52b79 Merge branch 'dev' of https: refs #8006//gitea.verdnatura.es/verdnatura/salix-front into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 03:38:17 +01:00
Javier Segarra 6c4136fb58 Merge branch 'dev' of https: refs #8725//gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:31:04 +01:00
Javier Segarra 81aa5cdfa4 Merge branch 'dev' of https: refs #8131//gitea.verdnatura.es/verdnatura/salix-front into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 03:25:55 +01:00
Javier Segarra aebd9ea83c fix: refs #7356 update validation logic and enhance Cypress tests for ticket components
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:24:10 +01:00
Javier Segarra c7218ce2cf Merge branch 'dev' into 7356_e2e 2025-03-24 01:45:02 +01:00
Javier Segarra 6a0875a1cc Merge pull request 'fix: remove duplicated filter' (!1601) from fix_remove_duplicate_departmentFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1601
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 00:16:11 +00:00
Alex Moreno d17ff84a29 feat: refs #8534 add setPageTitle to router hooks for improved page title management
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 12:47:05 +01:00
Alex Moreno b5e9c381ad test: refs #8534 add unit tests for stateQueryGuard to ensure proper loading behavior
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 11:59:53 +01:00
Alex Moreno 44e5b136f0 feat: refs #8534 implement navigation and state query guards for improved routing control
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 11:58:21 +01:00
Alex Moreno 17cadc7ee7 fix: refs #8463 update data-cy attribute in VnLog test for consistency with VnDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-23 10:59:44 +01:00
Alex Moreno 944a70be47 feat: refs #8463 update data-cy attributes in VnDescriptor for improved testing and consistency
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 09:27:55 +01:00
Alex Moreno aa3f14e875 test(WorkerPda): refs #5926 remove redundant cy.clickConfirm call for streamlined flow
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-23 09:17:43 +01:00
Alex Moreno 8bdd581764 feat: refs #8463 add module prop to VnDescriptor component for enhanced functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 07:30:05 +01:00
Alex Moreno 71c91c295c test(WorkerPda): refs #5926 replace confirmButton function with cy.clickConfirm for consistency
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-23 07:22:30 +01:00
Alex Moreno 057a2520c0 test(WorkerPda): refs #5926 unify send and download e2e
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-23 07:21:17 +01:00
Jorge Penadés 517dc49cef fix: refs #8388 update translation for invoice summary mismatch message
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 15:41:40 +01:00
Jorge Penadés e75e09c206 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 15:33:34 +01:00
Alex Moreno 5b829acd88 Merge branch 'dev' into fix_remove_duplicate_departmentFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 13:41:08 +00:00
Alex Moreno 39e0f88380 refactor: refs #8463 remove unnecessary expose of getData in VnDescriptor component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 14:17:22 +01:00
Alex Moreno 7e0ca4ce6d test: refs #5926 simplify test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 13:54:56 +01:00
Pablo Natek c5e1ebec82 fix: refs #8638 update null check for maxlength validation in VnInput.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 13:51:05 +01:00
Javier Segarra ee4e181777 fix: refs #8131 remove unnecessary 'is-' prefix from v-model bindings in filter components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 13:46:38 +01:00
Pablo Natek eb6046f338 fix: refs #8638 restore invoiceInBasicData
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 13:28:22 +01:00
Jon Elias 373d011017 Merge branch '7358-AddChipInNavbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 13:26:01 +01:00
Jon Elias d8b9f3467a refactor: refs #7358 changed function to computed 2025-03-21 13:25:59 +01:00
Pablo Natek a39f648da0 fix: refs #8638 update comment formatting in VnTable.vue
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 13:25:17 +01:00
Pablo Natek c9bd7d1a47 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8638-entryUpgradesForInvoiceInFixes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 13:22:13 +01:00
Pablo Natek 4ed1021a67 feat: refs #8638 add AWB field to travel and entry forms, update translations and styles
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 13:19:43 +01:00
Javier Segarra cfa98dd683 Merge branch 'dev' into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:55:52 +01:00
Alex Moreno 63cf602ab2 refactor(WorkerPda): refs #5926 optimize fetchDocuware and sendToTablet functions for better readability
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 11:46:42 +01:00
Benjamin Esteve 197a4a0ca7 fix: refs #8790 update default SMS message in SendSmsDialog component for improved clarity and localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:42:31 +01:00
Jon Elias 8f9863ce9c Merge branch 'dev' into 7358-AddChipInNavbar
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-21 10:41:39 +00:00
Alex Moreno 4c980cb805 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:33:14 +01:00
Alex Moreno 07f24cb9ae Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 10:22:19 +00:00
Alex Moreno f7d3b340ca Merge branch '5926-signPdaPdf' of https://gitea.verdnatura.es/verdnatura/salix-front into 5926-signPdaPdf
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-21 11:15:55 +01:00
Alex Moreno 5e0c133eb3 test: refs #5926 improve VnDmsList tests with mock and data structure adjustments 2025-03-21 11:15:53 +01:00
Benjamin Esteve d279d284c2 fix: refs #8790 format code and update default SMS message in SendSmsDialog component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 11:09:56 +01:00
Jon Elias a74ff042bc feat: refs #7358 added chip in navbar to show environment
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-21 11:09:42 +01:00
Benjamin Esteve a365dcc3c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:55:07 +01:00
Benjamin Esteve a6531ff6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 10:54:39 +01:00
Alex Moreno c182a68455 Merge branch 'dev' into 5926-signPdaPdf
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-21 09:38:40 +00:00
Alex Moreno ab697c951d feat(WorkerPDA): refs #5926 send to docuware
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-21 10:36:05 +01:00
Jon Elias b9216907a1 Merge branch 'dev' into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 09:23:48 +00:00
Javier Segarra f2e65a7e65 Merge pull request 'fix: workerDescriptorMenu_i18n' (!1593) from fix_workerDescriptorMenu_i18n into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1593
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2025-03-21 09:10:26 +00:00
Benjamin Esteve 41af9b54a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 09:52:53 +01:00
Javier Segarra cc4cd5bb75 Merge branch 'dev' into fix_workerDescriptorMenu_i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 08:49:16 +00:00
Alex Moreno 88407463f5 fix: reduce parallelism in Cypress tests to improve stability
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-21 09:49:00 +01:00
Benjamin Esteve 3e956cda69 fix: refs #8118 update VnDropdown options in ClaimSummary and TicketSummary components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 09:26:09 +01:00
Jon Elias 767511cec0 fix: refs #8326 e2e
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-21 09:13:34 +01:00
Javier Segarra b1528810b2 Merge branch 'dev' into fix_workerDescriptorMenu_i18n
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 08:02:32 +00:00
Jon Elias bd8c610ce8 Merge branch 'dev' of https: refs #8326//gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 08:14:36 +01:00
Benjamin Esteve b992c3e62a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 08:08:56 +01:00
Alex Moreno 4a249b8da8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-21 07:31:26 +01:00
Alex Moreno 5d6784588f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-20 14:39:10 +01:00
Jose Antonio Tubau 868172d208 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 13:49:25 +01:00
Benjamin Esteve 7de4bd4f4a fix: refs #8118 update Cypress parallel test execution to run with two instances
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 13:01:13 +01:00
Benjamin Esteve 489fcda410 fix: refs #8683 update Cypress parallel test execution to run with a single instance
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 12:59:33 +01:00
Benjamin Esteve efb6c2357b fix: refs #8118 update Cypress parallel test execution to run with a single instance
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 12:55:46 +01:00
Benjamin Esteve 198b4ab338 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 09:11:26 +00:00
Benjamin Esteve b7309298aa refactor: refs #8118 simplify VnDropdown usage and replace onMounted data fetching with FetchData component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 10:04:27 +01:00
Benjamin Esteve 6848758258 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-20 10:03:53 +01:00
Jorge Penadés 25fce95265 Merge pull request '#8581 invoiceIn e2e' (!1452) from 8581-invoiceinE2e into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1452
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-20 08:57:59 +00:00
Benjamin Esteve 030d9213c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 09:34:00 +01:00
Jorge Penadés af3b64b86f fix: refs #8581 update test to check cardDescriptor_subtitle instead of descriptor_id
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 08:59:41 +01:00
Jorge Penadés 5c0f519073 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-20 08:59:35 +01:00
Jon Elias f9bb8d2a93 Merge pull request '#7869: Added include and exclude event from list' (!1574) from 7869-ModifyZones into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1574
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-20 07:39:08 +00:00
Benjamin Esteve 102e93ccf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 08:10:34 +01:00
Benjamin Esteve a286400828 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 08:09:49 +01:00
Jon Elias 5ec0da63f2 Merge branch 'dev' into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 07:01:41 +00:00
Alex Moreno edb3c0cbce Merge pull request '6994-vnLog_descriptors' (!1579) from 6994-vnLog_descriptors into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1579
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-03-20 06:58:19 +00:00
Alex Moreno 9f3c068245 Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 06:46:07 +00:00
Alex Moreno 872d89339a Merge pull request 'feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline' (!1596) from 6695-artifacts into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1596
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2025-03-20 06:44:03 +00:00
Alex Moreno 0aec126d71 Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 06:43:46 +00:00
Alex Moreno 72d1281bde Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 06:20:13 +00:00
Alex Moreno ccbd624389 Merge branch 'dev' into 6695-artifacts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 06:19:16 +00:00
Alex Moreno 30d287bbf6 Merge pull request '5926-refactor_docuware' (!1613) from 5926-refactor_docuware into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1613
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-18 13:59:04 +00:00
Alex Moreno b6706218fe feat: refs #8463 add data attributes for summary buttons in VnDescriptor component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 14:46:51 +01:00
Alex Moreno d9d40da4f1 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-18 14:45:11 +01:00
Jorge Penadés f107684473 fix: refs #8581 update data-cy attribute concatenation in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-18 14:21:16 +01:00
Alex Moreno 0160897030 Merge branch 'dev' into 5926-refactor_docuware
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-18 13:20:00 +00:00
Alex Moreno c55304e1d2 refactor: refs #5926 simplify sendDocuware function to accept multiple tickets
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-18 12:32:25 +01:00
Jorge Penadés 6546d06f60 refactor: refs #8388 update UI feedback
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-18 12:04:54 +01:00
Jorge Penadés 05bc79ec32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-18 12:02:40 +01:00
Jorge Penadés 6e801e8f64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 11:49:02 +01:00
Jose Antonio Tubau d698275ba2 Merge pull request 'refactor: refs #8721 swap 'client' and 'street' columns' (!1608) from 8721-reorderColumnsRouteTickets into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1608
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-18 10:44:45 +00:00
Jose Antonio Tubau 6d1f1770dd Merge branch 'dev' into 8721-reorderColumnsRouteTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-18 10:32:13 +00:00
Jorge Penadés ce5be197ce Merge branch '8581-invoiceinE2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 11:27:37 +01:00
Jorge Penadés 7ed7a38df2 fix: refs #8581 rollback 2025-03-18 11:27:35 +01:00
Jorge Penadés bfd62eaa54 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 11:23:01 +01:00
Jose Antonio Tubau acbe0730bb refactor: refs #8721 swap 'client' and 'street' columns
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 10:15:18 +01:00
Alex Moreno 25799cd1da build: init new version
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-18 09:48:11 +01:00
Jose Antonio Tubau f68a480768 Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-18 08:17:21 +00:00
Jon Elias fdf3af0550 refactor: refs #7869 undo skip test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-18 08:12:15 +01:00
Jon Elias ff39addd67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-18 07:57:45 +01:00
Alex Moreno 22bdd0ef08 refactor: refs #5926 call Docuwares/upload-delivery-note 2025-03-18 07:17:33 +01:00
Jose Antonio Tubau 013410e4a9 Merge branch 'dev' into 8440-createVehicleNotes 2025-03-17 15:05:39 +00:00
Jose Antonio Tubau 93b5be7628 test: refs #8621 ensure elements are visible before interaction in cmrList tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 14:09:14 +01:00
Jorge Penadés 01d1ca83ea fix: refs #8388 improve error handling and notification for invoice booking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 13:25:40 +01:00
Jose Antonio Tubau aa9e0bb2a2 Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 13:07:12 +01:00
Jorge Penadés 1c4421aaa2 refactor: refs #8581 remove unused checkNumber command from Cypress support
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 12:18:30 +01:00
Jorge Penadés 260d3dd133 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 12:17:06 +01:00
Jorge Penadés af0a672356 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 12:15:46 +01:00
Jose Antonio Tubau 7e74ab58da fix: refs #8621 intermittent test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 12:03:26 +01:00
Jose Antonio Tubau 458a994a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 11:52:19 +01:00
Benjamin Esteve 854500b8ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 10:37:32 +01:00
Benjamin Esteve b2f2048e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 10:37:00 +01:00
Benjamin Esteve df3fe91b03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 10:15:00 +01:00
Benjamin Esteve 55ec60d90f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 10:14:26 +01:00
Benjamin Esteve 24fd6b8f5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 09:07:37 +01:00
Benjamin Esteve 5b0e8b228f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 09:05:48 +01:00
Jon Elias 1a6fc1c327 fix: refs #7869 fixed zoneDeliveryDays e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 08:38:11 +01:00
Jon Elias 69318a9917 fix: refs #7869 fixed zoneDeliveryDays e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 08:24:20 +01:00
Jon Elias 89d9d75976 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 08:04:00 +01:00
Javier Segarra ed6c2dc6d1 chore: remove slowTestThreshold from Cypress configuration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-16 13:57:51 +01:00
Javier Segarra 1b34175ed5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_workerDescriptorMenu_i18n 2025-03-16 13:57:17 +01:00
Javier Segarra 2c09969de8 feat: refs #8772 update TicketSummary to use VnLinkPhone for displaying phone numbers
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 13:48:57 +01:00
Javier Segarra 92088873a1 fix: remove deprecated filter
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-16 12:22:36 +01:00
Jorge Penadés e75ab882c9 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-03-14 17:24:52 +01:00
Jorge Penadés 300048c1e1 refactor: refs #8581 streamline validation logic in invoiceInDescriptor test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 15:49:32 +01:00
Jorge Penadés f232334367 refactor: refs #8581 comment validation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 15:48:19 +01:00
Jose Antonio Tubau bbbe348434 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:04:13 +00:00
Jorge Penadés 203426a236 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:58:02 +01:00
Javier Segarra 1a0df60e06 fix: remove reserved ticket functionality from TicketProblems and TicketSaleMoreActions components
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-14 14:21:26 +01:00
Alex Moreno d7f7bccb58 Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 12:24:52 +00:00
Jorge Penadés e82d69f0ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 13:22:07 +01:00
Jorge Penadés c729c6a241 fix: refs #8581 enhance form filling command by adding backspace before input
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:21:05 +01:00
Alex Moreno 6240e32c40 ci: refs #6695 allow empty archive for Cypress screenshots in Jenkinsfile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 12:59:50 +01:00
Jorge Penadés 7bd6c92aed fix: refs #8581 streamline form filling command by removing unnecessary backspace
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 12:47:27 +01:00
Alex Moreno a6713e97b1 Merge branch 'dev' into 6695-artifacts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-14 11:45:01 +00:00
Jorge Penadés 749b157fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 12:41:44 +01:00
Javier Segarra 904d4e4c55 Merge branch 'dev' into fix_workerDescriptorMenu_i18n
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:26:35 +00:00
Alex Moreno a0a1b03b53 Merge branch 'dev' into 6695-artifacts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:15:49 +00:00
Alex Moreno dd496eb47f Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:15:45 +00:00
Alex Moreno c4badef5c1 Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 11:15:41 +00:00
Benjamin Esteve cea515f555 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 12:10:15 +01:00
Jorge Penadés 594c4e22ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 12:00:42 +01:00
Benjamin Esteve 8c933db356 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 12:00:34 +01:00
Jorge Penadés 94eebce445 fix: refs #8581 update fillInForm command to include delay and remove unused default case
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:56:53 +01:00
Alex Moreno ee0b2e863f Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 10:46:08 +00:00
Alex Moreno bff0e78eaf Merge branch 'dev' into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-14 10:45:58 +00:00
Javier Segarra 3fdf82258e style: refs #8131 remove outlined from filterPanel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:45:48 +01:00
Alex Moreno bf36bc5906 Merge branch 'dev' into 6695-artifacts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 10:45:13 +00:00
Javier Segarra e92fbb1e85 style: refs #8131 replace rounded by filled 2025-03-14 11:43:01 +01:00
Alex Moreno fa8a3d219c fix: refs #6695 update Jenkinsfile to pull specific services before starting containers
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:25:31 +01:00
Alex Moreno 58c3d47a2f fix: refs #6695 up with pull
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-14 11:23:15 +01:00
Alex Moreno 2c4ee50f46 test: refs #6695 handle uncaught exceptions in logout.spec.js for better error management
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-14 11:16:54 +01:00
Jorge Penadés 25e60e549a refactor: refs #8581 remove unused Cypress commands and update tests for invoice creation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:10:17 +01:00
Jorge Penadés 6dc23f4a26 fix: refs #8581 update notification message in toBook function
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 10:47:53 +01:00
Jorge Penadés 4ec7212d30 fix: refs #8581 improve error handling in toBook function
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-14 10:46:58 +01:00
Jorge Penadés d31ea18c0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 10:43:01 +01:00
Alex Moreno 7bd4f088eb fix: refs #6695 update Cypress parallel test execution to run with a single instance
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 10:30:14 +01:00
Alex Moreno 9befd7317f fix: refs #8463 update entity check and replace OrderDescriptorProxy with CustomerDescriptorProxy
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 09:36:59 +01:00
Alex Moreno da9d96277a Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 08:18:06 +00:00
Alex Moreno f7046be50d fix: refs #8463 fix name 2025-03-14 09:15:50 +01:00
Alex Moreno 1139035e45 refactor: refs #8463 replace CardDescriptor with EntityDescriptor in multiple components 2025-03-14 09:13:45 +01:00
Alex Moreno 148eab2333 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard 2025-03-14 08:59:20 +01:00
Alex Moreno 368e289c36 Merge branch 'dev' into 6695-artifacts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:27:02 +00:00
Benjamin Esteve 5350183e20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 08:19:42 +01:00
Benjamin Esteve d7dd34713a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 08:19:08 +01:00
Alex Moreno 618926430c feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-14 08:01:32 +01:00
Benjamin Esteve 4e26b9f3ea Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:38:09 +01:00
Benjamin Esteve 3d8178c9dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-14 07:38:05 +01:00
Benjamin Esteve 6d6525b636 Merge branch '8683-vnSelectSortByOptionLabel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:37:16 +01:00
Benjamin Esteve 306a0a4822 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-14 07:37:02 +01:00
Jose Antonio Tubau c4cf81a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:30:34 +01:00
Jose Antonio Tubau ba5ea898c3 test: refs #8440 ensure delete note button is visible before clicking
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-14 07:30:26 +01:00
Jose Antonio Tubau 911097dae4 test: refs #8621 remove unnecessary checkbox click in CMR list test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:25:58 +01:00
Alex Moreno a5429799ec Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 06:15:21 +00:00
Jorge Penadés 561f761b65 refactor: refs #8581 remove filter tests 2025-03-13 16:14:19 +01:00
Jorge Penadés 9d3c2323fd feat: refs #8581 add custom Cypress commands for creating and deleting InvoiceIn entries
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 16:06:52 +01:00
Jose Antonio Tubau bf7533e82f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 15:35:28 +01:00
Jorge Penadés 78b2a9ead6 test: refs #8581 skip file download test for InvoiceInDescriptor 2025-03-13 13:17:57 +01:00
Benjamin Esteve 13d9967bb5 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 12:17:09 +00:00
Benjamin Esteve ea4032dff6 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 12:16:32 +00:00
Benjamin Esteve 96b02a3b22 fix: refs #8118 correct spelling in success message for work center removal
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 13:10:55 +01:00
Javier Segarra 9fcd1477e5 ci: update Cypress slowTestThreshold argument
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-13 12:39:18 +01:00
Javier Segarra 80fec12f9f fix: workerDescriptorMenu_i18n
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 12:36:32 +01:00
Jon Elias 4730485324 fix: refs #7869 fixed locations e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 11:51:48 +01:00
Jorge Penadés 74aa45d4d2 fix: refs #8581 rollback 2025-03-13 11:19:54 +01:00
Alex Moreno 610075ab55 refactor: refs #8463 update VnCard and Order components for improved data handling and consistency 2025-03-13 10:30:39 +01:00
Jorge Penadés f2c4e2c0c1 ci: refs #8581 update Cypress tests to use dynamic date generation for InvoiceIn
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 10:17:03 +01:00
Jorge Penadés 595f975b4f ci: refs #8581 update Cypress tests for InvoiceIn integration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 10:10:40 +01:00
Jorge Penadés 79873aeb1a ci: refs #8581 change spec parallel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 09:51:00 +01:00
Jorge Penadés 7c29e19939 ci: refs #8581 change spec parallel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 09:49:24 +01:00
Jorge Penadés 24b63c4da0 ci: refs #8581 change spec parallel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 09:46:14 +01:00
Jorge Penadés b46e1b3fec ci: refs #8581 change spec parallel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 09:44:52 +01:00
Jorge Penadés 66e4c3b86e ci: refs #8581 change spec parallel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-13 09:42:24 +01:00
Alex Moreno ae62e40c60 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:21:44 +00:00
Alex Moreno 704bf77771 refactor: refs #8463 simplify CardDescriptor 2025-03-13 09:05:23 +01:00
Jose Antonio Tubau c50d6d884e test: refs #8621 add data-cy attributes for summary navigation buttons in CMR list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 09:02:41 +01:00
Alex Moreno 4d8fb8eb5b refactor: refs #8463 simplify creating VnDescriptor 2025-03-13 09:01:15 +01:00
Jorge Penadés 1261c053ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:59:04 +01:00
Jon Elias 12f59cbe04 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:51:31 +01:00
Jon Elias 10dbd0324c Merge branch '7869-ModifyZones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-13 08:45:02 +01:00
Jon Elias 7027715c3c refactor: refs #7869 skipped failing e2es 2025-03-13 08:44:58 +01:00
Benjamin Esteve 5116ce89a1 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:43:38 +00:00
Benjamin Esteve 295182f42e Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:43:34 +00:00
Jose Antonio Tubau 54bfd9f384 Merge branch '8626-addTestCasesInRouteListTest' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:41:04 +01:00
Jose Antonio Tubau 781138aba3 Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:38:04 +01:00
Alex Moreno e4265765f3 refactor: refs #6994 update client ID input selector and remove viewport setting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:16:26 +01:00
Jon Elias e3252f4079 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-13 08:09:13 +01:00
Benjamin Esteve 77bb76539b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:08:45 +01:00
Benjamin Esteve bcb2e62a21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:06:55 +01:00
Benjamin Esteve bce7e2ad56 feat: refs #8118 enhance VnDropdown component; simplify usage in Claim and Ticket summaries 2025-03-13 08:06:39 +01:00
Alex Moreno 9d695e1335 Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:06:05 +00:00
Benjamin Esteve b2b00d98c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:21:05 +01:00
Javier Segarra 007c407433 Merge branch '8725_submit_form_onClick' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 23:53:44 +01:00
Javier Segarra e100078f4b Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 22:53:20 +00:00
Jorge Penadés 5786ba5253 fix: refs #8581 update supplierRef value in InvoiceInDescriptor test 2025-03-12 16:58:43 +01:00
Jorge Penadés b74e3229d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 16:01:09 +01:00
Alex Moreno 54d126f602 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard 2025-03-12 14:26:40 +01:00
Alex Moreno 6106ca67d0 test: refs #6994 e2e VnLog VnLogValue functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 14:22:14 +01:00
Alex Moreno 6ddc1c77f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-12 14:18:16 +01:00
Alex Moreno fc549cae97 test: refs #6994 create test VnLogValue front
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-12 14:18:10 +01:00
Jon Elias 4ae7d9f6ab Merge branch 'dev' into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:18:09 +00:00
Alex Moreno 0a9560f286 feat: refs #6994 create VnLogValue and use in VnLog 2025-03-12 14:17:51 +01:00
Alex Moreno 6d0b4b7607 chore: refs #6994 revert VnJsonValue 2025-03-12 14:17:27 +01:00
Jon Elias 1765688ee4 fix: refs #7869 fixed translation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:59:19 +01:00
Jon Elias 4ed2e6235e Merge branch '7869-ModifyZones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:49:40 +01:00
Jon Elias 807d5f12fa refactor: refs #7869 modified max months data 2025-03-12 13:49:38 +01:00
Benjamin Esteve c7030598dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:41:25 +01:00
Benjamin Esteve 1cb73aaa2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:22:07 +01:00
Benjamin Esteve 2c0522a5e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:19:33 +01:00
Jose Antonio Tubau 2f88e97e2e Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 12:08:34 +00:00
Benjamin Esteve 63ae4ff499 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 12:47:20 +01:00
Jose Antonio Tubau 6a0c58631c fix: refs #8621 test for date input selector
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 12:34:03 +01:00
Jose Antonio Tubau 050c76a8ac Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 11:55:08 +01:00
Jose Antonio Tubau f255963ef0 refactor: refs #8621 update RouteDescriptor and RouteList components; enhance route tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 11:51:18 +01:00
Alex Moreno 9db10b7b5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-12 11:36:22 +01:00
Javier Segarra 9b3a98e26f fix: refs #8725 submit or button 2025-03-12 11:34:37 +01:00
Javier Segarra 50e3385be4 feat: refs #8725 enable validations in formPopup 2025-03-12 11:34:18 +01:00
Jose Antonio Tubau 8674e14fe7 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 10:12:30 +00:00
Jorge Penadés b9d240e254 chore: refs #8581 rollback
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 10:32:58 +01:00
Jorge Penadés 6605c8deca fix: refs #8581 update Cypress test directory path for improved integration testing
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 10:24:22 +01:00
Jorge Penadés fc0d409ab6 fix: refs #8581 update Cypress test paths and improve download validation logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-12 10:22:17 +01:00
Jose Antonio Tubau 632a077e6a test: refs #8440 remove only from VnNotes test suite description
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 09:57:57 +01:00
Jose Antonio Tubau e61196f8be refactor: refs #8440 update selector for delete note button in vehicle notes tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 09:29:00 +01:00
Jorge Penadés b86ba0c67b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 09:15:21 +01:00
Jose Antonio Tubau a703f9dac6 Merge branch '8440-createVehicleNotes' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 09:02:40 +01:00
Jose Antonio Tubau 3aec5584db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes 2025-03-12 09:02:23 +01:00
Jose Antonio Tubau 6adc6742ed Merge branch '8621-createCmrListE2eTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:48:36 +01:00
Jose Antonio Tubau 9c7034f6cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8621-createCmrListE2eTest 2025-03-12 08:48:32 +01:00
Alex Moreno af64ac2973 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-12 08:10:18 +01:00
Benjamin Esteve ffb55558f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 07:31:10 +01:00
Jorge Penadés 0a41e0a93e fix: refs #8581 update invoiceInList tests to use waitTableScrollLoad for better synchronization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 17:30:42 +01:00
Jorge Penadés 291946e78c fix: refs #8581 remove unnecessary waitTableLoad call in validateVnTableRows command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 17:19:52 +01:00
Jorge Penadés 8890006c43 fix: refs #8581 update validateDownload command to support multiple file types 2025-03-11 17:19:39 +01:00
Jorge Penadés f5a1172d32 fix: refs #8581 update validateDownload command to restrict file type to text/plain
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 14:48:17 +01:00
Jorge Penadés 9d49b5af2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-11 14:47:38 +01:00
Jorge Penadés 319c23dd98 fix: refs #8581 update validateDownload command to support jpeg/image type
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 14:42:43 +01:00
Benjamin Esteve 9eceb8bb0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-11 14:17:10 +01:00
Benjamin Esteve e503373fbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-11 14:16:39 +01:00
Jorge Penadés df3bbfe5e4 fix: refs #8388 update file attachment logic and redirect after invoice creation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-11 13:41:52 +01:00
Benjamin Esteve 13cf7c6031 fix(VnLog): refs #8683 update validation content for entity filter test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 13:17:36 +01:00
Benjamin Esteve d82369a62c fix(UserPanel): refs #8683 update initial values for user warehouse and company selections
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 13:10:13 +01:00
Alex Moreno 77b9dc0fd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-11 12:56:16 +01:00
Alex Moreno 0e5b47c36e Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard 2025-03-11 12:55:42 +01:00
Jorge Penadés 2c134f9935 refactor: refs #8581 simplify createCorrective function and update assertions for invoice creation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 12:52:02 +01:00
Benjamin Esteve 5d8919e6c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 12:51:40 +01:00
Jorge Penadés aeab837348 test: refs #8581 rollback
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 12:44:44 +01:00
Jon Elias f8358fc361 Merge branch 'dev' into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-11 11:21:45 +00:00
Jon Elias ae93b82749 Merge branch 'dev' into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:15:50 +00:00
Jorge Penadés 418d01b8f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 12:14:49 +01:00
Jose Antonio Tubau ff92c03c16 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-11 11:02:14 +00:00
Jon Elias 781c8050a8 refactor: refs #8326 modified sumaryDialog width
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:56:50 +01:00
Jose Antonio Tubau 5e8d9e04b2 Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 10:52:35 +00:00
Jon Elias 5f630e21ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles 2025-03-11 11:48:59 +01:00
Jorge Penadés ab1800d8ca Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:15:49 +01:00
Jorge Penadés f783aa43de feat: refs #8581 update InvoiceInDescriptorMenu and tests for improved dialog handling and form submission
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:15:25 +01:00
Jon Elias e162ee720d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles 2025-03-11 11:00:00 +01:00
Jorge Penadés 4ce9254af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-11 10:55:37 +01:00
Jorge Penadés b5f2abcfac Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 09:48:16 +01:00
Jose Antonio Tubau 4f7c6eb739 Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 08:44:01 +01:00
Jorge Penadés d528b48735 fix: refs #8581 correct syntax for down arrow key input in client balance mandate test 2025-03-10 16:40:28 +01:00
Jorge Penadés 1cf7c68a56 refactor: refs #8581 simplify file download validation in invoiceInDescriptor test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 16:19:56 +01:00
Jorge Penadés 4bd5c70b44 refactor: refs #8581 remove unnecessary option selections in invoiceInCorrective test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 16:08:44 +01:00
Jorge Penadés 1b0f9daac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 14:23:19 +01:00
Benjamin Esteve 6a48ff9326 test(UserPanel): refs #8683 update initial value in user selection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 14:14:22 +01:00
Jorge Penadés 120107cc7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 14:00:38 +01:00
Benjamin Esteve 37f1882530 test(UserPanel): refs #8683 update initial values and options in user selection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 13:55:36 +01:00
Jorge Penadés d23bc5f67d fix(ui): refs #8581 add data-cy attributes for better test targeting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 13:38:49 +01:00
Alex Moreno aa4cf98d91 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 11:37:34 +00:00
Alex Moreno 4e1a2aa8d2 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-10 11:18:08 +00:00
Javier Segarra 4f17691d86 feat: refs #8725 remove inject dependency 2025-03-10 12:07:47 +01:00
Jorge Penadés 5ae91430a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 11:30:08 +01:00
Jorge Penadés c64986ba23 test(invoiceInCorrective): refs #8581 add visibility test for corrective invoice section
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 11:29:21 +01:00
Jorge Penadés a239f84498 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 11:04:40 +01:00
Javier Segarra 9e037c0300 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-10 10:29:53 +01:00
Alex Moreno 9f498c83df test: refs #6994 add json-link front test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 08:47:46 +01:00
Jorge Penadés 3d02b75365 test: refs #8581 update supplier reference in InvoiceInList filtering test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 15:33:38 +01:00
Jorge Penadés c3a4052edc test: refs #8581 update mock data in InvoiceInDescriptor tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 15:24:38 +01:00
Alex Moreno b37fe3a6f3 Merge branch '6994-vnLog_descriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev Build started... Details
2025-03-07 14:59:31 +01:00
Alex Moreno bb6082026b refactor(descriptorStore): refs #6994 remove debug log from has function 2025-03-07 14:59:29 +01:00
Jorge Penadés a5777211b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 14:27:52 +01:00
Alex Moreno f402dd2051 Merge branch 'dev' into 6994-vnLog_descriptors
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 13:05:29 +00:00
Alex Moreno 564877a73c test: refs #6994 add front test descriptors 2025-03-07 14:02:21 +01:00
Alex Moreno a4dfb549be test: refs #6994 add e2e VnLog descriptors 2025-03-07 14:02:03 +01:00
Alex Moreno 80eebef931 feat(VnLog): refs #6994 add descriptors 2025-03-07 14:01:36 +01:00
Javier Segarra 215e3a6da4 feat: refs #8725 ok
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 14:00:50 +01:00
Javier Segarra 255df3acd6 fix: refs #8725 streamline form submission logic in FormModel.vue 2025-03-07 13:33:53 +01:00
Benjamin Esteve 733ba24c41 Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 13:28:49 +01:00
Jon Elias fad667444c Merge branch 'dev' into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 12:27:30 +00:00
Benjamin Esteve bb5dfe4360 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 12:23:48 +00:00
Benjamin Esteve 51998963eb Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-07 12:23:37 +00:00
Jon Elias dd5356f45c fix: refs #7869 fixed dated when adding an indefinetely or range event
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 13:13:18 +01:00
Benjamin Esteve c3ec349eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-07 13:11:49 +01:00
Jon Elias 268d723eb1 refactor: refs #7869 merged changes with #8606
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 12:29:03 +01:00
Jon Elias 74692a6107 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-07 12:28:48 +01:00
Benjamin Esteve 015efb31d3 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 11:12:39 +00:00
Benjamin Esteve 68af7a50fa fix: refs #8683 update computedSortBy to append ' ASC' to optionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 11:59:22 +01:00
Jorge Penadés 8accf13c04 test: refs #8581 update invoiceInList 2025-03-07 11:38:19 +01:00
Jorge Penadés 98541ef7dc test: refs #8581 update invoiceInDescriptor spec to visit the correct invoice summary page
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 11:19:52 +01:00
Jorge Penadés 60aa099536 test: refs #8581 update invoiceInDescriptor spec to remove exclusive test execution
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 11:18:56 +01:00
Jorge Penadés 9c99c337e3 test: refs #8581 update invoiceInDescriptor spec to validate download type for descriptor option 2025-03-07 11:18:45 +01:00
Jorge Penadés bd53d2014f test: refs #8581 update invoiceInBasicData spec to correct supplier reference key 2025-03-07 11:16:54 +01:00
Jorge Penadés c5f4f8d5c7 test: refs #8581 update invoiceInList and invoiceInSummary specs for improved filtering and navigation 2025-03-07 11:12:04 +01:00
Benjamin Esteve d893505cd6 fix: refs #8683 update fetchFilter to use computed sortBy value
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 09:14:18 +01:00
Jorge Penadés f22caaa678 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 09:11:24 +01:00
Alex Moreno 0f64efd20b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-07 08:33:15 +01:00
Benjamin Esteve b311fe3449 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 07:18:22 +01:00
Jon Elias 16521d7848 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 07:11:49 +01:00
Jon Elias 590e764cc2 feat: refs #7869 added include and exclude event from list
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 07:09:07 +01:00
Jorge Penadés e49ab4dfa4 fix: refs #8581 enhance filtering logic in InvoiceInList tests and add waitTableLoad command
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-06 17:31:51 +01:00
Jorge Penadés 65a7ca1848 fix: refs #8581 update test case to remove 'only' and enhance item selection logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 16:01:17 +01:00
Jorge Penadés 5b81836ab2 fix: refs #8581 update data-cy attributes and improve test assertions in InvoiceIn components
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 15:03:32 +01:00
Alex Moreno 96dc556985 Merge branch 'dev' of https: refs #6994//gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-03-06 13:34:54 +01:00
Jorge Penadés 1233f0724c fix: refs #8581 update data-cy attribute
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:23:34 +01:00
Jorge Penadés 8470066124 fix: refs #8581 update data-cy attribute for SendEmailDialog input
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:18:00 +01:00
Jorge Penadés 87a429a0fa Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-06 12:17:41 +01:00
Jorge Penadés dfc95d94cb refactor: refs #8581 remove unnecessary API intercepts in invoiceInDescriptor tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:08:15 +01:00
Jorge Penadés 664b167b2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 10:49:42 +01:00
Alex Moreno 69d99350bc fix(jenkins): refs #8698 update module detection logic to ensure execution only for changed modules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-06 10:18:08 +01:00
Alex Moreno 76e9aab5ae fix(cypress): refs #8698 improve parallel test execution and adjust module detection logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-06 10:16:16 +01:00
Javier Segarra 32dac089f8 feat: refs #8725 saveAndContinue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 10:11:56 +01:00
Alex Moreno 22a978098e refactor(cypress): refs #8698 restructure parallel test execution and cleanup scripts
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-06 10:05:35 +01:00
Javier Segarra 1f83197440 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-06 10:01:49 +01:00
Javier Segarra 095f01717d perf: refs #8725 handle axios.error 2025-03-06 10:01:35 +01:00
Jorge Penadés 34ffb419ad Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 10:00:24 +01:00
Alex Moreno cf261828db Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-06 09:53:28 +01:00
Jorge Penadés 129eb507c6 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 09:25:08 +01:00
Javier Segarra a01f02e31b fix: refs #8725 customerFiscalData 2025-03-05 23:24:11 +01:00
Javier Segarra 4641adbae3 feat: refs #8725 init 2025-03-05 23:20:23 +01:00
Jorge Penadés 7be2381299 test: refs #8581 update login role to 'administrative' in invoiceIn tests and add new invoiceInSerial test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 17:29:55 +01:00
Jorge Penadés c6dcbcdae2 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 17:03:41 +01:00
Jorge Penadés 389728f41e refactor: refs #8581 update invoiceInCorrective component and add Cypress tests for invoice modification
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 17:03:10 +01:00
Jorge Penadés f2a36310b2 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-05 15:56:28 +01:00
Jorge Penadés a62d7b165f feat: refs #8581 add Cypress tests for InvoiceInSummary and enhance data attributes for better accessibility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 14:49:06 +01:00
Jorge Penadés bfd0b23719 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 14:33:28 +01:00
Jorge Penadés 3fdd698109 fix: refs #8581 update supplier link in InvoiceInDescriptor and enhance validation in tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 14:33:01 +01:00
Alex Moreno eb6ed49060 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 14:02:44 +01:00
Alex Moreno 838d5e24ce fix: refs #8698 clean up Jenkinsfile and improve error handling in find.js
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 13:59:46 +01:00
Alex Moreno 0f9f9bf21d ci: refs #8698 try git_commit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:35:38 +01:00
Alex Moreno b9f23dfb18 ci: refs #8698 try git_commit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:32:28 +01:00
Alex Moreno 4ee8c80340 fix: refs #8698 update Jenkinsfile to skip Cypress execution if no modules have changed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:28:08 +01:00
Alex Moreno 27d7a732b7 refactor: refs #8698 remove commented-out code in ItemDescriptorProxy.vue and VnLog.spec.js
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-05 13:13:50 +01:00
Alex Moreno 04f1aae5a0 feat: refs #8698 add Cypress tests for Order Catalog and Supplier Balance, improve module name handling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:06:39 +01:00
Alex Moreno 83c0bfad0c fix: refs #8698 update Jenkinsfile to run Cypress tests with specified modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:03:44 +01:00
Alex Moreno d01951a709 fix: refs #8698 handle promise rejection in getChangedModules function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 12:57:23 +01:00
Alex Moreno 31bfe6c44e feat: refs #8698 add module resolution and import finding utilities for Cypress tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 12:52:32 +01:00
Alex Moreno 2fd9067096 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 12:42:02 +01:00
Jorge Penadés efd364e3b2 test: refs #8581 update invoiceInDescriptor test to ensure correct navigation to invoiceIn list
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 12:34:45 +01:00
Jorge Penadés 9b04fc3bc8 feat: refs #8581 add checkQueryParams command to validate URL query parameters
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 12:28:43 +01:00
Jorge Penadés 7b4b5c892a fix: refs #8581 update default data-cy value in VnTable component 2025-03-05 12:28:31 +01:00
Alex Moreno 92566f6e53 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 12:02:56 +01:00
Alex Moreno f1e334f1fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 10:30:42 +01:00
Jorge Penadés 02d8254c0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 08:53:08 +01:00
Jorge Penadés fd810db535 test: refs #8581 enhance command functions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 08:47:54 +01:00
Jose Antonio Tubau 25ffdb94e6 Merge branch 'dev' of https: refs #8440//gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 07:19:11 +01:00
Jorge Penadés 527c17a0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 16:15:37 +01:00
Jose Antonio Tubau fa5c1643a4 test: refs #8717 add integration test for agencyModes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-04 12:32:21 +01:00
Jorge Penadés f932554af7 feat: refs #8581 add data-cy attrs 2025-03-04 11:18:03 +01:00
Jose Antonio Tubau ae502d5fac refactor: refs #8440 remove unused 'style' attribute from computed $attrs in VnNotes component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 10:24:52 +01:00
Alex Moreno 31ff7de958 ci: refs #8698 use always lastCommit from CHANGE_TARGET
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:55:50 +01:00
Alex Moreno 5bb078540d ci: refs #8698 use always lastCommit from CHANGE_TARGET
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:54:37 +01:00
Jorge Penadés d2a380e3bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:52:02 +01:00
Alex Moreno 7d8f25ff7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:48:38 +01:00
Alex Moreno fcebf6f664 ci: refs #8698 move functions inside script step
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:47:04 +01:00
Alex Moreno e1b96d6a73 ci: refs #8698 move functions inside script step
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:44:57 +01:00
Jose Antonio Tubau ad96392cba test: refs #8440 enhance visibility check and typing delay for adding new vehicle notes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:01:30 +01:00
Alex Moreno d15144a98a ci: refs #8698 refactor Cypress test command to use a variable for specs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:00:29 +01:00
Carlos Andrés 816a6197c7 feat: refs #8529 enhance InvoiceInVat component with data-cy attribute for isDeductible checkbox
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 18:05:19 +01:00
Jorge Penadés 1cdf0df22a Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 16:11:52 +01:00
Jose Antonio Tubau ef0ac17d88 refactor: refs #8440 update required and deletable attribute checks to use 'in' operator for originalAttrs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 16:01:04 +01:00
Jose Antonio Tubau 0619f21cf5 test: refs #8440 add deleteNote functionality test for VnNotes component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 14:43:10 +01:00
Jorge Penadés bb20b7b7f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 14:34:16 +01:00
Alex Moreno b51f99f5f1 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 14:21:43 +01:00
Alex Moreno 5c627dd489 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 13:49:31 +01:00
Jose Antonio Tubau 7670c24f04 test: refs #8440 add Cypress integration tests for vehicle notes functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 13:28:22 +01:00
Jose Antonio Tubau 01af6e8c2d refactor: refs #8440 update required and deletable attribute checks to use originalAttrs 2025-03-03 13:28:15 +01:00
Alex Moreno d199478c1d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 13:23:35 +01:00
Alex Moreno 5e782a1465 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 13:22:57 +01:00
Alex Moreno 42f898531d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 13:16:33 +01:00
Alex Moreno 1d34fc0287 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:59:39 +01:00
Alex Moreno a6eb5dde8d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:57:37 +01:00
Alex Moreno 04543c8397 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:53:13 +01:00
Alex Moreno ee96142f2d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 12:39:45 +01:00
Benjamin Esteve 330b9ca820 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 12:09:43 +01:00
Alex Moreno d5486f89a5 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:07:16 +01:00
Alex Moreno 15159c1937 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 11:46:05 +01:00
Alex Moreno 4789c1d3cb ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:33:19 +01:00
Alex Moreno ca020fff80 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:32:14 +01:00
Alex Moreno d302ee58c0 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 11:31:01 +01:00
Alex Moreno e24600d1ad ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:18:19 +01:00
Alex Moreno 1fcdd120c5 Merge branch '8698_jenkins_e2e_onlyChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 11:13:17 +01:00
Alex Moreno 6ab64453ab ci: refs #8698 try lastSuccessfulBuild 2025-03-03 11:13:15 +01:00
Jorge Penadés 41e7bdb917 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 10:32:50 +01:00
Alex Moreno ed615d7bbd Merge branch 'dev' into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:12:45 +00:00
Alex Moreno 1a52a23712 fix: refs #8698 update Jenkinsfile to include last successful build test information
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-03 09:56:52 +01:00
Alex Moreno 0491fa58b4 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 09:56:22 +01:00
Alex Moreno d2be59ddbf fix: refs #8698 comment out unnecessary echo statements and clean up lastSuccessfulBuild logic in Jenkinsfile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 09:45:25 +01:00
Alex Moreno efaa8a517b feat: refs #8698 add Cypress tests for login, logout, password recovery, and two-factor authentication
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:32:03 +01:00
Alex Moreno c7d26084aa fix: refs #8698 comment out commit ID echo in Jenkinsfile
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 08:59:06 +01:00
Alex Moreno 40875256ff Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-03 08:58:59 +01:00
Alex Moreno 4ee7a5c4fb ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 08:49:05 +01:00
Benjamin Esteve cef76f1553 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-03 07:44:47 +01:00
Javier Segarra 0263af7938 test: refs #7356 init each missing e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-02 23:58:36 +01:00
Carlos Andrés 878b311789 Merge branch 'dev' of https: refs #8529//gitea.verdnatura.es/verdnatura/salix-front into 8529-InvoiceIn-deductible-TAX-lines
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-02 12:12:15 +01:00
Javier Segarra 644339bd13 test: vnNotes restore
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-01 02:38:05 +01:00
Javier Segarra bdda691ca9 Merge branch 'dev' into update_vitest_version 2025-03-01 02:37:35 +01:00
Javier Segarra a330efd13f Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-01 02:32:15 +01:00
Javier Segarra 36083b4e7a perf: refs #8006 eslintrc
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-01 02:18:04 +01:00
Javier Segarra cc55cd3822 Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-01 02:16:28 +01:00
Alex Moreno a250cc0eb5 ci: refs #8698 extract lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 15:01:45 +01:00
Alex Moreno 95f9917dc2 refactor: refs #8698 update Jenkinsfile to log last successful build details and clean up commented code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 14:59:54 +01:00
Alex Moreno 28ae84a931 refactor: refs #8698 update Jenkinsfile to use last successful build's changesets for commit extraction
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:58:37 +01:00
Alex Moreno f17b773cca refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:57:33 +01:00
Alex Moreno bfe302e9d4 refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:55:35 +01:00
Alex Moreno 69f84e2fcd refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:53:54 +01:00
Alex Moreno d755c0c8ba refactor: refs #8698 update Jenkinsfile to find last successful build and remove commented test stages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 14:41:27 +01:00
Benjamin Esteve a07afe3a94 refactor: refs #8683 enhance sorting logic in VnSelect component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 13:44:14 +01:00
Benjamin Esteve 6e9fa6eae0 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 11:51:19 +00:00
Jon Elias 0bfb1344dc feat: refs #8326 wip added new style
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 12:03:23 +01:00
Benjamin Esteve d148b7b813 Merge branch 'dev' into 8118-createComponentVnDropdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 10:38:49 +00:00
Benjamin Esteve 0e48701bc7 feat: refs #8118 add VnDropdown component and integrate it into Claim and Ticket summaries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 11:36:24 +01:00
Jose Antonio Tubau 4e0be5df0a Merge branch 'dev' into 8621-createCmrListE2eTest
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 08:46:37 +00:00
Jorge Penadés 96ef19401f Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 09:28:13 +01:00
Jorge Penadés 7c560b289a feat: refs #8581 update query parameters and refactor tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 09:25:51 +01:00
Jorge Penadés 415c6f2177 feat: refs #8581 add validation commands for file downloads and PDF checks in Cypress tests 2025-02-28 09:25:04 +01:00
Jorge Penadés 4e87c596d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 12:42:58 +01:00
Jorge Penadés 85a9260382 feat: refs #8581 add data attributes for Cypress testing and update invoice tests 2025-02-27 12:42:51 +01:00
Jorge Penadés 1ab89fd9f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 10:39:38 +01:00
Jorge Penadés fbe5fdc7a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-27 10:11:02 +01:00
Jorge Penadés 4e8c08f972 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-27 09:52:31 +01:00
Jorge Penadés a63cc17142 test: refs #8581 update invoiceInDescriptor tests for improved coverage and clarity
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-27 09:47:26 +01:00
Jorge Penadés 24cd4caa96 fix: refs #8581 ensure actions descriptor is opened only when necessary in selectDescriptorOption command 2025-02-26 17:31:47 +01:00
Jorge Penadés 6271dea2c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 16:56:18 +01:00
Jorge Penadés ad10e62217 refactor: refs #8581 update client list and invoice descriptor tests for improved clarity and functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 14:18:19 +01:00
Jorge Penadés 271f7d70af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 13:49:37 +01:00
Jose Antonio Tubau 15e44174ba refactor: refs #8621 update column names in RouteList and add formatting for agency and vehicle fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 12:08:40 +01:00
Jose Antonio Tubau 083e68c291 test: refs #8621 add functionality to remove filters in cmrList e2e tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 09:09:19 +01:00
Jorge Penadés c26f1f1707 fix: refs #8581 update data-cy attribute in CardDescriptor for consistency in Cypress tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 15:31:24 +01:00
Jorge Penadés 99861cbd42 fix: refs #8581 add data-cy attribute to CardDescriptor component for improved testing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 15:27:23 +01:00
Jorge Penadés 2ca60b6a0f fix: refs #8581 update Cypress tests to use data-cy attributes and improve checkbox validation 2025-02-25 15:27:12 +01:00
Jose Antonio Tubau ee3ebc51f1 test: refs #8621 add e2e tests for cmrList
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 15:27:01 +01:00
Jorge Penadés 3993e37f39 feat: refs #8581 add custom Cypress commands for selecting descriptor options and validating checkboxes 2025-02-25 15:27:00 +01:00
Jorge Penadés 43e0134d41 fix: refs #8581 update field references for supplier withholding in InvoiceInDescriptorMenu 2025-02-25 15:26:52 +01:00
Jorge Penadés dfb5cfb513 fix: refs #8581 update field references for supplier withholding in InvoiceInDescriptorMenu 2025-02-25 13:24:16 +01:00
Jorge Penadés 9a5c1240c9 fix: refs #8581 add data-cy attribute to QList in VnMoreOptions component 2025-02-25 13:19:37 +01:00
Jorge Penadés 01403240c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:38:27 +01:00
Jorge Penadés 8c2cc42de2 test: refs #8581 refactor InvoiceInDescriptor tests for better structure and readability
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:11:33 +01:00
Jorge Penadés 5690fb1003 fix: refs #8581 enable skipped tests in InvoiceInList for improved coverage
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:16:06 +01:00
Jorge Penadés 7422d28d88 fix: refs #8581 replace QCheckbox with VnCheckbox for consistency in InvoiceInFilter 2025-02-24 18:15:52 +01:00
Jorge Penadés 8a6cd267f9 fix: refs #8581 update date format in checkDate command to MM/DD/YYYY for consistency 2025-02-24 18:15:25 +01:00
Jorge Penadés bb2676952c fix: refs #8581 update data-cy attribute in VnFilterPanel for improved testability 2025-02-24 17:32:54 +01:00
Jorge Penadés 02fe39668d fix: refs #8581 add data-cy attribute to QCheckbox for better testability 2025-02-24 17:32:16 +01:00
Jorge Penadés e29f82ba8c fix: refs #8581 ensure listbox defaults in validateDescriptor 2025-02-24 16:30:43 +01:00
Jorge Penadés 7326d08051 fix: refs #8581 ensure case-insensitive 2025-02-24 16:26:06 +01:00
Jorge Penadés 702f295403 refactor: refs #8581 extract number & date validation 2025-02-24 16:04:28 +01:00
Alex Moreno 0e7a8e61d3 refactor: refs #6994 update VnJsonValue component props and improve descriptor handling
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 14:50:57 +01:00
Alex Moreno 1bf34ff443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-02-24 14:49:34 +01:00
Jorge Penadés d52635b764 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 14:33:42 +01:00
Jorge Penadés 502ee6dc7c test: refs #8581 skip 'From param' filter test and add 'To param' and 'daysAgo param' filter tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 14:10:21 +01:00
Jorge Penadés 723dbb0af4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:38:31 +01:00
Alex Moreno 76fe92450a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-02-24 12:51:55 +01:00
Jorge Penadés ed097d7091 feat: refs #8581 add tests for creating and filtering invoices in InvoiceInList
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 17:38:08 +01:00
Jorge Penadés fcea5b7bbe feat: refs #8581 validateVnTableRows 2025-02-21 17:37:58 +01:00
Jorge Penadés bb2997fc65 refactor: refs #8581 remove undefined values 2025-02-21 17:37:26 +01:00
Jorge Penadés 44532c4265 feat: refs #8581 add data-cy attr VnTable & implement validation rows 2025-02-21 16:59:43 +01:00
Jorge Penadés e1c4a0bdb9 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-02-21 15:15:48 +01:00
Jorge Penadés 039d4c22fb feat: refs #8581 add data-cy attr VnLv 2025-02-21 13:50:16 +01:00
Jorge Penadés 140abcbbc4 feat: refs #8581 add data-cy attributes CardDescriptor 2025-02-21 13:48:14 +01:00
Jorge Penadés a8fa03a5d0 feat: refs #8581 add data-cy attributes CardDescriptor 2025-02-21 13:48:09 +01:00
Jorge Penadés 9b0365aac4 feat: refs #8581 add validation command for card descriptor 2025-02-21 13:44:37 +01:00
Javier Segarra 82b2180cba Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 10:26:38 +00:00
Jorge Penadés 6d12fc2c1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 09:45:09 +01:00
Javier Segarra 59ddd2377b feat: refs #8006 eslint migration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 00:35:32 +01:00
Jorge Penadés 7c588f4bbe fix: refs #8581 update invoiceInBasicDataSupplierRef to use string format 2025-02-20 18:03:27 +01:00
Jorge Penadés c041877f65 refactor: refs #8581 simplify fillInForm and validateForm 2025-02-20 18:02:07 +01:00
Jorge Penadés c3b6f79965 fix: refs #8581 update data-cy attr syntax
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-20 17:18:56 +01:00
Jorge Penadés f86691cdfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-20 17:17:49 +01:00
Jorge Penadés 6e8f54ec1f test: refs #8581 validate form
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 16:35:14 +01:00
Jorge Penadés 813e677a12 feat: refs #8581 add validateForm command for form validation with date handling 2025-02-20 16:33:46 +01:00
Jorge Penadés 73f3a2c98d test: refs #8581 every field 2025-02-20 15:54:03 +01:00
Jorge Penadés c284356f61 feat: refs #8581 add data-cy attributes 2025-02-20 15:53:35 +01:00
Jorge Penadés 94cc4f2950 refactor: refs #8581 enhance fillInForm 2025-02-20 15:53:08 +01:00
Javier Segarra 95e69ff79b fix: refs #8006 example
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-20 13:10:19 +01:00
Javier Segarra e797905764 feat: refs #8006 quasar viteConfig 2025-02-20 13:10:09 +01:00
Javier Segarra 158c0f684a feat: refs #8006 copy paste rules 2025-02-20 13:10:00 +01:00
Jorge Penadés e0459f2016 fix: refs #8581 update data-cy attribute binding #7529 2025-02-20 12:22:58 +01:00
Javier Segarra af531958ca feat: change customersumamry title
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-17 19:18:25 +01:00
Javier Segarra fa755bf608 feat: change columns order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-17 18:50:41 +01:00
Carlos Andrés 658bd015ca feat: refs #8529 invoiceIn move deductible field from head to lines
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 12:41:11 +01:00
Jose Antonio Tubau 3de0ebeccd refactor: refs #8440 remove unnecessary computed properties
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-12 14:52:05 +01:00
Jose Antonio Tubau 62e8b5b307 feat: refs #8440 add delete functionality to notes and update required attributes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 14:40:17 +01:00
Jose Antonio Tubau b229fc0ff3 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-10 12:43:59 +00:00
Jose Antonio Tubau 51afa21fa4 feat: refs #8440 add VehicleNotes component and update routing
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-10 13:41:03 +01:00
Alex Moreno a6a2723734 feat: refs #8463 cardDescriptorBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-27 14:21:09 +01:00
Javier Segarra 5f2b71dc70 feat: updates 2025-01-23 11:33:19 +01:00
Javier Segarra ff63a8fd11 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 23:18:55 +01:00
Alex Moreno 6e0e5e0ada Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-01-17 08:13:35 +01:00
Alex Moreno d8408d1bf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-01-13 10:08:09 +01:00
Alex Moreno 3d03cf723c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-01-10 13:39:17 +01:00
Alex Moreno 5f40d0a3aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6994-vnLog_descriptors 2025-01-10 10:30:52 +01:00
Alex Moreno 9ca4db0f18 Merge branch 'dev' into 6994-vnLog_descriptors 2025-01-10 08:27:22 +00:00
Javier Segarra fcb2e3cc74 feat: organize imports
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
2024-12-23 12:47:09 +01:00
Javier Segarra 5b0479e60c Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:26:33 +01:00
Javier Segarra 099c613ccc feat: update_vitest_version to 2.0.0
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:23:53 +01:00
Alex Moreno 48f1070740 feat(VnLog): add descriptors
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-11-05 12:52:53 +01:00
340 changed files with 8119 additions and 6195 deletions

View File

@ -1,6 +0,0 @@
/dist
/src-capacitor
/src-cordova
/.quasar
/node_modules
.eslintrc.js

View File

@ -1,75 +0,0 @@
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)
root: true,
parserOptions: {
ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
},
env: {
node: true,
browser: true,
'vue/setup-compiler-macros': true,
},
// Rules order is important, please avoid shuffling them
extends: [
// Base ESLint recommended rules
'eslint:recommended',
// Uncomment any of the lines below to choose desired strictness,
// but leave only one uncommented!
// See https://eslint.vuejs.org/rules/#available-rules
// 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
// https://github.com/prettier/eslint-config-prettier#installation
// usage with Prettier, provided by 'eslint-config-prettier'.
'prettier',
],
plugins: [
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
// required to lint *.vue files
'vue',
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
// Prettier has not been included as plugin to avoid performance impact
// add it as an extension for your IDE
],
globals: {
ga: 'readonly', // Google Analytics
cordova: 'readonly',
__statics: 'readonly',
__QUASAR_SSR__: 'readonly',
__QUASAR_SSR_SERVER__: 'readonly',
__QUASAR_SSR_CLIENT__: 'readonly',
__QUASAR_SSR_PWA__: 'readonly',
process: 'readonly',
Capacitor: 'readonly',
chrome: 'readonly',
},
// add your custom rules here
rules: {
'prefer-promise-reject-errors': 'off',
'no-unused-vars': 'warn',
'vue/no-multiple-template-root': 'off',
// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
},
overrides: [
{
files: ['test/cypress/**/*.*'],
extends: [
// Add Cypress-specific lint rules, globals and Cypress plugin
// See https://github.com/cypress-io/eslint-plugin-cypress#rules
'plugin:cypress/recommended',
],
},
],
};

3
.eslintrc.json Normal file
View File

@ -0,0 +1,3 @@
{
"extends": ["plugin:cypress/recommended"]
}

View File

@ -1,3 +1,214 @@
# Version 25.12 - 2025-03-25
### Added 🆕
- chore: add junit-merge dependency to package.json by:alexm
- chore: downgrade version from 25.14.0 to 25.12.0 in package.json by:alexm
- chore: reduce page load timeout in Cypress configuration by:alexm
- chore: refs #6695 update Cypress to version 14.1.0 and simplify test execution in Jenkinsfile by:alexm
- chore: refs #8602 add comments for clarity in Cypress commands file by:pablone
- chore: refs #8602 enhance Cypress support files with detailed comments and organization by:pablone
- ci: refs #6695 feat jenkins parallel e2e by:alexm
- feat: integrate vue-router to enhance routing capabilities in ZoneCard component by:alexm
- feat: refs #6695 implement parallel Cypress testing and enhance timeout configurations by:alexm
- feat: refs #6695 update Cypress parallel test execution to use 3 instances by:alexm
- feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list by:jgallego
- feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations by:jgallego
- feat: refs #6802 add DepartmentDescriptorProxy to various components and update department handling by:jgallego
- feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor by:jtubau
- feat: refs #7949 show new field in ticket sales by:Jon
- feat: refs #8045 added new logic to show the correct icon and the correct path to redirect by:Jon
- feat: refs #8045 modified icon and route to redirect from CardDescriptor by:Jon
- feat: refs #8074 modified spinner size by:Jon
- feat: refs #8600 added calendar e2e and modified basic data by:Jon
- feat: refs #8600 added deliveryDays and modified warehouse E2Es by:Jon
- feat: refs #8600 added new tests for zoneSummary & zoneLocations by:provira
- feat: refs #8602 add custom Cypress commands for improved element interaction and request handling by:pablone
- feat: refs #8602 add new Cypress command for clicking buttons with icons by:pablone
- feat: refs #8602 add remove functionality for tag filters in EntryBuys component by:pablone
- feat: refs #8602 add sorting options for select fields and update locale files with supplier name by:pablone
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
- feat: refs #8602 remove unused state property from useArrayDataStore by:pablone
- feat: refs #8602 remove unused URL property from VnTable in ClaimList component by:pablone
- feat: refs #8602 skip warehouse creation and removal test in ZoneWarehouse spec by:pablone
- feat: refs #8602 streamline beforeSaveFn execution in CrudModel component by:pablone
- feat: refs #8602 streamline beforeSaveFn execution in VnTable component by:pablone
- feat: refs #8602 streamline filter logic in EntryBuys component by:pablone
- feat: refs #8602 update entry components and tests, add data-cy attributes for Cypress integration by:pablone
- feat: refs #8602 update localization for purchased spaces and enhance Entry components with new labels by:pablone
- feat: refs #8606 adapt module to VnCatdBeta by:Jon
- feat: refs #8612 added summary button & changed e2e tests by:provira
- feat: refs #8612 changed shelving to VnTable & created e2e tests by:provira
- feat: refs #8616 add summary prop to CardDescriptor in RoadmapDescriptor and WorkerDescriptor by:jtubau
- feat: refs #8616 add VnCheckbox component to VnFilter and update prop types in VnFilterPanel and VnSearchbar by:jtubau
- feat: refs #8630 add Agency and Vehicle descriptor components with summary props by:jtubau
- feat: refs #8638 add AWB field to travel and entry forms, update translations and styles by:pablone
- feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests by:pablone
- feat: refs #8648 enhance roadmapList tests with improved selectors and additional scenarios by:jtubau
- feat: refs #8664 add CmrFilter component and integrate it into CmrList for enhanced filtering options by:jtubau
- feat: refs #8721 add ticket navigation and update route columns by:jtubau
- feat: run.sh build neccessary images by:alexm
- feat: update Jenkinsfile to pull Docker images for back and db services by:alexm
- feat: update labels and add department selection in InvoiceOut filter and list by:jgallego
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
- style: refs #8041 new variable by:benjaminedc
### Changed 📦
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
- refactor(cypress): refs #6695 simplify parallel test execution script by:alexm
- refactor: deleted useless (origin/Warmfix-DepartmentIcon) by:Jon
- refactor: refs #6695 enable ClaimNotes test suite by:alexm
- refactor: refs #6695 fix invoiceOutSummary by:alexm
- refactor: refs #6695 improve notification check and extend waitForElement timeout by:alexm
- refactor: refs #6695 remove mocha dependency and optimize Cypress command execution by:alexm
- refactor: refs #6695 skips by:alexm
- refactor: refs #6695 skip zoneWarehouse by:alexm
- refactor: refs #6695 streamline Cypress test execution and remove deprecated configurations by:alexm
- refactor: refs #6802 replace salesPerson references with department in claims and tickets by:jgallego
- refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components by:jgallego
- refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory by:jgallego
- refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker by:jgallego
- refactor: refs #6802 update TicketFilter and TicketSale components to use departmentFk and adjust API endpoints by:jgallego
- refactor: refs #8041 unify class link and unify titles to VnTitles by:benjaminedc
- refactor: refs #8045 modified icon and module const by:Jon
- refactor: refs #8197 rename VnCardBeta to VnCard by:alexm
- refactor: refs #8197 simplify menu retrieval logic in LeftMenu component by:alexm
- refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta by:provira
- refactor: refs #8322 remove keyBinding from Wagon router module by:alexm
- refactor: refs #8322 update WagonCard component and routing structure by:alexm
- refactor: refs #8370 modified function to get the correct date by:Jon
- refactor: refs #8472 remove added div and add class to VnInput by:jtubau
- refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios by:jtubau
- refactor: refs #8472 update class names from q-span-2 to col-span-2 for consistency in layout by:jtubau
- refactor: refs #8600 changed test case description by:provira
- refactor: refs #8600 modified make invoice and send dialog e2es by:Jon
- refactor: refs #8600 modified upcomingDeliveries e2e and created deliveryDays by:Jon
- refactor: refs #8600 modified zoneSummary e2e by:Jon
- refactor: refs #8602 remove redundant date input test from entryList.spec.js by:pablone
- refactor: refs #8606 clear some warnings by:Jon
- refactor: refs #8606 deleted code and fixed translation by:Jon
- refactor: refs #8606 merged previous and e2e changes and corrected minor errors by:Jon
- refactor: refs #8606 requested changes by:Jon
- refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components by:jtubau
- refactor: refs #8616 integrate VnSelectWorker component in RouteList and optimize format functions by:jtubau
- refactor: refs #8616 simplify template bindings and improve link generation in VehicleSummary by:jtubau
- refactor: refs #8616 update routing components for AgencyList and RouteRoadmap in route.js by:jtubau
- refactor: refs #8619 simplify empty data check in RouteDescriptor component by:jtubau
- refactor: refs #8626 add cardVisible property to RouteList columns by:jtubau
- refactor: refs #8626 add formatting for agency and vehicle columns in RouteList by:jtubau
- refactor: refs #8626 enhance Worker and Agency components with data attributes and improved routing by:jtubau
- refactor: refs #8626 improve test messages and selectors in route tests by:jtubau
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
- refactor: refs #8626 update RouteList columns and enable AgencyWorkCenter tests by:jtubau
- refactor: refs #8630 add vehicle translations and enhance route list columns by:jtubau
- refactor: refs #8648 update roadmap deletion test to use current element text by:jtubau
- refactor: refs #8664 enhance CmrList component with query initialization and user parameters by:jtubau
- refactor: refs #8664 localization files by:jtubau
- refactor: refs #8664 remove CmrFilter and replace with VnSearchbar in CmrList by:jtubau
- refactor: remove unnecessary login and reload calls in ClaimDevelopment tests by:alexm
- refactor: simplify client selection in order creation test by:alexm
- refactor: update client ID input selector and remove viewport setting by:alexm
- test: refs #8197 comment out ticket list tests for refactoring by:alexm
- test: refs #8626 refactor notification check in routeList.spec.js by:jtubau
- test: refs #8626 refactor routeList.spec.js to use a constant for summary URL by:jtubau
- test: refs #8626 refactor routeList.spec.js to use selectors and improve readability by:jtubau
### Fixed 🛠️
- fix: add --init flag to Docker container for Cypress tests by:alexm
- fix: agency list filters by:jtubau
- fix: align Article label to the left in EntryBuys component by:alexm
- fix: card descriptor imports by:Jon
- fix: card descriptor merge by:Jon
- fix(ClaimAction): update shelving options to use URL instead of static data by:jgallego
- fix(ClaimSummary): clean url by:alexm
- fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies by:alexm
- fix(cypressParallel.sh): refs #6695 improve script readability by:alexm
- fix(cypressParallel.sh): refs #6695 improve test execution output for clarity by:alexm
- fix(cypressParallel.sh): refs #6695 simplify test execution output format by:alexm
- fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection by:alexm
- fix: fixed department descriptor icon by:Jon
- fix: fixed submodule descriptors icons by:Jon
- fix(invoiceOutSummary.spec.js): refs #6695 remove unnecessary visibility check for descriptor by:alexm
- fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 by:alexm
- fix(Jenkinsfile): refs #6695 add credentials for Docker login in E2E stage by:alexm
- fix(Jenkinsfile): refs #6695 change parallel test execution from 4 to 2 by:alexm
- fix(Jenkinsfile): refs #6695 increase parallel test execution from 2 to 4 by:alexm
- fix(Jenkinsfile): refs #6695 update parallel test execution to 4 by:alexm
- fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure by:alexm
- fix: refs #6695 update Cypress configuration and test result paths by:alexm
- fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method by:alexm
- fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution by:alexm
- fix: refs #6695 update Jenkinsfile to source cypressParallel.sh correctly by:alexm
- fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload by:alexm
- fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue by:jgallego
- fix: refs #6802 update OrderFilter to use department relation instead of salesPerson by:jgallego
- fix: refs #8041 update redirection from preview to summary in ShelvingList tests by:benjaminedc
- fix: refs #8041 update selector for summary header in ParkingList tests by:benjaminedc
- fix: refs #8041 update summaryHeader selector in ParkingList test by:benjaminedc
- fix: refs #8322 update order property for WagonList component by:alexm
- fix: refs #8370 change param rely on month by:Jon
- fix: refs #8417 added data-cy to all files and fixed test by:provira
- fix: refs #8417 added data-cy to delete button by:provira
- fix: refs #8417 fixed claimPhoto e2e by:provira
- fix: refs #8417 fixed claimPhoto e2e test by:provira
- fix: refs #8417 fixed e2e test by:provira
- fix: refs #8417 fixed e2e test case by:provira
- fix: refs #8417 fixed failing test case by:provira
- fix: refs #8417 fixed invoiceOutSummary e2e test by:provira
- fix: refs #8417 removed .only by:provira
- fix: refs #8583 basicData, business, summary by:carlossa
- fix: refs #8583 basicData e2e by:carlossa
- fix: refs #8583 basicData timeControl by:carlossa
- fix: refs #8583 cypressconf by:carlossa
- fix: refs #8583 dataCy operator by:carlossa
- fix: refs #8583 fix AddCard by:carlossa
- fix: refs #8583 mutual create by:carlossa
- fix: refs #8583 operator by:carlossa
- fix: refs #8583 remove workerTimeControl by:carlossa
- fix: refs #8583 tMutual, tNotes, TOperator by:carlossa
- fix: refs #8583 wBusiness by:carlossa
- fix: refs #8583 wBusiness e2e by:carlossa
- fix: refs #8583 workerBasicData & workerTimeControl by:carlossa
- fix: refs #8583 workerBusiness by:carlossa
- fix: refs #8583 workerBusiness e2e by:carlossa
- fix: refs #8583 workerBusiness test by:carlossa
- fix: refs #8583 workerE2E by:carlossa
- fix: refs #8583 worker mutual e2e by:carlossa
- fix: refs #8583 workerSummary test by:carlossa
- fix: refs #8583 workerTimeControl by:carlossa
- fix: refs #8583 workerTimeControl e2e by:carlossa
- fix: refs #8600 e2e by:Jon
- fix: refs #8600 fixed calendar e2e by:Jon
- fix: refs #8600 fixed e2e and skip client ones by:Jon
- fix: refs #8600 fixed e2e by:Jon
- fix: refs #8600 fixed invoiceOut summary e2e by:Jon
- fix: refs #8600 fixed zoneList & added test case to zoneSummary by:provira
- fix: refs #8600 zone basic data e2e and skip intermitent invoice out summary it by:Jon
- fix: refs #8602 delete unused entryDms and stockBought test files (origin/8581-e2eInvoiceIn) by:pablone
- fix: refs #8606 deleted code by:Jon
- fix: refs #8612 changed QCheckbox for VnCheckbox by:provira
- fix: refs #8612 fixed shelving e2e tests by:provira
- fix: refs #8616 add conditional for SupplierDescriptorProxy and bind attributes in CardDescriptor by:jtubau
- fix: refs #8616 remove redundant v-on binding from QCheckbox in VnCheckbox.vue by:jtubau
- fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue by:jtubau
- fix: refs #8616 update FormModel prop from 'update-url' to 'url-update' in Agency and RoadMap BasicData by:jtubau
- fix: refs #8619 handle empty ticket records in RouteDescriptor component by:jtubau
- fix: refs #8619 update route descriptor to handle empty ticket records and adjust test cases by:jtubau
- fix: refs #8626 remove duplicate ref attribute from RouteList.vue by:jtubau
- fix: refs #8630 remove duplicated locations by:jtubau
- fix: refs #8638 restore invoiceInBasicData by:pablone
- fix: refs #8638 update comment formatting in VnTable.vue by:pablone
- fix: refs #8638 update null check for maxlength validation in VnInput.vue by:pablone
- fix: simplify menu structure in monitor router module (origin/fix_monitor_leftMenu) by:Javier Segarra
- refactor: refs #6695 fix invoiceOutSummary by:alexm
- refactor: refs #8606 deleted code and fixed translation by:Jon
- test: fix intermitent e2e by:alexm
- test: fix orderList e2e, unestables by:alexm
- test(OrderList): fix inconsistency by:alexm
- test(TicketList): fix inconsistency by:alexm
# Version 25.10 - 2025-03-11
### Added 🆕

7
Jenkinsfile vendored
View File

@ -115,6 +115,7 @@ pipeline {
steps {
script {
sh 'rm -f junit/e2e-*.xml'
sh 'rm -rf test/cypress/screenshots'
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
@ -124,14 +125,17 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
echo "E2E MODULES: ${modules}"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh 'sh test/cypress/cypressParallel.sh 2'
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
}
}
}
post {
always {
sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
junit(
testResults: 'junit/e2e-*.xml',
allowEmptyResults: true
@ -181,3 +185,4 @@ pipeline {
}
}
}

View File

@ -49,3 +49,9 @@ pnpm run test:e2e:summary
```bash
quasar build
```
### Serve the app for production
```bash
quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
```

87
eslint.config.js Normal file
View File

@ -0,0 +1,87 @@
import cypress from 'eslint-plugin-cypress';
import eslint from 'eslint-plugin-import';
import globals from 'globals';
import js from '@eslint/js';
import vue from 'eslint-plugin-vue';
export default {
plugins: { vue, eslint, cypress },
languageOptions: {
globals: {
...globals.node,
...globals.browser,
...vue.configs['vue3-strongly-recommended'].globals,
...cypress.environments.globals.globals,
ga: 'readonly',
cordova: 'readonly',
__statics: 'readonly',
__QUASAR_SSR__: 'readonly',
__QUASAR_SSR_SERVER__: 'readonly',
__QUASAR_SSR_CLIENT__: 'readonly',
__QUASAR_SSR_PWA__: 'readonly',
process: 'readonly',
Capacitor: 'readonly',
chrome: 'readonly',
},
ecmaVersion: 2020,
sourceType: 'module',
parserOptions: {
parser: '@babel/eslint-parser',
},
},
rules: {
...vue.rules['flat/strongly-recommended'],
...js.configs.recommended.rules,
semi: 'off',
'generator-star-spacing': 'warn',
'arrow-parens': 'warn',
'no-var': 'error',
'prefer-const': 'error',
'prefer-template': 'warn',
'prefer-destructuring': 'off',
'prefer-spread': 'warn',
'prefer-rest-params': 'warn',
'prefer-object-spread': 'warn',
'prefer-arrow-callback': 'warn',
'prefer-numeric-literals': 'warn',
'prefer-exponentiation-operator': 'warn',
'prefer-regex-literals': 'warn',
'one-var': [
'error',
{
let: 'never',
const: 'never',
},
],
'no-void': 'off',
'prefer-promise-reject-errors': 'error',
'multiline-ternary': 'warn',
'no-restricted-imports': 'warn',
'no-import-assign': 'warn',
'no-duplicate-imports': 'warn',
'no-useless-rename': 'warn',
'eslint/no-named-as-default': 'warn',
'eslint/no-named-as-default-member': 'warn',
'no-unsafe-optional-chaining': 'warn',
'no-undef': 'error',
'no-unused-vars': 'error',
'no-console': 'error',
'no-debugger': 'error',
'no-useless-escape': 'error',
'no-prototype-builtins': 'error',
'no-async-promise-executor': 'error',
'no-irregular-whitespace': 'error',
'no-constant-condition': 'error',
'no-unsafe-finally': 'error',
'no-extend-native': 'error',
},
ignores: [
'/dist',
'/src-capacitor',
'/src-cordova',
'/.quasar',
'/node_modules',
'.eslintrc.js',
],
};

View File

@ -1,6 +1,6 @@
{
"name": "salix-front",
"version": "25.12.0",
"version": "25.16.0",
"description": "Salix frontend",
"productName": "Salix",
"author": "Verdnatura",
@ -9,7 +9,8 @@
"type": "module",
"scripts": {
"resetDatabase": "cd ../salix && gulp docker",
"lint": "eslint --ext .js,.vue ./",
"lint": "eslint \"**/*.{vue,js}\" ",
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
"test:e2e": "cypress open",
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
@ -17,6 +18,8 @@
"test:e2e:summary": "bash ./test/cypress/summary.sh",
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
"test:front": "vitest",
"test:ui": "vitest --ui",
"test:coverage": "vitest run --coverage",
"test:front:ci": "vitest run",
"commitlint": "commitlint --edit",
"prepare": "npx husky install",
@ -26,43 +29,53 @@
"docs:preview": "vitepress preview docs"
},
"dependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"@quasar/cli": "^2.4.1",
"@quasar/extras": "^1.16.16",
"axios": "^1.4.0",
"chromium": "^3.0.3",
"croppie": "^2.6.5",
"es-module-lexer": "^1.6.0",
"fast-glob": "^3.3.3",
"moment": "^2.30.1",
"pinia": "^2.1.3",
"quasar": "^2.17.7",
"validator": "^13.9.0",
"vue": "^3.5.13",
"vue-i18n": "^9.3.0",
"vue-i18n": "^9.4.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@intlify/unplugin-vue-i18n": "^0.8.2",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@pinia/testing": "^0.1.2",
"@quasar/app-vite": "^2.0.8",
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vitest/ui": "3.1.1",
"@vue/compiler-sfc": "^3.5.13",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",
"cypress": "^14.1.0",
"cypress-mochawesome-reporter": "^3.8.2",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-cypress": "^4.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-vue": "^9.32.0",
"globals": "^16.0.0",
"husky": "^8.0.0",
"junit-merge": "^2.0.0",
"mocha": "^11.1.0",
"postcss": "^8.4.23",
"prettier": "^3.4.2",
"sass": "^1.83.4",
"vitepress": "^1.6.3",
"vitest": "^0.34.0",
"vitest": "^3.0.3",
"xunit-viewer": "^10.6.1"
},
"engines": {
@ -76,4 +89,4 @@
"vite": "^6.0.11",
"vitest": "^0.31.1"
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
build: {
target: {
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
node: 'node18',
node: 'node20',
},
vueRouterMode: 'hash', // available values: 'hash', 'history'
@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
vitePlugins: [
[
VueI18nPlugin({
strictMessage: false,
runtimeOnly: false,
include: [
path.resolve(__dirname, './src/i18n/locale/**'),

View File

@ -0,0 +1,227 @@
/* eslint-disable */
/**
* THIS FILE IS GENERATED AUTOMATICALLY.
* 1. DO NOT edit this file directly as it won't do anything.
* 2. EDIT the original quasar.config file INSTEAD.
* 3. DO NOT git commit this file. It should be ignored.
*
* This file is still here because there was an error in
* the original quasar.config file and this allows you to
* investigate the Node.js stack error.
*
* After you fix the original file, this file will be
* deleted automatically.
**/
// quasar.config.js
import { configure } from "quasar/wrappers";
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
import path from "path";
var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
var quasar_config_default = configure(function() {
return {
eslint: {
// fix: true,
// include = [],
// exclude = [],
// rawOptions = {},
warnings: true,
errors: true
},
// https://v2.quasar.dev/quasar-cli/prefetch-feature
// preFetch: true,
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli/boot-files
boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
css: ["app.scss"],
// https://github.com/quasarframework/quasar/tree/dev/extras
extras: [
// 'ionicons-v4',
// 'mdi-v5',
// 'fontawesome-v6',
// 'eva-icons',
// 'themify',
// 'line-awesome',
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
"roboto-font",
"material-icons-outlined",
"material-symbols-outlined"
],
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
build: {
target: {
browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
node: "node20"
},
vueRouterMode: "hash",
// available values: 'hash', 'history'
// vueRouterBase,
// vueDevtools,
// vueOptionsAPI: false,
// rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
// publicPath: '/',
// analyze: true,
// env: {},
rawDefine: {
"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
},
// ignorePublicFolder: true,
// minify: false,
// polyfillModulePreload: true,
// distDir
extendViteConf(viteConf) {
delete viteConf.build.polyfillModulePreload;
viteConf.build.modulePreload = {
polyfill: false
};
},
// viteVuePluginOptions: {},
alias: {
composables: path.join(__quasar_inject_dirname__, "./src/composables"),
filters: path.join(__quasar_inject_dirname__, "./src/filters")
},
vitePlugins: [
[
VueI18nPlugin({
strictMessage: false,
runtimeOnly: false,
include: [
path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
]
})
]
]
},
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
devServer: {
server: {
type: "http"
},
proxy: {
"/api": {
target,
logLevel: "debug",
changeOrigin: true,
secure: false
}
},
open: false,
allowedHosts: [
"front",
// Agrega este nombre de host
"localhost"
// Opcional, para pruebas locales
]
},
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
framework: {
config: {
config: {
dark: "auto"
}
},
lang: "en-GB",
// iconSet: 'material-icons', // Quasar icon set
// lang: 'en-US', // Quasar language pack
// For special cases outside of where the auto-import strategy can have an impact
// (like functional components as one of the examples),
// you can manually specify Quasar components/directives to be available everywhere:
//
// components: [],
// directives: [],
// Quasar plugins
plugins: ["Notify", "Dialog"],
all: "auto",
autoImportComponentCase: "pascal"
},
// animations: 'all', // --- includes all animations
// https://v2.quasar.dev/options/animations
animations: [],
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
// sourceFiles: {
// rootComponent: 'src/App.vue',
// router: 'src/router/index',
// store: 'src/store/index',
// registerServiceWorker: 'src-pwa/register-service-worker',
// serviceWorker: 'src-pwa/custom-service-worker',
// pwaManifestFile: 'src-pwa/manifest.json',
// electronMain: 'src-electron/electron-main',
// electronPreload: 'src-electron/electron-preload'
// },
// https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
ssr: {
// ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
// will mess up SSR
// extendSSRWebserverConf (esbuildConf) {},
// extendPackageJson (json) {},
pwa: false,
// manualStoreHydration: true,
// manualPostHydrationTrigger: true,
prodPort: 3e3,
// The default port that the production server should use
// (gets superseded if process.env.PORT is specified at runtime)
middlewares: [
"render"
// keep this as last one
]
},
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
pwa: {
workboxMode: "generateSW",
// or 'injectManifest'
injectPwaMetaTags: true,
swFilename: "sw.js",
manifestFilename: "manifest.json",
useCredentialsForManifestTag: false
// useFilenameHashes: true,
// extendGenerateSWOptions (cfg) {}
// extendInjectManifestOptions (cfg) {},
// extendManifestJson (json) {}
// extendPWACustomSWConf (esbuildConf) {}
},
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
cordova: {
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
},
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
capacitor: {
hideSplashscreen: true
},
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
electron: {
// extendElectronMainConf (esbuildConf)
// extendElectronPreloadConf (esbuildConf)
inspectPort: 5858,
bundler: "packager",
// 'packager' or 'builder'
packager: {
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
// OS X / Mac App Store
// appBundleId: '',
// appCategoryType: '',
// osxSign: '',
// protocol: 'myapp://path',
// Windows only
// win32metadata: { ... }
},
builder: {
// https://www.electron.build/configuration/configuration
appId: "salix-frontend"
}
},
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
bex: {
contentScripts: ["my-content-script"]
// extendBexScriptsConf (esbuildConf) {}
// extendBexManifestJson (json) {}
}
};
});
export {
quasar_config_default as default
};

View File

@ -9,6 +9,30 @@ vi.mock('src/composables/useSession', () => ({
}),
}));
// Mock axios
vi.mock('axios', () => ({
default: {
create: vi.fn(() => ({
interceptors: {
request: { use: vi.fn() },
response: { use: vi.fn() },
},
})),
interceptors: {
request: { use: vi.fn() },
response: { use: vi.fn() },
},
defaults: {
baseURL: '',
},
},
}));
vi.mock('src/router', () => ({
Router: {
push: vi.fn(),
},
}));
vi.mock('src/stores/useStateQueryStore', () => ({
useStateQueryStore: () => ({
add: () => vi.fn(),
@ -29,7 +53,7 @@ describe('Axios boot', () => {
'Accept-Language': 'en-US',
Authorization: 'DEFAULT_TOKEN',
},
})
}),
);
});
});

View File

@ -1,3 +1,4 @@
/* eslint-disable eslint/export */
export * from './defaults/qTable';
export * from './defaults/qInput';
export * from './defaults/qSelect';

View File

@ -13,13 +13,12 @@ import VnConfirm from './ui/VnConfirm.vue';
import { tMobile } from 'src/composables/tMobile';
import { useArrayData } from 'src/composables/useArrayData';
import { getDifferences, getUpdatedValues } from 'src/filters';
const { push } = useRouter();
const quasar = useQuasar();
const state = useState();
const stateStore = useStateStore();
const { t } = useI18n();
const { validate } = useValidator();
const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
@ -119,7 +118,7 @@ const defaultButtons = computed(() => ({
color: 'primary',
icon: 'save',
label: 'globals.save',
click: async () => await save(),
click: async (evt) => submitForm(evt),
type: 'submit',
},
reset: {
@ -132,6 +131,13 @@ const defaultButtons = computed(() => ({
...$props.defaultButtons,
}));
const submitForm = async (evt) => {
const isFormValid = await myForm.value.validate();
if (isFormValid) {
await save(evt);
}
};
onMounted(async () => {
nextTick(() => (componentIsRendered.value = true));
@ -227,10 +233,9 @@ async function save() {
const method = $props.urlCreate ? 'post' : 'patch';
const url =
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
let response;
if ($props.saveFn) response = await $props.saveFn(body);
else response = await axios[method](url, body);
const response = await Promise.resolve(
$props.saveFn ? $props.saveFn(body) : axios[method](url, body),
);
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
@ -307,11 +312,13 @@ async function onKeyup(evt) {
selectionStart = selectionEnd = selectionStart + 1;
return;
}
await save();
await myForm.value.submit(evt);
}
}
defineExpose({
submitForm,
myForm,
save,
isLoading,
hasChanges,
@ -325,7 +332,7 @@ defineExpose({
<QForm
ref="myForm"
v-if="formData"
@submit.prevent
@submit.prevent="save"
@keyup.prevent="onKeyup"
@reset="reset"
class="q-pa-md"
@ -339,6 +346,7 @@ defineExpose({
name="form"
:data="formData"
:validate="validate"
:validations="validations()"
:filter="filter"
/>
<SkeletonForm v-else />

View File

@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
emit('onDataSaved', formData, requestResponse);
};
const onClick = async (saveAndContinue) => {
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
await formModelRef.value.myForm.validate(true);
isSaveAndContinue.value = saveAndContinue;
await formModelRef.value.save();
if (formModelRef.value) {
await formModelRef.value.submitForm();
}
};
defineExpose({
@ -59,16 +62,23 @@ defineExpose({
ref="formModelRef"
:observe-form-changes="false"
:default-actions="false"
@submit="onClick"
v-bind="$attrs"
@on-data-saved="onDataSaved"
:prevent-submit="false"
>
<template #form="{ data, validate }">
<template #form="{ data, validate, validations }">
<span ref="closeButton" class="close-icon" v-close-popup>
<QIcon name="close" size="sm" />
</span>
<h1 class="title">{{ title }}</h1>
<p>{{ subtitle }}</p>
<slot name="form-inputs" :data="data" :validate="validate" />
<slot
name="form-inputs"
:data="data"
:validate="validate"
:validations="validations"
/>
<div class="q-mt-lg row justify-end">
<QBtn
:label="t('globals.cancel')"
@ -87,12 +97,13 @@ defineExpose({
:flat="showSaveAndContinueBtn"
:label="t('globals.save')"
:title="t('globals.save')"
@click="onClick(false)"
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
color="primary"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_save"
@click="showSaveAndContinueBtn ? onClick(false) : null"
z-max
/>
<QBtn
@ -100,12 +111,13 @@ defineExpose({
:label="t('globals.isSaveAndContinue')"
:title="t('globals.isSaveAndContinue')"
color="primary"
:type="showSaveAndContinueBtn ? 'submit' : 'button'"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_isSaveAndContinue"
@click="showSaveAndContinueBtn ? onClick(true) : null"
z-max
@click="onClick(true)"
/>
</div>
</template>

View File

@ -198,8 +198,7 @@ const setCategoryList = (data) => {
v-model="params.typeFk"
:options="itemTypesOptions"
dense
outlined
rounded
filled
use-input
:disable="!selectedCategoryFk"
@update:model-value="
@ -235,8 +234,7 @@ const setCategoryList = (data) => {
v-model="value.selectedTag"
:options="tagOptions"
dense
outlined
rounded
filled
:emit-value="false"
use-input
:is-clearable="false"
@ -252,8 +250,7 @@ const setCategoryList = (data) => {
option-value="value"
option-label="value"
dense
outlined
rounded
filled
emit-value
use-input
:disable="!value"
@ -265,7 +262,6 @@ const setCategoryList = (data) => {
v-model="value.value"
:label="t('components.itemsFilterPanel.value')"
:disable="!value"
is-outlined
:is-clearable="false"
@keyup.enter="applyTags(params, searchFn)"
/>

View File

@ -1,5 +1,5 @@
<script setup>
import { onMounted, ref } from 'vue';
import { onMounted, ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useState } from 'src/composables/useState';
import { useStateStore } from 'stores/useStateStore';
@ -18,6 +18,14 @@ const state = useState();
const user = state.getUser();
const appName = 'Lilium';
const pinnedModulesRef = ref();
const hostname = window.location.hostname;
const env = ref();
const getEnvironment = computed(() => {
env.value = hostname.split('-');
if (env.value.length <= 1) return;
return env.value[0];
});
onMounted(() => stateStore.setMounted());
const refresh = () => window.location.reload();
@ -49,6 +57,9 @@ const refresh = () => window.location.reload();
{{ t('globals.backToDashboard') }}
</QTooltip>
</QBtn>
<QBadge v-if="getEnvironment" color="primary" align="top">
{{ getEnvironment }}
</QBadge>
</RouterLink>
<VnBreadcrumbs v-if="$q.screen.gt.sm" />
<QSpinner

View File

@ -17,17 +17,6 @@ defineProps({ row: { type: Object, required: true } });
</QTooltip>
</QIcon>
</router-link>
<QIcon
v-if="row?.reserved"
color="primary"
name="vn:reserva"
size="xs"
data-cy="ticketSaleReservedIcon"
>
<QTooltip>
{{ t('ticketSale.reserved') }}
</QTooltip>
</QIcon>
<QIcon
v-if="row?.isDeleted"
color="primary"

View File

@ -55,6 +55,8 @@ const $props = defineProps({
},
});
const label = $props.showLabel && $props.column.label ? $props.column.label : '';
const defaultSelect = {
attrs: {
row: $props.row,
@ -62,7 +64,7 @@ const defaultSelect = {
class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
},
};
@ -74,7 +76,7 @@ const defaultComponents = {
class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
},
},
number: {
@ -84,7 +86,7 @@ const defaultComponents = {
class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
},
},
date: {
@ -96,7 +98,7 @@ const defaultComponents = {
class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
},
},
time: {
@ -105,7 +107,7 @@ const defaultComponents = {
disable: !$props.isEditable,
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
},
},
checkbox: {
@ -125,7 +127,7 @@ const defaultComponents = {
return defaultAttrs;
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
label,
autofocus: true,
},
events: {

View File

@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
:style="textAlignToFlex(align)"
>
<span :title="label">{{ label }}</span>
<div v-if="name && model?.index">
<div v-if="name && (model?.index || vertical)">
<QChip
:label="!vertical ? model?.index : ''"
:icon="
@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
:size="vertical ? '' : 'sm'"
:class="[
model?.index ? 'color-vn-text' : 'bg-transparent',
vertical ? 'q-px-none' : '',
vertical ? 'q-mx-none q-py-lg' : '',
]"
class="no-box-shadow"
:clickable="true"
style="min-width: 40px; max-height: 30px"
>
<div
class="column flex-center"
class="column justify-center text-center"
v-if="vertical"
:style="!model?.index && 'color: #5d5d5d'"
>

View File

@ -19,6 +19,7 @@ import { useQuasar, date } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { useFilterParams } from 'src/composables/useFilterParams';
import { dashIfEmpty, toDate } from 'src/filters';
import { useTableHeight } from './filters/useTableHeight';
import CrudModel from 'src/components/CrudModel.vue';
import FormModelPopup from 'components/FormModelPopup.vue';
@ -117,7 +118,7 @@ const $props = defineProps({
},
tableHeight: {
type: String,
default: '90vh',
default: undefined,
},
footer: {
type: Boolean,
@ -140,7 +141,7 @@ const $props = defineProps({
},
dataCy: {
type: String,
default: 'vn-table',
default: 'vnTable',
},
});
@ -166,6 +167,7 @@ const tableRef = ref();
const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app');
const tableHeight = useTableHeight();
const editingRow = ref(null);
const editingField = ref(null);
@ -633,6 +635,7 @@ const rowCtrlClickFunction = computed(() => {
:data-key="$attrs['data-key']"
:columns="columns"
:redirect="redirect"
v-bind="$attrs?.['table-filter']"
>
<template
v-for="(_, slotName) in $slots"
@ -677,14 +680,14 @@ const rowCtrlClickFunction = computed(() => {
table-header-class="bg-header"
card-container-class="grid-three"
flat
:style="isTableMode && `max-height: ${tableHeight}`"
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode"
@virtual-scroll="handleScroll"
@row-click="(event, row) => handleRowClick(event, row)"
@update:selected="emit('update:selected', $event)"
@selection="(details) => handleSelection(details, rows)"
:hide-selected-banner="true"
:data-cy="$props.dataCy ?? 'vnTable'"
:data-cy
>
<template #top-left v-if="!$props.withoutHeader">
<slot name="top-left"> </slot>
@ -781,6 +784,7 @@ const rowCtrlClickFunction = computed(() => {
text-overflow: ellipsis;
white-space: nowrap;
"
:data-cy="`vnTableCell_${col.name}`"
>
<slot
:name="`column-${col.name}`"
@ -895,7 +899,7 @@ const rowCtrlClickFunction = computed(() => {
{{ row[splittedColumns.title.name] }}
</span>
</QCardSection>
<!-- Fields -->
<!-- Fields -->
<QCardSection
class="q-pl-sm q-py-xs"
:class="$props.cardClass"
@ -1040,7 +1044,7 @@ const rowCtrlClickFunction = computed(() => {
:model="$attrs['data-key'] + 'Create'"
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
>
<template #form-inputs="{ data }">
<template #form-inputs="{ data, validations }">
<slot name="alter-create" :data="data">
<div :style="createComplement?.containerStyle">
<div
@ -1058,6 +1062,7 @@ const rowCtrlClickFunction = computed(() => {
:key="column.name"
:name="`column-create-${column.name}`"
:data="data"
:validations="validations"
:column-name="column.name"
:label="column.label"
>
@ -1154,7 +1159,7 @@ es:
.grid-create {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
max-width: 100%;
grid-gap: 20px;
margin: 0 auto;

View File

@ -26,7 +26,12 @@ function columnName(col) {
}
</script>
<template>
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
<VnFilterPanel
v-bind="$attrs"
:search-button="true"
:disable-submit-event="true"
:search-url
>
<template #body="{ params, orders, searchFn }">
<div
class="container"
@ -34,13 +39,20 @@ function columnName(col) {
:key="col.id"
>
<div class="filter">
<VnFilter
ref="tableFilterRef"
:column="col"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
:search-url="searchUrl"
/>
<slot
:name="`filter-${col.name}`"
:params="params"
:column-name="columnName(col)"
:search-fn
>
<VnFilter
ref="tableFilterRef"
:column="col"
:data-key="$attrs['data-key']"
v-model="params[columnName(col)]"
:search-url="searchUrl"
/>
</slot>
</div>
<div class="order">
<VnTableOrder
@ -77,13 +89,13 @@ function columnName(col) {
display: flex;
justify-content: center;
align-items: center;
height: 45px;
min-height: 45px;
gap: 10px;
}
.filter {
width: 70%;
height: 40px;
min-height: 40px;
text-align: center;
}
.order {

View File

@ -1,8 +1,7 @@
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';
import { default as axios } from 'axios';
describe('VnVisibleColumns', () => {
let wrapper;
let vm;

View File

@ -0,0 +1,18 @@
import { onMounted, nextTick, ref } from 'vue';
export function useTableHeight() {
const tableHeight = ref('90vh');
onMounted(async () => {
await nextTick();
let height = 100;
Array.from(document.querySelectorAll('[role="toolbar"]'))
.filter((element) => window.getComputedStyle(element).display !== 'none')
.forEach(() => {
height -= 10;
});
tableHeight.value = `${height}vh`;
});
return tableHeight;
}

View File

@ -1,4 +1,6 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import CrudModel from 'components/CrudModel.vue';
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';

View File

@ -1,4 +1,5 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import EditForm from 'components/EditTableCellValueForm.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';

View File

@ -1,4 +1,6 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import FilterItemForm from 'src/components/FilterItemForm.vue';
import { vi, beforeAll, describe, expect, it } from 'vitest';
@ -38,9 +40,9 @@ describe('FilterItemForm', () => {
{ relation: 'producer', scope: { fields: ['name'] } },
{ relation: 'ink', scope: { fields: ['name'] } },
],
where: {"name":{"like":"%bolas de madera%"}},
where: { name: { like: '%bolas de madera%' } },
};
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
params: { filter: JSON.stringify(expectedFilter) },
});
@ -79,4 +81,4 @@ describe('FilterItemForm', () => {
vm.selectItem({ id: 12345 });
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
});
});
});

View File

@ -1,5 +1,7 @@
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import FormModel from 'src/components/FormModel.vue';
describe('FormModel', () => {

View File

@ -1,6 +1,7 @@
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 { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
import { default as axios } from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import LeftMenu from 'components/LeftMenu.vue';
import * as vueRouter from 'vue-router';
import { useNavigationStore } from 'src/stores/useNavigationStore';
@ -101,7 +102,7 @@ function mount(source = 'main') {
vi.spyOn(axios, 'get').mockResolvedValue({
data: [],
});
const wrapper = createWrapper(Leftmenu, {
const wrapper = createWrapper(LeftMenu, {
propsData: {
source,
},
@ -164,7 +165,7 @@ describe('getRoutes', () => {
});
});
describe('Leftmenu as card', () => {
describe('LeftMenu as card', () => {
beforeAll(() => {
vm = mount('card').vm;
});
@ -173,7 +174,7 @@ describe('Leftmenu as card', () => {
vm.getRoutes();
});
});
describe('Leftmenu as main', () => {
describe('LeftMenu as main', () => {
beforeEach(() => {
vm = mount().vm;
});

View File

@ -60,7 +60,7 @@ async function confirm() {
v-model="address"
is-outlined
autofocus
data-cy="SendEmailNotifiactionDialogInput"
data-cy="SendEmailNotificationDialogInput"
/>
</QCardSection>
<QCardActions align="right">

View File

@ -1,15 +1,15 @@
<script setup>
import {useDialogPluginComponent} from 'quasar';
import {useI18n} from 'vue-i18n';
import {computed, ref} from 'vue';
import { useDialogPluginComponent } from 'quasar';
import { useI18n } from 'vue-i18n';
import { computed, ref } from 'vue';
import VnInput from 'components/common/VnInput.vue';
import axios from 'axios';
import useNotify from "composables/useNotify";
import useNotify from 'composables/useNotify';
const MESSAGE_MAX_LENGTH = 160;
const {t} = useI18n();
const {notify} = useNotify();
const { t } = useI18n();
const { notify } = useNotify();
const props = defineProps({
title: {
type: String,
@ -34,7 +34,7 @@ const props = defineProps({
});
const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
const {dialogRef, onDialogHide} = useDialogPluginComponent();
const { dialogRef, onDialogHide } = useDialogPluginComponent();
const smsRules = [
(val) => (val && val.length > 0) || t("The message can't be empty"),
@ -43,10 +43,10 @@ const smsRules = [
t("The message it's too long"),
];
const message = ref('');
const message = ref(t('routeDelay'));
const charactersRemaining = computed(
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size,
);
const charactersChipColor = computed(() => {
@ -114,7 +114,7 @@ const onSubmit = async () => {
<QTooltip>
{{
t(
'Special characters like accents counts as a multiple'
'Special characters like accents counts as a multiple',
)
}}
</QTooltip>
@ -144,7 +144,10 @@ const onSubmit = async () => {
max-width: 450px;
}
</style>
<i18n>
en:
routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience."
es:
Message: Mensaje
Send: Enviar
@ -153,4 +156,5 @@ es:
The destination can't be empty: El destinatario no puede estar vacio
The message can't be empty: El mensaje no puede estar vacio
The message it's too long: El mensaje es demasiado largo
</i18n>
routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias."
</i18n>

View File

@ -1,35 +1,14 @@
<script setup>
import { nextTick, ref } from 'vue';
import VnInput from './VnInput.vue';
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
const $props = defineProps({
insertable: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
const model = defineModel({ prop: 'modelValue' });
const inputRef = ref(false);
function setCursorPosition(pos) {
const input = inputRef.value.vnInputRef.$el.querySelector('input');
input.focus();
input.setSelectionRange(pos, pos);
}
async function handleUpdateModel(val) {
model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
await nextTick(() => setCursorPosition(0));
}
</script>
<template>
<VnInput
v-model="model"
ref="inputRef"
:insertable
@update:model-value="handleUpdateModel"
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
/>
</template>

View File

@ -1,12 +1,15 @@
<script setup>
import { onBeforeMount } from 'vue';
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
import { onBeforeMount, computed, markRaw } from 'vue';
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
import { useArrayData } from 'src/composables/useArrayData';
import { useStateStore } from 'stores/useStateStore';
import useCardSize from 'src/composables/useCardSize';
import VnSubToolbar from '../ui/VnSubToolbar.vue';
const emit = defineEmits(['onFetch']);
const props = defineProps({
id: { type: Number, required: false, default: null },
dataKey: { type: String, required: true },
url: { type: String, default: undefined },
idInWhere: { type: Boolean, default: false },
@ -16,26 +19,25 @@ const props = defineProps({
searchDataKey: { type: String, default: undefined },
searchbarProps: { type: Object, default: undefined },
redirectOnError: { type: Boolean, default: false },
visual: { type: Boolean, default: true },
});
const route = useRoute();
const stateStore = useStateStore();
const router = useRouter();
const arrayData = useArrayData(props.dataKey, {
url: props.url,
userFilter: props.filter,
oneRecord: true,
});
const entityId = computed(() => props.id || route?.params?.id);
let arrayData = getArrayData(entityId.value, props.url);
onBeforeRouteLeave(() => {
stateStore.cardDescriptorChangeValue(null);
});
onBeforeMount(async () => {
stateStore.cardDescriptorChangeValue(props.descriptor);
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
const route = router.currentRoute.value;
try {
await fetch(route.params.id);
await fetch(entityId.value);
} catch {
const { matched: matches } = route;
const { path } = matches.at(-1);
@ -51,24 +53,41 @@ onBeforeRouteUpdate(async (to, from) => {
router.push({ name, params: to.params });
}
}
const id = to.params.id;
if (id !== from.params.id) await fetch(id, true);
if (entityId.value !== to.params.id) await fetch(to.params.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}`);
else {
arrayData = getArrayData(id);
}
await arrayData.fetch({ append, updateRouter: false });
emit('onFetch', arrayData.store.data);
}
function hasRouteParam(params, valueToCheck = ':addressId') {
return Object.values(params).includes(valueToCheck);
}
function formatUrl(id) {
const newId = id || entityId.value;
const regex = /\/(\d+)/;
if (!regex.test(props.url)) return `${props.url}/${newId}`;
return props.url.replace(regex, `/${newId}`);
}
function getArrayData(id, url) {
return useArrayData(props.dataKey, {
url: url ?? formatUrl(id),
userFilter: props.filter,
oneRecord: true,
});
}
</script>
<template>
<VnSubToolbar />
<div :class="[useCardSize(), $attrs.class]">
<RouterView :key="$route.path" />
</div>
<template v-if="visual">
<VnSubToolbar />
<div :class="[useCardSize(), $attrs.class]">
<RouterView :key="$route.path" />
</div>
</template>
</template>

View File

@ -27,7 +27,11 @@ const checkboxModel = computed({
</script>
<template>
<div>
<QCheckbox v-bind="$attrs" v-model="checkboxModel" />
<QCheckbox
v-bind="$attrs"
v-model="checkboxModel"
:data-cy="$attrs['data-cy'] ?? `vnCheckbox${$attrs['label'] ?? ''}`"
/>
<QIcon
v-if="info"
v-bind="$attrs"

View File

@ -35,6 +35,10 @@ const $props = defineProps({
type: String,
default: null,
},
hasFile: {
type: Boolean,
default: false,
},
});
const warehouses = ref();
@ -90,6 +94,7 @@ function defaultData() {
if ($props.formInitialData) return (dms.value = $props.formInitialData);
return addDefaultData({
reference: route.params.id,
hasFile: $props.hasFile,
});
}

View File

@ -0,0 +1,166 @@
<script setup>
import VnConfirm from '../ui/VnConfirm.vue';
import VnInput from './VnInput.vue';
import VnDms from './VnDms.vue';
import axios from 'axios';
import { useQuasar } from 'quasar';
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { downloadFile } from 'src/composables/downloadFile';
const { t } = useI18n();
const quasar = useQuasar();
const documentDialogRef = ref({});
const editDownloadDisabled = ref(false);
const $props = defineProps({
defaultDmsCode: {
type: String,
default: 'invoiceIn',
},
disable: {
type: Boolean,
default: true,
},
data: {
type: Object,
default: null,
},
formRef: {
type: Object,
default: null,
},
});
function deleteFile(dmsFk) {
quasar
.dialog({
component: VnConfirm,
componentProps: {
title: t('globals.confirmDeletion'),
message: t('globals.confirmDeletionMessage'),
},
})
.onOk(async () => {
await axios.post(`dms/${dmsFk}/removeFile`);
$props.formRef.formData.dmsFk = null;
$props.formRef.formData.dms = undefined;
$props.formRef.hasChanges = true;
$props.formRef.save();
});
}
</script>
<template>
<div class="row no-wrap">
<VnInput
:label="t('Document')"
v-model="data.dmsFk"
clearable
clear-icon="close"
class="full-width"
:disable="disable"
/>
<div
v-if="data.dmsFk"
class="row no-wrap q-pa-xs q-gutter-x-xs"
data-cy="dms-buttons"
>
<QBtn
:disable="editDownloadDisabled"
@click="downloadFile(data.dmsFk)"
icon="cloud_download"
color="primary"
flat
:class="{
'no-pointer-events': editDownloadDisabled,
}"
padding="xs"
round
>
<QTooltip>{{ t('Download file') }}</QTooltip>
</QBtn>
<QBtn
:disable="editDownloadDisabled"
@click="
() => {
documentDialogRef.show = true;
documentDialogRef.dms = data.dms;
}
"
icon="edit"
color="primary"
flat
:class="{
'no-pointer-events': editDownloadDisabled,
}"
padding="xs"
round
>
<QTooltip>{{ t('Edit document') }}</QTooltip>
</QBtn>
<QBtn
:disable="editDownloadDisabled"
@click="deleteFile(data.dmsFk)"
icon="delete"
color="primary"
flat
round
:class="{
'no-pointer-events': editDownloadDisabled,
}"
padding="xs"
>
<QTooltip>{{ t('Delete file') }}</QTooltip>
</QBtn>
</div>
<QBtn
v-else
icon="add_circle"
color="primary"
flat
round
v-shortcut="'+'"
padding="xs"
@click="
() => {
documentDialogRef.show = true;
delete documentDialogRef.dms;
}
"
data-cy="dms-create"
>
<QTooltip>{{ t('Create document') }}</QTooltip>
</QBtn>
</div>
<QDialog v-model="documentDialogRef.show">
<VnDms
model="dms"
:default-dms-code="defaultDmsCode"
:form-initial-data="documentDialogRef.dms"
:url="
documentDialogRef.dms
? `Dms/${documentDialogRef.dms.id}/updateFile`
: 'Dms/uploadFile'
"
:description="documentDialogRef.supplierName"
@on-data-saved="
(_, { data }) => {
let dmsData = data;
if (Array.isArray(data)) dmsData = data[0];
formRef.formData.dmsFk = dmsData.id;
formRef.formData.dms = dmsData;
formRef.hasChanges = true;
formRef.save();
}
"
/>
</QDialog>
</template>
<i18n>
es:
Document: Documento
Download file: Descargar archivo
Edit document: Editar documento
Delete file: Eliminar archivo
Create document: Crear documento
</i18n>

View File

@ -0,0 +1,53 @@
<script setup>
import { ref } from 'vue';
import VnSelect from './VnSelect.vue';
const stateBtnDropdownRef = ref();
const emit = defineEmits(['changeState']);
const $props = defineProps({
disable: {
type: Boolean,
default: null,
},
options: {
type: Array,
default: null,
},
optionLabel: {
type: String,
default: 'name',
},
optionValue: {
type: String,
default: 'id',
},
});
async function changeState(value) {
stateBtnDropdownRef.value?.hide();
emit('changeState', value);
}
</script>
<template>
<QBtnDropdown
ref="stateBtnDropdownRef"
color="black"
text-color="white"
:label="$t('globals.changeState')"
:disable="$props.disable"
>
<VnSelect
:options="$props.options"
:option-label="$props.optionLabel"
:option-value="$props.optionValue"
hide-selected
hide-dropdown-icon
focus-on-mount
@update:model-value="changeState"
>
</VnSelect>
</QBtnDropdown>
</template>

View File

@ -84,7 +84,7 @@ const mixinRules = [
...($attrs.rules ?? []),
(val) => {
const maxlength = $props.maxlength;
if (maxlength && +val.length > maxlength)
if (maxlength && +val?.length > maxlength)
return t(`maxLength`, { value: maxlength });
const { min, max } = vnInputRef.value.$attrs;
if (!min) return null;

View File

@ -107,7 +107,7 @@ const manageDate = (date) => {
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
>
<template #append>
<QIcon

View File

@ -1,5 +1,5 @@
<script setup>
import { ref, onUnmounted, watch } from 'vue';
import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router';
import axios from 'axios';
@ -10,12 +10,12 @@ import { useColor } from 'src/composables/useColor';
import { useCapitalize } from 'src/composables/useCapitalize';
import { useValidator } from 'src/composables/useValidator';
import VnAvatar from '../ui/VnAvatar.vue';
import VnJsonValue from '../common/VnJsonValue.vue';
import FetchData from '../FetchData.vue';
import VnSelect from './VnSelect.vue';
import VnLogValue from './VnLogValue.vue';
import VnUserLink from '../ui/VnUserLink.vue';
import VnPaginate from '../ui/VnPaginate.vue';
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
import RightMenu from './RightMenu.vue';
import { useFilterParams } from 'src/composables/useFilterParams';
const stateStore = useStateStore();
const validationsStore = useValidator();
@ -72,39 +72,8 @@ const filter = {
};
const paginate = ref();
const actions = ref();
const changeInput = ref();
const searchInput = ref();
const userRadio = ref();
const userSelect = ref();
const dateFrom = ref();
const dateFromDialog = ref(false);
const dateTo = ref();
const dateToDialog = ref(false);
const selectedFilters = ref({});
const userTypes = [
{ label: 'All', value: undefined },
{ label: 'User', value: { neq: null } },
{ label: 'System', value: null },
];
const checkboxOptions = ref({
insert: {
label: 'Creates',
selected: false,
},
update: {
label: 'Edits',
selected: false,
},
delete: {
label: 'Deletes',
selected: false,
},
select: {
label: 'Accesses',
selected: false,
},
});
const dataKey = computed(() => `${props.model}Log`);
const userParams = ref(useFilterParams(dataKey.value).params);
let validations = models;
let pointRecord = ref(null);
@ -246,131 +215,55 @@ async function setLogTree(data) {
function filterByRecord(modelLog) {
byRecord.value = true;
const { id, model } = modelLog;
searchInput.value = id;
selectedFilters.value.changedModelId = id;
selectedFilters.value.changedModel = model;
applyFilter();
applyFilter({ changedModelId: id, changedModel: model });
}
async function applyFilter() {
filter.where = { and: [] };
if (
!selectedFilters.value.changedModel ||
(!selectedFilters.value.changedModelValue &&
!selectedFilters.value.changedModelId)
)
byRecord.value = false;
if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
if (Object.keys(selectedFilters.value).length) {
filter.where.and.push(selectedFilters.value);
}
paginate.value.fetch({ filter });
async function applyFilter(params = {}) {
paginate.value.arrayData.resetPagination();
paginate.value.arrayData.applyFilter({
filter: {},
params: { originFk: route.params.id, ...params },
});
}
function setDate(type) {
let from = dateFrom.value
? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
: undefined;
from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
let to = dateTo.value
? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
: date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
to = date.adjustDate(
to,
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
true,
);
switch (type) {
case 'from':
return { between: [from, to] };
case 'to': {
if (dateFrom.value) {
function exprBuilder(param, value) {
switch (param) {
case 'changedModelValue':
return { [param]: { like: `%${value}%` } };
case 'change':
if (value)
return {
between: [from, to],
or: [
{ oldJson: { like: `%${value}%` } },
{ newJson: { like: `%${value}%` } },
{ description: { like: `%${value}%` } },
],
};
}
return { lte: to };
}
break;
case 'action':
if (value?.length) return { [param]: { inq: value } };
break;
case 'from':
return { creationDate: { gte: value } };
case 'to':
return { creationDate: { lte: value } };
case 'userType':
if (value === 'User') return { userFk: { neq: null } };
if (value === 'System') return { userFk: null };
break;
default:
return { [param]: value };
}
}
function selectFilter(type, dateType) {
const filter = {};
const actions = { inq: [] };
let reload = true;
if (type === 'search') {
if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
selectedFilters.value.changedModelId = searchInput.value.trim();
} else if (!searchInput.value) {
selectedFilters.value.changedModelId = undefined;
selectedFilters.value.changedModelValue = undefined;
} else {
selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
}
}
if (type === 'action' && selectedFilters.value.changedModel === null) {
selectedFilters.value.changedModel = undefined;
}
if (type === 'userRadio') {
selectedFilters.value.userFk = userRadio.value;
}
if (type === 'change') {
if (changeInput.value)
selectedFilters.value.or = [
{ oldJson: { like: `%${changeInput.value}%` } },
{ newJson: { like: `%${changeInput.value}%` } },
{ description: { like: `%${changeInput.value}%` } },
];
else selectedFilters.value.or = undefined;
}
if (type === 'userSelect') {
selectedFilters.value.userFk =
userSelect.value !== null ? userSelect.value : undefined;
}
if (type === 'date') {
if (!dateFrom.value && !dateTo.value) {
selectedFilters.value.creationDate = undefined;
} else if (dateType === 'to') {
selectedFilters.value.creationDate = setDate('to');
} else if (dateType === 'from') {
selectedFilters.value.creationDate = setDate('from');
}
}
Object.keys(checkboxOptions.value).forEach((key) => {
if (checkboxOptions.value[key].selected) actions.inq.push(key);
});
selectedFilters.value.action = actions.inq.length ? actions : undefined;
Object.keys(selectedFilters.value).forEach((key) => {
if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
});
if (reload) applyFilter(filter);
}
async function clearFilter() {
selectedFilters.value = {};
byRecord.value = false;
userSelect.value = undefined;
searchInput.value = undefined;
changeInput.value = undefined;
dateFrom.value = undefined;
dateTo.value = undefined;
userRadio.value = undefined;
Object.keys(checkboxOptions.value).forEach(
(opt) => (checkboxOptions.value[opt].selected = false),
);
await applyFilter();
}
onMounted(() => {
stateStore.rightDrawerChangeValue(true);
});
onUnmounted(() => {
stateStore.rightDrawer = false;
});
@ -383,32 +276,18 @@ watch(
);
</script>
<template>
<FetchData
:url="`${props.model}Logs/${route.params.id}/models`"
:filter="{ order: ['changedModel'] }"
@on-fetch="
(data) =>
(actions = data.map((item) => {
const changedModel = item.changedModel;
return {
locale: useCapitalize(
validations[changedModel]?.locale?.name ?? changedModel,
),
value: changedModel,
};
}))
"
auto-load
/>
<VnPaginate
ref="paginate"
:data-key="`${model}Log`"
:url="`${model}Logs`"
:data-key
:url="dataKey + 's'"
:user-filter="filter"
:skeleton="false"
auto-load
@on-fetch="setLogTree"
@on-change="setLogTree"
search-url="logs"
:exprBuilder
:order="['creationDate DESC', 'id DESC']"
>
<template #body>
<div
@ -467,6 +346,7 @@ watch(
backgroundColor: useColor(modelLog.model),
}"
:title="`${modelLog.model} #${modelLog.id}`"
data-cy="vnLog-model-chip"
>
{{ t(modelLog.modelI18n) }}
</QChip>
@ -560,10 +440,9 @@ watch(
value.nameI18n
}}:
</span>
<VnJsonValue
:value="
value.val.val
"
<VnLogValue
:value="value.val"
:name="value.name"
/>
</QItem>
</QCardSection>
@ -581,6 +460,7 @@ watch(
}`,
)
"
data-cy="vnLog-action-icon"
/>
</div>
</QItem>
@ -614,7 +494,10 @@ watch(
>
{{ prop.nameI18n }}:
</span>
<VnJsonValue :value="prop.val.val" />
<VnLogValue
:value="prop.val"
:name="prop.name"
/>
<span
v-if="
propIndex <
@ -642,8 +525,9 @@ watch(
{{ prop.nameI18n }}:
</span>
<span v-if="log.action == 'update'">
<VnJsonValue
:value="prop.old.val"
<VnLogValue
:value="prop.old"
:name="prop.name"
/>
<span
v-if="prop.old.id"
@ -652,8 +536,9 @@ watch(
#{{ prop.old.id }}
</span>
<VnJsonValue
:value="prop.val.val"
<VnLogValue
:value="prop.val"
:name="prop.name"
/>
<span
v-if="prop.val.id"
@ -663,8 +548,9 @@ watch(
</span>
</span>
<span v-else="prop.old.val">
<VnJsonValue
:value="prop.val.val"
<VnLogValue
:value="prop.val"
:name="prop.name"
/>
<span
v-if="prop.old.id"
@ -692,176 +578,12 @@ watch(
</VnPaginate>
<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.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">
<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"
>
<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>
<VnLogFilter :data-key />
</template>
</RightMenu>
<QDialog v-model="dateFromDialog">
<QDate
:years-in-month-view="false"
v-model="dateFrom"
dense
flat
minimal
@update:model-value="
(value) => {
dateFromDialog = false;
dateFrom = date.formatDate(value, 'DD-MM-YYYY');
selectFilter('date', 'from');
}
"
/>
</QDialog>
<QDialog v-model="dateToDialog">
<QDate
v-model="dateTo"
dense
flat
minimal
@update:model-value="
(value) => {
dateToDialog = false;
dateTo = date.formatDate(value, 'DD-MM-YYYY');
selectFilter('date', 'to');
}
"
/>
</QDialog>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn
v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
color="primary"
icon="filter_alt_off"
size="md"

View File

@ -1,77 +1,249 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnTableFilter from '../VnTable/VnTableFilter.vue';
import VnSelect from './VnSelect.vue';
import { useRoute } from 'vue-router';
import VnInput from './VnInput.vue';
import { ref, computed, watch } from 'vue';
import VnInputDate from './VnInputDate.vue';
import { useFilterParams } from 'src/composables/useFilterParams';
import FetchData from '../FetchData.vue';
import { useValidator } from 'src/composables/useValidator';
import { useCapitalize } from 'src/composables/useCapitalize';
import VnAvatar from '../ui/VnAvatar.vue';
const { t } = useI18n();
const props = defineProps({
const $props = defineProps({
dataKey: {
type: String,
required: true,
default: null,
},
});
const workers = ref();
const { t } = useI18n();
const route = useRoute();
const validationsStore = useValidator();
const { models } = validationsStore;
const entities = ref([]);
const editors = ref([]);
const userParams = ref(useFilterParams($props.dataKey).params);
let validations = models;
const userTypes = [
{ value: 'All', label: t(`Users.All`) },
{ value: 'User', label: t(`Users.User`) },
{ value: 'System', label: t(`Users.System`) },
];
const checkboxOptions = ref([
{ name: 'insert', label: 'Creates', selected: false },
{ name: 'update', label: 'Edits', selected: false },
{ name: 'delete', label: 'Deletes', selected: false },
{ name: 'select', label: 'Accesses', selected: false },
]);
const columns = computed(() => [
{ name: 'changedModelValue' },
{ name: 'changedModel' },
{ name: 'userType', orderBy: false },
{ name: 'userFk' },
{ name: 'change', orderBy: false },
{ name: 'action' },
{ name: 'from', orderBy: 'creationDate' },
{ name: 'to', orderBy: 'creationDate' },
]);
const userParamsWatcher = watch(
() => userParams.value,
(params) => {
if (params.action) {
params.action.forEach((option) => {
checkboxOptions.value.find((o) => o.name === option).selected = true;
});
userParamsWatcher();
}
},
);
function getActions() {
const actions = checkboxOptions.value
.filter((option) => option.selected)
?.map((o) => o.name);
return actions.length ? actions : null;
}
</script>
<template>
<FetchData
url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }"
@on-fetch="(data) => (workers = data)"
:url="`${dataKey}s/${route.params.id}/models`"
:filter="{ order: ['changedModel'] }"
@on-fetch="
(data) =>
(entities = data.map((item) => {
const changedModel = item.changedModel;
return {
locale: useCapitalize(
validations[changedModel]?.locale?.name ?? changedModel,
),
value: changedModel,
};
}))
"
auto-load
/>
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
<FetchData
:url="`${dataKey}s/${route.params.id}/editors`"
:filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
sort-by="nickname"
@on-fetch="(data) => (editors = data)"
auto-load
/>
<VnTableFilter
v-if="dataKey"
:data-key
:columns="columns"
:redirect="false"
:hiddenTags="['originFk', 'creationDate']"
search-url="logs"
:showTagChips="false"
>
<template #filter-changedModelValue="{ params, columnName, searchFn }">
<VnInput
:label="t('globals.search')"
v-model="params[columnName]"
@keyup.enter="searchFn"
@blur="searchFn"
@remove="searchFn"
:info="t('tooltips.search')"
dense
filled
data-cy="vnLog-search"
/>
</template>
<template #filter-changedModel="{ params, columnName, searchFn }">
<VnSelect
:label="t('globals.entity')"
v-model="params[columnName]"
option-label="locale"
option-value="value"
:options="entities"
@update:model-value="() => searchFn()"
dense
filled
data-cy="vnLog-entity"
/>
</template>
<template #filter-userType="{ params, columnName, searchFn }">
<QOptionGroup
class="text-left"
size="sm"
v-model="params[columnName]"
:options="userTypes"
color="primary"
@update:model-value="
() => {
params.userFk = null;
searchFn();
}
"
/>
</template>
<template #filter-userFk="{ params, columnName, searchFn }">
<VnSelect
:label="t('globals.user')"
v-model="params[columnName]"
:options="editors"
@update:modelValue="() => searchFn()"
:disable="params.userType === 'System'"
dense
filled
>
<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>
</template>
<template #filter-change="{ params, columnName, searchFn }">
<VnInput
:label="t('globals.changes')"
v-model="params[columnName]"
@keyup.enter="searchFn"
@blur="searchFn"
@remove="searchFn"
:info="t('tooltips.changes')"
dense
filled
/>
</template>
<template #filter-action="{ searchFn }">
<div class="column">
<QCheckbox
v-for="checkboxOption in checkboxOptions"
:key="checkboxOption"
size="sm"
v-model="checkboxOption.selected"
:label="t(`actions.${checkboxOption.label}`)"
@update:model-value="
() => searchFn(undefined, 'action', getActions())
"
data-cy="vnLog-checkbox"
/>
</div>
</template>
<template #body="{ params, searchFn }">
<QDate
v-model="params.created"
@update:model-value="searchFn()"
<template #filter-from="{ params, columnName, searchFn }">
<VnInputDate
:label="t('globals.from')"
v-model="params[columnName]"
dense
flat
minimal
>
</QDate>
<QSeparator />
<QItem>
<QItemSection v-if="!workers">
<QSkeleton type="QInput" class="full-width" />
</QItemSection>
<QItemSection v-if="workers">
<QSelect
:label="t('User')"
v-model="params.userFk"
@update:model-value="searchFn()"
:options="workers"
option-value="id"
option-label="name"
emit-value
map-options
use-input
:input-debounce="0"
/>
</QItemSection>
</QItem>
filled
@update:modelValue="() => searchFn()"
/>
</template>
</VnFilterPanel>
<template #filter-to="{ params, columnName, searchFn }">
<VnInputDate
:label="t('globals.to')"
v-model="params[columnName]"
dense
filled
@update:modelValue="() => searchFn()"
/>
</template>
</VnTableFilter>
</template>
<i18n>
en:
params:
search: Contains
userFk: User
created: Created
es:
tooltips:
search: Buscar por identificador o concepto
changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
actions:
Creates: Crea
Edits: Modifica
Deletes: Elimina
Accesses: Accede
Users:
User: Usuario
All: Todo
System: Sistema
params:
search: Contiene
userFk: Usuario
created: Creada
User: Usuario
changedModel: Entity
en:
tooltips:
search: Search by identifier or concept
changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
actions:
Creates: Creates
Edits: Edits
Deletes: Deletes
Accesses: Accesses
Users:
User: User
All: All
System: System
params:
changedModel: Entidad
</i18n>

View File

@ -0,0 +1,28 @@
<script setup>
import { useDescriptorStore } from 'src/stores/useDescriptorStore';
import VnJsonValue from './VnJsonValue.vue';
import { computed } from 'vue';
const descriptorStore = useDescriptorStore();
const $props = defineProps({
value: { type: Object, default: () => {} },
name: { type: String, default: undefined },
});
const descriptor = computed(() => descriptorStore.has($props.name));
</script>
<template>
<VnJsonValue :value="value.val" />
<span
v-if="(value.id || typeof value.val == 'number') && descriptor"
style="margin-left: 2px"
>
<QIcon
name="launch"
class="link"
:data-cy="'iconLaunch-' + $props.name"
style="padding-bottom: 2px"
/>
<component :is="descriptor" :id="value.id ?? value.val" />
</span>
</template>

View File

@ -40,10 +40,6 @@ const $props = defineProps({
type: Boolean,
default: true,
},
keepData: {
type: Boolean,
default: true,
},
});
const route = useRoute();
@ -61,7 +57,6 @@ onBeforeMount(() => {
if ($props.dataKey)
arrayData = useArrayData($props.dataKey, {
searchUrl: 'table',
keepData: $props.keepData,
...$props.arrayDataProps,
navigate: $props.redirect,
});

View File

@ -152,6 +152,10 @@ const value = computed({
},
});
const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC';
});
watch(options, (newValue) => {
setOptions(newValue);
});
@ -186,7 +190,7 @@ function findKeyInOptions() {
}
function setOptions(data) {
data = dataByOrder(data, $props.sortBy);
data = dataByOrder(data, computedSortBy.value);
myOptions.value = JSON.parse(JSON.stringify(data));
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
emit('update:options', data);
@ -216,7 +220,8 @@ function filter(val, options) {
async function fetchFilter(val) {
if (!$props.url) return;
const { fields, include, sortBy, limit } = $props;
const { fields, include, limit } = $props;
const sortBy = computedSortBy.value;
const key =
optionFilterValue.value ??
(new RegExp(/\d/g).test(val)

View File

@ -1,4 +1,5 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
import { Notify } from 'quasar';

View File

@ -1,4 +1,5 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
import VnDms from 'src/components/common/VnDms.vue';
@ -40,7 +41,10 @@ describe('VnDms', () => {
companyFk: 2,
dmsTypeFk: 3,
description: 'This is a test description',
files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
files: {
name: 'example.txt',
content: new Blob(['file content'], { type: 'text/plain' }),
},
};
const expectedBody = {
@ -59,7 +63,7 @@ describe('VnDms', () => {
url: '/test',
formInitialData: { id: 1, reference: 'test' },
model: 'Worker',
}
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
@ -98,7 +102,7 @@ describe('VnDms', () => {
expect(vm.getUrl()).toBe('/test');
});
it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {
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');
});
@ -113,7 +117,9 @@ describe('VnDms', () => {
describe('save', () => {
it('should save data correctly', async () => {
await vm.save();
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
params: expectedBody,
});
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
});
});
@ -127,8 +133,8 @@ describe('VnDms', () => {
warehouseFk: 2,
companyFk: 3,
dmsTypeFk: 2,
description: 'This is a test description'
}
description: 'This is a test description',
};
await wrapper.setProps({ formInitialData: testData });
vm.defaultData();
@ -137,10 +143,10 @@ describe('VnDms', () => {
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.route.params.id = '111';
vm.defaultData();
expect(vm.dms.reference).toBe('111');
});
});
});
});

View File

@ -1,15 +1,20 @@
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import VnDmsList from 'src/components/common/VnDmsList.vue';
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
describe('VnDmsList', () => {
let vm;
const dms = {
userFk: 1,
name: 'DMS 1'
const dms = {
userFk: 1,
name: 'DMS 1',
};
beforeAll(() => {
vi.mock('src/composables/getUrl', () => ({
getUrl: vi.fn().mockResolvedValue(''),
}));
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
vm = createWrapper(VnDmsList, {
props: {
@ -18,8 +23,8 @@ describe('VnDmsList', () => {
filter: 'wd.workerFk',
updateModel: 'Workers',
deleteModel: 'WorkerDms',
downloadModel: 'WorkerDms'
}
downloadModel: 'WorkerDms',
},
}).vm;
});
@ -29,46 +34,45 @@ describe('VnDmsList', () => {
describe('setData()', () => {
const data = [
{
userFk: 1,
{
userFk: 1,
name: 'Jessica',
lastName: 'Jones',
file: '4.jpg',
created: '2021-07-28 21:00:00'
created: '2021-07-28 21:00:00',
},
{
userFk: 2,
{
userFk: 2,
name: 'Bruce',
lastName: 'Banner',
created: '2022-07-28 21:00:00',
dms: {
userFk: 2,
userFk: 2,
name: 'Bruce',
lastName: 'BannerDMS',
created: '2022-07-28 21:00:00',
file: '4.jpg',
}
},
},
{
userFk: 3,
name: 'Natasha',
lastName: 'Romanoff',
file: '4.jpg',
created: '2021-10-28 21:00:00'
}
]
created: '2021-10-28 21:00:00',
},
];
it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
vm.setData(data);
expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
expect([vm.rows][0][1].lastName).toEqual('Romanoff');
});
});
describe('parseDms()', () => {
const resultDms = { ...dms, userId:1};
const resultDms = { ...dms, userId: 1 };
it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
const parsedDms = vm.parseDms(dms);
expect(parsedDms).toEqual(resultDms);
@ -76,12 +80,12 @@ describe('VnDmsList', () => {
});
describe('showFormDialog()', () => {
const resultDms = { ...dms, userId:1};
const resultDms = { ...dms, userId: 1 };
it('should call fn parseDms() and set show true if dms is defined', () => {
vm.showFormDialog(dms);
expect(vm.formDialog.show).toEqual(true);
expect(vm.formDialog.dms).toEqual(resultDms);
});
});
});
});

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnLog from 'src/components/common/VnLog.vue';
describe('VnLog', () => {
@ -108,27 +109,4 @@ describe('VnLog', () => {
expect(vm.logTree[0].originFk).toEqual(1);
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
});
it('should correctly set the selectedFilters when filtering', () => {
vm.searchInput = '1';
vm.userSelect = '21';
vm.checkboxOptions.insert.selected = true;
vm.checkboxOptions.update.selected = true;
vm.selectFilter('search');
vm.selectFilter('userSelect');
expect(vm.selectedFilters.changedModelId).toEqual('1');
expect(vm.selectedFilters.userFk).toEqual('21');
expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
});
it('should correctly set the date from', () => {
vm.dateFrom = '18-09-2023';
vm.selectFilter('date', 'from');
expect(vm.selectedFilters.creationDate.between).toEqual([
new Date('2023-09-18T00:00:00.000Z'),
new Date('2023-09-18T21:59:59.999Z'),
]);
});
});

View File

@ -0,0 +1,28 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
describe('VnLogFilter', () => {
let vm;
beforeAll(async () => {
vm = createWrapper(VnLogFilter, {
props: {
dataKey: 'ClaimLog',
},
}).vm;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should getActions selected', async () => {
vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
const actions = vm.getActions();
expect(actions.length).toEqual(2);
expect(actions).toEqual(['insert', 'update']);
});
});

View File

@ -0,0 +1,26 @@
import { describe, it, expect } from 'vitest';
import VnLogValue from 'src/components/common/VnLogValue.vue';
import { createWrapper } from 'app/test/vitest/helper';
const buildComponent = (props) => {
return createWrapper(VnLogValue, {
props,
global: {},
}).wrapper;
};
describe('VnLogValue', () => {
const id = 1;
it('renders without descriptor', async () => {
expect(getIcon('inventFk').exists()).toBe(false);
});
it('renders with descriptor', async () => {
expect(getIcon('claimFk').text()).toBe('launch');
});
function getIcon(name) {
const wrapper = buildComponent({ value: { val: id }, name });
return wrapper.find('.q-icon');
}
});

View File

@ -1,16 +1,7 @@
import {
describe,
it,
expect,
vi,
beforeAll,
afterEach,
beforeEach,
afterAll,
} from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import VnNotes from 'src/components/ui/VnNotes.vue';
import vnDate from 'src/boot/vnDate';
describe('VnNotes', () => {
let vm;
@ -18,6 +9,7 @@ describe('VnNotes', () => {
let spyFetch;
let postMock;
let patchMock;
let deleteMock;
let expectedInsertBody;
let expectedUpdateBody;
const defaultOptions = {
@ -57,6 +49,7 @@ describe('VnNotes', () => {
beforeEach(() => {
postMock = vi.spyOn(axios, 'post');
patchMock = vi.spyOn(axios, 'patch');
deleteMock = vi.spyOn(axios, 'delete');
});
afterEach(() => {
@ -153,4 +146,16 @@ describe('VnNotes', () => {
);
});
});
describe('delete', () => {
it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
generateWrapper();
createSpyFetch();
await vm.deleteNote({ id: 1 });
expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
expect(spyFetch).toHaveBeenCalled();
});
});
});

View File

@ -1,363 +1,38 @@
<script setup>
import { onBeforeMount, watch, computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
import { useArrayData } from 'composables/useArrayData';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useState } from 'src/composables/useState';
import { useRoute, useRouter } from 'vue-router';
import { useClipboard } from 'src/composables/useClipboard';
import VnMoreOptions from './VnMoreOptions.vue';
import { ref } from 'vue';
import VnDescriptor from './VnDescriptor.vue';
const $props = defineProps({
url: {
type: String,
default: '',
},
filter: {
type: Object,
default: null,
},
title: {
type: String,
default: '',
},
subtitle: {
id: {
type: Number,
default: null,
default: false,
},
dataKey: {
type: String,
default: null,
},
summary: {
card: {
type: Object,
default: null,
},
width: {
type: String,
default: 'md-width',
},
toModule: {
type: String,
default: null,
},
});
const state = useState();
const route = useRoute();
const router = useRouter();
const { t } = useI18n();
const { copyText } = useClipboard();
const { viewSummary } = useSummaryDialog();
let arrayData;
let store;
let entity;
const isLoading = ref(false);
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
const DESCRIPTOR_PROXY = 'DescriptorProxy';
const moduleName = ref();
const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
defineExpose({ getData });
onBeforeMount(async () => {
arrayData = useArrayData($props.dataKey, {
url: $props.url,
userFilter: $props.filter,
skip: 0,
oneRecord: true,
});
store = arrayData.store;
entity = computed(() => {
const data = store.data ?? {};
if (data) emit('onFetch', data);
return data;
});
// It enables to load data only once if the module is the same as the dataKey
if (!isSameDataKey.value || !route.params.id) await getData();
watch(
() => [$props.url, $props.filter],
async () => {
if (!isSameDataKey.value) await getData();
},
);
});
function getName() {
let name = $props.dataKey;
if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
name = name.split(DESCRIPTOR_PROXY)[0];
}
return name;
}
const routeName = computed(() => {
let routeName = getName();
return `${routeName}Summary`;
});
async function getData() {
store.url = $props.url;
store.filter = $props.filter ?? {};
isLoading.value = true;
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
state.set($props.dataKey, data);
emit('onFetch', data);
} finally {
isLoading.value = false;
}
}
function getValueFromPath(path) {
if (!path) return;
const keys = path.toString().split('.');
let current = entity.value;
for (const key of keys) {
if (current[key] === undefined) return undefined;
else current = current[key];
}
return current;
}
function copyIdText(id) {
copyText(id, {
component: {
copyValue: id,
},
});
}
const emit = defineEmits(['onFetch']);
const iconModule = computed(() => {
moduleName.value = getName();
if ($props.toModule) {
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
}
if (isSameModuleName) {
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
?.meta?.icon;
} else {
return route.matched[1].meta.icon;
}
});
const toModule = computed(() => {
moduleName.value = getName();
if ($props.toModule) return $props.toModule;
if (isSameModuleName) {
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
?.redirect;
} else {
return route.matched[1].path.split('/').length > 2
? route.matched[1].redirect
: route.matched[1].children[0].redirect;
}
});
const entity = ref();
</script>
<template>
<div class="descriptor">
<template v-if="entity && !isLoading">
<div class="header bg-primary q-pa-sm justify-between">
<slot name="header-extra-action">
<QBtn
round
flat
dense
size="md"
:icon="iconModule"
color="white"
class="link"
:to="toModule"
>
<QTooltip>
{{ t('globals.goToModuleIndex') }}
</QTooltip>
</QBtn>
</slot>
<QBtn
@click.stop="viewSummary(entity.id, $props.summary, $props.width)"
round
flat
dense
size="md"
icon="preview"
color="white"
class="link"
v-if="summary"
data-cy="openSummaryBtn"
>
<QTooltip>
{{ t('components.smartCard.openSummary') }}
</QTooltip>
</QBtn>
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
<QBtn
class="link"
color="white"
dense
flat
icon="launch"
round
size="md"
data-cy="goToSummaryBtn"
>
<QTooltip>
{{ t('components.cardDescriptor.summary') }}
</QTooltip>
</QBtn>
</RouterLink>
<VnMoreOptions v-if="$slots.menu">
<template #menu="{ menuRef }">
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
</template>
</VnMoreOptions>
</div>
<slot name="before" />
<div class="body q-py-sm">
<QList dense>
<QItemLabel header class="ellipsis text-h5" :lines="1">
<div class="title">
<span v-if="$props.title" :title="getValueFromPath(title)">
{{ getValueFromPath(title) ?? $props.title }}
</span>
<slot v-else name="description" :entity="entity">
<span :title="entity.name">
{{ entity.name }}
</span>
</slot>
</div>
</QItemLabel>
<QItem>
<QItemLabel class="subtitle">
#{{ getValueFromPath(subtitle) ?? entity.id }}
</QItemLabel>
<QBtn
round
flat
dense
size="sm"
icon="content_copy"
color="primary"
@click.stop="copyIdText(entity.id)"
>
<QTooltip>
{{ t('globals.copyId') }}
</QTooltip>
</QBtn>
</QItem>
</QList>
<div class="list-box q-mt-xs">
<slot name="body" :entity="entity" />
</div>
</div>
<div class="icons">
<slot name="icons" :entity="entity" />
</div>
<div class="actions justify-center" data-cy="descriptor_actions">
<slot name="actions" :entity="entity" />
</div>
<slot name="after" />
</template>
<SkeletonDescriptor v-if="!entity || isLoading" />
</div>
<QInnerLoading
:label="t('globals.pleaseWait')"
:showing="isLoading"
color="primary"
/>
</template>
<style lang="scss">
.body {
background-color: var(--vn-section-color);
.text-h5 {
font-size: 20px;
padding-top: 5px;
padding-bottom: 0px;
}
.q-item {
min-height: 20px;
.link {
margin-left: 10px;
}
}
.vn-label-value {
display: flex;
padding: 0px 16px;
.label {
color: var(--vn-label-color);
font-size: 14px;
&:not(:has(a))::after {
content: ':';
<component
:is="card"
:id
:visual="false"
v-bind="$attrs"
@on-fetch="
(data) => {
entity = data;
emit('onFetch', data);
}
}
.value {
color: var(--vn-text-color);
font-size: 14px;
margin-left: 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
}
.info {
margin-left: 5px;
}
}
}
</style>
<style lang="scss" scoped>
.title {
overflow: hidden;
text-overflow: ellipsis;
span {
color: var(--vn-text-color);
font-weight: bold;
}
}
.subtitle {
color: var(--vn-text-color);
font-size: 16px;
margin-bottom: 2px;
}
.list-box {
.q-item__label {
color: var(--vn-label-color);
padding-bottom: 0%;
}
}
.descriptor {
width: 256px;
.header {
display: flex;
align-items: center;
}
.icons {
margin: 0 10px;
display: flex;
justify-content: center;
.q-icon {
margin-right: 5px;
}
}
.actions {
margin: 0 5px;
justify-content: center !important;
}
}
</style>
<i18n>
en:
globals:
copyId: Copy ID
es:
globals:
copyId: Copiar ID
</i18n>
"
/>
<VnDescriptor v-model="entity" v-bind="$attrs">
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</VnDescriptor>
</template>

View File

@ -159,6 +159,7 @@ async function fetch() {
display: flex;
flex-direction: row;
margin-top: 2px;
align-items: start;
.label {
color: var(--vn-label-color);
width: 9em;
@ -169,9 +170,15 @@ async function fetch() {
flex-grow: 0;
flex-shrink: 0;
}
&.ellipsis > .value {
text-overflow: ellipsis;
white-space: pre;
}
.value {
color: var(--vn-text-color);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.header {
@ -201,6 +208,23 @@ async function fetch() {
}
}
}
.vn-card-group {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 16px;
}
.vn-card-content {
display: flex;
flex-direction: column;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
> div {
max-height: 70px;
}
}
</style>
<style lang="scss" scoped>
.summaryHeader .vn-label-value {

View File

@ -0,0 +1,78 @@
<script setup>
import { onBeforeMount, watch, computed, ref } from 'vue';
import { useArrayData } from 'composables/useArrayData';
import { useState } from 'src/composables/useState';
import { useRoute } from 'vue-router';
import VnDescriptor from './VnDescriptor.vue';
const $props = defineProps({
url: {
type: String,
default: '',
},
filter: {
type: Object,
default: null,
},
dataKey: {
type: String,
default: null,
},
});
const state = useState();
const route = useRoute();
let arrayData;
let store;
let entity;
const isLoading = ref(false);
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
defineExpose({ getData });
onBeforeMount(async () => {
arrayData = useArrayData($props.dataKey, {
url: $props.url,
userFilter: $props.filter,
skip: 0,
oneRecord: true,
});
store = arrayData.store;
entity = computed(() => {
const data = store.data ?? {};
if (data) emit('onFetch', data);
return data;
});
// It enables to load data only once if the module is the same as the dataKey
if (!isSameDataKey.value || !route.params.id) await getData();
watch(
() => [$props.url, $props.filter],
async () => {
if (!isSameDataKey.value) await getData();
},
);
});
async function getData() {
store.url = $props.url;
store.filter = $props.filter ?? {};
isLoading.value = true;
try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
state.set($props.dataKey, data);
emit('onFetch', data);
} finally {
isLoading.value = false;
}
}
const emit = defineEmits(['onFetch']);
</script>
<template>
<VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template>
</VnDescriptor>
</template>

View File

@ -0,0 +1,322 @@
<script setup>
import { computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useRoute, useRouter } from 'vue-router';
import { useClipboard } from 'src/composables/useClipboard';
import VnMoreOptions from './VnMoreOptions.vue';
const entity = defineModel({ type: Object, default: null });
const $props = defineProps({
title: {
type: String,
default: '',
},
subtitle: {
type: Number,
default: null,
},
summary: {
type: Object,
default: null,
},
width: {
type: String,
default: 'md-width',
},
module: {
type: String,
default: null,
},
toModule: {
type: Object,
default: null,
},
});
const route = useRoute();
const router = useRouter();
const { t } = useI18n();
const { copyText } = useClipboard();
const { viewSummary } = useSummaryDialog();
const DESCRIPTOR_PROXY = 'DescriptorProxy';
const moduleName = ref();
const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
function getName() {
let name = $props.module;
if ($props.module.includes(DESCRIPTOR_PROXY)) {
name = name.split(DESCRIPTOR_PROXY)[0];
}
return name;
}
const routeName = computed(() => {
let routeName = getName();
return `${routeName}Summary`;
});
function getValueFromPath(path) {
if (!path) return;
const keys = path.toString().split('.');
let current = entity.value;
for (const key of keys) {
if (current[key] === undefined) return undefined;
else current = current[key];
}
return current;
}
function copyIdText(id) {
copyText(id, {
component: {
copyValue: id,
},
});
}
const emit = defineEmits(['onFetch']);
const iconModule = computed(() => {
moduleName.value = getName();
if ($props.toModule) {
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
}
if (isSameModuleName) {
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
?.meta?.icon;
} else {
return route.matched[1].meta.icon;
}
});
const toModule = computed(() => {
moduleName.value = getName();
if ($props.toModule) return $props.toModule;
if (isSameModuleName) {
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
?.redirect;
} else {
return route.matched[1].path.split('/').length > 2
? route.matched[1].redirect
: route.matched[1].children[0].redirect;
}
});
</script>
<template>
<div class="descriptor" data-cy="vnDescriptor">
<template v-if="entity && entity?.id">
<div class="header bg-primary q-pa-sm justify-between">
<slot name="header-extra-action">
<QBtn
round
flat
dense
size="md"
:icon="iconModule"
color="white"
class="link"
:to="toModule"
>
<QTooltip>
{{ t('globals.goToModuleIndex') }}
</QTooltip>
</QBtn>
</slot>
<QBtn
@click.stop="viewSummary(entity.id, summary, width)"
round
flat
dense
size="md"
icon="preview"
color="white"
class="link"
v-if="summary"
data-cy="openSummaryBtn"
>
<QTooltip>
{{ t('components.smartCard.openSummary') }}
</QTooltip>
</QBtn>
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
<QBtn
class="link"
color="white"
dense
flat
icon="launch"
round
size="md"
data-cy="goToSummaryBtn"
>
<QTooltip>
{{ t('components.vnDescriptor.summary') }}
</QTooltip>
</QBtn>
</RouterLink>
<VnMoreOptions v-if="$slots.menu">
<template #menu="{ menuRef }">
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
</template>
</VnMoreOptions>
</div>
<slot name="before" />
<div class="body q-py-sm">
<QList dense>
<QItemLabel header class="ellipsis text-h5" :lines="1">
<div class="title">
<span
v-if="title"
:title="getValueFromPath(title)"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
>
{{ getValueFromPath(title) ?? title }}
</span>
<slot v-else name="description" :entity="entity">
<span
:title="entity.name"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
v-text="entity.name"
/>
</slot>
</div>
</QItemLabel>
<QItem>
<QItemLabel
class="subtitle"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
>
#{{ getValueFromPath(subtitle) ?? entity.id }}
</QItemLabel>
<QBtn
round
flat
dense
size="sm"
icon="content_copy"
color="primary"
@click.stop="copyIdText(entity.id)"
>
<QTooltip>
{{ t('globals.copyId') }}
</QTooltip>
</QBtn>
</QItem>
</QList>
<div
class="list-box q-mt-xs"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
>
<slot name="body" :entity="entity" />
</div>
</div>
<div class="icons">
<slot name="icons" :entity="entity" />
</div>
<div class="actions justify-center" data-cy="descriptor_actions">
<slot name="actions" :entity="entity" />
</div>
<slot name="after" />
</template>
<SkeletonDescriptor v-if="!entity" />
</div>
<QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
</template>
<style lang="scss">
.body {
background-color: var(--vn-section-color);
.text-h5 {
font-size: 20px;
padding-top: 5px;
padding-bottom: 0px;
}
.q-item {
min-height: 20px;
.link {
margin-left: 10px;
}
}
.vn-label-value {
display: flex;
padding: 0px 16px;
.label {
color: var(--vn-label-color);
font-size: 14px;
&:not(:has(a))::after {
content: ':';
}
}
&.ellipsis > .value {
text-overflow: ellipsis;
white-space: pre;
}
.value {
color: var(--vn-text-color);
font-size: 14px;
margin-left: 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
}
.info {
margin-left: 5px;
}
}
}
</style>
<style lang="scss" scoped>
.title {
overflow: hidden;
text-overflow: ellipsis;
span {
color: var(--vn-text-color);
font-weight: bold;
}
}
.subtitle {
color: var(--vn-text-color);
font-size: 16px;
margin-bottom: 2px;
}
.list-box {
.q-item__label {
color: var(--vn-label-color);
padding-bottom: 0%;
}
}
.descriptor {
width: 256px;
.header {
display: flex;
align-items: center;
}
.icons {
margin: 0 10px;
display: flex;
justify-content: center;
.q-icon {
margin-right: 5px;
}
}
.actions {
margin: 0 5px;
justify-content: center !important;
}
}
</style>
<i18n>
en:
globals:
copyId: Copy ID
es:
globals:
copyId: Copiar ID
</i18n>

View File

@ -61,6 +61,10 @@ const $props = defineProps({
type: Object,
default: null,
},
showTagChips: {
type: Boolean,
default: true,
},
});
const emit = defineEmits([
@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
defineExpose({ search, params: userParams, remove });
const isLoading = ref(false);
async function search(evt) {
async function search(evt, name, value) {
try {
if (evt && $props.disableSubmitEvent) return;
store.filter.where = {};
isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue };
if (name) filter[name] = value;
store.userParamsChanged = true;
await arrayData.addFilter({
params: filter,
@ -214,7 +219,7 @@ const getLocale = (label) => {
</QTooltip>
</QBtn>
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
<QList dense>
<QList dense v-if="showTagChips">
<QItem class="q-mt-xs">
<QItemSection top>
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
@ -249,7 +254,7 @@ const getLocale = (label) => {
:key="chip.label"
:removable="!unremovableParams?.includes(chip.label)"
@remove="remove(chip.label)"
data-cy="vnFilterPanelChip"
:data-cy="`vnFilterPanelChip_${chip.label}`"
>
<slot
name="tags"

View File

@ -1,8 +1,11 @@
<script setup>
import { dashIfEmpty } from 'src/filters';
defineProps({ email: { type: [String], default: null } });
</script>
<template>
<QBtn
class="q-pr-xs"
v-if="email"
flat
round
@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
:href="`mailto:${email}`"
@click.stop
/>
<span>{{ dashIfEmpty(email) }}</span>
</template>

View File

@ -1,7 +1,7 @@
<script setup>
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
import axios from 'axios';
import { parsePhone } from 'src/filters';
import { dashIfEmpty, parsePhone } from 'src/filters';
import useOpenURL from 'src/composables/useOpenURL';
const props = defineProps({
@ -12,49 +12,65 @@ const props = defineProps({
const phone = ref(props.phoneNumber);
const config = reactive({
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
'say-simple': {
icon: 'vn:saysimple',
url: null,
channel: props.channel,
},
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
});
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
const attrs = useAttrs();
const types = Object.keys(config)
.filter((key) => key in attrs)
.sort();
const activeTypes = types.length ? types : ['sip'];
onBeforeMount(async () => {
if (!phone.value) return;
let { channel } = config[type];
if (type === 'say-simple') {
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
.data;
if (!channel) channel = defaultChannel;
for (const type of activeTypes) {
if (type === 'say-simple') {
let { channel } = config[type];
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
.data;
if (!channel) channel = defaultChannel;
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
config[
type
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
phone.value = await parsePhone(
props.phoneNumber,
props.country?.toLowerCase(),
);
config[type].url =
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
}
}
});
function handleClick() {
function handleClick(type) {
if (config[type].url) useOpenURL(config[type].url);
else if (config[type].href) window.location.href = config[type].href;
}
</script>
<template>
<QBtn
v-if="phone"
flat
round
:icon="config[type].icon"
size="sm"
color="primary"
padding="none"
@click.stop="handleClick"
>
<QTooltip>
{{ capitalize(type).replace('-', '') }}
</QTooltip>
</QBtn>
<div class="flex items-center gap-2">
<template v-for="type in activeTypes">
<QBtn
:key="type"
v-if="phone"
flat
round
:icon="config[type].icon"
size="sm"
color="primary"
padding="none"
@click.stop="() => handleClick(type)"
>
<QTooltip>
{{ capitalize(type).replace('-', '') }}
</QTooltip>
</QBtn></template
>
<span>{{ dashIfEmpty(phone) }}</span>
</div>
</template>

View File

@ -28,13 +28,14 @@ function copyValueText() {
const val = computed(() => $props.value);
</script>
<template>
<div class="vn-label-value">
<div class="vn-label-value" :data-cy="`${$attrs['data-cy'] ?? 'vnLv'}${label ?? ''}`">
<QCheckbox
v-if="typeof value === 'boolean'"
v-model="val"
:label="label"
disable
dense
size="sm"
/>
<template v-else>
<div v-if="label || $slots.label" class="label">
@ -42,9 +43,9 @@ const val = computed(() => $props.value);
<span style="color: var(--vn-label-color)">{{ label }}</span>
</slot>
</div>
<div class="value">
<div class="value" v-if="value || $slots.value">
<slot name="value">
<span :title="value">
<span :title="value" style="text-overflow: ellipsis">
{{ dash ? dashIfEmpty(value) : value }}
</span>
</slot>

View File

@ -9,10 +9,10 @@
data-cy="descriptor-more-opts"
>
<QTooltip>
{{ $t('components.cardDescriptor.moreOptions') }}
{{ $t('components.vnDescriptor.moreOptions') }}
</QTooltip>
<QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
<QList>
<QList data-cy="descriptor-more-opts_list">
<slot name="menu" :menu-ref="$refs.menuRef" />
</QList>
</QMenu>

View File

@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
const emit = defineEmits(['onFetch']);
const $attrs = useAttrs();
const isRequired = computed(() => {
return Object.keys($attrs).includes('required');
const originalAttrs = useAttrs();
const $attrs = computed(() => {
const { required, deletable, ...rest } = originalAttrs;
return rest;
});
const $props = defineProps({
@ -40,6 +40,11 @@ const quasar = useQuasar();
const newNote = reactive({ text: null, observationTypeFk: null });
const observationTypes = ref([]);
const vnPaginateRef = ref();
const defaultObservationType = computed(() =>
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
);
let originalText;
function handleClick(e) {
@ -48,6 +53,11 @@ function handleClick(e) {
else insert();
}
async function deleteNote(e) {
await axios.delete(`${$props.url}/${e.id}`);
await vnPaginateRef.value.fetch();
}
async function insert() {
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@ -111,14 +121,22 @@ function fetchData([data]) {
originalText = data?.notes;
emit('onFetch', data);
}
const handleObservationTypes = (data) => {
observationTypes.value = data;
if(defaultObservationType.value) {
newNote.observationTypeFk = defaultObservationType.value;
}
};
</script>
<template>
<FetchData
v-if="selectType"
url="ObservationTypes"
:filter="{ fields: ['id', 'description'] }"
:filter="{ fields: ['id', 'description', 'code'] }"
auto-load
@on-fetch="(data) => (observationTypes = data)"
@on-fetch="handleObservationTypes"
/>
<FetchData
v-if="justInput"
@ -144,7 +162,7 @@ function fetchData([data]) {
v-model="newNote.observationTypeFk"
option-label="description"
style="flex: 0.15"
:required="isRequired"
:required="'required' in originalAttrs"
@keyup.enter.stop="insert"
/>
<VnInput
@ -152,10 +170,10 @@ function fetchData([data]) {
type="textarea"
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
filled
size="lg"
autogrow
autofocus
@keyup.enter.stop="handleClick"
:required="isRequired"
:required="'required' in originalAttrs"
clearable
>
<template #append>
@ -189,7 +207,6 @@ function fetchData([data]) {
:search-url="false"
@on-fetch="
newNote.text = '';
newNote.observationTypeFk = null;
"
>
<template #body="{ rows }">
@ -226,6 +243,21 @@ function fetchData([data]) {
</QBadge>
</div>
<span v-text="toDateHourMin(note.created)" />
<div>
<QIcon
v-if="'deletable' in originalAttrs"
name="delete"
size="sm"
class="cursor-pointer"
color="primary"
@click="deleteNote(note)"
data-cy="notesRemoveNoteBtn"
>
<QTooltip>
{{ t('ticketNotes.removeNote') }}
</QTooltip>
</QIcon>
</div>
</div>
</QCardSection>
<QCardSection class="q-pa-xs q-my-none q-py-none">

View File

@ -115,7 +115,7 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
if (!store.keepData) arrayData.reset(['data']);
arrayData.reset(['data']);
arrayData.resetPagination();
});
@ -215,6 +215,7 @@ defineExpose({
paginate,
userParams: arrayData.store.userParams,
currentFilter: arrayData.store.currentFilter,
arrayData,
});
</script>

View File

@ -26,6 +26,7 @@ const id = props.entityId;
:to="{ name: routeName, params: { id: id } }"
class="header link"
:href="url"
data-cy="goToSummaryBtn"
>
<QIcon name="open_in_new" color="white" size="sm" />
</router-link>

View File

@ -1,5 +1,7 @@
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import { createWrapper } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import CardSummary from 'src/components/ui/CardSummary.vue';
import * as vueRouter from 'vue-router';

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
describe('VnPaginate', () => {

View File

@ -1,5 +1,5 @@
import { describe, it, expect, beforeAll, vi } from 'vitest';
import { axios } from 'app/test/vitest/helper';
import axios from 'axios';
import parsePhone from 'src/filters/parsePhone';
describe('parsePhone filter', () => {

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import VnSms from 'src/components/ui/VnSms.vue';
describe('VnSms', () => {

View File

@ -1,15 +1,17 @@
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
import { axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { downloadFile } from 'src/composables/downloadFile';
import { useSession } from 'src/composables/useSession';
const session = useSession();
const token = session.getToken();
describe('downloadFile', () => {
const baseUrl = 'http://localhost:9000';
let defaulCreateObjectURL;
beforeAll(() => {
vi.mock('src/composables/getUrl', () => ({
getUrl: vi.fn().mockResolvedValue(''),
}));
defaulCreateObjectURL = window.URL.createObjectURL;
window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
});
@ -22,15 +24,14 @@ describe('downloadFile', () => {
headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
};
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
else if (url.includes('downloadFile')) return Promise.resolve(res);
if (url.includes('downloadFile')) return Promise.resolve(res);
});
await downloadFile(1);
expect(axios.get).toHaveBeenCalledWith(
`${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
{ responseType: 'blob' }
`/api/dms/1/downloadFile?access_token=${token}`,
{ responseType: 'blob' },
);
});
});

View File

@ -1,5 +1,7 @@
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
import { axios, flushPromises } from 'app/test/vitest/helper';
import axios from 'axios';
import { flushPromises } from '@vue/test-utils';
import { useAcl } from 'src/composables/useAcl';
describe('useAcl', () => {

View File

@ -1,15 +1,39 @@
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
import { axios, flushPromises } from 'app/test/vitest/helper';
import { default as axios } from 'axios';
import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia';
describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}';
const params = { supplierFk: 2 };
beforeEach(() => {
vi.spyOn(useRouter(), 'replace');
vi.spyOn(useRouter(), 'push');
setActivePinia(createPinia());
// Mock route
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
path: 'mockSection/list',
matched: [],
query: {},
params: {},
meta: { moduleName: 'mockName' },
});
// Mock router
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
push: vi.fn(),
replace: vi.fn(),
currentRoute: {
value: {
path: 'mockSection/list',
params: { id: 1 },
meta: { moduleName: 'mockName' },
matched: [{ path: 'mockName/:id' }],
},
},
});
});
afterEach(() => {
@ -17,103 +41,69 @@ describe('useArrayData', () => {
});
it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
const arrayData = useArrayData('ArrayData', {
url: 'mockUrl',
searchUrl: 'params',
});
arrayData.store.userParams = params;
arrayData.fetch({});
await arrayData.fetch({});
await flushPromises();
const routerReplace = useRouter().replace.mock.calls[0][0];
expect(axios.get.mock.calls[0][1].params).toEqual({
filter,
supplierFk: 2,
expect(axios.get).toHaveBeenCalledWith('mockUrl', {
signal: expect.any(Object),
params: {
filter,
supplierFk: 2,
},
});
expect(routerReplace.path).toEqual('mockSection/list');
expect(routerReplace.path).toBe('mockSection/list');
expect(JSON.parse(routerReplace.query.params)).toEqual(
expect.objectContaining(params),
);
});
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 }] });
it('should redirect to detail when single record is returned with navigation', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({
data: [{ id: 1 }],
});
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
const arrayData = useArrayData('ArrayData', {
url: 'mockUrl',
navigate: {},
});
arrayData.store.userParams = params;
arrayData.fetch({});
await arrayData.fetch({});
await flushPromises();
const routerPush = useRouter().push.mock.calls[0][0];
expect(axios.get.mock.calls[0][1].params).toEqual({
filter,
supplierFk: 2,
});
expect(routerPush.path).toEqual('mockName/1');
expect(routerPush.path).toBe('mockName/1');
expect(routerPush.query).toBeUndefined();
});
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({
matched: [],
query: {},
params: {},
meta: { moduleName: 'mockName' },
path: 'mockName/1',
});
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
push: vi.fn(),
replace: vi.fn(),
currentRoute: {
value: {
params: {
id: 1,
},
meta: { moduleName: 'mockName' },
matched: [{ path: 'mockName/:id' }],
},
},
});
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
arrayData.store.userParams = params;
arrayData.fetch({});
await flushPromises();
const routerPush = useRouter().push.mock.calls[0][0];
expect(axios.get.mock.calls[0][1].params).toEqual({
filter,
supplierFk: 2,
});
expect(routerPush.path).toEqual('mockName/');
expect(routerPush.query.params).toBeDefined();
});
it('should return one record', async () => {
vi.spyOn(axios, 'get').mockReturnValueOnce({
it('should return one record when oneRecord is true', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({
data: [
{ id: 1, name: 'Entity 1' },
{ id: 2, name: 'Entity 2' },
],
});
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
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();
expect(arrayData.store.data).toEqual({
id: 1,
name: 'Entity 1',
});
});
});

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it } from 'vitest';
import { axios, flushPromises } from 'app/test/vitest/helper';
import axios from 'axios';
import { flushPromises } from '@vue/test-utils';
import { useRole } from 'composables/useRole';
const role = useRole();
@ -23,18 +24,19 @@ describe('useRole', () => {
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
worker: { department: { departmentFk: 155 } },
};
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
departmentFk: 155,
};
const expectedRoles = ['salesPerson', 'admin'];
vi.spyOn(axios, 'get')
.mockResolvedValueOnce({
vi.spyOn(axios, 'get').mockResolvedValueOnce({
data: { roles: rolesData, user: fetchedUser },
})
});
vi.spyOn(role.state, 'setUser');
vi.spyOn(role.state, 'setRoles');

View File

@ -1,5 +1,5 @@
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
import { axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { useSession } from 'composables/useSession';
import { useState } from 'composables/useState';
@ -75,6 +75,7 @@ describe('session', () => {
userConfig: {
darkMode: false,
},
worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
@ -143,7 +144,7 @@ describe('session', () => {
await session.destroy(); // this clears token and user for any other test
});
},
{}
{},
);
describe('RenewToken', () => {
@ -175,7 +176,7 @@ describe('session', () => {
await session.checkValidity();
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
expectedTokenMultimedia
expectedTokenMultimedia,
);
});
it('Should renewToken', async () => {
@ -204,7 +205,7 @@ describe('session', () => {
await session.checkValidity();
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
expectedTokenMultimedia
expectedTokenMultimedia,
);
});
});

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it } from 'vitest';
import { axios, flushPromises } from 'app/test/vitest/helper';
import axios from 'axios';
import { flushPromises } from '@vue/test-utils';
import { useTokenConfig } from 'composables/useTokenConfig';
const tokenConfig = useTokenConfig();

View File

@ -7,18 +7,33 @@ const { getTokenMultimedia } = useSession();
const token = getTokenMultimedia();
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
const appUrl = await getAppUrl();
const response = await axios.get(
url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
{ responseType: 'blob' }
{ responseType: 'blob' },
);
download(response);
}
export async function downloadDocuware(url, params) {
const appUrl = await getAppUrl();
const response = await axios.get(`${appUrl}/api/` + url, {
responseType: 'blob',
params,
});
download(response);
}
function download(response) {
const contentDisposition = response.headers['content-disposition'];
const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
const filename =
matches != null && matches[1]
? matches[1].replace(/['"]/g, '')
: 'downloaded-file';
const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
exportFile(filename, response.data);
}
async function getAppUrl() {
return (await getUrl('', 'lilium')).replace('/#/', '');
}

View File

@ -30,9 +30,16 @@ export function useAcl() {
return false;
}
function hasAcl(model, prop, accessType) {
const modelAcl = state.getAcls().value[model];
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
return !!(propAcl?.[accessType] || propAcl?.['*']);
}
return {
fetch,
hasAny,
state,
hasAcl,
};
}

View File

@ -5,12 +5,11 @@ import { useArrayDataStore } from 'stores/useArrayDataStore';
import { buildFilter } from 'filters/filterPanel';
import { isDialogOpened } from 'src/filters';
const arrayDataStore = useArrayDataStore();
export function useArrayData(key, userOptions) {
key ??= useRoute().meta.moduleName;
if (!key) throw new Error('ArrayData: A key is required to use this composable');
const arrayDataStore = useArrayDataStore(); // Move inside function
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@ -56,7 +55,6 @@ export function useArrayData(key, userOptions) {
'searchUrl',
'navigate',
'mapKey',
'keepData',
'oneRecord',
];
if (typeof userOptions === 'object') {
@ -108,7 +106,7 @@ export function useArrayData(key, userOptions) {
store.hasMoreData = limit && response.data.length >= limit;
if (!append && !isDialogOpened() && updateRouter) {
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
if (updateStateParams(response.data)?.redirect) return;
}
store.isLoading = false;
canceller = null;
@ -189,7 +187,7 @@ export function useArrayData(key, userOptions) {
store.order = order;
resetPagination();
fetch({});
await fetch({});
index++;
return { index, order };

View File

@ -14,7 +14,7 @@ export function useFilterParams(key) {
watch(
() => arrayData.value.store?.currentFilter,
(val, oldValue) => (val || oldValue) && setUserParams(val),
{ immediate: true, deep: true }
{ immediate: true, deep: true },
);
function parseOrder(urlOrders) {
@ -54,7 +54,7 @@ export function useFilterParams(key) {
Object.assign(params, item);
});
delete params[key];
} else if (value && typeof value === 'object') {
} else if (value && typeof value === 'object' && !Array.isArray(value)) {
const param = Object.values(value)[0];
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
}

View File

@ -13,6 +13,7 @@ export function useRole() {
name: data.user.name,
nickname: data.user.nickname,
lang: data.user.lang || 'es',
departmentFk: data.user?.worker?.department?.departmentFk,
};
state.setUser(userData);
state.setRoles(roles);

View File

@ -60,7 +60,7 @@ export function useSession() {
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
if (isValidToken)
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
destroyToken(url, storage, key)
destroyToken(url, storage, key),
);
}
} finally {

View File

@ -78,7 +78,8 @@ export function useValidator() {
if (min >= 0)
if (Math.floor(value) < min) return t('inputMin', { value: min });
},
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
custom: (value) =>
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
};
};

View File

@ -325,7 +325,6 @@ input::-webkit-inner-spin-button {
min-height: auto !important;
display: flex;
align-items: flex-end;
padding-bottom: 2px;
.q-field__native.row {
min-height: auto !important;
}
@ -341,3 +340,6 @@ input::-webkit-inner-spin-button {
.containerShrinked {
width: 70%;
}
.q-item__section--main ~ .q-item__section--side {
padding-inline: 0;
}

View File

@ -370,6 +370,11 @@ globals:
countryCodeFk: Country
companyFk: Company
nickname: Alias
changedModel: Entity
changedModelValue: Search
changedModelId: Entity id
userFk: User
action: Action
model: Model
fuel: Fuel
active: Active
@ -646,6 +651,7 @@ worker:
model: Model
serialNumber: Serial number
removePDA: Deallocate PDA
sendToTablet: Send to tablet
create:
lastName: Last name
birth: Birth
@ -816,6 +822,7 @@ travel:
search: Search travel
searchInfo: You can search by travel id or name
id: Id
awbFk: AWB
travelList:
tableVisibleColumns:
ref: Reference
@ -840,6 +847,7 @@ travel:
availabledHour: Availabled hour
thermographs: Thermographs
hb: HB
roundedCc: Rounded CC
basicData:
daysInForward: Automatic movement (Raid)
isRaid: Raid
@ -882,7 +890,7 @@ components:
openCard: View
openSummary: Summary
viewSummary: Summary
cardDescriptor:
vnDescriptor:
mainList: Main list
summary: Summary
moreOptions: More options

View File

@ -371,6 +371,11 @@ globals:
countryCodeFk: País
companyFk: Empresa
nickname: Alias
changedModel: Entidad
changedModelValue: Buscar
changedModelId: Id de entidad
userFk: Usuario
action: Acción
errors:
statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor
@ -731,6 +736,7 @@ worker:
model: Modelo
serialNumber: Número de serie
removePDA: Desasignar PDA
sendToTablet: Enviar a la tablet
create:
lastName: Apellido
birth: Fecha de nacimiento
@ -899,6 +905,7 @@ travel:
search: Buscar envío
searchInfo: Buscar envío por id o nombre
id: Id
awbFk: Guía aérea
travelList:
tableVisibleColumns:
ref: Referencia
@ -923,6 +930,7 @@ travel:
availabled: F. Disponible
availabledHour: Hora Disponible
hb: HB
roundedCc: CC redondeado
basicData:
daysInForward: Desplazamiento automatico (redada)
isRaid: Redada
@ -966,7 +974,7 @@ components:
openCard: Ficha
openSummary: Detalles
viewSummary: Vista previa
cardDescriptor:
vnDescriptor:
mainList: Listado principal
summary: Resumen
moreOptions: Más opciones

View File

@ -47,7 +47,7 @@ const rolesOptions = ref([]);
:label="t('globals.name')"
v-model="params.name"
lazy-rules
is-outlined
filled
/>
</QItemSection>
</QItem>
@ -57,7 +57,7 @@ const rolesOptions = ref([]);
:label="t('account.card.alias')"
v-model="params.nickname"
lazy-rules
is-outlined
filled
/>
</QItemSection>
</QItem>
@ -75,8 +75,7 @@ const rolesOptions = ref([]);
use-input
hide-selected
dense
outlined
rounded
filled
:input-debounce="0"
/>
</QItemSection>

View File

@ -56,8 +56,7 @@ onBeforeMount(() => {
option-label="name"
use-input
dense
outlined
rounded
filled
/>
</QItemSection>
</QItem>
@ -72,8 +71,7 @@ onBeforeMount(() => {
option-label="name"
use-input
dense
outlined
rounded
filled
/>
</QItemSection>
</QItem>
@ -83,7 +81,7 @@ onBeforeMount(() => {
:label="t('acls.aclFilter.property')"
v-model="params.property"
lazy-rules
is-outlined
filled
/>
</QItemSection>
</QItem>
@ -98,8 +96,7 @@ onBeforeMount(() => {
option-label="name"
use-input
dense
outlined
rounded
filled
/>
</QItemSection>
</QItem>
@ -114,8 +111,7 @@ onBeforeMount(() => {
option-label="name"
use-input
dense
outlined
rounded
filled
/>
</QItemSection>
</QItem>

View File

@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import axios from 'axios';
@ -48,7 +48,7 @@ const removeAlias = () => {
</script>
<template>
<CardDescriptor
<EntityDescriptor
ref="descriptor"
:url="`MailAliases/${entityId}`"
data-key="Alias"
@ -63,7 +63,7 @@ const removeAlias = () => {
<template #body="{ entity }">
<VnLv :label="t('role.description')" :value="entity.description" />
</template>
</CardDescriptor>
</EntityDescriptor>
</template>
<i18n>

View File

@ -1,7 +1,7 @@
<script setup>
import { ref, computed, onMounted } from 'vue';
import { useRoute } from 'vue-router';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
import VnImg from 'src/components/ui/VnImg.vue';
@ -20,7 +20,7 @@ onMounted(async () => {
</script>
<template>
<CardDescriptor
<EntityDescriptor
ref="descriptor"
:url="`VnUsers/preview`"
:filter="{ ...filter, where: { id: entityId } }"
@ -78,7 +78,7 @@ onMounted(async () => {
</QIcon>
</QCardActions>
</template>
</CardDescriptor>
</EntityDescriptor>
</template>
<style scoped>
.q-item__label {

View File

@ -100,12 +100,8 @@ const onChangePass = (oldPass) => {
};
onMounted(() => {
hasitManagementAccess.value = useAcl().hasAny([
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
]);
hasSysadminAccess.value = useAcl().hasAny([
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
]);
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
});
</script>
<template>
@ -227,7 +223,7 @@ onMounted(() => {
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
</QItem>
<QItem
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
v-ripple
clickable
@click="showSyncDialog = true"

View File

@ -0,0 +1,14 @@
<script setup>
import AccountDescriptor from './AccountDescriptor.vue';
import AccountSummary from './AccountSummary.vue';
</script>
<template>
<QPopupProxy style="max-width: 10px">
<AccountDescriptor
v-if="$attrs.id"
v-bind="$attrs"
:summary="AccountSummary"
:proxy-render="true"
/>
</QPopupProxy>
</template>

View File

@ -18,7 +18,7 @@ const entityId = computed(() => $props.id || route.params.id);
data-key="Account"
ref="AccountSummary"
url="VnUsers/preview"
:filter="filter"
:filter="{ ...filter, where: { id: entityId } }"
>
<template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
<template #menu>

View File

@ -27,7 +27,7 @@ const props = defineProps({
:label="t('globals.name')"
v-model="params.name"
lazy-rules
is-outlined
filled
/>
</QItemSection>
</QItem>
@ -37,7 +37,7 @@ const props = defineProps({
:label="t('role.description')"
v-model="params.description"
lazy-rules
is-outlined
filled
/>
</QItemSection>
</QItem>

View File

@ -2,7 +2,7 @@
import { computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
@ -32,7 +32,7 @@ const removeRole = async () => {
</script>
<template>
<CardDescriptor
<EntityDescriptor
url="VnRoles"
:filter="{ where: { id: entityId } }"
data-key="Role"
@ -47,7 +47,7 @@ const removeRole = async () => {
<template #body="{ entity }">
<VnLv :label="t('role.description')" :value="entity.description" />
</template>
</CardDescriptor>
</EntityDescriptor>
</template>
<style scoped>
.q-item__label {

View File

@ -2,6 +2,7 @@
import { ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { getDifferences, getUpdatedValues } from 'src/filters';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
import FetchData from 'components/FetchData.vue';
@ -9,12 +10,18 @@ import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnAvatar from 'src/components/ui/VnAvatar.vue';
const route = useRoute();
const { t } = useI18n();
const workersOptions = ref([]);
function onBeforeSave(formData, originalData) {
return getUpdatedValues(
Object.keys(getDifferences(formData, originalData)),
formData,
);
}
</script>
<template>
<FetchData
@ -27,6 +34,7 @@ const workersOptions = ref([]);
<FormModel
model="Claim"
:url-update="`Claims/updateClaim/${route.params.id}`"
:mapper="onBeforeSave"
auto-load
>
<template #form="{ data, validate }">

View File

@ -6,7 +6,7 @@ import { toDateHourMinSec, toPercentage } from 'src/filters';
import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import { getUrl } from 'src/composables/getUrl';
@ -44,7 +44,7 @@ onMounted(async () => {
</script>
<template>
<CardDescriptor
<EntityDescriptor
:url="`Claims/${entityId}`"
:filter="filter"
title="client.name"
@ -147,7 +147,7 @@ onMounted(async () => {
</QBtn>
</QCardActions>
</template>
</CardDescriptor>
</EntityDescriptor>
</template>
<style scoped>
.q-item__label {

View File

@ -0,0 +1,14 @@
<script setup>
import ClaimDescriptor from './ClaimDescriptor.vue';
import ClaimSummary from './ClaimSummary.vue';
</script>
<template>
<QPopupProxy style="max-width: 10px">
<ClaimDescriptor
v-if="$attrs.id"
v-bind="$attrs.id"
:summary="ClaimSummary"
:proxy-render="true"
/>
</QPopupProxy>
</template>

View File

@ -21,6 +21,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
import VnDropdown from 'src/components/common/VnDropdown.vue';
const route = useRoute();
const router = useRouter();
@ -36,7 +37,7 @@ const $props = defineProps({
});
const entityId = computed(() => $props.id || route.params.id);
const ClaimStates = ref([]);
const claimStates = ref([]);
const claimDmsRef = ref();
const claimDms = ref([]);
const multimediaDialog = ref();
@ -173,7 +174,9 @@ function openDialog(dmsId) {
}
async function changeState(value) {
await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
await axios.patch(`Claims/updateClaim/${entityId.value}`, {
claimStateFk: value,
});
router.go(route.fullPath);
}
@ -183,13 +186,18 @@ function claimUrl(section) {
</script>
<template>
<FetchData
url="ClaimStates"
:filter="{ fields: ['id', 'description'] }"
@on-fetch="(data) => (claimStates = data)"
auto-load
/>
<FetchData
url="ClaimDms"
:filter="claimDmsFilter"
@on-fetch="(data) => setClaimDms(data)"
ref="claimDmsRef"
/>
<FetchData url="ClaimStates" @on-fetch="(data) => (ClaimStates = data)" auto-load />
<CardSummary
ref="summary"
:url="`Claims/${entityId}/getSummary`"
@ -201,34 +209,11 @@ function claimUrl(section) {
{{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
</template>
<template #header-right>
<QBtnDropdown
side
top
color="black"
text-color="white"
:label="t('globals.changeState')"
>
<QList>
<QVirtualScroll
class="max-container-height"
:items="ClaimStates"
separator
v-slot="{ item, index }"
>
<QItem
:key="index"
dense
clickable
v-close-popup
@click="changeState(item.id)"
>
<QItemSection>
<QItemLabel>{{ item.description }}</QItemLabel>
</QItemSection>
</QItem>
</QVirtualScroll>
</QList>
</QBtnDropdown>
<VnDropdown
:options="claimStates"
option-label="description"
@change-state="changeState"
/>
</template>
<template #menu="{ entity }">
<ClaimDescriptorMenu :claim="entity.claim" />

View File

@ -88,13 +88,13 @@ const columns = [
auto-load
>
<template #column-itemFk="{ row }">
<span class="link">
<span class="link" @click.stop>
{{ row.itemFk }}
<ItemDescriptorProxy :id="row.itemFk" />
</span>
</template>
<template #column-ticketFk="{ row }">
<span class="link">
<span class="link" @click.stop>
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
describe('ClaimDescriptorMenu', () => {

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import ClaimLines from '/src/pages/Claim/Card/ClaimLines.vue';
describe('ClaimLines', () => {

View File

@ -1,5 +1,6 @@
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper';
import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
describe('ClaimLinesImport', () => {

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