Compare commits

...

220 Commits

Author SHA1 Message Date
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 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
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
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
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 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 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
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
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 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 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 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 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
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
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
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
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 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
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
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 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
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 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 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
Javier Segarra 9ef29e61bd Merge branch 'dev' into 8006_eslint_rules 2025-03-31 13:20:57 +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
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 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 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
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
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
Jon Elias c03a56f69f feat: refs #7995 added hasAcl to check only one acl 2025-03-28 09:28:24 +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
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
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
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
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
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
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
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
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 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
Javier Segarra 4b1a648509 fix: refs #8006 defaults 2025-03-26 09:22:25 +01: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 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 dc35377f13 Merge branch 'dev' into 8006_eslint_rules 2025-03-25 19:59:48 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
86 changed files with 1492 additions and 464 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"]
}

5
Jenkinsfile vendored
View File

@ -125,8 +125,10 @@ 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 1'
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
}
}
}
@ -183,3 +185,4 @@ pipeline {
}
}
}

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.14.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",
@ -31,22 +32,27 @@
"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",
"@vue/compiler-sfc": "^3.5.13",
"@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14",
"cypress": "^14.1.0",
@ -54,7 +60,9 @@
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
"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",

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

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

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

@ -219,6 +219,7 @@ function filterByRecord(modelLog) {
}
async function applyFilter(params = {}) {
paginate.value.arrayData.resetPagination();
paginate.value.arrayData.applyFilter({
filter: {},
params: { originFk: route.params.id, ...params },

View File

@ -10,6 +10,7 @@ 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 $props = defineProps({
dataKey: {
@ -99,7 +100,6 @@ function getActions() {
:columns="columns"
:redirect="false"
:hiddenTags="['originFk', 'creationDate']"
:exprBuilder
search-url="logs"
:showTagChips="false"
>

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 {
@ -203,27 +210,21 @@ async function fetch() {
}
.vn-card-group {
display: flex;
flex-direction: column;
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;
}
}
@media (min-width: 1010px) {
.vn-card-group {
flex-direction: row;
}
.vn-card-content {
flex: 1;
}
}
</style>
<style lang="scss" scoped>
.summaryHeader .vn-label-value {

View File

@ -252,6 +252,10 @@ const toModule = computed(() => {
content: ':';
}
}
&.ellipsis > .value {
text-overflow: ellipsis;
white-space: pre;
}
.value {
color: var(--vn-text-color);
font-size: 14px;

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,38 +12,51 @@ 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];
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>
<div class="flex items-center gap-2">
<template v-for="type in activeTypes">
<QBtn
:key="type"
v-if="phone"
flat
round
@ -51,11 +64,13 @@ function handleClick() {
size="sm"
color="primary"
padding="none"
@click.stop="handleClick"
@click.stop="() => handleClick(type)"
>
<QTooltip>
{{ capitalize(type).replace('-', '') }}
</QTooltip>
</QBtn>
{{ phoneNumber }}
</QBtn></template
>
<span>{{ dashIfEmpty(phone) }}</span>
</div>
</template>

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

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

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

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

View File

@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
const { openConfirmationModal } = useVnConfirm();
const { sendEmail, openReport } = usePrintService();
const { t } = useI18n();
const { hasAny } = useAcl();
const { hasAcl } = useAcl();
const quasar = useQuasar();
const route = useRoute();
@ -276,9 +276,7 @@ const showBalancePdf = ({ id }) => {
>
<VnInput
v-model="scope.value"
:disable="
!hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
"
:disable="!hasAcl('Receipt', '*', 'WRITE')"
@keypress.enter="scope.set"
autofocus
/>

View File

@ -3,7 +3,13 @@ import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
import {
toCurrency,
toPercentage,
toDate,
dashOrCurrency,
dashIfEmpty,
} from 'src/filters';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@ -287,10 +293,14 @@ const sumRisk = ({ clientRisks }) => {
<VnLv
v-if="entity.creditInsurance"
:label="t('customer.summary.securedCredit')"
:value="toCurrency(entity.creditInsurance)"
:info="t('customer.summary.securedCreditInfo')"
/>
>
<template #value>
{{ toCurrency(entity.creditInsurance) }}({{
dashIfEmpty(entity.classifications[0]?.insurances[0]?.grade)
}})
</template></VnLv
>
<VnLv
:label="t('customer.summary.balance')"
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"

View File

@ -72,6 +72,7 @@ const exprBuilder = (param, value) => {
option-value="id"
option-label="name"
url="Departments"
no-one="true"
/>
</QItemSection>
</QItem>
@ -154,9 +155,9 @@ en:
city: City
phone: Phone
email: Email
departmentFk: Department
isToBeMailed: Mailed
isEqualizated: Equailized
departmentFk: Department
businessTypeFk: Business type
sageTaxTypeFk: Sage Tax Type
sageTransactionTypeFk: Sage Tax Type

View File

@ -127,6 +127,7 @@ es:
Identifier: Identificador
Social name: Razón social
Phone: Teléfono
Postcode: Código postal
City: Población
Email: Email
Campaign consumption: Consumo campaña

View File

@ -93,10 +93,26 @@ const updateAddressTicket = async () => {
};
const updateObservations = async (payload) => {
await axios.post('AddressObservations/crud', payload);
await axios.post('AddressObservations/crud', cleanPayload(payload));
notes.value = [];
deletes.value = [];
};
function cleanPayload(payload) {
['creates', 'deletes', 'updates'].forEach((prop) => {
if (prop === 'creates' || prop === 'updates') {
payload[prop] = payload[prop].filter(
(item) => item.description !== '' && item.observationTypeFk !== '',
);
} else {
payload[prop] = payload[prop].filter(
(item) => item !== null && item !== undefined,
);
}
});
return payload;
}
async function updateAll({ data, payload }) {
await updateObservations(payload);
await updateAddress(data);

View File

@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
:without-header="true"
auto-load
:row-click="rowClick"
order="shipped DESC, id"
order="shipped DESC, id DESC"
:disable-option="{ card: true, table: true }"
class="full-width"
:disable-infinite-scroll="true"

View File

@ -70,8 +70,8 @@ onMounted(async () => {
:url="`#/entry/${entityId}/basic-data`"
:text="t('globals.summary.basicData')"
/>
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv
:label="t('entry.summary.commission')"
:value="entry?.commission"
@ -93,7 +93,7 @@ onMounted(async () => {
:value="entry?.invoiceNumber"
/>
</div>
<div class="card-content">
<div class="vn-card-content">
<VnCheckbox
:label="t('entry.list.tableVisibleColumns.isOrdered')"
v-model="entry.isOrdered"
@ -130,8 +130,8 @@ onMounted(async () => {
:url="`#/travel/${entry.travel.id}/summary`"
:text="t('Travel')"
/>
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv :label="t('entry.summary.travelReference')">
<template #value>
<span class="link">
@ -161,7 +161,7 @@ onMounted(async () => {
:value="entry.travel.warehouseIn?.name"
/>
</div>
<div class="card-content">
<div class="vn-card-content">
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
<VnCheckbox
:label="t('entry.summary.travelDelivered')"
@ -193,31 +193,6 @@ onMounted(async () => {
</template>
</CardSummary>
</template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
text-overflow: ellipsis;
> div {
max-height: 24px;
}
}
@media (min-width: 1010px) {
.card-group {
flex-direction: row;
}
.card-content {
flex: 1;
margin-right: 16px;
}
}
</style>
<i18n>
es:
Travel: Envío

View File

@ -22,7 +22,7 @@ const routes = reactive({
getSupplier: (id) => {
return { name: 'SupplierCard', params: { id } };
},
getTickets: (id) => {
getInvoices: (id) => {
return {
name: 'InvoiceInList',
query: {
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
</QBtn>
<QBtn
size="md"
icon="vn:ticket"
icon="vn:invoice-in"
color="primary"
:to="routes.getTickets(entity.supplierFk)"
:to="routes.getInvoices(entity.supplierFk)"
>
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
</QBtn>
<QBtn
v-if="

View File

@ -15,6 +15,7 @@ invoiceIn:
amount: Amount
descriptor:
ticketList: Ticket list
invoices: Supplier invoices
descriptorMenu:
book: Book
unbook: Unbook

View File

@ -14,7 +14,7 @@ invoiceIn:
awb: AWB
amount: Importe
descriptor:
ticketList: Listado de tickets
invoices: Facturas de proveedor
descriptorMenu:
book: Contabilizar
unbook: Descontabilizar

View File

@ -198,7 +198,7 @@ const getLocale = (label) => {
<QItemSection>
<VnSelect
dense
rounded
filled
:label="t('globals.params.packing')"
v-model="params.packing"
url="ItemPackingTypes"

View File

@ -112,12 +112,9 @@ const filter = {
:label="t('Trailer Plate')"
:value="dashIfEmpty(entity?.trailerPlate)"
/>
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
<VnLv :label="t('Phone')">
<template #value>
<span>
{{ dashIfEmpty(entity?.phone) }}
<VnLinkPhone :phone-number="entity?.phone" />
</span>
</template>
</VnLv>
<VnLv

View File

@ -46,7 +46,6 @@ const columns = computed(() => [
},
isId: true,
columnFilter: false,
width: '25px',
},
{
name: 'workerFk',
@ -142,7 +141,6 @@ const columns = computed(() => [
label: 'm3',
cardVisible: true,
columnClass: 'shrink',
width: '50px',
},
{
name: 'started',
@ -150,7 +148,6 @@ const columns = computed(() => [
component: 'time',
columnFilter: false,
format: ({ started }) => toHour(started),
width: '50px',
},
{
name: 'finished',
@ -158,7 +155,6 @@ const columns = computed(() => [
component: 'time',
columnFilter: false,
format: ({ finished }) => toHour(finished),
width: '50px',
},
{
align: 'right',

View File

@ -46,7 +46,6 @@ const columns = computed(() => [
condition: () => true,
},
columnFilter: false,
width: '25px',
},
{
align: 'left',
@ -57,7 +56,6 @@ const columns = computed(() => [
cardVisible: true,
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
columnFilter: false,
width: '100px',
},
{
label: t('globals.agency'),
@ -100,7 +98,6 @@ const columns = computed(() => [
cardVisible: true,
columnFilter: false,
format: ({ started }) => toHour(started),
width: '50px',
},
{
align: 'center',
@ -109,7 +106,6 @@ const columns = computed(() => [
cardVisible: true,
columnFilter: false,
format: ({ finished }) => toHour(finished),
width: '50px',
},
{
align: 'left',

View File

@ -25,9 +25,7 @@ const { validate } = useValidator();
const { notify } = useNotify();
const router = useRouter();
const { t } = useI18n();
const canEditZone = useAcl().hasAny([
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
]);
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
const agencyFetchRef = ref();
const warehousesOptions = ref([]);

View File

@ -1,5 +1,5 @@
<script setup>
import { onMounted, ref, computed, watch } from 'vue';
import { onMounted, ref, computed, watch, inject } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter, useRoute } from 'vue-router';
import { useQuasar } from 'quasar';
@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
import VnConfirm from 'src/components/ui/VnConfirm.vue';
import TicketProblems from 'src/components/TicketProblems.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
const app = inject('app');
const route = useRoute();
const router = useRouter();
const { t } = useI18n();
@ -196,13 +196,17 @@ const changeQuantity = async (sale) => {
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
return;
else sale.originalQuantity = sale.quantity;
if (!sale.id) return addSale(sale);
try {
if (!sale.id) await addSale(sale);
} catch (e) {
app.config.errorHandler(e);
return;
}
if (await isSalePrepared(sale)) {
await confirmUpdate(() => updateQuantity(sale));
} else await updateQuantity(sale);
};
const updateQuantity = async (sale) => {
try {
let { quantity, id } = sale;
@ -215,7 +219,7 @@ const updateQuantity = async (sale) => {
(s) => s.id === sale.id,
);
sale.quantity = quantity;
throw e;
app.config.errorHandler(e);
}
};
@ -224,7 +228,7 @@ const addSale = async (sale) => {
barcode: sale.itemFk,
quantity: sale.quantity,
};
try {
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
if (!data) return;
@ -242,6 +246,9 @@ const addSale = async (sale) => {
notify('globals.dataSaved', 'positive');
sale.isNew = false;
resetChanges();
} catch (e) {
app.config.errorHandler(e);
}
};
const changeConcept = async (sale) => {
if (await isSalePrepared(sale)) {
@ -250,10 +257,14 @@ const changeConcept = async (sale) => {
};
const updateConcept = async (sale) => {
try {
const data = { newConcept: sale.concept };
await axios.post(`Sales/${sale.id}/updateConcept`, data);
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
app.config.errorHandler(e);
}
};
const DEFAULT_EDIT = {
@ -264,18 +275,6 @@ const DEFAULT_EDIT = {
oldQuantity: null,
};
const edit = ref({ ...DEFAULT_EDIT });
const usesMana = ref(null);
const getUsesMana = async () => {
const { data } = await axios.get('Sales/usesMana');
usesMana.value = data;
};
const getMana = async () => {
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
mana.value = data;
await getUsesMana();
};
const selectedValidSales = computed(() => {
if (!sales.value) return;
@ -312,11 +311,15 @@ const changePrice = async (sale) => {
}
};
const updatePrice = async (sale, newPrice) => {
try {
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
sale.price = newPrice;
edit.value = { ...DEFAULT_EDIT };
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
app.config.errorHandler(e);
}
};
const changeDiscount = async (sale) => {
@ -339,6 +342,7 @@ const updateDiscounts = async (sales, newDiscount) => {
};
const updateDiscount = async (sales, newDiscount = 0) => {
try {
const salesIds = sales.map(({ id }) => id);
const params = {
salesIds,
@ -348,6 +352,10 @@ const updateDiscount = async (sales, newDiscount = 0) => {
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
app.config.errorHandler(e);
return;
}
};
const getNewPrice = computed(() => {
@ -369,11 +377,15 @@ const getNewPrice = computed(() => {
});
const newOrderFromTicket = async () => {
try {
const { data } = await axios.post(`Orders/newFromTicket`, {
ticketFk: Number(route.params.id),
});
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
window.open(routeData.href, '_blank');
} catch (e) {
app.config.errorHandler(e);
}
};
const goToLog = (saleId) => {
@ -390,11 +402,15 @@ const goToLog = (saleId) => {
};
const changeTicketState = async (val) => {
try {
stateBtnDropdownRef.value.hide();
const params = { ticketFk: route.params.id, code: val };
await axios.post('Tickets/state', params);
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
app.config.errorHandler(e);
}
};
const removeSelectedSales = () => {
@ -414,10 +430,14 @@ const removeSales = async () => {
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
if (params.sales.length == 0) return;
try {
await axios.post('Sales/deleteSales', params);
removeSelectedSales();
notify('globals.dataSaved', 'positive');
resetChanges();
} catch (e) {
app.config.errorHandler(e);
}
};
const setTransferParams = async () => {

View File

@ -55,9 +55,7 @@ const isClaimable = computed(() => {
if (ticket.value) {
const landedPlusWeek = new Date(ticket.value.landed);
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
const createAfterDeadline = acl.hasAny([
{ model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
]);
const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
}
return false;

View File

@ -113,7 +113,7 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'shipped',
name: 'shippedDate',
cardVisible: true,
label: t('ticketList.shipped'),
columnFilter: {
@ -123,7 +123,7 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'shipped',
name: 'shippedHour',
component: 'time',
columnFilter: false,
label: t('ticketList.hour'),

View File

@ -205,6 +205,7 @@ ticketList:
toLines: Go to lines
addressNickname: Address nickname
ref: Reference
hour: Hour
rounding: Rounding
noVerifiedData: No verified data
purchaseRequest: Purchase request

View File

@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
router.push({ name: 'TravelBasicData', params: { id: data.id } });
};
const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
const openDeleteEntryDialog = (id) => {
quasar

View File

@ -505,7 +505,6 @@ watch(route, () => {
:props="props"
@click="stopEventPropagation($event, col)"
:style="col.style"
style="padding-left: 5px"
>
<component
:is="tableColumnComponents[col.name].component"
@ -581,19 +580,20 @@ watch(route, () => {
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
<EntryDescriptorProxy :id="entry.id" />
</QTd>
<QTd>
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
<QTd :colspan="2">
<div style="display: flex">
<span class="link">
{{ entry.supplierName }}
<SupplierDescriptorProxy :id="entry.supplierFk" />
</QTd>
<QTd class="text-center">
</span>
<QIcon
v-if="entry.isCustomInspectionRequired"
name="warning"
color="negative"
size="md"
:title="t('extraCommunity.requiresInspection')"
>
</QIcon>
/>
</div>
</QTd>
<QTd class="text-right">
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
@ -639,9 +639,7 @@ watch(route, () => {
&:nth-child(1) {
max-width: 65px;
}
&:nth-child(4) {
padding: 0;
}
padding: 0 5px 0;
}
thead > tr > th {
padding: 3px;

View File

@ -18,9 +18,7 @@ const router = useRouter();
const route = useRoute();
const { t } = useI18n();
const acl = useAcl();
const canSeeNotes = computed(() =>
acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
);
const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
const workerIsFreelance = ref();
const WorkerFreelanceRef = ref();
const workerCalendarFilterRef = ref(null);

View File

@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
<template #body="{ entity }">
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
<VnLv
class="ellipsis-text"
class="ellipsis"
:label="t('globals.params.email')"
:value="entity.user?.emailUser?.email"
copy
@ -128,15 +128,13 @@ const handlePhotoUpdated = (evt = false) => {
</template>
</VnLv>
<VnLv :value="entity.phone">
<template #label>
{{ t('globals.phone') }}
<VnLv :label="t('globals.phone')">
<template #value>
<VnLinkPhone :phone-number="entity.phone" />
</template>
</VnLv>
<VnLv :value="entity?.sip?.extension">
<template #label>
{{ t('worker.summary.sipExtension') }}
<VnLv :label="t('worker.summary.sipExtension')">
<template #value>
<VnLinkPhone :phone-number="entity?.sip?.extension" />
</template>
</VnLv>

View File

@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
import { useArrayData } from 'src/composables/useArrayData';
import FetchData from 'components/FetchData.vue';
const { hasAny } = useAcl();
const { hasAcl } = useAcl();
const { t } = useI18n();
const fetchData = ref();
const originaLockerId = ref();
@ -58,11 +58,7 @@ const init = async (data) => {
option-label="code"
option-value="id"
hide-selected
:readonly="
!hasAny([
{ model: 'Worker', props: '__get__locker', accessType: 'READ' },
])
"
:readonly="!hasAcl('Worker', '__get__locker', 'READ')"
/>
</template>
</FormModel>

View File

@ -73,28 +73,25 @@ onBeforeMount(async () => {
/>
</template>
</VnLv>
<VnLv :value="worker.mobileExtension">
<template #label>
{{ t('worker.summary.phoneExtension') }}
<VnLv :label="t('worker.summary.phoneExtension')">
<template #value>
<VnLinkPhone :phone-number="worker.mobileExtension" />
</template>
</VnLv>
<VnLv :value="worker.phone">
<template #label>
{{ t('worker.summary.entPhone') }}
<VnLv :label="t('worker.summary.entPhone')">
<template #value>
<VnLinkPhone :phone-number="worker.phone" />
</template>
</VnLv>
<VnLv :value="advancedSummary?.client?.phone">
<template #label>
{{ t('worker.summary.personalPhone') }}
<VnLv :label="t('worker.summary.personalPhone')">
<template #value>
<VnLinkPhone
:phone-number="advancedSummary?.client?.phone"
/>
</template>
</VnLv>
</div>
<div class="vn-card-content">
<div class="vn-card-content" v-if="advancedSummary">
<VnLv
:label="t('worker.summary.fiDueDate')"
:value="toDate(advancedSummary.fiDueDate)"
@ -135,6 +132,7 @@ onBeforeMount(async () => {
<VnTitle :text="t('worker.summary.userData')" />
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
<VnLv
class="ellipsis"
:label="t('globals.params.email')"
:value="worker.user?.emailUser?.email"
copy
@ -147,9 +145,8 @@ onBeforeMount(async () => {
</span>
</template>
</VnLv>
<VnLv :value="worker?.sip?.extension">
<template #label>
{{ t('worker.summary.sipExtension') }}
<VnLv :label="t('worker.summary.sipExtension')">
<template #value>
<VnLinkPhone :phone-number="worker?.sip?.extension" />
</template>
</VnLv>

View File

@ -68,13 +68,9 @@ const arrayData = useArrayData('Worker');
const acl = useAcl();
const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
const worker = computed(() => arrayData.store?.data);
const canSend = computed(() =>
acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }]),
);
const canSend = computed(() => acl.hasAcl('WorkerTimeControl', 'sendMail', 'WRITE'));
const canUpdate = computed(() =>
acl.hasAny([
{ model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
]),
acl.hasAcl('WorkerTimeControl', 'updateMailState', 'WRITE'),
);
const isHimself = computed(() => user.value.id === Number(route.params.id));

View File

@ -75,13 +75,13 @@ onMounted(async () => {
<template #body="{ entity: zone }">
<QCard class="vn-one">
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
<div class="card-group">
<div class="card-content">
<div class="vn-card-group">
<div class="vn-card-content">
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
</div>
<div class="card-content">
<div class="vn-card-content">
<VnLv
:label="t('summary.closeHour')"
:value="toTimeFormat(zone.hour)"
@ -98,7 +98,7 @@ onMounted(async () => {
</div>
</div>
</QCard>
<QCard class="vn-one">
<QCard class="vn-max">
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
<QTable
:columns="columns"
@ -109,15 +109,3 @@ onMounted(async () => {
</template>
</CardSummary>
</template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
}
</style>

View File

@ -1,15 +0,0 @@
#!/bin/bash
find 'test/cypress/integration' \
-mindepth 1 \
-maxdepth 1 \
-type d | \
xargs -P "$1" -I {} sh -c '
echo "🔷 {}" &&
xvfb-run -a cypress run \
--headless \
--spec "{}" \
--quiet \
> /dev/null
'
wait

View File

@ -0,0 +1,20 @@
#!/bin/bash
echo $2
if [ -z "$2" ]; then
TEST_DIRS=$(find 'test/cypress/integration' -mindepth 1 -maxdepth 1 -type d)
else
TEST_DIRS=$2
fi
echo $TEST_DIRS x$1
echo "$TEST_DIRS" | xargs -P "$1" -I {} sh -c '
echo "🔷 {}" &&
xvfb-run -a cypress run \
--headless \
--spec "{}" \
--quiet \
> /dev/null
'
wait

View File

@ -0,0 +1,52 @@
import fs from 'fs';
import { parse } from 'es-module-lexer';
import { parse as vueParse } from '@vue/compiler-sfc';
import glob from 'fast-glob';
import { resolveImportPath, toRelative } from './resolve-import-path.js';
const ROUTER_MODULES = 'src/router/modules/';
const files = await glob(['src/**/*.{vue,js,ts}'], { absolute: true });
const vueFiles = new Map();
export async function findImports(targetFile, visited = new Set(), identation = '') {
if (visited.has(targetFile)) return []; // Avoid infinite loops
visited.add(targetFile);
const usageFiles = files
.filter((file) => {
let content = fs.readFileSync(file, 'utf8');
if (file.endsWith('.vue')) {
if (vueFiles.has(file)) {
content = vueFiles.get(file);
} else {
const { descriptor } = vueParse(content);
content = descriptor?.scriptSetup?.content ?? '';
vueFiles.set(file, content);
}
}
if (!content.trim()) return false;
return parse(content)[0].some((imp) => {
if (!imp?.n) return false;
return resolveImportPath(imp.n, targetFile) === targetFile;
});
})
.map((file) => toRelative(file));
let fullTree = [...usageFiles];
for (const file of usageFiles) {
if (file.startsWith(ROUTER_MODULES)) {
continue;
}
fullTree = [
...fullTree,
...(await findImports(file, visited, identation + ' ')),
];
}
return getUniques(fullTree); // Remove duplicates
}
function getUniques(array) {
return Array.from(new Set(array));
}

View File

@ -0,0 +1,36 @@
import { execSync } from 'child_process';
import { findImports } from './find-imports.js';
import { getModules } from './get-modules.js';
const E2E_PATH = 'test/cypress/integration';
const FINDED_PATHS = ['src', E2E_PATH];
function getGitDiff(options) {
const TARGET_BRANCH = options[2] || 'dev';
const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, {
encoding: 'utf-8',
});
return diff.split('\n');
}
async function getChangedModules() {
let changedModules = new Set();
const changes = getGitDiff(process.argv);
for (const change of changes) {
if (!change) continue;
if (!FINDED_PATHS.some((prefix) => change.startsWith(prefix))) return '';
const changedArray = [
...changedModules,
...new Set(getModules(await findImports(change))),
];
if (change.startsWith(E2E_PATH)) changedArray.push(change);
changedModules = new Set(changedArray);
}
return [...changedModules].join('\n');
}
getChangedModules()
.then((modules) => console.log(modules)) // is return
.catch((e) => {
console.error(e);
process.exit(1);
});

View File

@ -0,0 +1,13 @@
export function getModules(files) {
const CYPRESS_PREFIX = 'test/cypress/integration/';
const CYPRESS_SUFIX = '/**/*.spec.js';
const modules = [];
for (const file of files) {
if (file.startsWith('src/page')) {
modules.push(
CYPRESS_PREFIX + file.split('/')[2].toLowerCase() + CYPRESS_SUFIX,
);
}
}
return modules;
}

View File

@ -0,0 +1,34 @@
import fs from 'fs';
import path from 'path';
const rootDir = process.cwd();
const config = JSON.parse(fs.readFileSync('jsconfig.json', 'utf-8'));
const { paths, baseUrl } = config.compilerOptions;
function resolveImportPath(importPath, fileBase) {
if (!importPath) return null;
importPath = jsConfigPaths(importPath);
const fileDir = path.dirname(fileBase);
if (importPath.startsWith('.') || importPath.startsWith('/')) {
return path.relative(rootDir, path.resolve(fileDir, importPath));
}
return importPath;
}
function toRelative(file) {
return path.relative(rootDir, file);
}
function jsConfigPaths(importPath) {
for (const [aliasPattern, [target]] of Object.entries(paths)) {
const alias = aliasPattern.replace('/*', '');
const targetBase = target.replace('/*', '');
if (importPath.startsWith(alias)) {
const rest = importPath.slice(alias.length);
return path.resolve(baseUrl, targetBase + rest);
}
}
return importPath;
}
export { resolveImportPath, toRelative };

View File

@ -35,6 +35,8 @@ docker build -f ./docs/Dockerfile.dev -t lilium-dev .
# END IMAGES
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d
files=$(node test/cypress/docker/find/find.js)
echo $files
docker run -it --rm \
-v "$(pwd)":/app \
@ -42,6 +44,6 @@ docker run -it --rm \
-e CI \
-e TZ \
lilium-dev \
bash -c 'sh test/cypress/cypressParallel.sh 2'
bash -c "sh test/cypress/docker/cypressParallel.sh 2 '$files'"
cleanup

View File

@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => {
cy.validateCheckbox(checkbox, false);
});
it.skip('should delete the invoice properly', () => {
it('should delete the invoice properly', () => {
cy.visit('/#/invoice-in/2/summary');
cy.selectDescriptorOption(2);
cy.clickConfirm();
@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
cy.visit('/#/invoice-in/6/summary');
cy.selectDescriptorOption(5);
cy.dataCy('SendEmailNotifiactionDialogInput_input').type(
cy.dataCy('SendEmailNotificationDialogInput_input').type(
'{selectall}jorgito@gmail.mx',
);
cy.clickConfirm();

View File

@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
});
});
it('should transfer the invoice ', () => {
it.skip('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(1)).click();
@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});
@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});

View File

@ -1,6 +1,6 @@
/// <reference types="cypress" />
describe('VnShortcuts', () => {
// https://redmine.verdnatura.es/issues/8848
describe.skip('VnShortcuts', () => {
const modules = {
item: 'a',
customer: 'c',

View File

@ -1,4 +1,5 @@
describe('WorkerList', () => {
// https://redmine.verdnatura.es/issues/8848
describe.skip('WorkerList', () => {
const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
const searchBtn = '.q-drawer button:nth-child(3)';
const descriptorTitle = '.descriptor .title span';
@ -13,7 +14,7 @@ describe('WorkerList', () => {
cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
cy.get(searchBtn).click();
cy.wait('@worker').then(() =>
cy.get(descriptorTitle).should('include.text', 'Jessica')
cy.get(descriptorTitle).should('include.text', 'Jessica'),
);
});
});

View File

@ -5,12 +5,11 @@ import jsconfigPaths from 'vite-jsconfig-paths';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path';
let reporters,
outputFile;
let reporters, outputFile;
if (process.env.CI) {
reporters = ['junit', 'default'];
outputFile = {junit: './junit/vitest.xml'};
outputFile = { junit: './junit/vitest.xml' };
} else {
reporters = 'default';
}
@ -28,6 +27,9 @@ export default defineConfig({
'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
],
},
server: {
hmr: { overlay: false },
},
plugins: [
vue({
template: {
@ -39,8 +41,11 @@ export default defineConfig({
sassVariables: 'src/quasar-variables.scss',
}),
VueI18nPlugin({
strictMessage: false,
runtimeOnly: false,
include: [
path.resolve(__dirname, 'src/i18n/**'),
path.resolve(__dirname, 'src/i18n/locale/**'),
path.resolve(__dirname, 'src/pages/**/locale/**'),
],
}),