Compare commits

..

762 Commits

Author SHA1 Message Date
Alex Moreno 2dfdfc2987 test: skip e2e invoiceOutList
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-29 11:03:18 +02:00
Alex Moreno c334c58691 fix: revert
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-04-29 10:27:37 +02:00
Pablo Natek 9528048b5f Merge pull request 'fix(VnTable): replace click event with mousedown for editable rows' (!1753) from fixTextSelectionOnInputOnVntable into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1753
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-28 10:06:18 +00:00
Pablo Natek 70ceee988c fix(VnTable): replace click event with mousedown for editable rows
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-27 16:16:33 +02:00
Jon Elias 6273aea7ff Merge pull request '#8028: Modified arrayData to fix inject warning' (!1747) from 8028-WarningInject into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1747
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-25 11:33:46 +00:00
Jon Elias 397e378856 Merge branch 'dev' into 8028-WarningInject
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-25 07:48:13 +00:00
Alex Moreno f145351cf1 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-25 09:39:26 +02:00
Alex Moreno 8bceb21493 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-25 09:39:15 +02:00
Alex Moreno e30232741f fix(VnCard): conditionally update card descriptor based on visual prop
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 09:39:10 +02:00
Jon Elias d71b928802 Merge branch 'dev' into 8028-WarningInject
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-25 06:47:09 +00:00
Alex Moreno 0748a2728c fix(ItemDescriptorProxy): add proxy-render prop to ItemDescriptor component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 08:33:51 +02:00
Alex Moreno bac21ac062 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-25 08:28:28 +02:00
Alex Moreno ce81185089 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-25 08:28:14 +02:00
Alex Moreno 4eff607ecb fix(WorkerTimeControl): replace axiosNoError with axios for API calls
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 08:28:06 +02:00
Alex Moreno 92b3ea126f refactor(WorkerBasicData): update addAdvancedData to use formData and remove state dependency
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 08:07:22 +02:00
Alex Moreno 312677964e refactor(workerBasicData): fix useAdvancedSummary
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-25 07:35:30 +02:00
Jon Elias d568fc3100 refactor: refs #8028 modified arrayData to fix inject warning
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 16:18:38 +02:00
Alex Moreno 16eecb324f 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-24 15:08:30 +02:00
Alex Moreno 3ed24ae23d 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-24 15:08:23 +02:00
Alex Moreno ba2ab0f300 refactor: workerDescriptor use CardDescriptor
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-24 15:08:08 +02:00
Javier Segarra 97f82ffa3a fix: update getDate function to handle hour data and add VnInputTime component for shipped hour
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-24 12:41:17 +02:00
Jon Elias 8df3ed8779 Merge pull request 'Hotfix[VnDmsList]: Open file in new window to equal Salix's behavior' (!1744) from Hotfix-VnDmsList into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1744
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-24 11:25:22 +00:00
Jon Elias 295d514457 Merge branch 'master' into Hotfix-VnDmsList
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-24 10:53:43 +00:00
Alex Moreno 8ee1d96bda Merge pull request 'fix: remove unused props and simplify component structure in multiple descriptor proxies' (!1742) from hotFix_descriptor_getData into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1742
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-24 10:47:11 +00:00
Jon Elias 7c699e9022 fix: open dms file in new window instead of downloading it automatically to equal salix behavior
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-24 12:27:58 +02:00
Javier Segarra c540865694 fix: update getDate function to handle hour data and add VnInputTime component for shipped hour
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-24 12:01:43 +02:00
Jorge Penadés 5b4ff55a1d Merge pull request 'fix: refs #8936 change default value of preventSubmit to false' (!1743) from 8936-preventSubmit into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1743
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-24 09:27:08 +00:00
Jorge Penadés 43b23f62a5 fix: refs #8936 change default value of preventSubmit to false
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-24 10:20:06 +02:00
Jon Elias 82736beef0 Merge pull request '#8254: New autofill component' (!1741) from 8254-CreateAutofillComponent into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1741
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-24 07:20:59 +00:00
Jon Elias 71fddf14c5 Merge branch 'dev' into 8254-CreateAutofillComponent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-24 07:06:40 +00:00
Alex Moreno 3b6c41208f fix: remove unused props and simplify component structure in multiple descriptor proxies
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-24 09:04:42 +02:00
Alex Moreno 172b2d1574 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-24 08:45:27 +02:00
Jon Elias e96da2fa59 Merge branch 'dev' into 8254-CreateAutofillComponent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 06:39:32 +00:00
Jon Elias e824a53fa3 feat: refs #8254 new autofill component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-24 08:24:20 +02:00
Javier Segarra ebc2357685 perf: change limit
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 20:14:24 +02:00
Javier Segarra 2c8d3ac0e0 Merge pull request 'feat: add VnMultiCheck component for multi-selection functionality' (!1734) from vnTable_multi_check into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1734
2025-04-23 17:53:04 +00:00
Javier Segarra 0016ee8e12 Merge branch 'vnTable_multi_check' of https://gitea.verdnatura.es/verdnatura/salix-front into vnTable_multi_check
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 19:25:16 +02:00
Javier Segarra a0ceabb527 fix: revert test to allow removal of all items in ItemFixedPrice tests 2025-04-23 19:25:14 +02:00
Javier Segarra a3420a0a83 Merge branch 'dev' into vnTable_multi_check 2025-04-23 19:24:45 +02:00
Javier Segarra 2c9f756871 fix: update checkbox selector for editing and removing items in ItemFixedPrice tests 2025-04-23 19:24:13 +02:00
Javier Segarra 0c0d21e53e feat: add multi-check support to VnTable and VnMultiCheck components 2025-04-23 19:24:07 +02:00
Jon Elias 3876dc4c34 Merge pull request 'Warmfix[ZoneList]: Fixed id filter' (!1739) from Warmfix-ZoneListIdFilter into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1739
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-23 14:16:43 +00:00
Jon Elias 02b8df4955 Merge branch 'test' into Warmfix-ZoneListIdFilter
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-23 13:54:08 +00:00
Jon Elias dfa7374bbc fix: fixed zone id filter
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-04-23 15:51:12 +02:00
Javier Segarra af8909177e Merge branch 'dev' into vnTable_multi_check
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-23 13:41:41 +00:00
Javier Segarra c8a9661d50 fix: enhance layout and styling for TicketNotes, TicketPackage components
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 15:09:26 +02:00
Javier Segarra 7ec9c44130 fix: remove v-bind 2025-04-23 15:09:09 +02:00
Javier Segarra 73f896f38a fix: refactor canEditZone logic and improve date handling in getDate function
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 15:05:26 +02:00
Alex Moreno f72543f533 Merge pull request 'fix: refactor createTicket function to use formData directly and remove unused reactive state' (!1737) from hotFix_ticketExpedition into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1737
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-23 10:20:50 +00:00
Alex Moreno 508a82ee75 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-23 12:12:34 +02:00
Alex Moreno 33bde1732f fix: remove readonly attribute from VnSelect component to improve interactivity
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-23 12:08:26 +02:00
Alex Moreno bcdb89d1a7 fix: refactor createTicket function to use formData directly and remove unused reactive state
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-23 11:21:14 +02:00
Alex Moreno 02b5141c01 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-23 11:17:49 +02:00
Alex Moreno a689582e89 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-23 11:17:44 +02:00
Alex Moreno efa0be5bc5 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-23 11:17:16 +02:00
Jose Antonio Tubau dad798abaf Merge pull request '#7638 - showAllCmrs' (!1642) from 7638-showAllCmrs into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1642
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-23 08:14:57 +00:00
Jose Antonio Tubau 74fc843406 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 08:00:54 +00:00
Benjamin Esteve 794afc77c4 Merge pull request 'fix: refs #8909 remove column shippedHour from ticket basicdata' (!1730) from 8909-hotfix-removeFieldFromTicketBasicdata into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1730
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-23 07:25:58 +00:00
Benjamin Esteve adfd9eba6f Merge pull request 'feat: refs #8828 add warehouse filtering for tickets and travels' (!1678) from 8828-filterVnSelectWarehouses into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1678
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-23 07:19:41 +00:00
Benjamin Esteve 17211b5e4e Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-23 07:04:39 +00:00
Javier Segarra f683d78e0e feat: enhance i18n support for campaign consumption and select all functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 18:02:54 +02:00
Javier Segarra 7bbabb9761 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into vnTable_multi_check 2025-04-22 17:51:19 +02:00
Javier Segarra b13bcea331 feat: add VnMultiCheck component for multi-selection functionality
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 17:43:29 +02:00
Jorge Penadés 259a8f7df2 Merge pull request 'fix(VnFilter): refs #8277 update columnFilter event handling on component mount' (!1733) from 8277-fixSupplierFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1733
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-22 14:31:59 +00:00
Javier Segarra 7ae4d1575f Merge pull request 'WARMFIX: VnSelect cannot scroll' (!1732) from warmifx_select_scroll into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1732
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-22 13:44:22 +00:00
Benjamin Esteve 6b472341a1 fix: refs #8828 correct response index in ticket filter interception
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 13:40:30 +02:00
Benjamin Esteve 55d2cbe028 Merge branch 'master' into 8909-hotfix-removeFieldFromTicketBasicdata
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-22 10:59:53 +00:00
Alex Moreno 4da9d7b262 Merge branch 'test' into warmifx_select_scroll
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-22 10:32:38 +00:00
Javier Segarra 6ff71374fc fix: rename 'import' column to 'totalWithVat' in ticketColumns
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-22 12:31:50 +02:00
Jorge Penadés 177a9aab6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-fixSupplierFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 12:12:37 +02:00
Benjamin Esteve 83f6a05244 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 12:12:28 +02:00
Benjamin Esteve 21689eaaa2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-22 12:12:24 +02:00
Benjamin Esteve 5a8efa4322 Merge branch 'dev' into 8828-filterVnSelectWarehouses 2025-04-22 10:08:15 +00:00
Javier Segarra d482752be9 Merge pull request 'feat: #8443 created vehicle events' (!1379) from 8443-vehicleEvent into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1379
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-22 09:55:27 +00:00
Jorge Penadés 8e62102cc1 fix(VnFilter): refs #8277 update event handling for columnFilter in onBeforeMount
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 11:49:13 +02:00
Jorge Penadés 96a517028a fix(EntryPreAccount): refs #8277 correct translation key for Canary Islands in i18n
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-22 11:38:29 +02:00
Jorge Penadés 53bbdf52cf fix(VnFilter): refs #8277 update columnFilter event handling on component mount
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 11:35:47 +02:00
Javier Segarra 4033dd472d fix: change disable to readonly for loading state in VnSelect component
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-04-22 11:22:18 +02:00
Benjamin Esteve 5eeae1143c refactor: refs #8828 update filter logic to use boolean
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-22 10:03:22 +02:00
Alex Moreno 2d60ed5522 Merge pull request 'fix: #8698 Jenkins find use TARGET_BRANCH' (!1728) from warmFix_gitFetch_gitDiff into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1728
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-22 08:02:29 +00:00
Benjamin Esteve cb76d7e93b Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 09:53:29 +02:00
Benjamin Esteve 766aa24a89 Merge branch 'dev' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-22 09:53:26 +02:00
Benjamin Esteve 1985ab2910 fix: refs #8909 remove column shippedHour from ticket basicdata
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-22 09:16:01 +02:00
Alex Moreno 83a0a1ab5d fix: pass COMPOSE_TAG to find.js script for E2E module detection
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-22 08:25:53 +02:00
Alex Moreno 87f4a21f97 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-22 06:02:35 +00:00
Pau Rovira d89d6c018a Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-22 05:55:58 +00:00
Jorge Penadés 508cf2f684 Merge pull request '#8277 createEntryControl' (!1370) from 8277-createEntryControl into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-17 16:45:29 +00:00
Jorge Penadés 23ceaf9c9b fix(itemTax): refs #8277 update tax type from 'General VAT' to 'IVA General' for accuracy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-17 18:10:46 +02:00
Jorge Penadés 200b1ab329 refactor(EntryPreAccount): refs #8277 rename accountType to fiscalCode and update related data fetching
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 16:27:00 +02:00
Jorge Penadés 412e04b1ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 15:53:06 +02:00
Alex Moreno 5fa5776ee7 fix: ensure git fetch is executed with the correct encoding in getGitDiff function
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-04-17 15:08:30 +02:00
Alex Moreno 95bbe04e32 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-17 15:02:45 +02:00
Alex Moreno 7d51465e03 fix(VnSelect): warning and error isLoading
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 15:02:35 +02:00
Pau Rovira f6759da796 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-17 10:52:34 +00:00
Pau Rovira 58057a8ac2 fix: refs #8443 fixed broken route
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-17 12:50:37 +02:00
Jorge Penadés 0009ed8fdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-04-17 12:26:26 +02:00
Javier Segarra 3fa7fe7ae0 fix: make setDefault function async axios patch 2025-04-17 12:16:02 +02:00
Alex Moreno d4a0939c28 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-17 11:00:00 +02:00
Alex Moreno 99bc6d3b75 fix: add optional chaining to loading state check in VnSelect component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:59:57 +02:00
Alex Moreno 6265c44c67 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-17 10:51:42 +02:00
Alex Moreno 5a04aa8e27 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-17 10:51:36 +02:00
Alex Moreno c5fb889b75 fix: simplify loading state check in VnSelect component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:49:50 +02:00
Jorge Penadés 7e04a794cb chore: refs #8277 rename received
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:49:35 +02:00
Alex Moreno 3815a9772e 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-17 10:44:35 +02:00
Alex Moreno 3eacf92404 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-17 10:44:30 +02:00
Alex Moreno 6336cf9e24 test: fix warning
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 10:44:07 +02:00
Jorge Penadés 785f27fd77 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-17 10:34:05 +02:00
Alex Moreno 33c421e29f 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-17 10:31:28 +02:00
Alex Moreno ae474bf99a 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-17 10:31:04 +02:00
Jorge Penadés 3d573fc871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:30:36 +02:00
Pau Rovira 297ef023e4 Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-17 10:20:36 +02:00
Javier Segarra 3e06dacb07 Merge pull request 'HOTFIX: #8918 - Ticket Negative descriptor' (!1723) from hotfix_negative_descriptor into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1723
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-17 07:29:57 +00:00
Javier Segarra 8baa1c4af4 Merge branch 'master' into hotfix_negative_descriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-17 07:09:30 +00:00
Alex Moreno f99271289d chore: remove console.log
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 08:51:04 +02:00
Alex Moreno e3adbefc41 test: enable invoiceOutList, invoiceOutSummary and ticketSale skipped
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-17 08:23:18 +02:00
Alex Moreno 9b1eaf949a 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-17 08:03:20 +02:00
Alex Moreno 53178d2429 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-17 08:01:06 +02:00
Javier Segarra 9d166691fa fix: update route parameter from 'id' to 'itemFk' in TicketLack components
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-16 21:32:58 +02:00
Jorge Penadés 4c8681d124 refactor: refs #8277 update daysAgo logic to use dynamic maxDays and defaultDays from API response
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 18:30:04 +02:00
Jorge Penadés b5b69055bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 17:54:01 +02:00
Jose Antonio Tubau a2991281a7 Merge pull request 'refactor: refs #8413 vnInputDate component and improve date formatting logic' (!1700) from 8413-addDateYearAutofillVnInputDate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1700
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 15:03:39 +00:00
Alex Moreno d012c79356 Merge pull request 'fix: refs #8910 ticketList orders' (!1721) from 8910-TicketFilter_fix_order into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1721
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-04-16 14:30:09 +00:00
Jose Antonio Tubau 66da64eb78 Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 14:21:22 +00:00
Jose Antonio Tubau 210ff8427b Merge pull request '#8442 - createVehicleDms' (!1614) from 8422-createVehicleDms into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1614
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 14:20:23 +00:00
Jose Antonio Tubau 57a31e4f0b Merge branch '8413-addDateYearAutofillVnInputDate' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 16:16:16 +02:00
Jose Antonio Tubau fba386f8c4 refactor: refs #8413 remove redundant test for error color on invalid date input in VnInputDate component 2025-04-16 16:15:38 +02:00
Jorge Penadés 3ff9cdd8fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 15:45:09 +02:00
Alex Moreno 34c59b9d20 Merge branch 'master' into 8910-TicketFilter_fix_order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-16 13:43:08 +00:00
Jose Antonio Tubau 5f0eabd626 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 15:26:33 +02:00
Jose Antonio Tubau 7bc53b131a Merge branch 'dev' into 8422-createVehicleDms 2025-04-16 15:26:31 +02:00
Jose Antonio Tubau 5053dbe1eb Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:21:14 +00:00
Jose Antonio Tubau 0e66e3362f test: refs #8413 add validation for error color on invalid date input in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 15:20:45 +02:00
Alex Moreno 41f064d2ab Merge branch '8910-TicketFilter_fix_order' of https://gitea.verdnatura.es/verdnatura/salix-front into 8910-TicketFilter_fix_order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-16 15:00:04 +02:00
Alex Moreno fdf0283e7e test: refs #8910 skip EntryDescriptor 2025-04-16 15:00:03 +02:00
Javier Segarra de50676c65 fix: re-call workerSummary
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-16 14:39:07 +02:00
Alex Moreno 8396c0547c Merge branch 'master' into 8910-TicketFilter_fix_order
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-16 12:31:22 +00:00
Alex Moreno 7c5fcf78b9 fix: refs #8910 ticketList orders
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-16 14:30:54 +02:00
Jon Elias a6d2ee8ab2 Merge pull request '#8647 #8028 fix vitest warnings' (!1467) from 8647_fix_warnings into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1467
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-16 11:18:09 +00:00
Jose Antonio Tubau 290586e642 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 11:15:58 +00:00
Jose Antonio Tubau a3a6f1aa2b test: refs #8413 add data-cy attributes for form submit and stop buttons in InvoiceOutGlobalForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:14:52 +02:00
Jose Antonio Tubau 917ef597bb refactor: refs #8413 update date input test cases to use dot separators for date formatting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 12:47:16 +02:00
Jon Elias 39228ed257 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:46:09 +00:00
Jon Elias fba4fbb759 Merge pull request '#7868: Added department.notificationEmail instead of user email' (!1717) from 7868-CustomerSample into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-16 10:43:23 +00:00
Jon Elias ebabbce34c Merge branch 'dev' into 7868-CustomerSample
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:31:45 +00:00
Jorge Penadés 6c4c558107 Merge pull request 'fix(SupplierFiscalData): refs #8916 integrate array data fetching on form save' (!1720) from 8916-hotfix-reloadCard into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1720
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-16 10:24:57 +00:00
Jorge Penadés 5317f2c104 fix(SupplierFiscalData): refs #8916 integrate array data fetching on form save
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-16 12:03:15 +02:00
Jon Elias 2ef4a8c5de fix: refs #8647 fixed inputDateTime modelValue warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 11:42:58 +02:00
Alex Moreno 2d21ce3681 Merge pull request 'fix(ItemTags): wait data' (!1718) from hotFix_itemTags_id into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1718
2025-04-16 08:18:45 +00:00
Jose Antonio Tubau eaab97072c feat: refs #8413 update input background color based on date validation in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 10:11:23 +02:00
Alex Moreno 0af58c0536 refactor(cloneItem): simplify dialog invocation by removing unnecessary chaining
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-16 09:56:50 +02:00
Alex Moreno 650b205a04 fix(CrudModel, VnSelect): improve loading state handling and condition checks
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-16 09:52:30 +02:00
Jon Elias 75780f1ad2 fix: refs #8647 warning in VnInputDateTime
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:50:24 +02:00
Jon Elias 1a954cae60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-16 09:49:23 +02:00
Jorge Penadés f02013bc17 Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 09:47:29 +02:00
Jon Elias 4add424471 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:43:13 +02:00
Jon Elias 4f1c49afb3 refactor: refs #8647 undo paginate changes 2025-04-16 09:43:11 +02:00
Alex Moreno 787f76b401 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-16 09:20:14 +02:00
Alex Moreno 665168dc45 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-16 09:20:09 +02:00
Alex Moreno 71ae35be26 fix(ItemTags): wait data
gitea/salix-front/pipeline/pr-master This commit looks good Details
refactor: components use real loading
2025-04-16 09:18:53 +02:00
Benjamin Esteve 803e62342a Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 06:43:47 +00:00
Javier Segarra 55a0a53915 Merge pull request '#8582 - test: e2e monitorTicket' (!1391) from e2e_monitor into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1391
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 21:04:47 +00:00
Javier Segarra caa5fdf587 Merge pull request 'hotfix: Ticket negative improve' (!1591) from hotfix_negative_available into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 21:04:28 +00:00
Jorge Penadés d51b03a941 fix: refs #8277 update preAccount function to handle agricultural entries and adjust notification checks
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 18:50:13 +02:00
Jorge Penadés 00063ae20a fix: refs #8277 update entry account options to use 'code' for value and sorting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 16:27:25 +02:00
Jon Elias 7c7e492b6c feat: refs #7868 added department.notificationEmail instead of user email
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 16:25:05 +02:00
Jose Antonio Tubau b625258856 fix: refs #8413 ensure date input submits correctly in tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 16:05:03 +02:00
Jon Elias a4a9da9885 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 13:42:21 +00:00
Javier Segarra f615c5c196 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:35:38 +00:00
Jon Elias 77db8392cc Merge pull request 'Hotfix[routeSummary]: Show in table client id instead of client's name' (!1715) from Hotfix-RouteClient into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1715
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 13:22:36 +00:00
Jon Elias d8234ba141 Merge branch 'master' into Hotfix-RouteClient
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:00:44 +00:00
Jorge Penadés 494948cb20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 14:43:30 +02:00
Jon Elias 65a3582e79 test: refs #8647 skip failling e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 14:38:39 +02:00
Pau Rovira 2eb70aadcb Merge pull request 'hotfix: make accountNumber to work on blur' (!1714) from hotfix_vnAccountNumber into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1714
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 12:38:24 +00:00
Jon Elias 1d573b5dee fix: show in table client id instead of client's name
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 14:37:09 +02:00
Pau Rovira d8ba342d7c Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 14:36:42 +02:00
Benjamin Esteve 690bfcb547 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 14:03:00 +02:00
Benjamin Esteve eb8ffc6e16 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-15 14:02:26 +02:00
Benjamin Esteve 48eb945b36 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:56:38 +00:00
Pau Rovira d122752672 hotfix: make accountNumber to work on blur
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 11:54:26 +00:00
Javier Segarra 82b6fb6c2f fix: correct data retrieval after fetching in getData function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:49:21 +02:00
Jose Antonio Tubau f9f9caa493 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-15 11:40:33 +00:00
Pau Rovira 1a3e717620 Merge pull request 'feat: #8655 added button for scrolling up' (!1523) from 8655-scrollUpButton into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1523
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 11:26:06 +00:00
Benjamin Esteve ca5576f0e1 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:06:26 +00:00
Javier Segarra 31acc3d0a1 Merge branch 'master' into hotfix_negative_available 2025-04-15 12:23:31 +02:00
Pau Rovira 5b3ef29294 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 09:55:59 +00:00
Javier Segarra a66849f361 fix: ensure submit is awaited
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:38:04 +02:00
Jon Elias 1b20b0de60 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:14:25 +02:00
Jon Elias 42b8e908fa test: refs #8647 skip intermitent failling e2e 2025-04-15 11:14:24 +02:00
Jon Elias 1ea8c0fc4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-15 11:13:26 +02:00
Guillermo Bonet 04e1f7a1b5 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:02:04 +02:00
Guillermo Bonet a7ccc68ab7 Merge branch 'master' into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:01:53 +02:00
Guillermo Bonet 917a7e8ecc fix: i18n error
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:01:40 +02:00
Jon Elias 4f7dcca917 Merge pull request 'fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion' (!1711) from Hotfix-ZoneExclusionDated into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1711
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 08:54:42 +00:00
Jose Antonio Tubau 005693550e Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 10:39:34 +02:00
Jose Antonio Tubau db06227b14 refactor: refs #8422 add document and import translations for DMS in global locales 2025-04-15 10:39:33 +02:00
Javier Segarra 64e30b7143 refactor: remove redundant form filling step in order creation test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 10:38:00 +02:00
Jon Elias 63e7c55b7d fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 10:32:12 +02:00
Benjamin Esteve e32858374e Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 10:31:27 +02:00
Benjamin Esteve 1a35c6e60b Merge branch 'dev' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-15 10:31:25 +02:00
Jose Antonio Tubau 0e3247ceac Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 08:23:38 +00:00
Javier Segarra de359043af Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 07:43:11 +00:00
Jon Elias e6e43ccfc4 Merge pull request 'Hotfix[ZoneEventInclusion]: Fixed event inclusion duplicateKey' (!1710) from Hotfix-ZoneInclusionDeleteEvent into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1710
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 07:12:52 +00:00
Jon Elias dd74664eb6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 06:58:01 +00:00
Jon Elias dcf6d3cad4 Merge branch 'master' into Hotfix-ZoneInclusionDeleteEvent
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 06:49:23 +00:00
Jon Elias 0f7bb9cfe1 fix: fixed event inclusion duplicateKey because of props assignment in onMounted
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-15 08:46:31 +02:00
Alex Moreno e03e6b2305 build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 08:30:03 +02:00
Jose Antonio Tubau 76c6bd3048 refactor: refs #8422 update document ID prompt for clarity in Spanish and English locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 08:22:31 +02:00
Pau Rovira d171c7dd94 Merge pull request 'hotfix: fixed CustomerSamples table not loading correctly when reloading' (!1709) from hotfix_customerSamples into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1709
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-15 06:16:35 +00:00
Alex Moreno 12fdf567c4 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-15 07:25:22 +02:00
Pau Rovira 01ac0f2921 Merge branch 'master' into hotfix_customerSamples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 05:07:40 +00:00
Jorge Penadés 070899b974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 17:08:08 +02:00
Jorge Penadés 3d1da8345c refactor: refs #8277 simplify QBadge usage in invoice creation component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 17:02:39 +02:00
Jon Elias b524a6d8eb Merge pull request 'Hotfix[ZoneEvents]: Fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event' (!1708) from Hotfix-ZoneExclusionDatedValue into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1708
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-14 14:38:09 +00:00
Jon Elias 9838342e27 Merge branch 'master' into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 13:56:39 +00:00
Alex Moreno be7c63150c Merge pull request 'fix: add unremovableParams to VnFilterPanel for better filtering control' (!1705) from fix_ticketList_fromTo_unremovable into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1705
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-04-14 13:16:11 +00:00
Jorge Penadés a02174af7b refactor: refs #8277 update QBadge styling for company column in invoice creation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 15:07:10 +02:00
Alex Moreno bbd07e71fa Merge branch 'master' into fix_ticketList_fromTo_unremovable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 12:55:50 +00:00
Jon Elias 6692b499d2 Merge branch 'Hotfix-ZoneExclusionDatedValue' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 14:34:08 +02:00
Jon Elias 78f1756edc fix: dated name 2025-04-14 14:34:07 +02:00
Pau Rovira 9919352e8c hotfix: fixed CustomerSamples table not loading correctly when reloading
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 12:32:11 +00:00
Jon Elias 690d807ef1 Merge branch 'master' into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-14 12:19:19 +00:00
Jon Elias ff6d2a71bf fix: fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 13:44:53 +02:00
Jose Antonio Tubau 46c0e4bc74 test: refs #8422 skip download DMS test to prevent execution during current test run
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 13:43:52 +02:00
Jose Antonio Tubau e52c6afe4c Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:15:11 +00:00
Javier Segarra f49f694970 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 11:09:13 +00:00
Javier Segarra d399afcd89 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 10:39:54 +00:00
Jose Antonio Tubau b26be0bf6d feat: refs #8422 add testDmsAction command to handle create and delete actions with improved logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:27:15 +02:00
Jose Antonio Tubau be877fa2b8 refactor: refs #8422 add testDmsAction command for streamlined DMS operations in Cypress tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:07:58 +02:00
Jorge Penadés e680cbc25d refactor: refs #8277 update invoice creation logic and adjust data filtering options
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:04:13 +02:00
Jon Elias 239e008aba Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:24:47 +02:00
Jon Elias 38bd00e82a test: refs #8647 fix skipped tests 2025-04-14 11:24:45 +02:00
Jon Elias 7119cbbe89 Merge pull request 'Hotfix[ClientConsumption]: Fixed arrayData key' (!1706) from Hotfix-ClientConsumption into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1706
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-14 09:19:00 +00:00
Benjamin Esteve 907afc84e4 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:16:47 +00:00
Jon Elias db85936963 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 11:14:41 +02:00
Jon Elias 516e89d445 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:14:00 +00:00
Pau Rovira 2e8192ef7b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 09:13:39 +00:00
Javier Segarra dea2ddcd6c test: skip test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-14 11:12:13 +02:00
Javier Segarra b162dd7672 test: remove filter by column
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:09:21 +02:00
Jon Elias 05311b8ffa fix: skip failing test
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 10:56:28 +02:00
Jorge Penadés 09d88e25ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 10:47:45 +02:00
Jon Elias 57955ec2d5 fix: refs #8647 vndms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 10:33:13 +02:00
Javier Segarra d1440c1083 Merge branch 'dev' into e2e_monitor 2025-04-14 10:16:43 +02:00
Jon Elias 180153d8f0 fix: skip failing tests
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 10:08:44 +02:00
Jon Elias 3782e7e8d7 fix: refs #8647 skip tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:49:44 +02:00
Benjamin Esteve 220e2dccd6 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:07:00 +02:00
Benjamin Esteve 8ea4163f05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-14 09:06:39 +02:00
Jon Elias 535bfa4347 fix: fixed arrayData key
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 09:00:18 +02:00
Benjamin Esteve 7a05b8e768 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 06:51:27 +00:00
Alex Moreno 6acd2e9e9f fix: add unremovableParams to VnFilterPanel for better filtering control
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 08:38:16 +02:00
Jon Elias 797ce5922d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 08:04:31 +02:00
Pau Rovira 3bcafc5734 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-14 07:19:15 +02:00
Pau Rovira 199a6c8cce Merge pull request 'fix: fixed CustomerConsumption errors when changing customer & downloading pdf' (!1666) from fix-CustomerConsumption into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1666
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-14 05:17:46 +00:00
Pau Rovira 8309e2cddf Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 05:13:42 +00:00
Guillermo Bonet 8e45abd041 Merge pull request 'refactor: refs #8289 Delete guessPriority method' (!1704) from 8289-routeGuessPriority into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1704
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-14 05:02:24 +00:00
Guillermo Bonet b50ad72155 refactor: refs #8289 Delete guessPriority method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-13 09:42:08 +02:00
Guillermo Bonet c43f8f8af4 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-13 09:37:09 +02:00
Jorge Penadés fb638542bb refactor: refs #8277 remove redundant axios import from helper in EntryPreAccount tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 17:17:01 +02:00
Jorge Penadés 648d60c81f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 16:30:22 +02:00
Javier Segarra 510eab8af0 feat: fix minor bugs
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 15:04:24 +02:00
Jose Antonio Tubau b45c97e3c1 test: refs #8422 remove 'only' from download DMS test to ensure all tests run
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 14:01:05 +02:00
Jon Elias a547188498 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 13:44:44 +02:00
Jon Elias df39cd4eca perf: refs #8647 paginate 2025-04-11 13:44:43 +02:00
Jon Elias 19481209d8 Merge pull request 'Fix[InputBic]: Fixed filter' (!1701) from Fix-AutoFillBic into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1701
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 11:38:41 +00:00
Jon Elias 88099a9f34 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-11 11:33:25 +00:00
Jon Elias 9410257822 Merge branch 'dev' into Fix-AutoFillBic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 11:33:09 +00:00
Javi Gallego b321ab3240 Merge pull request 'refactor: refs #6696 remove VnUsesMana component and update related logic in TicketEditMana and TicketSale' (!1675) from 6696-manaAfterDepartment into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 10:39:56 +00:00
Javier Segarra b32a889dfe feat: updates 2025-04-11 12:30:37 +02:00
Jose Antonio Tubau ec906daf41 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:20:03 +02:00
Jose Antonio Tubau 800e5e18d4 test: refs #8422 update download DMS test to verify file download response 2025-04-11 12:20:01 +02:00
Benjamin Esteve 190310f285 Merge pull request 'refactor: refs #8833 streamline state color handling in Claim components' (!1691) from 8833-addColumnClassColor into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1691
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 10:19:03 +00:00
Jon Elias 19fde32006 fix: fixed filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 12:03:24 +02:00
Javi Gallego 1125067b09 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:02:55 +02:00
Jose Antonio Tubau 2159ce0897 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:02:48 +00:00
Javi Gallego 50ab4d28c2 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 12:01:57 +02:00
Jon Elias 27691943d3 perf: refs #8647 warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:56:53 +02:00
Jon Elias be3c48b9f1 refactor: refs #8647 solved inject warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 11:50:39 +02:00
Jose Antonio Tubau 4b5fb2453a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:20:47 +02:00
Benjamin Esteve 55e074754e Merge branch '8828-filterVnSelectWarehouses' of https: refs #8828//gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:14:47 +02:00
Benjamin Esteve b6b9e1d97d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-11 11:14:17 +02:00
Benjamin Esteve 76a2c8200f Merge branch 'dev' into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 09:13:22 +00:00
Jorge Penadés ce1aa3fb1b Merge pull request 'feat: refs #6564 add agency & ticket list' (!1108) from 6564-enhanceTicketAdvance into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1108
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 09:11:10 +00:00
Jorge Penadés 3fa1f2961d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 10:54:45 +02:00
Jorge Penadés 8f141bba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:49:06 +02:00
Benjamin Esteve 5c6e97b42a feat: refs #8833 add neutral color variable and update state color handling in claim components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:44:57 +02:00
Jose Antonio Tubau 6dddad95c9 fix: refs #8422 correct spelling of 'PopUp' in checkRedirectionFromPopup command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:43:49 +02:00
Jon Elias a4e4c882ee refactor: refs #8647 deleted many warnings and skipped only true failing e2e in local branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:17:11 +02:00
Javier Segarra 37bc464a98 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 10:06:21 +02:00
Javier Segarra 5fca08aaa2 test: add VnInputDateTime component tests 2025-04-11 10:05:47 +02:00
Benjamin Esteve 5225a9f57c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 09:45:18 +02:00
Benjamin Esteve b21720c79c Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 07:05:17 +00:00
Jose Antonio Tubau 9a0211787a refactor: refs #8422 implement checkRedirectionFromPopup command and refactor tests for improved readability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 09:01:47 +02:00
Jon Elias e4da145a5e refactor: refs #8647 skip front failing test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:53:43 +02:00
Jose Antonio Tubau e84107dcbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:26:15 +02:00
Jose Antonio Tubau 6dc9f3ca07 refactor: refs #8413 vnInputDate component and improve date formatting logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:15:03 +02:00
Jon Elias 2678ac5def feat: refs #8647 unskipp e2e to test which of them are really failling and fixed VnDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 08:01:46 +02:00
Javi Gallego 4e0450bf36 fix: rename variable for clarity in updateDiscount function
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-11 07:52:41 +02:00
Javi Gallego bf1bb002e6 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 07:44:18 +02:00
Jon Elias 915776c4e8 Merge pull request 'Fix[Swift/Bic]: Fixed autocomplete when entering an iban' (!1697) from Fix-CustomerBillingData into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 05:24:01 +00:00
Jon Elias f0a6fc00cf Merge branch 'dev' into Fix-CustomerBillingData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 04:11:15 +00:00
Jorge Penadés 96b57cab33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 18:22:38 +02:00
Jorge Penadés 85fa1543c1 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 18:10:45 +02:00
Jorge Penadés 7ee32158c7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-10 18:09:47 +02:00
Jon Elias 6976569c42 Merge pull request 'Hotfix: SummaryProblems' (!1699) from Hotfix-TicketSummaryAddress into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1699
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-10 14:57:06 +00:00
Jon Elias 02b7afb9ec Merge branch 'Hotfix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 16:13:59 +02:00
Jon Elias 3027d579cf perf: deleted !important 2025-04-10 16:13:57 +02:00
Jon Elias 9e74a4a3f8 Merge branch 'master' into Hotfix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 13:44:53 +00:00
Jon Elias 6b6118c66c fix: fixed recommended credit not showing correctly
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-04-10 15:03:03 +02:00
Javier Segarra 31451a86ed fix: 'shippedDate' filter
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-10 14:59:52 +02:00
Jon Elias b54bb22967 perf: english translation 2025-04-10 14:59:12 +02:00
Jon Elias db1f5e3083 perf: tooltip
gitea/salix-front/pipeline/pr-master Build queued... Details
2025-04-10 14:57:46 +02:00
Jon Elias 2be108c897 fix: ticket client address
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-10 14:54:41 +02:00
Jon Elias 0e5e092450 fix: ticket address and fixed CustomerSummary height fields 2025-04-10 14:53:25 +02:00
Javier Segarra 5e0f0caa2e Merge pull request 'fix: update phone number VnTable.Card and CustomerBalance checkbox' (!1696) from hotfix_customer_minorchanges into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1696
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-10 11:22:38 +00:00
Jon Elias 82f4397fd4 fix: simplify @update-bic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 13:02:06 +02:00
Jon Elias bc6d11846f fix: fixed autocomplete when entering an iban
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 12:37:14 +02:00
Javier Segarra 0b6ba8fc5e Merge branch 'master' into hotfix_customer_minorchanges
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 10:26:06 +00:00
Javier Segarra 954c5a3bad fix: update phone number component handling
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 12:11:10 +02:00
Jon Elias d24e153033 Merge pull request '#8363: Modified ItemFixedPrice' (!1561) from 8363-RefactorItemFixedPrice into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1561
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-10 10:01:29 +00:00
Jorge Penadés 9434cdf851 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-10 11:34:09 +02:00
Jorge Penadés a0e3aab4e0 feat(EntryPreAccount): refs #8277 add company color badge to invoice entry table
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-10 11:33:19 +02:00
Jon Elias d5b5c33bc0 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 07:57:07 +00:00
Benjamin Esteve 2f122725e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 09:56:49 +02:00
Alex Moreno c0ce2af459 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 07:40:45 +00:00
Jon Elias aefb7b7dcb feat: refs #8647 vitest fail on warning
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-10 09:34:18 +02:00
Jon Elias 7816150693 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:56:06 +02:00
Jon Elias 289f5ce404 refactor: refs #8363 translations and fixed popup 2025-04-10 08:56:05 +02:00
Benjamin Esteve c633a3e283 Merge pull request 'fix(CustomerSummary): refs #8824 include insurance grade in secured credit display' (!1687) from 8824-showCreditGrade into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1687
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-10 06:54:45 +00:00
Benjamin Esteve 7325b68bd9 Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 06:45:21 +00:00
Pablo Natek 5d6af7bfdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:31:28 +02:00
Jon Elias b7ed24dd72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-04-10 08:17:09 +02:00
Jon Elias 15c8f4ac43 Merge pull request 'Fix: InvoiceInList E2E' (!1694) from Fix-InvoiceInListE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1694
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-10 06:12:57 +00:00
Jon Elias 659050700b fix: fixed and skipped e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:08:46 +02:00
Javi Gallego 0e7da211df fix: refs #6696 standardize viewport size in Cypress tests for consistency
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 07:30:26 +02:00
Javier Segarra fd36bd7c7e Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 22:44:12 +02:00
Javier Segarra 80fb1eaf6a test: enhance monitor client actions and ticket tests with Cypress intercepts 2025-04-09 22:38:30 +02:00
Javier Segarra 5f2e2421a8 refactor: streamline visibility checks in monitor tests and update login role 2025-04-09 20:57:26 +02:00
Javier Segarra e7bb829bf5 test: perf clientAndActions 2025-04-09 20:35:47 +02:00
Jon Elias 6f4b618a7f fix: fixed e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 16:45:38 +02:00
Jon Elias eb4340122d fix: fixed e2e 2025-04-09 16:44:11 +02:00
Jon Elias a74e1102ed test: refs #8647 deleted all warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 15:32:53 +02:00
Javi Gallego 70d8b65fcb Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 14:05:35 +02:00
Jon Elias d31c2d55eb test: refs #8647 fix warnings arraydata and vnselect
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 14:00:52 +02:00
Jon Elias da1321ee34 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 13:04:36 +02:00
Jon Elias 3350f9d6a7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-09 13:04:25 +02:00
Benjamin Esteve 2df532d739 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 12:43:05 +02:00
Jon Elias 629af07502 Merge pull request 'fix: allow description field autogrow' (!1692) from Hotfix-TicketNotesDescription into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1692
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-09 10:27:08 +00:00
Jon Elias bc6ce826ce feat: prevent default with enter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 12:06:22 +02:00
Jorge Penadés be41253d1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-09 11:25:47 +02:00
Alex Moreno 4351ee4976 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 09:21:20 +00:00
Alex Moreno eab1994fb8 fix(find-imports): remove the specific one if the module is there
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-09 11:21:00 +02:00
Jon Elias f3de8ecb73 fix: allow description field autogrow
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 11:08:51 +02:00
Javier Segarra d0f4eb9db9 feat: handle action notification 2025-04-09 10:59:43 +02:00
Benjamin Esteve d8a5945bce refactor: refs #8833 streamline state color handling in Claim components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 10:37:30 +02:00
Jon Elias 6a129c89d7 perf: refs #8363 e2e intermittence
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 09:54:15 +02:00
Javi Gallego b521aa86f3 fix(TicketSale): refs #6696 pass componentId to updateDiscount functions 2025-04-09 09:53:03 +02:00
Javi Gallego bd8747e1fd fix: refs #6696 remove viewport from various cypress test files 2025-04-09 09:52:43 +02:00
Benjamin Esteve 0e0323a9e8 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 07:27:00 +00:00
Benjamin Esteve ef8d45fd21 Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 07:26:52 +00:00
Jon Elias 955c4718dd Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 08:50:13 +02:00
Jon Elias 96b20f6711 fix: refs #8363 conflicts 2025-04-09 08:50:11 +02:00
Alex Moreno 3f01436d02 Merge pull request 'fix(VnLog): update filter to include originFk and improve sorting in VnLogFilter' (!1690) from hotFix_vnLogFilter_changeId into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1690
2025-04-09 06:44:56 +00:00
Alex Moreno c47cb05cbd fix(VnLog): update filter to include originFk and improve sorting in VnLogFilter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 08:23:38 +02:00
Alex Moreno ac7fab7ada 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-09 07:41:26 +02:00
Jorge Penadés 35b09c829e fix(EntryPreAccount): refs #8277 remove unused save-url property from table component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 18:00:37 +02:00
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
Alex Moreno 9d00668acb Merge pull request 'hotFix_vnJsonValue_showHours' (!1689) from hotFix_vnJsonValue_showHours into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1689
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-08 13:00:58 +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
Alex Moreno e081543d39 Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-08 12:19:43 +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
Alex Moreno a2f8a61c20 fix(WorkerPDA): fetching available PDA data when add and remove pda
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 14:11:43 +02: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 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 e809e598f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-04-08 12:54:06 +02:00
Javier Segarra 8f5b4af7cc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available 2025-04-08 12:30:29 +02:00
Benjamin Esteve fddeece32f Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 09:08:46 +00:00
Benjamin Esteve b4611aad4c Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 09:08:41 +00:00
Jorge Penadés 87d4e02c9d fix(entryPreAccount): refs #8277 update test cases to use correct row ID for document inheritance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 11:01:37 +02:00
Jorge Penadés 4151423a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 10:42:52 +02:00
Javi Gallego 5bd2859e5d fix: refs #6696 update login role in tests and add data attributes for component options
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 10:33:11 +02:00
Benjamin Esteve 0e3406a502 fix(CustomerSummary): refs #8824 include insurance grade in secured credit display
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 09:23:58 +02:00
Benjamin Esteve 971d27d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 09:13:56 +02:00
Javi Gallego 4e40156c38 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 09:01:48 +02:00
Alex Moreno c9957371df Merge branch 'master' into hotFix_vnJsonValue_showHours 2025-04-08 06:58:44 +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
Jorge Penadés 966f52d3e3 chore: refs #8277 replace end-point name
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 17:15:52 +02:00
Jorge Penadés e8af2b6a74 test: refs #8277 add unit tests for EntryPreAccount component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 16:55:15 +02:00
Jorge Penadés e127c4cec9 fix: refs #8277 improve tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 16:18:30 +02:00
Javier Segarra 0440115d5a Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 15:35:49 +02:00
Alex Moreno 562b3c88f0 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 12:33:35 +00:00
Alex Moreno ac969d18a6 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:14:48 +00:00
Benjamin Esteve 7d813ab549 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:12:13 +00:00
Jon Elias b782da7a8d Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 11:47:04 +00:00
Alex Moreno 4eb2fe9cee Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 11:32:08 +00:00
Jon Elias 7cc06adeef Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 11:23:45 +00:00
Alex Moreno ee2cbb7ae5 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 11:23:45 +00:00
Jon Elias 11994b80b0 refactor: refs #8363 requested changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 13:20:00 +02:00
Jorge Penadés 5b80c22bae fix: refs #8277 update tooltip text and add data-cy attributes for Cypress tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:49:25 +02:00
Alex Moreno 5edf3f7efe fix: skip invoice transfer test in InvoiceOut summary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-07 12:34:48 +02:00
Benjamin Esteve 25ad79639e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:22:27 +02:00
Jorge Penadés 5c2c78a894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 12:07:52 +02:00
Benjamin Esteve aa6cd82da3 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 11:56:00 +02:00
Benjamin Esteve e0e4a549c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-07 11:51:17 +02:00
Jose Antonio Tubau bdcd8cad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 11:21:58 +02:00
Benjamin Esteve b6f7dbd1eb Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:09:13 +00:00
Alex Moreno e2b77ac2ed Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-07 09:06:33 +00:00
Benjamin Esteve eaa896852c fix: refs #8828 update warehouse selection in ticket list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 10:15:37 +02:00
Jose Antonio Tubau 2715502aba fix: refs #8422 ensure checkbox state toggles correctly in route extended list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:25:16 +02:00
Benjamin Esteve 87a4e1d469 Merge branch '8828-filterVnSelectWarehouses' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:25:11 +02:00
Benjamin Esteve b2e022ed56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8828-filterVnSelectWarehouses 2025-04-07 09:25:00 +02:00
Alex Moreno c9e5e86465 Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-07 07:04:20 +00:00
Javier Segarra 7c4c708342 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 05:52:06 +00:00
Javi Gallego d637ca9785 fix: refs #6696 handle optional chaining and ensure async operations in TicketSale components 2025-04-06 13:26:33 +02:00
Jorge Penadés f79d7e0d9f refactor: refs #8277 rename entry control to pre-account in components and localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 17:14:42 +02:00
Pau Rovira 0a299b0fe5 feat: refs #8443 used data-cy for select in test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 15:04:57 +02:00
Pau Rovira 1f8051081e Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 11:56:56 +00:00
Javier Segarra 0a90c62369 test: changes requested
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 13:08:14 +02:00
Javier Segarra bcad2dea1b Merge branch 'dev' into e2e_monitor 2025-04-04 13:07:46 +02:00
Jorge Penadés cd7f9e15fc refactor: refs #8277 rename dmsType to dmsTypeFk in EntryPreAccount.vue
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-04 12:55:02 +02:00
Jose Antonio Tubau 6ddcf57b08 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 10:06:34 +00:00
Jorge Penadés a1f93a87b2 refactor: refs #8277 rename entry control to pre-account in localization and routing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-04 12:00:32 +02:00
Benjamin Esteve 9f9ae26d55 Merge branch 'dev' into 8828-filterVnSelectWarehouses
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 09:43:34 +00:00
Alex Moreno 3349aebdde fix: update date display format in VnJsonValue tests to include time
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-04 11:22:54 +02:00
Jon Elias 0304010f62 fix: refs #8363 skip failing e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-04 10:44:56 +02:00
Jon Elias 5e999e0fb1 fix: refs #8363 ended v-model
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 10:11:39 +02:00
Alex Moreno a84743d890 fix: remove debug logging from updateValue function in VnJsonValue component
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-04-04 08:53:40 +02:00
Alex Moreno 103835d08b fix: update date formatting in VnJsonValue component to include hours, minutes, and seconds
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-04 08:53:05 +02:00
Jon Elias 5af6b60a4a Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 08:23:14 +02:00
Jon Elias 1185c345d8 fix: refs #8363 fixed buyer select 2025-04-04 08:23:12 +02:00
Jorge Penadés ec19ecdc98 refactor: refs #8277 update account type labels and filter fields in EntryControl.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 18:09:26 +02:00
Jose Antonio Tubau a1e21d156b refactor: refs #8422 update RouteAutonomous tests to improve readability and maintainability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 15:06:50 +02:00
Jose Antonio Tubau 5e2a74125f Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 14:10:47 +02:00
Jose Antonio Tubau 7aeb75d4e1 refactor: refs #8422 simplify DMS creation test by using fillInForm utility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 13:02:15 +02:00
Benjamin Esteve 84dbf9691e feat: refs #8828 add warehouse filtering for tickets and travels
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 12:25:11 +02:00
Javier Segarra 88d8562189 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-03 09:45:49 +00:00
Jorge Penadés 304dc7db49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 10:34:09 +02:00
Jose Antonio Tubau dab3a2ce09 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 10:28:47 +02:00
Jose Antonio Tubau 070def57bb refactor: refs #8422 update vehicle DMS tests and add download verification 2025-04-03 10:28:40 +02:00
Alex Moreno dc566b3902 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 07:02:35 +00:00
Jose Antonio Tubau 5cc599a0e6 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 05:17:49 +00:00
Javier Segarra 7706d77f55 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 20:30:14 +00:00
Javier Segarra 2afa0765b9 refactor: remove unused fields from monitorTicket test cases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 19:18:48 +02:00
Jorge Penadés e65ad67bd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 16:26:03 +02:00
Javi Gallego 85f74e5ad8 refactor: refs #6696 remove VnUsesMana component and update related logic in TicketEditMana and TicketSale
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 15:38:39 +02: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 fa1a9da29e fix: refs #6564 update condition for displaying deleted ticket icon in TicketProblems.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 15:10:27 +02:00
Jorge Penadés 07a36b4e53 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-04-02 15:09:56 +02:00
Javier Segarra 088c401723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 14:26:09 +02:00
Javier Segarra 19751ee3fb test: monitorTicket remove count rows and check checkbox 2025-04-02 14:26:05 +02:00
Jon Elias 76c07d2102 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-02 14:25:42 +02:00
Jon Elias 0c4e88a45e refactor: refs #8363 fix create fields 2025-04-02 14:25:40 +02:00
Jon Elias 8bdc71f8d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-04-02 14:12:33 +02:00
Pau Rovira 8df07a4c62 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 11:54:15 +00:00
Pau Rovira 8d3c2f51cf fix: fixed errors on CustomerSamples
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 11:53:44 +00:00
Jose Antonio Tubau 0d056d3ed6 fix: refs #8422 router/module/route.js
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 13:52:49 +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 c2d56ee002 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 12:29:36 +02:00
Javier Segarra d29a27999a test: fix monitorTicket
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 12:29:08 +02:00
Pau Rovira 36918d8434 fix: fixed CustomerConsumption errors when changing customer & downloading pdf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 09:13:59 +00:00
Jorge Penadés ce23d6f723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 09:31:58 +02:00
Javier Segarra d40bf0f2ca Merge branch 'dev' into 7356_e2e 2025-04-01 19:38:39 +02:00
Javier Segarra 20ccdb133c refactor: add spinner wait to monitor ticket row count
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:38:45 +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 32fa5248d0 refactor: update monitor ticket tests to improve filtering logic and remove unused intercepts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:11:10 +02:00
Jorge Penadés 758ab77f6c refactor(EntryControl): refs #8277 add hasFile property to upload file data structure
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 18:04:15 +02:00
Jorge Penadés a92cbeb95d refactor(EntryControl): refs #8277 update dmsFk assignment to undefined for clarity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 17:44:49 +02:00
Javier Segarra da31d6db3b refactor: streamline filter panel tests with parameterized test cases
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 16:41:17 +02:00
Jorge Penadés 3120ca93e6 refactor(EntryControl): refs #8277 update file handling and improve dialog management
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 16:31:08 +02:00
Jose Antonio Tubau 5b0090adc9 Merge branch 'dev' into 7638-showAllCmrs
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 15:18:12 +02:00
Javier Segarra f80a14370e Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-01 13:12:40 +00:00
Jon Elias 6e4079de95 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 10:10:06 +00:00
Pau Rovira 49391140d8 Merge branch 'dev' of https: refs #8443//gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 11:01:24 +02:00
Jon Elias 7fd22cce26 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 07:35:12 +00:00
Jorge Penadés dd908c49ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:28:33 +02:00
Jorge Penadés ec7a578bbc refactor(EntryControl): refs #8277 clean up supplierRef assignment and update comments
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:18:33 +02:00
Jose Antonio Tubau f6360e29af Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:57:54 +02:00
Jose Antonio Tubau f0ef9b42c9 refactor: refs #8422 removed error-related changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:56:02 +02:00
Javier Segarra 2f47bb10aa fix: update client actions test to expect zero table rows
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 01:19:11 +02:00
Javier Segarra 477ab36487 Merge branch 'dev' into e2e_monitor 2025-04-01 01:12:27 +02:00
Jorge Penadés 3545d8f5a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 16:45:05 +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
Pau Rovira 7d6b3e27b4 refactor: refs #8443 improved code
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-31 13:03:27 +02:00
Javier Segarra a84c2a78c8 Merge branch 'dev' into 7356_e2e 2025-03-31 12:38:57 +02:00
Javier Segarra 789b0d22cc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 10:36:57 +00:00
Pau Rovira 70c8780782 fix: refs #8443 code and form view fixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:25:25 +02:00
Jorge Penadés a896e4ce23 refactor: refs #6564 hide problems column in TicketAdvance.vue and update localization files
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 17:53:04 +01:00
Jorge Penadés 72a19cbba1 refactor: refs #6564 update API call
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 17:11:57 +01:00
Jorge Penadés 530dc62e00 feat: refs #6564 implement getValueFromPath utility
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 16:38:37 +01:00
Jorge Penadés bbf4234351 refactor: refs #6564 rename 'totalProblems' to 'problems' in TicketAdvance.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 15:11:40 +01:00
Jorge Penadés e73604d908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 14:53:01 +01:00
Jorge Penadés 61a9676c32 feat: refs #8277 changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 12:14:16 +01:00
Jon Elias 28c8e93a61 refactor: refs #8363 clone fixed price in same dialog as create, changed item filter and vncolor height
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 10:53:49 +01:00
Jorge Penadés 1117d3d07a feat: refs #8277 add invoice confirmation dialog and total amount calculation in EntryControl 2025-03-28 09:49:44 +01:00
Jorge Penadés 232cb7b4f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-03-28 09:45:54 +01:00
Pau Rovira 6434a37598 feat: refs #8655 simplified code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 09:36:20 +01:00
Jose Antonio Tubau dbdccc4774 refactor: refs #8422 improve error handling and notifications in DMS components 2025-03-28 08:56:26 +01:00
Javier Segarra cf8923a2d4 refactor: streamline table interaction methods and update test cases 2025-03-28 02:20:51 +01:00
Javier Segarra 269427e08c Merge branch 'dev' into e2e_monitor 2025-03-28 01:32:52 +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
Jose Antonio Tubau 96ed69acd2 refactor: refs #8422 update document ID error messages and improve notifications in DMS forms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 15:10:31 +01:00
Jose Antonio Tubau f07ce9a0a1 chore: refs #8422 update localizations 2025-03-27 15:10:16 +01:00
Jorge Penadés 00e6c79013 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-27 14:49:45 +01:00
Jorge Penadés ec328935c0 feat: refs #8277 add isBooked parameter to EntryControl for enhanced filtering
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 14:48:09 +01:00
Alex Moreno c9bea020fa Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 13:00:38 +00:00
Javier Segarra b1bd730fbf Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 10:02:32 +01:00
Javier Segarra 92fba2e0c4 test: comments requested 2025-03-27 10:02:29 +01:00
Javier Segarra 65a089e562 fix: correct spelling of clicDescriptorAction to clickDescriptorAction in tests 2025-03-27 10:02:13 +01: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
Jorge Penadés d69211acaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 16:13:49 +01:00
Jorge Penadés 36f2328656 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-26 16:11:54 +01:00
Jose Antonio Tubau ac19803fcd refactor: refs #7638 add cmrFk order
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 13:28:51 +01:00
Jose Antonio Tubau af612f9379 test: refs #7638 add route, agency, and carrier pop-up redirection tests in CmrList component 2025-03-26 13:28:18 +01:00
Jose Antonio Tubau f2e4fff69a refactor: refs #7638 add localization support for Cmr and Route components in English and Spanish
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 12:57:14 +01:00
Jose Antonio Tubau ee1fcf75fb refactor: refs #7638 enhance CmrList component with additional fields and improved formatting 2025-03-26 12:57:02 +01:00
Jorge Penadés d2d38c1d3e Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 10:44:58 +01:00
Jorge Penadés 8be9feb41f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-26 10:44:39 +01:00
Javier Segarra 38d16b56a9 feat: remove FetchData 2025-03-26 10:12:13 +01:00
Jorge Penadés bed4763e88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-26 10:07:08 +01:00
Pau Rovira 4e0922e989 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:34:32 +00:00
Pau Rovira d12cd08e08 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 07:34:07 +00:00
Pau Rovira 47779437d3 feat: refs #8443 added EntityCalendar and EntityCalendarGrid
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 08:32:29 +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 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 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 e42f4797b1 refactor: refs #8647 remove :data-cy in VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:00:07 +01:00
Javier Segarra 227dec72b3 Merge branch 'dev' into 8647_fix_warnings 2025-03-25 18:58:20 +01:00
Jorge Penadés 7b1e126966 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-25 17:38:11 +01:00
Jorge Penadés 1badf92b1c feat: refs #8277 enhance pre-accounting process and integrate user warehouse data
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 17:28:13 +01:00
Jorge Penadés 998cde58a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 16:19:33 +01:00
Jorge Penadés a1840f14df feat: refs #8277 add confirmation dialog for pre-accounting entries and update localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 16:19:16 +01:00
Jorge Penadés 6fd7e6e875 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:40:54 +01: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 06f721ae02 fix: refs #8277 validate supplier and company consistency in preAccount function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:35:50 +01:00
Jon Elias 93e85c536e Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:17:53 +01:00
Jon Elias 15bd9da3e2 refactor: refs #8363 use same dialog as create when cloning a fixedPrice 2025-03-25 09:17:52 +01:00
Jon Elias 25bd351c17 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 07:11:51 +00:00
Jorge Penadés 26e6427277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 16:27:35 +01:00
Jon Elias 712b983340 Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 16:06:02 +01:00
Jorge Penadés 41c2c56013 chore: refs #8277 notes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 15:48:24 +01:00
Jorge Penadés 890667c8a6 fix: refs #8277 add 'fit' class to supplier select component in EntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 15:24:21 +01: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
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
Jorge Penadés 18abb3e331 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:39:02 +01:00
Jon Elias bbd771e61d refactor: refs #8363 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:04:36 +01:00
Jon Elias 461d48c69d Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 14:03:26 +01:00
Jon Elias abdea67bf6 fix: refs #8363 conflicts 2025-03-24 14:03:25 +01:00
Javier Segarra 73740822a3 test: refs #7356 update ticket tracking components and remove unused TicketCreateTracking.vue 2025-03-24 13:18:41 +01:00
Jorge Penadés 304a039ebd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-24 12:59:47 +01:00
Javier Segarra 69629147ad Merge branch 'dev' into 7356_e2e 2025-03-24 12:35:16 +01:00
Pau Rovira ca2e507401 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:49:07 +00:00
Pau Rovira f4d347eef1 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 11:46:56 +01:00
Pau Rovira d2b414c883 fix: refs #8655 centered button for phone display 2025-03-24 11:46:54 +01:00
Javier Segarra 0404c00a05 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 11:15:36 +01:00
Javier Segarra 351f291086 test: remove timeout 2025-03-24 11:15:25 +01:00
Jose Antonio Tubau 1b86d34976 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 10:36:10 +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
Jorge Penadés acddcd58b8 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-24 09:56:09 +01:00
Javier Segarra bc75bd9dc0 feat: update order creation test to use form data and improve readability
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-24 09:20:39 +01:00
Javier Segarra 303b9cb5a5 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:32:27 +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 48689374bc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 01:43:42 +01:00
Javier Segarra b26b8b6ddd test: enhance Monitor pages 2025-03-24 01:43:27 +01:00
Javier Segarra fd68071a2e feat: add custom Cypress commands for table row manipulation 2025-03-24 01:43:00 +01:00
Javier Segarra d8bea48b26 fix: restore viewport setting for API readiness in tests 2025-03-24 01:42:43 +01:00
Javier Segarra 4a5171aa6e fix: remove exclusive test flag from 'clear scopeDays' test 2025-03-24 00:18:29 +01:00
Javier Segarra d3d80149e0 Merge branch 'dev' into e2e_monitor 2025-03-24 00:11:11 +01:00
Jorge Penadés 90d556c892 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-21 15:53:53 +01:00
Pau Rovira 018084c7c4 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:33:05 +00:00
Pau Rovira 75a99caf51 feat: refs #8443 changed VehicleEvents to use native loopback for events fetch 2025-03-21 12:32:01 +01:00
Jorge Penadés dbb8d2a115 feat: refs #8277 add pre-account functionality and update daysAgo handling in EntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 12:25:14 +01:00
Javier Segarra c672d33b0c feat: change i18n hasObservation
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 11:41:55 +01:00
Javier Segarra e3c2ae935c style: improve css
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-21 11:15:26 +01:00
Javier Segarra 69548456c3 feat: hide url 2025-03-21 11:14:13 +01:00
Javier Segarra 64fe998053 feat: add availabled item 2025-03-21 11:14:01 +01:00
Javier Segarra ae856ec0bc perf: remove comments 2025-03-21 11:13:42 +01:00
Pau Rovira 7d5f51349a Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:06:09 +00:00
Jon Elias b9128cde86 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 09:58:50 +00:00
Javier Segarra 239805515d feat: show substitution note
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 10:49:33 +01:00
Javier Segarra 56da11345b revert: remove substitutionAllowed 2025-03-21 10:49:17 +01:00
Javier Segarra 78d0f31b11 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 09:35:30 +00:00
Jorge Penadés b528bb4ed1 fix: refs #8277 update daysAgo handling to use watch for reactive updates and set max limit to 365
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:15:15 +01:00
Jorge Penadés 456eb0a8e4 fix: refs #8277 update daysAgo limit to 365 days in localization files
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 09:04:39 +01:00
Jorge Penadés 0315b1c8fc Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 08:51:50 +01:00
Jorge Penadés 9b3fc52377 feat: refs #8277 add agricultural and account type fields, enhance filtering options, and update localization
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 18:05:17 +01:00
Pau Rovira 2ac3b280af Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 12:37:05 +00:00
Jose Antonio Tubau cb99c50f33 fix: refs #8422 vehicleDms tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-20 13:34:14 +01:00
Jose Antonio Tubau de9f1bca9a Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 09:25:20 +01:00
Jon Elias 2f5260a1a1 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 08:16:49 +00:00
Jorge Penadés ba38c42140 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 08:57:29 +01:00
Jorge Penadés 234269bdef feat: refs #8277 add entry type selection and localization to EntryControl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 08:57:13 +01:00
Pau Rovira 70a15bff30 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 06:35:13 +00:00
Pau Rovira 8995d7d454 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-20 07:34:10 +01:00
Pau Rovira 8a8ce72c4c feat: refs #8655 added hover to scroll button 2025-03-20 07:34:06 +01:00
Jose Antonio Tubau 5d356428d3 refactor: refs #8422 enhance error handling in save function and update selectors in tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 15:54:47 +01:00
Jon Elias 7e2e6208bc Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-18 15:01:52 +01:00
Jon Elias 277373e6b5 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 15:00:49 +01:00
Jon Elias 541d931d21 refactor: refs #8363 adapted fixed price e2e 2025-03-18 15:00:48 +01:00
Jorge Penadés e00fae2412 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl 2025-03-18 14:26:37 +01:00
Jose Antonio Tubau 22d912ba76 Merge branch 'dev' into 8422-createVehicleDms 2025-03-18 14:24:26 +01:00
Jon Elias fa06a9003e Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 08:02:34 +00:00
Pau Rovira da8366d05b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 06:58:28 +00:00
Javier Segarra 6bee0ead8c fix: refs #8647 allow searchUrl prop to accept both String and Boolean types
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 14:39:48 +01:00
Javier Segarra 74c1e53c89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-16 13:58:40 +01:00
Javier Segarra 57e80040fa test: check params from and to
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-16 12:36:22 +01:00
Javier Segarra e0def231b1 fix: remove deprecated filter
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 12:23:20 +01:00
Javier Segarra 23eff4937c feat: add data-cy 2025-03-16 12:22:55 +01:00
Javier Segarra cfccc74710 test: improve monitorTest 2025-03-16 12:19:26 +01:00
Javier Segarra 4c4d7c9dbe test: check url scopeDays para value 2025-03-16 11:08:18 +01:00
Javier Segarra ee4eafc639 test: validate scopeDays 2025-03-16 10:57:04 +01:00
Javier Segarra 8417411efc test: ctrl click 2025-03-16 10:44:04 +01:00
Javier Segarra 7510611c0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-16 10:16:00 +01:00
Jose Antonio Tubau 6c7ea26a41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:57:33 +01:00
Pau Rovira 55394c2a2e Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:37:23 +01:00
Pau Rovira bc69b33028 refactor: refs #8655 removed unused function 2025-03-14 13:37:20 +01:00
Pau Rovira 08b0eb3c74 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 12:07:24 +00:00
Pau Rovira 4db882cc03 feat: refs #8655 made VnTable to use VnScroll button
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:06:05 +01:00
Javier Segarra a6f7db154e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-14 12:34:59 +01:00
Jon Elias b0dd15636c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-03-13 13:16:53 +01:00
Javier Segarra fc61c13ec4 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 12:04:46 +00:00
Javier Segarra bb949cd00c Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-13 08:01:56 +00:00
Pau Rovira 20c531bc04 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:42:20 +00:00
Jon Elias ad9dc4fe44 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:20:54 +00:00
Jon Elias db91a26114 refactor: refs #8363 deleted useless code
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:08:10 +01:00
Jon Elias d376c3acbf refactor: refs #8363 deleted useless test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:02:12 +01:00
Javier Segarra b4d21d5a52 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 22:55:59 +00:00
Javier Segarra f4c22938c7 perf: minor changes
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 23:47:31 +01:00
Jon Elias 9eff4aa929 refactor: refs #8363 modified fixedPrice form test name
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 16:11:41 +01:00
Jon Elias d12cd60079 refactor: refs #8363 update color when modifying an item
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 15:49:13 +01:00
Javier Segarra 23670debd1 feat: add VnInputDateTime component and enhance date handling functions
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 15:34:30 +01:00
Javier Segarra 311c361f11 fix: minor bugs 2025-03-12 15:34:20 +01:00
Jose Antonio Tubau ca6c0cff29 refactor: refs #8422 update form input handling to select all text before typing
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:32:45 +01:00
Jose Antonio Tubau 7ab2e28dc7 fix: refs #8422 update filter structure in VnDmsList component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:30:14 +01:00
Jose Antonio Tubau 21196fcc3b test: refs #8422 add temporary upload folder configuration 2025-03-12 08:30:02 +01:00
Jon Elias 5eb6e7b24b Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-11 15:59:26 +01:00
Jon Elias a38470577c feat: refs #8363 added new clone form, modified list and created new composable 2025-03-11 15:59:24 +01:00
Jose Antonio Tubau f4b72c5d75 refactor: refs #8422 add notifications for data save and delete actions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 13:02:20 +01:00
Pau Rovira 429772ce88 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:34:22 +00:00
Javier Segarra 6778a309dd test: refs #8647 solve fail test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 10:52:02 +01:00
Javier Segarra 6dbaf841a4 test: refs #8647 try to solve the problem 2025-03-10 13:02:41 +01:00
Javier Segarra dcd4c327a0 fix: refs #8647 solve warning 2025-03-10 13:02:14 +01:00
Javier Segarra 04a3c48cd6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 12:34:34 +01:00
Javier Segarra 92a7f2c33c test: refs #8647 revert filter string
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:33:31 +01:00
Javier Segarra dcceee3c3a Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:30:26 +01:00
Javier Segarra aefffa4a42 test: refs #8647 revert saveFn string 2025-03-10 12:30:24 +01:00
Jon Elias 22c8a8f9d6 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 12:38:00 +00:00
Pau Rovira 48ebca9568 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 10:09:25 +00:00
Jon Elias ac12e1454a Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:56:08 +01:00
Jon Elias f3fa931c70 feat: refs #8363 created composable to modify minPrice and adapt e2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:51:43 +01:00
Pau Rovira adb78c7433 fix: refs #8655 fixed e2e tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:44:58 +01:00
Pau Rovira ff4e0103e7 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 08:31:04 +00:00
Jorge Penadés 82d9d6016f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 09:27:00 +01:00
Pau Rovira a0860522f5 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 05:46:16 +00:00
Jose Antonio Tubau cc2e9f7890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 13:49:21 +01:00
Jorge Penadés 13a904290c refactor: refs #8647 simplify filter handling logic in VnSelect component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:12:26 +01:00
Jorge Penadés 73b73cba62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 12:03:46 +01:00
Jorge Penadés 8edb9ec644 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:37:02 +01:00
Jorge Penadés de0ce51f10 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:18:26 +01:00
Jorge Penadés 7433c3c551 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 11:17:55 +01:00
Jon Elias 9f8c491eda refactor: refs #8363 modified ItemFixedPrice and the e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 08:07:40 +01:00
Pau Rovira cee6e0d0b1 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:40:59 +00:00
Pau Rovira f33f09ca6f Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:00:58 +00:00
Pau Rovira 6e9e5c7564 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 12:21:33 +00:00
Pau Rovira 83b9b602a0 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 10:46:31 +00:00
Jose Antonio Tubau b259988f90 test: refs #8422 add test for vehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 11:14:20 +01:00
Jose Antonio Tubau c5284e54c7 refactor: refs #8422 enhance DMS import functionality and improve localization 2025-03-05 11:13:45 +01:00
Jose Antonio Tubau 3570556c47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 07:42:02 +01:00
Pau Rovira 1101db707e Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 06:02:52 +00:00
Pau Rovira 640d989090 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-04 09:28:27 +00:00
Pau Rovira a5f287d782 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-03 14:05:28 +00:00
Pau Rovira 9bf0b4c077 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 13:12:54 +01:00
Pau Rovira 8ffc3e8f2d feat: refs #8443 added notifications and translations
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 13:08:19 +01:00
Pau Rovira ecdd1a95df Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 09:45:54 +00:00
Pau Rovira 27866e7090 fix: refs #8655 fixed button problems & added translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:49:32 +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
Javier Segarra 97c673b5f3 test: check fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-01 03:13:11 +01:00
Javier Segarra e0ad4fc2f1 Merge branch 'dev' into e2e_monitor 2025-03-01 02:43:53 +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 0ee939d568 feat: refs #8647 updates
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 19:27:09 +01:00
Javier Segarra 539fc81ffa Merge branch 'dev' into 8647_fix_warnings 2025-02-28 19:04:30 +01:00
Pau Rovira 69452e2627 feat: refs #8655 added button for scrolling up
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:25:09 +01:00
Javier Segarra 2acbe53788 feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:59:06 +01:00
Javier Segarra f0b3ae3ada feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:58:17 +01:00
Javier Segarra ba31e98b8a fix: refs #8647 remove comment 2025-02-28 13:58:07 +01:00
Jorge Penadés ccf7e5dfad fix: refs #8647 remove unused townFilter from CreateNewPostcodeForm component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:07:27 +01:00
Jorge Penadés 2dab2866e7 fix: refs #8647 remove unused filterTowns fn
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 13:02:46 +01:00
Jorge Penadés 30afbd84d6 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 12:43:38 +01:00
Jorge Penadés 55d51ddf22 fix: refs #8647 add filter function prop to VnSelect component and refactor bank entity filter logic 2025-02-28 12:43:35 +01:00
Javier Segarra d23b22ca55 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:40:55 +01:00
Javier Segarra 9961f5cda0 test: refs #8647 fix warning 2025-02-28 10:40:52 +01:00
Jorge Penadés 561db9f7c8 fix: refs #8647 add default value for summary prop in WorkerDescriptor component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:26:39 +01:00
Javier Segarra 287c61f507 test: refs #8647 fix warning 2025-02-28 10:15:23 +01:00
Jorge Penadés abf2a5bb5d fix: refs #8647 set default value for id prop in InvoiceInDescriptorProxy component 2025-02-28 10:08:29 +01:00
Javier Segarra f64c2a2854 test: refs #8647 fix warning 2025-02-28 10:07:45 +01:00
Jorge Penadés c2d8c76512 fix: refs #8647 set default value for id prop in SupplierDescriptorProxy component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 10:07:32 +01:00
Jorge Penadés 4518ebdc35 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:57:09 +01:00
Jorge Penadés 1c44aceccf fix: refs #8647 set default value for model in VnDate component 2025-02-28 09:57:06 +01:00
Javier Segarra 092e6e427f Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:42:15 +01:00
Javier Segarra a6777cc183 test: refs #8647 fix warning 2025-02-28 09:42:11 +01:00
Jorge Penadés 942004d710 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 09:28:47 +01:00
Jorge Penadés 1edf57da7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-02-28 09:28:35 +01:00
Javier Segarra 29cd014ec8 test: refs #8647 fix warning 2025-02-28 09:26:57 +01:00
Javier Segarra 642e2c7d5c Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 20:41:38 +01:00
Javier Segarra b08778aed7 fix: refs #8647 warnings common 2025-02-27 20:41:32 +01:00
Javier Segarra dcc4f390c6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-test Build queued... Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 19:16:01 +00:00
Javier Segarra cf397a38ce fix: refs #8647 some swarning
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:16:43 +01:00
Pau Rovira 33c268ddb9 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 12:03:23 +00:00
Javier Segarra bc3334529b test: refs #8647 improve_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 21:54:35 +01:00
Javier Segarra cc2c5e7567 feat: refs #8647 hidde filter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 10:02:28 +01:00
Javier Segarra 6e279120ea Merge branch 'dev' into 8647_fix_warnings 2025-02-22 13:40:18 +01:00
Javier Segarra 2ae8dc4124 Merge branch '6321_improve_handleResults' into 8647_fix_warnings 2025-02-22 13:40:08 +01:00
Javier Segarra 07d86251cb test: refs #8647 mock keyShortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 13:50:04 +01:00
Javier Segarra d881730f27 feat: refs #8647 init 2025-02-21 13:49:39 +01:00
Pau Rovira ff24971df9 Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 06:49:50 +00:00
Javier Segarra f1a57ceba1 feat: refs #6321 init 2025-02-19 14:09:00 +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
Javier Segarra a7d271bafd test: add describe for each test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:53:39 +01:00
Javier Segarra 55841d795f test: init e2e_monitorTicket
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:41:06 +01:00
Jorge Penadés 3c2c40c8e6 refactor: refs #6564 improve test structure and readability in UserPanel.spec.js
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 17:34:10 +01:00
Jorge Penadés 345dc4bfbc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 17:07:07 +01:00
Jorge Penadés 7a84e406e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 13:16:25 +01:00
Pau Rovira 398f76c6e7 feat: refs #8443 added select in form for vehicle state
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 07:49:12 +01:00
Jorge Penadés 1facb04d7a feat: refs #8277 update EntryControl component with new column definitions and filters
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-12 18:24:41 +01:00
Jorge Penadés 0c8e13db8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 14:31:31 +01:00
Pau Rovira 30f42cbde7 Merge branch '8443-vehicleEvent' of https://gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 12:32:32 +01:00
Pau Rovira bb70969d60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8443-vehicleEvent 2025-02-12 12:29:52 +01:00
Pau Rovira 80b0efac5a Merge branch 'dev' into 8443-vehicleEvent
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 11:29:34 +00:00
Pau Rovira a261de39b4 feat: refs #8443 created vehicle events
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 12:26:43 +01:00
Jorge Penadés 0c362d336b Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 09:54:50 +01:00
Jorge Penadés fa7705d2fc feat: refs #8277 add control labels and update column definitions in EntryControl component 2025-02-12 09:53:43 +01:00
Jorge Penadés b87e4f52cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-11 14:19:26 +01:00
Jose Antonio Tubau 8f0a4da245 feat: refs #8422 add Vehicle DMS import functionality and routing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 13:58:14 +01:00
Jorge Penadés c153352311 Merge branch 'dev' of https: refs #8277//gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-11 09:36:00 +01:00
Jorge Penadés 7a1eb9bec6 feat: refs #8277 add Entry Control page and update localization files 2025-02-11 09:28:56 +01:00
Jorge Penadés 5325095297 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 11:39:36 +01:00
Jorge Penadés 76b914e6be feat: refs #6564 add problems column to TicketAdvance and update localization
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 10:35:08 +01:00
Jorge Penadés aa91209ab7 fix: refs #6564 align ticket advance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 10:05:44 +01:00
Jorge Penadés 4ba57a1ca3 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 09:55:25 +01:00
Jorge Penadés 498e8c385e feat: refs #6564 enhance ticket advance functionality with confirmation actions and improved UI interactions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 17:35:36 +01:00
Jorge Penadés fda024d6fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-03 14:17:36 +01:00
Jorge Penadés 35dac33ff9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 11:43:46 +01:00
Jorge Penadés 82fa3b4648 feat: refs #6564 add 0 step
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 12:10:33 +01:00
Jorge Penadés aa3810a4c0 feat: refs #6564 add agency & ticket list
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 11:24:12 +01:00
308 changed files with 5858 additions and 2608 deletions

2
Jenkinsfile vendored
View File

@ -125,7 +125,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} pull db" sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() def modules = sh(script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}", returnStdout: true).trim()
echo "E2E MODULES: ${modules}" echo "E2E MODULES: ${modules}"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'" sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"

View File

@ -44,6 +44,7 @@ export default defineConfig({
supportFile: 'test/cypress/support/index.js', supportFile: 'test/cypress/support/index.js',
videosFolder: 'test/cypress/videos', videosFolder: 'test/cypress/videos',
downloadsFolder: 'test/cypress/downloads', downloadsFolder: 'test/cypress/downloads',
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
video: false, video: false,
specPattern: 'test/cypress/integration/**/*.spec.js', specPattern: 'test/cypress/integration/**/*.spec.js',
experimentalRunAllSpecs: true, experimentalRunAllSpecs: true,

View File

@ -1,6 +1,6 @@
{ {
"name": "salix-front", "name": "salix-front",
"version": "25.16.0", "version": "25.18.0",
"description": "Salix frontend", "description": "Salix frontend",
"productName": "Salix", "productName": "Salix",
"author": "Verdnatura", "author": "Verdnatura",
@ -18,6 +18,8 @@
"test:e2e:summary": "bash ./test/cypress/summary.sh", "test:e2e:summary": "bash ./test/cypress/summary.sh",
"test": "echo \"See package.json => scripts for available tests.\" && exit 0", "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
"test:front": "vitest", "test:front": "vitest",
"test:ui": "vitest --ui",
"test:coverage": "vitest run --coverage",
"test:front:ci": "vitest run", "test:front:ci": "vitest run",
"commitlint": "commitlint --edit", "commitlint": "commitlint --edit",
"prepare": "npx husky install", "prepare": "npx husky install",
@ -27,6 +29,8 @@
"docs:preview": "vitepress preview docs" "docs:preview": "vitepress preview docs"
}, },
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"@quasar/cli": "^2.4.1", "@quasar/cli": "^2.4.1",
"@quasar/extras": "^1.16.16", "@quasar/extras": "^1.16.16",
"axios": "^1.4.0", "axios": "^1.4.0",
@ -40,8 +44,6 @@
"validator": "^13.9.0", "validator": "^13.9.0",
"vue": "^3.5.13", "vue": "^3.5.13",
"vue-i18n": "^9.4.0", "vue-i18n": "^9.4.0",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"vue-router": "^4.2.5" "vue-router": "^4.2.5"
}, },
"devDependencies": { "devDependencies": {
@ -54,6 +56,7 @@
"@quasar/app-vite": "^2.0.8", "@quasar/app-vite": "^2.0.8",
"@quasar/quasar-app-extension-qcalendar": "^4.0.2", "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0", "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
"@vitest/ui": "3.1.1",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",
"@vue/test-utils": "^2.4.4", "@vue/test-utils": "^2.4.4",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
@ -86,4 +89,4 @@
"vite": "^6.0.11", "vite": "^6.0.11",
"vitest": "^0.31.1" "vitest": "^0.31.1"
} }
} }

View File

@ -75,7 +75,10 @@ devDependencies:
version: 4.1.2 version: 4.1.2
'@quasar/quasar-app-extension-testing-unit-vitest': '@quasar/quasar-app-extension-testing-unit-vitest':
specifier: ^0.4.0 specifier: ^0.4.0
version: 0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13) version: 0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13)
'@vitest/ui':
specifier: 3.1.1
version: 3.1.1(vitest@3.1.1)
'@vue/compiler-sfc': '@vue/compiler-sfc':
specifier: ^3.5.13 specifier: ^3.5.13
version: 3.5.13 version: 3.5.13
@ -132,7 +135,7 @@ devDependencies:
version: 1.86.3 version: 1.86.3
vitest: vitest:
specifier: ^3.0.3 specifier: ^3.0.3
version: 3.1.1(@types/node@22.14.0)(sass@1.86.3) version: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
xunit-viewer: xunit-viewer:
specifier: ^10.6.1 specifier: ^10.6.1
version: 10.6.1(@babel/runtime@7.27.0)(@codemirror/autocomplete@6.18.6)(@codemirror/language@6.11.0)(@codemirror/lint@6.8.5)(@codemirror/search@6.5.10)(@codemirror/state@6.5.2)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.36.5)(codemirror@6.0.1)(react-dom@19.1.0)(react@19.1.0) version: 10.6.1(@babel/runtime@7.27.0)(@codemirror/autocomplete@6.18.6)(@codemirror/language@6.11.0)(@codemirror/lint@6.8.5)(@codemirror/search@6.5.10)(@codemirror/state@6.5.2)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.36.5)(codemirror@6.0.1)(react-dom@19.1.0)(react@19.1.0)
@ -1139,6 +1142,10 @@ packages:
config-chain: 1.1.13 config-chain: 1.1.13
dev: false dev: false
/@polka/url@1.0.0-next.28:
resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
dev: true
/@quasar/app-vite@2.2.0(@types/node@22.14.0)(eslint@9.24.0)(pinia@2.3.1)(quasar@2.18.1)(sass@1.86.3)(typescript@5.8.3)(vue-router@4.5.0)(vue@3.5.13): /@quasar/app-vite@2.2.0(@types/node@22.14.0)(eslint@9.24.0)(pinia@2.3.1)(quasar@2.18.1)(sass@1.86.3)(typescript@5.8.3)(vue-router@4.5.0)(vue@3.5.13):
resolution: {integrity: sha512-MvCfJrCbxUYvoGaK5jPq0h0hjO8mbxYOWngf+dIKrxhwb+1h5ERh6aVYEUuCtMIwTMEVfPkCez4DIfZIoReuDw==} resolution: {integrity: sha512-MvCfJrCbxUYvoGaK5jPq0h0hjO8mbxYOWngf+dIKrxhwb+1h5ERh6aVYEUuCtMIwTMEVfPkCez4DIfZIoReuDw==}
engines: {node: ^30 || ^28 || ^26 || ^24 || ^22 || ^20 || ^18, npm: '>= 6.14.12', yarn: '>= 1.17.3'} engines: {node: ^30 || ^28 || ^26 || ^24 || ^22 || ^20 || ^18, npm: '>= 6.14.12', yarn: '>= 1.17.3'}
@ -1262,7 +1269,7 @@ packages:
'@quasar/quasar-ui-qcalendar': 4.1.2 '@quasar/quasar-ui-qcalendar': 4.1.2
dev: true dev: true
/@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13): /@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13):
resolution: {integrity: sha512-eyzdUdmZiCueNS+5nedjMmzdbpCetSrtdGIwW6KplW1dTzRbLiNvYUjpBOxQGmJCgEhWy9zuswJ7MZ/bTql24Q==} resolution: {integrity: sha512-eyzdUdmZiCueNS+5nedjMmzdbpCetSrtdGIwW6KplW1dTzRbLiNvYUjpBOxQGmJCgEhWy9zuswJ7MZ/bTql24Q==}
engines: {node: '>= 12.22.1', npm: '>= 6.14.12', yarn: '>= 1.17.3'} engines: {node: '>= 12.22.1', npm: '>= 6.14.12', yarn: '>= 1.17.3'}
peerDependencies: peerDependencies:
@ -1275,13 +1282,14 @@ packages:
'@vitest/ui': '@vitest/ui':
optional: true optional: true
dependencies: dependencies:
'@vitest/ui': 3.1.1(vitest@3.1.1)
'@vue/test-utils': 2.4.6 '@vue/test-utils': 2.4.6
happy-dom: 11.2.0 happy-dom: 11.2.0
lodash-es: 4.17.21 lodash-es: 4.17.21
quasar: 2.18.1 quasar: 2.18.1
vite-jsconfig-paths: 2.0.1(vite@6.2.5) vite-jsconfig-paths: 2.0.1(vite@6.2.5)
vite-tsconfig-paths: 4.3.2(typescript@5.8.3)(vite@6.2.5) vite-tsconfig-paths: 4.3.2(typescript@5.8.3)(vite@6.2.5)
vitest: 3.1.1(@types/node@22.14.0)(sass@1.86.3) vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
vue: 3.5.13(typescript@5.8.3) vue: 3.5.13(typescript@5.8.3)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -1813,6 +1821,21 @@ packages:
tinyspy: 3.0.2 tinyspy: 3.0.2
dev: true dev: true
/@vitest/ui@3.1.1(vitest@3.1.1):
resolution: {integrity: sha512-2HpiRIYg3dlvAJBV9RtsVswFgUSJK4Sv7QhpxoP0eBGkYwzGIKP34PjaV00AULQi9Ovl6LGyZfsetxDWY5BQdQ==}
peerDependencies:
vitest: 3.1.1
dependencies:
'@vitest/utils': 3.1.1
fflate: 0.8.2
flatted: 3.3.3
pathe: 2.0.3
sirv: 3.0.1
tinyglobby: 0.2.12
tinyrainbow: 2.0.0
vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
dev: true
/@vitest/utils@3.1.1: /@vitest/utils@3.1.1:
resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==} resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==}
dependencies: dependencies:
@ -4021,6 +4044,10 @@ packages:
picomatch: 4.0.2 picomatch: 4.0.2
dev: true dev: true
/fflate@0.8.2:
resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
dev: true
/figures@3.2.0: /figures@3.2.0:
resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
engines: {node: '>=8'} engines: {node: '>=8'}
@ -5588,6 +5615,11 @@ packages:
resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==} resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
dev: false dev: false
/mrmime@2.0.1:
resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
engines: {node: '>=10'}
dev: true
/ms@2.0.0: /ms@2.0.0:
resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@ -6964,6 +6996,15 @@ packages:
engines: {node: '>=14'} engines: {node: '>=14'}
dev: true dev: true
/sirv@3.0.1:
resolution: {integrity: sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==}
engines: {node: '>=18'}
dependencies:
'@polka/url': 1.0.0-next.28
mrmime: 2.0.1
totalist: 3.0.1
dev: true
/slash@3.0.0: /slash@3.0.0:
resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
engines: {node: '>=8'} engines: {node: '>=8'}
@ -7364,6 +7405,11 @@ packages:
resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
engines: {node: '>=0.6'} engines: {node: '>=0.6'}
/totalist@3.0.1:
resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
engines: {node: '>=6'}
dev: true
/tough-cookie@5.1.2: /tough-cookie@5.1.2:
resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==} resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
engines: {node: '>=16'} engines: {node: '>=16'}
@ -7772,7 +7818,7 @@ packages:
fsevents: 2.3.3 fsevents: 2.3.3
dev: true dev: true
/vitest@3.1.1(@types/node@22.14.0)(sass@1.86.3): /vitest@3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3):
resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==} resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
hasBin: true hasBin: true
@ -7807,6 +7853,7 @@ packages:
'@vitest/runner': 3.1.1 '@vitest/runner': 3.1.1
'@vitest/snapshot': 3.1.1 '@vitest/snapshot': 3.1.1
'@vitest/spy': 3.1.1 '@vitest/spy': 3.1.1
'@vitest/ui': 3.1.1(vitest@3.1.1)
'@vitest/utils': 3.1.1 '@vitest/utils': 3.1.1
chai: 5.2.0 chai: 5.2.0
debug: 4.4.0(supports-color@8.1.1) debug: 4.4.0(supports-color@8.1.1)

View File

@ -2,6 +2,7 @@
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import { useQuasar, Dark } from 'quasar'; import { useQuasar, Dark } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnScroll from './components/common/VnScroll.vue';
const quasar = useQuasar(); const quasar = useQuasar();
const { availableLocales, locale, fallbackLocale } = useI18n(); const { availableLocales, locale, fallbackLocale } = useI18n();
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
<template> <template>
<RouterView /> <RouterView />
<VnScroll/>
</template> </template>
<style lang="scss"> <style lang="scss">

View File

@ -67,7 +67,7 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); await expect(result).rejects.toEqual(expect.objectContaining(error));
}); });
it('should call to the Notify plugin with a message from the response property', async () => { it('should call to the Notify plugin with a message from the response property', async () => {
@ -83,7 +83,7 @@ describe('Axios boot', () => {
}; };
const result = onResponseError(error); const result = onResponseError(error);
expect(result).rejects.toEqual(expect.objectContaining(error)); await expect(result).rejects.toEqual(expect.objectContaining(error));
}); });
}); });
}); });

View File

@ -1,4 +1,6 @@
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import { date as quasarDate } from 'quasar';
const { formatDate } = quasarDate;
export default boot(() => { export default boot(() => {
Date.vnUTC = () => { Date.vnUTC = () => {
@ -25,4 +27,34 @@ export default boot(() => {
const date = new Date(Date.vnUTC()); const date = new Date(Date.vnUTC());
return new Date(date.getFullYear(), date.getMonth() + 1, 0); return new Date(date.getFullYear(), date.getMonth() + 1, 0);
}; };
Date.getCurrentDateTimeFormatted = (
options = {
startOfDay: false,
endOfDay: true,
iso: true,
mask: 'DD-MM-YYYY HH:mm',
},
) => {
const date = Date.vnUTC();
if (options.startOfDay) {
date.setHours(0, 0, 0);
}
if (options.endOfDay) {
date.setHours(23, 59, 0);
}
if (options.iso) {
return date.toISOString();
}
return formatDate(date, options.mask);
};
Date.convertToISODateTime = (dateTimeStr) => {
const [datePart, timePart] = dateTimeStr.split(' ');
const [day, month, year] = datePart.split('-');
const [hours, minutes] = timePart.split(':');
const isoDate = new Date(year, month - 1, day, hours, minutes);
return isoDate.toISOString();
};
}); });

View File

@ -20,7 +20,6 @@ const postcodeFormData = reactive({
provinceFk: null, provinceFk: null,
townFk: null, townFk: null,
}); });
const townFilter = ref({});
const countriesRef = ref(false); const countriesRef = ref(false);
const provincesOptions = ref([]); const provincesOptions = ref([]);
@ -33,11 +32,11 @@ function onDataSaved(formData) {
newPostcode.town = town.value.name; newPostcode.town = town.value.name;
newPostcode.townFk = town.value.id; newPostcode.townFk = town.value.id;
const provinceObject = provincesOptions.value.find( const provinceObject = provincesOptions.value.find(
({ id }) => id === formData.provinceFk ({ id }) => id === formData.provinceFk,
); );
newPostcode.province = provinceObject?.name; newPostcode.province = provinceObject?.name;
const countryObject = countriesRef.value.opts.find( const countryObject = countriesRef.value.opts.find(
({ id }) => id === formData.countryFk ({ id }) => id === formData.countryFk,
); );
newPostcode.country = countryObject?.name; newPostcode.country = countryObject?.name;
emit('onDataSaved', newPostcode); emit('onDataSaved', newPostcode);
@ -67,21 +66,11 @@ function setTown(newTown, data) {
} }
async function onCityCreated(newTown, formData) { async function onCityCreated(newTown, formData) {
newTown.province = provincesOptions.value.find( newTown.province = provincesOptions.value.find(
(province) => province.id === newTown.provinceFk (province) => province.id === newTown.provinceFk,
); );
formData.townFk = newTown; formData.townFk = newTown;
setTown(newTown, formData); setTown(newTown, formData);
} }
async function filterTowns(name) {
if (name !== '') {
townFilter.value.where = {
name: {
like: `%${name}%`,
},
};
}
}
</script> </script>
<template> <template>
@ -107,7 +96,6 @@ async function filterTowns(name) {
<VnSelectDialog <VnSelectDialog
:label="t('City')" :label="t('City')"
@update:model-value="(value) => setTown(value, data)" @update:model-value="(value) => setTown(value, data)"
@filter="filterTowns"
:tooltip="t('Create city')" :tooltip="t('Create city')"
v-model="data.townFk" v-model="data.townFk"
url="Towns/location" url="Towns/location"

View File

@ -65,7 +65,7 @@ const $props = defineProps({
default: null, default: null,
}, },
beforeSaveFn: { beforeSaveFn: {
type: Function, type: [String, Function],
default: null, default: null,
}, },
goTo: { goTo: {
@ -83,7 +83,7 @@ const isLoading = ref(false);
const hasChanges = ref(false); const hasChanges = ref(false);
const originalData = ref(); const originalData = ref();
const vnPaginateRef = ref(); const vnPaginateRef = ref();
const formData = ref([]); const formData = ref();
const saveButtonRef = ref(null); const saveButtonRef = ref(null);
const watchChanges = ref(); const watchChanges = ref();
const formUrl = computed(() => $props.url); const formUrl = computed(() => $props.url);
@ -298,6 +298,10 @@ watch(formUrl, async () => {
}); });
</script> </script>
<template> <template>
<SkeletonTable
v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
:columns="$attrs.columns?.length"
/>
<VnPaginate <VnPaginate
:url="url" :url="url"
:limit="limit" :limit="limit"
@ -316,10 +320,6 @@ watch(formUrl, async () => {
></slot> ></slot>
</template> </template>
</VnPaginate> </VnPaginate>
<SkeletonTable
v-if="!formData && $attrs.autoLoad"
:columns="$attrs.columns?.length"
/>
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar"> <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
<QBtnGroup push style="column-gap: 10px"> <QBtnGroup push style="column-gap: 10px">
<slot name="moreBeforeActions" /> <slot name="moreBeforeActions" />
@ -332,6 +332,7 @@ watch(formUrl, async () => {
:disable="!selected?.length" :disable="!selected?.length"
:title="t('globals.remove')" :title="t('globals.remove')"
v-if="$props.defaultRemove" v-if="$props.defaultRemove"
data-cy="crudModelDefaultRemoveBtn"
/> />
<QBtn <QBtn
:label="tMobile('globals.reset')" :label="tMobile('globals.reset')"

View File

@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
img.onerror = () => { img.onerror = () => {
notify( notify(
t("This photo provider doesn't allow remote downloads"), t("This photo provider doesn't allow remote downloads"),
'negative' 'negative',
); );
}; };
} }
@ -219,11 +219,7 @@ const makeRequest = async () => {
color="primary" color="primary"
class="cursor-pointer" class="cursor-pointer"
@click="rotateLeft()" @click="rotateLeft()"
> />
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate left') }}
</QTooltip> -->
</QIcon>
<div> <div>
<div ref="photoContainerRef" /> <div ref="photoContainerRef" />
</div> </div>
@ -233,11 +229,7 @@ const makeRequest = async () => {
color="primary" color="primary"
class="cursor-pointer" class="cursor-pointer"
@click="rotateRight()" @click="rotateRight()"
> />
<!-- <QTooltip class="no-pointer-events">
{{ t('Rotate right') }}
</QTooltip> -->
</QIcon>
</div> </div>
<div class="column"> <div class="column">
@ -265,7 +257,6 @@ const makeRequest = async () => {
class="cursor-pointer q-mr-sm" class="cursor-pointer q-mr-sm"
@click="openInputFile()" @click="openInputFile()"
> >
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
</QIcon> </QIcon>
<QIcon name="info" class="cursor-pointer"> <QIcon name="info" class="cursor-pointer">
<QTooltip>{{ <QTooltip>{{

View File

@ -0,0 +1,152 @@
<script setup>
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { date } from 'quasar';
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import useWeekdaysOrder from 'src/composables/getWeekdays';
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') => (
date.formatDate(dateToFormat, format)
);
const props = defineProps({
year: {
type: Number,
required: true,
},
month: {
type: Number,
required: true,
},
monthDate: {
type: Object,
default: null,
},
daysMap: {
type: Object,
default: null,
},
});
const emit = defineEmits(['onDateSelected']);
const { locale } = useI18n();
const weekdayStore = useWeekdayStore();
const weekDays = useWeekdaysOrder();
const calendarRef = ref(null);
const today = ref(formatDate(Date.vnNew()));
const todayTimestamp = computed(() => {
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
return date.getTime();
});
const _monthDate = computed(() => formatDate(props.monthDate));
const calendarHeaderTitle = computed(() => {
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
});
const isToday = (timestamp) => {
const { year, month, day } = timestamp;
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
};
const getEventByTimestamp = ({ year, month, day }) => {
const stamp = new Date(year, month - 1, day).getTime();
return props.daysMap?.[stamp] || null;
};
const handleDateClick = (timestamp) => {
const event = getEventByTimestamp(timestamp);
const { year, month, day } = timestamp;
const date = new Date(year, month - 1, day);
emit('onDateSelected', {
date,
isNewMode: !event,
event: event?.[0] || null
});
};
const getEventAttrs = (timestamp) => {
return {
class: '--event',
label: timestamp.day,
};
};
defineExpose({ getEventByTimestamp, handleDateClick });
</script>
<template>
<QCalendarMonthWrapper
style="height: 290px; width: 290px"
transparent-background
view-customization="workerCalendar"
>
<template #header>
<span class="full-width text-center text-body1 q-py-sm">{{
calendarHeaderTitle
}}</span>
</template>
<template #calendar>
<QCalendarMonth
ref="calendarRef"
:model-value="_monthDate"
show-work-weeks
no-outside-days
no-active-date
:weekdays="weekDays"
short-weekday-label
:locale="locale"
:now="today"
@click-date="handleDateClick($event.scope.timestamp)"
mini-mode
>
<template #day="{ scope: { timestamp } }">
<slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
<QBtn
v-if="getEventByTimestamp(timestamp)"
v-bind="{ ...getEventAttrs(timestamp) }"
@click="handleDateClick(timestamp)"
rounded
dense
flat
class="calendar-event"
:class="{ '--today': isToday(timestamp) }"
/>
</slot>
</template>
</QCalendarMonth>
</template>
</QCalendarMonthWrapper>
</template>
<style lang="scss">
.calendar-event {
display: flex;
justify-content: center;
width: 32px;
height: 32px;
font-size: 13px;
line-height: 1.715em;
cursor: pointer;
color: white;
&.--today {
border: 2px solid $info;
}
&.--event {
background-color: $positive;
color: black;
}
&:hover {
opacity: 0.8;
}
}
</style>

View File

@ -0,0 +1,126 @@
<script setup>
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
import { useStateStore } from 'stores/useStateStore';
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
import { useArrayData } from 'src/composables/useArrayData';
const props = defineProps({
dataKey: {
type: String,
required: true,
},
calendarComponent: {
type: Object,
required: true,
},
additionalProps: {
type: Object,
default: () => ({}),
}
});
const stateStore = useStateStore();
const weekdayStore = useWeekdayStore();
const nMonths = ref(4);
const _date = ref(Date.vnNew());
const firstDay = ref(Date.vnNew());
const lastDay = ref(Date.vnNew());
const months = ref([]);
const arrayData = useArrayData(props.dataKey);
onMounted(async () => {
const initialDate = Date.vnNew();
initialDate.setDate(1);
initialDate.setHours(0, 0, 0, 0);
date.value = initialDate;
await nextTick();
stateStore.rightDrawer = true;
});
onUnmounted(() => arrayData.destroy());
const emit = defineEmits([
'update:firstDay',
'update:lastDay',
'update:events',
'onDateSelected',
]);
const date = computed({
get: () => _date.value,
set: (value) => {
if (!(value instanceof Date)) return;
_date.value = value;
const stamp = value.getTime();
firstDay.value = new Date(stamp);
firstDay.value.setDate(1);
lastDay.value = new Date(stamp);
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
lastDay.value.setDate(0);
months.value = [];
for (let i = 0; i < nMonths.value; i++) {
const monthDate = new Date(stamp);
monthDate.setMonth(value.getMonth() + i);
months.value.push(monthDate);
}
emit('update:firstDay', firstDay.value);
emit('update:lastDay', lastDay.value);
emit('refresh-events');
},
});
const headerTitle = computed(() => {
if (!months.value?.length) return '';
const getMonthName = date =>
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
});
const step = (direction) => {
const newDate = new Date(date.value);
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
date.value = newDate;
};
defineExpose({
firstDay,
lastDay
});
</script>
<template>
<QCard style="height: max-content">
<div class="calendars-header">
<QBtn
icon="arrow_left"
size="sm"
flat
class="full-height"
@click="step(-1)"
/>
<span>{{ headerTitle }}</span>
<QBtn
icon="arrow_right"
size="sm"
flat
class="full-height"
@click="step(1)"
/>
</div>
<div class="calendars-container">
<component
:is="calendarComponent"
v-for="(month, index) in months"
:key="index"
:month="month.getMonth() + 1"
:year="month.getFullYear()"
:month-date="month"
v-bind="additionalProps"
@on-date-selected="data => emit('onDateSelected', data)"
/>
</div>
</QCard>
</template>

View File

@ -156,6 +156,9 @@ const selectTravel = ({ id }) => {
option-label="name" option-label="name"
option-value="id" option-value="id"
v-model="travelFilterParams.warehouseOutFk" v-model="travelFilterParams.warehouseOutFk"
:where="{
isOrigin: true,
}"
/> />
<VnSelect <VnSelect
:label="t('globals.warehouseIn')" :label="t('globals.warehouseIn')"
@ -164,6 +167,9 @@ const selectTravel = ({ id }) => {
option-label="name" option-label="name"
option-value="id" option-value="id"
v-model="travelFilterParams.warehouseInFk" v-model="travelFilterParams.warehouseInFk"
:where="{
isDestiny: true,
}"
/> />
<VnInputDate <VnInputDate
:label="t('globals.shipped')" :label="t('globals.shipped')"

View File

@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
const { notify } = useNotify(); const { notify } = useNotify();
const route = useRoute(); const route = useRoute();
const myForm = ref(null); const myForm = ref(null);
const attrs = useAttrs();
const $props = defineProps({ const $props = defineProps({
url: { url: {
type: String, type: String,
@ -99,8 +98,12 @@ const $props = defineProps({
type: Function, type: Function,
default: () => {}, default: () => {},
}, },
preventSubmit: {
type: Boolean,
default: false,
},
}); });
const emit = defineEmits(['onFetch', 'onDataSaved']); const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
const modelValue = computed( const modelValue = computed(
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`, () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
).value; ).value;
@ -284,7 +287,7 @@ function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: nul
state.set(modelValue, val); state.set(modelValue, val);
if (!$props.url) arrayData.store.data = val; if (!$props.url) arrayData.store.data = val;
emit(evt, state.get(modelValue), res, old); emit(evt, state.get(modelValue), res, old, formData);
} }
function trimData(data) { function trimData(data) {
@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
); );
} }
async function onKeyup(evt) { async function onKeyup(evt) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) { if (evt.key === 'Enter' && !$props.preventSubmit) {
const input = evt.target; const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) { if (input.type == 'textarea' && evt.shiftKey) {
let { selectionStart, selectionEnd } = input; let { selectionStart, selectionEnd } = input;
@ -330,6 +333,7 @@ defineExpose({
<template> <template>
<div class="column items-center full-width"> <div class="column items-center full-width">
<QForm <QForm
v-on="$attrs"
ref="myForm" ref="myForm"
v-if="formData" v-if="formData"
@submit.prevent="save" @submit.prevent="save"
@ -406,6 +410,7 @@ defineExpose({
</QBtnDropdown> </QBtnDropdown>
<QBtn <QBtn
v-else v-else
data-cy="saveDefaultBtn"
:label="tMobile('globals.save')" :label="tMobile('globals.save')"
color="primary" color="primary"
icon="save" icon="save"

View File

@ -181,7 +181,7 @@ const searchModule = () => {
<template> <template>
<QList padding class="column-max-width"> <QList padding class="column-max-width">
<template v-if="$props.source === 'main'"> <template v-if="$props.source === 'main'">
<template v-if="$route?.matched[1]?.name === 'Dashboard'"> <template v-if="route?.matched[1]?.name === 'Dashboard'">
<QItem class="q-pb-md"> <QItem class="q-pb-md">
<VnInput <VnInput
v-model="search" v-model="search"
@ -262,7 +262,7 @@ const searchModule = () => {
</template> </template>
<template v-for="item in items" :key="item.name"> <template v-for="item in items" :key="item.name">
<template v-if="item.name === $route?.matched[1]?.name"> <template v-if="item.name === route?.matched[1]?.name">
<QItem class="header"> <QItem class="header">
<QItemSection avatar v-if="item.icon"> <QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" /> <QIcon :name="item.icon" />

View File

@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
'no-visible': !stateQuery.isLoading().value, 'no-visible': !stateQuery.isLoading().value,
}" }"
size="sm" size="sm"
data-cy="loading-spinner" data-cy="navBar-spinner"
/> />
<QSpace /> <QSpace />
<div id="searchbar" class="searchbar"></div> <div id="searchbar" class="searchbar"></div>

View File

@ -40,6 +40,9 @@ const onDataSaved = (data) => {
url="Warehouses" url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)" @on-fetch="(data) => (warehousesOptions = data)"
auto-load auto-load
:where="{
isInventory: true,
}"
/> />
<FormModelPopup <FormModelPopup
url-create="Items/regularize" url-create="Items/regularize"

View File

@ -1,12 +1,22 @@
<script setup> <script setup>
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
import { getValueFromPath } from 'src/composables/getValueFromPath';
defineProps({ row: { type: Object, required: true } }); const { row, visibleProblems = null } = defineProps({
row: { type: Object, required: true },
visibleProblems: { type: Array },
});
function showProblem(problem) {
const val = getValueFromPath(row, problem);
if (!visibleProblems) return val;
return !!(visibleProblems?.includes(problem) && val);
}
</script> </script>
<template> <template>
<span class="q-gutter-x-xs"> <span class="q-gutter-x-xs">
<router-link <router-link
v-if="row.claim?.claimFk" v-if="showProblem('claim.claimFk')"
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }" :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
class="link" class="link"
> >
@ -18,7 +28,7 @@ defineProps({ row: { type: Object, required: true } });
</QIcon> </QIcon>
</router-link> </router-link>
<QIcon <QIcon
v-if="row?.isDeleted" v-if="showProblem('isDeleted')"
color="primary" color="primary"
name="vn:deletedTicket" name="vn:deletedTicket"
size="xs" size="xs"
@ -29,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.hasRisk" v-if="showProblem('hasRisk')"
name="vn:risk" name="vn:risk"
:color="row.hasHighRisk ? 'negative' : 'primary'" :color="row.hasHighRisk ? 'negative' : 'primary'"
size="xs" size="xs"
@ -40,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.hasComponentLack" v-if="showProblem('hasComponentLack')"
name="vn:components" name="vn:components"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay"> <QIcon
v-if="showProblem('hasItemDelay')"
color="primary"
size="xs"
name="vn:hasItemDelay"
>
<QTooltip> <QTooltip>
{{ $t('ticket.summary.hasItemDelay') }} {{ $t('ticket.summary.hasItemDelay') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost"> <QIcon
v-if="showProblem('hasItemLost')"
color="primary"
size="xs"
name="vn:hasItemLost"
>
<QTooltip> <QTooltip>
{{ $t('salesTicketsTable.hasItemLost') }} {{ $t('salesTicketsTable.hasItemLost') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.hasItemShortage" v-if="showProblem('hasItemShortage')"
name="vn:unavailable" name="vn:unavailable"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs"> <QIcon
v-if="showProblem('hasRounding')"
color="primary"
name="sync_problem"
size="xs"
>
<QTooltip> <QTooltip>
{{ $t('ticketList.rounding') }} {{ $t('ticketList.rounding') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.hasTicketRequest" v-if="showProblem('hasTicketRequest')"
name="vn:buyrequest" name="vn:buyrequest"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs"> <QIcon
v-if="showProblem('isTaxDataChecked')"
name="vn:no036"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs"> <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs"> <QIcon
v-if="showProblem('isTooLittle')"
name="vn:isTooLittle"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
</QIcon> </QIcon>
</span> </span>

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { markRaw, computed } from 'vue'; import { markRaw, computed, onBeforeMount } from 'vue';
import { QCheckbox, QToggle } from 'quasar'; import { QToggle } from 'quasar';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import VnInput from 'components/common/VnInput.vue'; import VnInput from 'components/common/VnInput.vue';
@ -150,6 +150,16 @@ const showFilter = computed(
const onTabPressed = async () => { const onTabPressed = async () => {
if (model.value) enterEvent['keyup.enter'](); if (model.value) enterEvent['keyup.enter']();
}; };
onBeforeMount(() => {
const columnFilter = $props.column?.columnFilter;
const component = columnFilter?.component;
const defaultComponent = components[component];
const events = { update: updateEvent, enter: enterEvent };
if (!columnFilter || defaultComponent) return;
$props.column.columnFilter.event = events[columnFilter.event];
});
</script> </script>
<template> <template>
<div v-if="showFilter" class="full-width" style="overflow: hidden"> <div v-if="showFilter" class="full-width" style="overflow: hidden">

View File

@ -16,7 +16,7 @@ const $props = defineProps({
required: true, required: true,
}, },
searchUrl: { searchUrl: {
type: String, type: [String, Boolean],
default: 'table', default: 'table',
}, },
vertical: { vertical: {

View File

@ -33,6 +33,8 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
import VnTableFilter from './VnTableFilter.vue'; import VnTableFilter from './VnTableFilter.vue';
import { getColAlign } from 'src/composables/getColAlign'; import { getColAlign } from 'src/composables/getColAlign';
import RightMenu from '../common/RightMenu.vue'; import RightMenu from '../common/RightMenu.vue';
import VnScroll from '../common/VnScroll.vue';
import VnMultiCheck from '../common/VnMultiCheck.vue';
const arrayData = useArrayData(useAttrs()['data-key']); const arrayData = useArrayData(useAttrs()['data-key']);
const $props = defineProps({ const $props = defineProps({
@ -65,7 +67,7 @@ const $props = defineProps({
default: null, default: null,
}, },
create: { create: {
type: Object, type: [Boolean, Object],
default: null, default: null,
}, },
createAsDialog: { createAsDialog: {
@ -112,6 +114,10 @@ const $props = defineProps({
type: Object, type: Object,
default: () => ({}), default: () => ({}),
}, },
multiCheck: {
type: Object,
default: () => ({}),
},
crudModel: { crudModel: {
type: Object, type: Object,
default: () => ({}), default: () => ({}),
@ -156,6 +162,7 @@ const CARD_MODE = 'card';
const TABLE_MODE = 'table'; const TABLE_MODE = 'table';
const mode = ref(CARD_MODE); const mode = ref(CARD_MODE);
const selected = ref([]); const selected = ref([]);
const selectAll = ref(false);
const hasParams = ref(false); const hasParams = ref(false);
const CrudModelRef = ref({}); const CrudModelRef = ref({});
const showForm = ref(false); const showForm = ref(false);
@ -168,6 +175,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
const orders = ref(useFilterParams($attrs['data-key']).orders); const orders = ref(useFilterParams($attrs['data-key']).orders);
const app = inject('app'); const app = inject('app');
const tableHeight = useTableHeight(); const tableHeight = useTableHeight();
const vnScrollRef = ref(null);
const editingRow = ref(null); const editingRow = ref(null);
const editingField = ref(null); const editingField = ref(null);
@ -189,6 +197,17 @@ const tableModes = [
}, },
]; ];
const onVirtualScroll = ({ to }) => {
handleScroll();
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
if (virtualScrollContainer) {
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
if (vnScrollRef.value) {
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
}
}
};
onBeforeMount(() => { onBeforeMount(() => {
const urlParams = route.query[$props.searchUrl]; const urlParams = route.query[$props.searchUrl];
hasParams.value = urlParams && Object.keys(urlParams).length !== 0; hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@ -229,6 +248,7 @@ watch(
defineExpose({ defineExpose({
create: createForm, create: createForm,
showForm,
reload, reload,
redirect: redirectFn, redirect: redirectFn,
selected, selected,
@ -326,16 +346,13 @@ function handleOnDataSaved(_) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value }); if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_); else $props.create.onDataSaved(_);
} }
function handleScroll() { function handleScroll() {
if ($props.crudModel.disableInfiniteScroll) return; if ($props.crudModel.disableInfiniteScroll) return;
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle'); const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
const { scrollHeight, scrollTop, clientHeight } = tMiddle; const { scrollHeight, scrollTop, clientHeight } = tMiddle;
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40; const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate(); if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
} }
function handleSelection({ evt, added, rows: selectedRows }, rows) { function handleSelection({ evt, added, rows: selectedRows }, rows) {
if (evt?.shiftKey && added) { if (evt?.shiftKey && added) {
const rowIndex = selectedRows[0].$index; const rowIndex = selectedRows[0].$index;
@ -627,6 +644,23 @@ const rowCtrlClickFunction = computed(() => {
}; };
return () => {}; return () => {};
}); });
const handleMultiCheck = (value) => {
if (value) {
selected.value = tableRef.value.rows;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
const handleSelectedAll = (data) => {
if (data) {
selected.value = data;
} else {
selected.value = [];
}
emit('update:selected', selected.value);
};
</script> </script>
<template> <template>
<RightMenu v-if="$props.rightSearch" :overlay="overlay"> <RightMenu v-if="$props.rightSearch" :overlay="overlay">
@ -682,13 +716,24 @@ const rowCtrlClickFunction = computed(() => {
flat flat
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`" :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
:virtual-scroll="isTableMode" :virtual-scroll="isTableMode"
@virtual-scroll="handleScroll" @virtual-scroll="onVirtualScroll"
@row-click="(event, row) => handleRowClick(event, row)" @row-click="(event, row) => handleRowClick(event, row)"
@update:selected="emit('update:selected', $event)" @update:selected="emit('update:selected', $event)"
@selection="(details) => handleSelection(details, rows)" @selection="(details) => handleSelection(details, rows)"
:hide-selected-banner="true" :hide-selected-banner="true"
:data-cy :data-cy
> >
<template #header-selection>
<VnMultiCheck
:searchUrl="searchUrl"
:expand="$props.multiCheck.expand"
v-model="selectAll"
:url="$attrs['url']"
@update:selected="handleMultiCheck"
@select:all="handleSelectedAll"
></VnMultiCheck>
</template>
<template #top-left v-if="!$props.withoutHeader"> <template #top-left v-if="!$props.withoutHeader">
<slot name="top-left"> </slot> <slot name="top-left"> </slot>
</template> </template>
@ -740,6 +785,7 @@ const rowCtrlClickFunction = computed(() => {
withFilters withFilters
" "
:column="col" :column="col"
:data-cy="`column-filter-${col.name}`"
:show-title="true" :show-title="true"
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"
v-model="params[columnName(col)]" v-model="params[columnName(col)]"
@ -1086,6 +1132,11 @@ const rowCtrlClickFunction = computed(() => {
</template> </template>
</FormModelPopup> </FormModelPopup>
</QDialog> </QDialog>
<VnScroll
ref="vnScrollRef"
v-if="isTableMode"
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
/>
</template> </template>
<i18n> <i18n>
en: en:

View File

@ -30,6 +30,7 @@ function columnName(col) {
v-bind="$attrs" v-bind="$attrs"
:search-button="true" :search-button="true"
:disable-submit-event="true" :disable-submit-event="true"
:data-key="$attrs['data-key']"
:search-url :search-url
> >
<template #body="{ params, orders, searchFn }"> <template #body="{ params, orders, searchFn }">

View File

@ -58,7 +58,7 @@ async function getConfig(url, filter) {
const response = await axios.get(url, { const response = await axios.get(url, {
params: { filter: filter }, params: { filter: filter },
}); });
return response.data && response.data.length > 0 ? response.data[0] : null; return response?.data && response?.data?.length > 0 ? response.data[0] : null;
} }
async function fetchViewConfigData() { async function fetchViewConfigData() {

View File

@ -11,6 +11,9 @@ describe('VnTable', () => {
propsData: { propsData: {
columns: [], columns: [],
}, },
attrs: {
'data-key': 'test',
},
}); });
vm = wrapper.vm; vm = wrapper.vm;

View File

@ -11,13 +11,7 @@ describe('CrudModel', () => {
beforeAll(() => { beforeAll(() => {
wrapper = createWrapper(CrudModel, { wrapper = createWrapper(CrudModel, {
global: { global: {
stubs: [ stubs: ['vnPaginate', 'vue-i18n'],
'vnPaginate',
'useState',
'arrayData',
'useStateStore',
'vue-i18n',
],
mocks: { mocks: {
validate: vi.fn(), validate: vi.fn(),
}, },
@ -29,7 +23,7 @@ describe('CrudModel', () => {
dataKey: 'crudModelKey', dataKey: 'crudModelKey',
model: 'crudModel', model: 'crudModel',
url: 'crudModelUrl', url: 'crudModelUrl',
saveFn: '', saveFn: vi.fn(),
}, },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
@ -231,7 +225,7 @@ describe('CrudModel', () => {
expect(vm.isLoading).toBe(false); expect(vm.isLoading).toBe(false);
expect(vm.hasChanges).toBe(false); expect(vm.hasChanges).toBe(false);
await wrapper.setProps({ saveFn: '' }); await wrapper.setProps({ saveFn: null });
}); });
it("should use default url if there's not saveFn", async () => { it("should use default url if there's not saveFn", async () => {

View File

@ -1,57 +0,0 @@
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';
const fieldA = 'fieldA';
const fieldB = 'fieldB';
describe('EditForm', () => {
let vm;
const mockRows = [
{ id: 1, itemFk: 101 },
{ id: 2, itemFk: 102 },
];
const mockFieldsOptions = [
{ label: 'Field A', field: fieldA, component: 'input', attrs: {} },
{ label: 'Field B', field: fieldB, component: 'date', attrs: {} },
];
const editUrl = '/api/edit';
beforeAll(() => {
vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
vm = createWrapper(EditForm, {
props: {
rows: mockRows,
fieldsOptions: mockFieldsOptions,
editUrl,
},
}).vm;
});
afterEach(() => {
vi.clearAllMocks();
});
describe('onSubmit()', () => {
it('should call axios.post with the correct parameters in the payload', async () => {
const selectedField = { field: fieldA, component: 'input', attrs: {} };
const newValue = 'Test Value';
vm.selectedField = selectedField;
vm.newValue = newValue;
await vm.onSubmit();
const payload = axios.post.mock.calls[0][1];
expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
expect(payload.field).toEqual(fieldA);
expect(payload.newValue).toEqual(newValue);
expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
expect(vm.isLoading).toEqual(false);
});
});
});

View File

@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
vm = mount('card').vm; vm = mount('card').vm;
}); });
it('should get routes for card source', async () => { it('should get routes for card source', () => {
vm.getRoutes(); vm.getRoutes();
}); });
}); });
@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
}); });
it('should get routes for main source', () => { it('should get routes for main source', () => {
vm.props.source = 'main';
vm.getRoutes(); vm.getRoutes();
expect(navigation.getModules).toHaveBeenCalled(); expect(navigation.getModules).toHaveBeenCalled();
}); });

View File

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

View File

@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
<VnInput <VnInput
v-model="model" v-model="model"
ref="inputRef" ref="inputRef"
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model" @keydown.tab="$refs.inputRef.vnInputRef.blur()"
@blur="model = useAccountShortToStandard(model) ?? model"
@input="model = $event.target.value.replace(/[^\d.]/g, '')" @input="model = $event.target.value.replace(/[^\d.]/g, '')"
/> />
</template> </template>

View File

@ -0,0 +1,93 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnInput from 'src/components/common/VnInput.vue';
import FetchData from '../FetchData.vue';
import VnSelectDialog from './VnSelectDialog.vue';
import CreateBankEntityForm from '../CreateBankEntityForm.vue';
const $props = defineProps({
iban: {
type: String,
default: null,
},
bankEntityFk: {
type: Number,
default: null,
},
disableElement: {
type: Boolean,
default: false,
},
});
const filter = {
fields: ['id', 'bic', 'name'],
order: 'bic ASC',
};
const { t } = useI18n();
const emit = defineEmits(['updateBic']);
const iban = ref($props.iban);
const bankEntityFk = ref($props.bankEntityFk);
const bankEntities = ref([]);
const autofillBic = async (bic) => {
if (!bic) return;
const bankEntityId = parseInt(bic.substr(4, 4));
const ibanCountry = bic.substr(0, 2);
if (ibanCountry != 'ES') return;
const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
bankEntityFk.value = existBank ? bankEntityId : null;
emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
};
const getBankEntities = (data) => {
bankEntityFk.value = data.id;
};
</script>
<template>
<FetchData
url="BankEntities"
:filter="filter"
auto-load
@on-fetch="(data) => (bankEntities = data)"
/>
<VnInput
:label="t('IBAN')"
clearable
v-model="iban"
@update:model-value="autofillBic($event)"
:disable="disableElement"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
<VnSelectDialog
:label="t('Swift / BIC')"
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
:options="bankEntities"
hide-selected
option-label="name"
option-value="id"
v-model="bankEntityFk"
@update:model-value="$emit('updateBic', { iban, bankEntityFk })"
:disable="disableElement"
>
<template #form>
<CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection v-if="scope.opt">
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectDialog>
</template>

View File

@ -33,7 +33,7 @@ onBeforeRouteLeave(() => {
}); });
onBeforeMount(async () => { onBeforeMount(async () => {
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor)); if (props.visual) stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
const route = router.currentRoute.value; const route = router.currentRoute.value;
try { try {

View File

@ -1,4 +1,6 @@
<script setup> <script setup>
import { computed } from 'vue';
const $props = defineProps({ const $props = defineProps({
colors: { colors: {
type: String, type: String,
@ -6,9 +8,9 @@ const $props = defineProps({
}, },
}); });
const colorArray = JSON.parse($props.colors)?.value; const colorArray = computed(() => JSON.parse($props.colors)?.value);
const maxHeight = 30; const maxHeight = 30;
const colorHeight = maxHeight / colorArray?.length; const colorHeight = maxHeight / colorArray.value?.length;
</script> </script>
<template> <template>
<div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }"> <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
const model = defineModel({ type: [String, Number], required: true }); const model = defineModel({ type: [String, Number], default: '' });
</script> </script>
<template> <template>
<QDate v-model="model" :today-btn="true" :options="$attrs.options" /> <QDate v-model="model" :today-btn="true" :options="$attrs.options" />

View File

@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import axios from 'axios'; import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify();
const emit = defineEmits(['onDataSaved']); const emit = defineEmits(['onDataSaved']);
const $props = defineProps({ const $props = defineProps({
@ -61,8 +63,11 @@ function onFileChange(files) {
function mapperDms(data) { function mapperDms(data) {
const formData = new FormData(); const formData = new FormData();
const { files } = data; let files = data.files;
if (files) formData.append(files?.name, files); if (files) {
files = Array.isArray(files) ? files : [files];
files.forEach((file) => formData.append(file?.name, file));
}
const dms = { const dms = {
hasFile: !!data.hasFile, hasFile: !!data.hasFile,
@ -83,11 +88,16 @@ function getUrl() {
} }
async function save() { async function save() {
const body = mapperDms(dms.value); try {
const response = await axios.post(getUrl(), body[0], body[1]); const body = mapperDms(dms.value);
emit('onDataSaved', body[1].params, response); const response = await axios.post(getUrl(), body[0], body[1]);
delete dms.value.files; emit('onDataSaved', body[1].params, response);
return response; notify(t('globals.dataSaved'), 'positive');
delete dms.value.files;
return response;
} catch (e) {
throw e;
}
} }
function defaultData() { function defaultData() {
@ -208,7 +218,7 @@ function addDefaultData(data) {
} }
</style> </style>
<i18n> <i18n>
en: en:
contentTypesInfo: Allowed file types {allowedContentTypes} contentTypesInfo: Allowed file types {allowedContentTypes}
EntryDmsDescription: Reference {reference} EntryDmsDescription: Reference {reference}
WorkersDescription: Working of employee id {reference} WorkersDescription: Working of employee id {reference}

View File

@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar'; import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
import axios from 'axios'; import axios from 'axios';
import { usePrintService } from 'composables/usePrintService';
import VnUserLink from '../ui/VnUserLink.vue'; import VnUserLink from '../ui/VnUserLink.vue';
import { downloadFile } from 'src/composables/downloadFile'; import { downloadFile } from 'src/composables/downloadFile';
@ -13,14 +14,17 @@ import VnDms from 'src/components/common/VnDms.vue';
import VnConfirm from 'components/ui/VnConfirm.vue'; import VnConfirm from 'components/ui/VnConfirm.vue';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
import { useSession } from 'src/composables/useSession'; import { useSession } from 'src/composables/useSession';
import useNotify from 'src/composables/useNotify.js';
const route = useRoute(); const route = useRoute();
const quasar = useQuasar(); const quasar = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify();
const rows = ref([]); const rows = ref([]);
const dmsRef = ref(); const dmsRef = ref();
const formDialog = ref({}); const formDialog = ref({});
const token = useSession().getTokenMultimedia(); const token = useSession().getTokenMultimedia();
const { openReport } = usePrintService();
const $props = defineProps({ const $props = defineProps({
model: { model: {
@ -88,7 +92,6 @@ const dmsFilter = {
], ],
}, },
}, },
where: { [$props.filter]: route.params.id },
}; };
const columns = computed(() => [ const columns = computed(() => [
@ -198,12 +201,7 @@ const columns = computed(() => [
color: 'primary', color: 'primary',
}), }),
click: (prop) => click: (prop) =>
downloadFile( openReport(`dms/${prop.row.id}/downloadFile`, {}, '_blank'),
prop.row.id,
$props.downloadModel,
undefined,
prop.row.download,
),
}, },
{ {
component: QBtn, component: QBtn,
@ -258,9 +256,16 @@ function deleteDms(dmsFk) {
}, },
}) })
.onOk(async () => { .onOk(async () => {
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`); try {
const index = rows.value.findIndex((row) => row.id == dmsFk); await axios.post(
rows.value.splice(index, 1); `${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
);
const index = rows.value.findIndex((row) => row.id == dmsFk);
rows.value.splice(index, 1);
notify(t('globals.dataDeleted'), 'positive');
} catch (e) {
throw e;
}
}); });
} }
@ -298,7 +303,9 @@ defineExpose({
:data-key="$props.model" :data-key="$props.model"
:url="$props.model" :url="$props.model"
:user-filter="dmsFilter" :user-filter="dmsFilter"
search-url="dmsFilter"
:order="['dmsFk DESC']" :order="['dmsFk DESC']"
:filter="{ where: { [$props.filter]: route.params.id } }"
auto-load auto-load
@on-fetch="setData" @on-fetch="setData"
> >

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { onMounted, watch, computed, ref, useAttrs } from 'vue'; import { nextTick, watch, computed, ref, useAttrs } from 'vue';
import { date } from 'quasar'; import { date, getCssVar } from 'quasar';
import VnDate from './VnDate.vue'; import VnDate from './VnDate.vue';
import { useRequired } from 'src/composables/useRequired'; import { useRequired } from 'src/composables/useRequired';
@ -20,61 +20,18 @@ const $props = defineProps({
}); });
const vnInputDateRef = ref(null); const vnInputDateRef = ref(null);
const errColor = getCssVar('negative');
const textColor = ref('');
const dateFormat = 'DD/MM/YYYY'; const dateFormat = 'DD/MM/YYYY';
const isPopupOpen = ref(); const isPopupOpen = ref();
const hover = ref(); const hover = ref();
const mask = ref();
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])]; const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
const formattedDate = computed({
get() {
if (!model.value) return model.value;
return date.formatDate(new Date(model.value), dateFormat);
},
set(value) {
if (value == model.value) return;
let newDate;
if (value) {
// parse input
if (value.includes('/') && value.length >= 10) {
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
value = date.formatDate(
new Date(value).toISOString(),
'YYYY-MM-DDTHH:mm:ss.SSSZ',
);
}
const [year, month, day] = value.split('-').map((e) => parseInt(e));
newDate = new Date(year, month - 1, day);
if (model.value) {
const orgDate =
model.value instanceof Date ? model.value : new Date(model.value);
newDate.setHours(
orgDate.getHours(),
orgDate.getMinutes(),
orgDate.getSeconds(),
orgDate.getMilliseconds(),
);
}
}
if (!isNaN(newDate)) model.value = newDate.toISOString();
},
});
const popupDate = computed(() => const popupDate = computed(() =>
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value, model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
); );
onMounted(() => {
// fix quasar bug
mask.value = '##/##/####';
});
watch(
() => model.value,
(val) => (formattedDate.value = val),
{ immediate: true },
);
const styleAttrs = computed(() => { const styleAttrs = computed(() => {
return $props.isOutlined return $props.isOutlined
@ -86,28 +43,138 @@ const styleAttrs = computed(() => {
: {}; : {};
}); });
const inputValue = ref('');
const validateAndCleanInput = (value) => {
inputValue.value = value.replace(/[^0-9./-]/g, '');
};
const manageDate = (date) => { const manageDate = (date) => {
formattedDate.value = date; inputValue.value = date.split('/').reverse().join('/');
isPopupOpen.value = false; isPopupOpen.value = false;
}; };
watch(
() => model.value,
(nVal) => {
if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
else inputValue.value = '';
},
{ immediate: true },
);
const formatDate = () => {
let value = inputValue.value;
if (!value || value === model.value) {
textColor.value = '';
return;
}
const regex =
/^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
if (!regex.test(value)) {
textColor.value = errColor;
return;
}
value = value.replace(/[.-]/g, '/');
const parts = value.split('/');
if (parts.length < 2) {
textColor.value = errColor;
return;
}
let [day, month, year] = parts;
if (day.length === 1) day = '0' + day;
if (month.length === 1) month = '0' + month;
const currentYear = Date.vnNew().getFullYear();
if (!year) year = currentYear;
const millennium = currentYear.toString().slice(0, 1);
switch (year.length) {
case 1:
year = `${millennium}00${year}`;
break;
case 2:
year = `${millennium}0${year}`;
break;
case 3:
year = `${millennium}${year}`;
break;
case 4:
break;
}
let isoCandidate = `${year}/${month}/${day}`;
isoCandidate = date.formatDate(
new Date(isoCandidate).toISOString(),
'YYYY-MM-DDTHH:mm:ss.SSSZ',
);
const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
const isValidDate =
parsedDate instanceof Date &&
!isNaN(parsedDate) &&
parsedDate.getFullYear() === parseInt(year) &&
parsedDate.getMonth() === parseInt(month) - 1 &&
parsedDate.getDate() === parseInt(day);
if (!isValidDate) {
textColor.value = errColor;
return;
}
if (model.value) {
const original =
model.value instanceof Date ? model.value : new Date(model.value);
parsedDate.setHours(
original.getHours(),
original.getMinutes(),
original.getSeconds(),
original.getMilliseconds(),
);
}
model.value = parsedDate.toISOString();
textColor.value = '';
};
const handleEnter = (event) => {
formatDate();
nextTick(() => {
const newEvent = new KeyboardEvent('keydown', {
key: 'Enter',
code: 'Enter',
bubbles: true,
cancelable: true,
});
vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
});
};
</script> </script>
<template> <template>
<div @mouseover="hover = true" @mouseleave="hover = false"> <div @mouseover="hover = true" @mouseleave="hover = false">
<QInput <QInput
ref="vnInputDateRef" ref="vnInputDateRef"
v-model="formattedDate" v-model="inputValue"
class="vn-input-date" class="vn-input-date"
:mask="mask"
placeholder="dd/mm/aaaa" placeholder="dd/mm/aaaa"
v-bind="{ ...$attrs, ...styleAttrs }" v-bind="{ ...$attrs, ...styleAttrs }"
:class="{ required: isRequired }" :class="{ required: isRequired }"
:rules="mixinRules" :rules="mixinRules"
:clearable="false" :clearable="false"
:input-style="{ color: textColor }"
@click="isPopupOpen = !isPopupOpen" @click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false" @keydown="isPopupOpen = false"
@blur="formatDate"
@keydown.enter.prevent="handleEnter"
hide-bottom-space hide-bottom-space
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'" :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
@update:model-value="validateAndCleanInput"
> >
<template #append> <template #append>
<QIcon <QIcon
@ -116,11 +183,12 @@ const manageDate = (date) => {
v-if=" v-if="
($attrs.clearable == undefined || $attrs.clearable) && ($attrs.clearable == undefined || $attrs.clearable) &&
hover && hover &&
model && inputValue &&
!$attrs.disable !$attrs.disable
" "
@click=" @click="
vnInputDateRef.focus(); vnInputDateRef.focus();
inputValue = null;
model = null; model = null;
isPopupOpen = false; isPopupOpen = false;
" "

View File

@ -0,0 +1,79 @@
<script setup>
import { computed, useAttrs } from 'vue';
import { date } from 'quasar';
import VnDate from './VnDate.vue';
import VnTime from './VnTime.vue';
const $attrs = useAttrs();
const model = defineModel({ type: [Date, String] });
const $props = defineProps({
isOutlined: {
type: Boolean,
default: false,
},
showEvent: {
type: Boolean,
default: true,
},
});
const styleAttrs = computed(() => {
return $props.isOutlined
? {
dense: true,
outlined: true,
rounded: true,
}
: {};
});
const mask = 'DD-MM-YYYY HH:mm';
const selectedDate = computed({
get() {
if (!model.value) return JSON.stringify(new Date(model.value));
return date.formatDate(new Date(model.value), mask);
},
set(value) {
model.value = Date.convertToISODateTime(value);
},
});
const manageDate = (date) => {
selectedDate.value = date;
};
</script>
<template>
<div @mouseover="hover = true" @mouseleave="hover = false">
<QInput
ref="vnInputDateRef"
v-model="selectedDate"
class="vn-input-date"
placeholder="dd/mm/aaaa HH:mm"
v-bind="{ ...$attrs, ...styleAttrs }"
:clearable="false"
@click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false"
hide-bottom-space
@update:model-value="manageDate"
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
>
<template #prepend>
<QIcon name="today" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnDate :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
<template #append>
<QIcon name="access_time" size="xs">
<QPopupProxy cover transition-show="scale" transition-hide="scale">
<VnTime format24h :mask="mask" v-model="selectedDate" />
</QPopupProxy>
</QIcon>
</template>
</QInput>
</div>
</template>
<i18n>
es:
Open date: Abrir fecha
</i18n>

View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import { watch } from 'vue'; import { watch } from 'vue';
import { toDateString } from 'src/filters'; import { toDateHourMinSec } from 'src/filters';
const props = defineProps({ const props = defineProps({
value: { type: [String, Number, Boolean, Object], default: undefined }, value: { type: [String, Number, Boolean, Object], default: undefined },
@ -40,7 +40,7 @@ const updateValue = () => {
break; break;
case 'object': case 'object':
if (props.value instanceof Date) { if (props.value instanceof Date) {
t = toDateString(props.value); t = toDateHourMinSec(props.value);
} else { } else {
t = props.value.toString(); t = props.value.toString();
} }

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, onMounted, onUnmounted, watch, computed } from 'vue'; import { ref, onMounted, onUnmounted, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import axios from 'axios'; import axios from 'axios';
@ -68,7 +68,6 @@ const filter = {
}, },
}, },
], ],
where: { and: [{ originFk: route.params.id }] },
}; };
const paginate = ref(); const paginate = ref();
@ -267,13 +266,6 @@ onMounted(() => {
onUnmounted(() => { onUnmounted(() => {
stateStore.rightDrawer = false; stateStore.rightDrawer = false;
}); });
watch(
() => router.currentRoute.value.params.id,
() => {
applyFilter();
},
);
</script> </script>
<template> <template>
<VnPaginate <VnPaginate
@ -281,6 +273,7 @@ watch(
:data-key :data-key
:url="dataKey + 's'" :url="dataKey + 's'"
:user-filter="filter" :user-filter="filter"
:filter="{ where: { and: [{ originFk: route.params.id }] } }"
:skeleton="false" :skeleton="false"
auto-load auto-load
@on-fetch="setLogTree" @on-fetch="setLogTree"

View File

@ -39,7 +39,7 @@ const checkboxOptions = ref([
{ name: 'select', label: 'Accesses', selected: false }, { name: 'select', label: 'Accesses', selected: false },
]); ]);
const columns = computed(() => [ const columns = computed(() => [
{ name: 'changedModelValue' }, { name: 'changedModelValue', orderBy: 'id' },
{ name: 'changedModel' }, { name: 'changedModel' },
{ name: 'userType', orderBy: false }, { name: 'userType', orderBy: false },
{ name: 'userFk' }, { name: 'userFk' },

View File

@ -0,0 +1,80 @@
<script setup>
import { ref } from 'vue';
import VnCheckbox from './VnCheckbox.vue';
import axios from 'axios';
import { toRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
const route = useRoute();
const { t } = useI18n();
const model = defineModel({ type: [Boolean] });
const props = defineProps({
expand: {
type: Boolean,
default: false,
},
url: {
type: String,
default: null,
required: true,
},
searchUrl: {
type: [String, Boolean],
default: 'table',
},
});
const value = ref(false);
const rows = ref(0);
const onClick = () => {
if (value.value) {
const { filter } = JSON.parse(route.query[props.searchUrl]);
filter.limit = 0;
const params = {
params: { filter: JSON.stringify(filter) },
};
axios
.get(props.url, params)
.then(({ data }) => {
rows.value = data;
})
.catch(console.error);
}
};
defineEmits(['update:selected', 'select:all']);
</script>
<template>
<div style="display: flex">
<VnCheckbox v-model="value" @click="$emit('update:selected', value)" />
<QBtn
v-if="value && $props.expand"
flat
dense
icon="expand_more"
@click="onClick"
>
<QMenu anchor="bottom right" self="top right">
<QList>
<QItem v-ripple clickable @click="$emit('select:all', toRaw(rows))">
{{ t('Select all', { rows: rows.length }) }}
</QItem>
<slot name="more-options"></slot>
</QList>
</QMenu>
</QBtn>
</div>
</template>
<i18n lang="yml">
en:
Select all: 'Select all ({rows})'
fr:
Select all: 'Sélectionner tout ({rows})'
es:
Select all: 'Seleccionar todo ({rows})'
de:
Select all: 'Alle auswählen ({rows})'
it:
Select all: 'Seleziona tutto ({rows})'
pt:
Select all: 'Selecionar tudo ({rows})'
</i18n>

View File

@ -0,0 +1,100 @@
<script setup>
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
const props = defineProps({
scrollTarget: { type: [String, Object], default: 'window' }
});
const scrollPosition = ref(0);
const showButton = ref(false);
let scrollContainer = null;
const onScroll = () => {
if (!scrollContainer) return;
scrollPosition.value =
typeof props.scrollTarget === 'object'
? scrollContainer.scrollTop
: window.scrollY;
};
watch(scrollPosition, (newValue) => {
showButton.value = newValue > 0;
});
const scrollToTop = () => {
if (scrollContainer) {
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
}
};
const updateScrollContainer = (container) => {
if (container) {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
}
scrollContainer = container;
scrollContainer.addEventListener('scroll', onScroll);
onScroll();
}
};
defineExpose({
updateScrollContainer
});
const initScrollContainer = async () => {
await nextTick();
if (typeof props.scrollTarget === 'object') {
scrollContainer = props.scrollTarget;
} else {
scrollContainer = window;
}
if (!scrollContainer) return
scrollContainer.addEventListener('scroll', onScroll);
};
onMounted(() => {
initScrollContainer();
});
onUnmounted(() => {
if (scrollContainer) {
scrollContainer.removeEventListener('scroll', onScroll);
scrollContainer = null;
}
});
</script>
<template>
<QIcon
v-if="showButton"
color="primary"
name="keyboard_arrow_up"
class="scroll-to-top"
@click="scrollToTop"
>
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
</QIcon>
</template>
<style scoped>
.scroll-to-top {
position: fixed;
top: 70px;
font-size: 65px;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
transition: transform 0.2s ease-in-out;
}
.scroll-to-top:hover {
transform: translateX(-50%) scale(1.2);
cursor: pointer;
filter: brightness(0.8);
}
</style>

View File

@ -54,6 +54,10 @@ const $props = defineProps({
type: [Array], type: [Array],
default: () => [], default: () => [],
}, },
filterFn: {
type: Function,
default: null,
},
exprBuilder: { exprBuilder: {
type: Function, type: Function,
default: null, default: null,
@ -62,16 +66,12 @@ const $props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
defaultFilter: {
type: Boolean,
default: true,
},
fields: { fields: {
type: Array, type: Array,
default: null, default: null,
}, },
include: { include: {
type: [Object, Array], type: [Object, Array, String],
default: null, default: null,
}, },
where: { where: {
@ -79,7 +79,7 @@ const $props = defineProps({
default: null, default: null,
}, },
sortBy: { sortBy: {
type: String, type: [String, Array],
default: null, default: null,
}, },
limit: { limit: {
@ -152,10 +152,22 @@ const value = computed({
}, },
}); });
const arrayDataKey =
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
const computedSortBy = computed(() => { const computedSortBy = computed(() => {
return $props.sortBy || $props.optionLabel + ' ASC'; return $props.sortBy || $props.optionLabel + ' ASC';
}); });
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
watch(options, (newValue) => { watch(options, (newValue) => {
setOptions(newValue); setOptions(newValue);
}); });
@ -174,16 +186,7 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300); if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
}); });
const arrayDataKey = const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
$props.dataKey ??
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
const arrayData = useArrayData(arrayDataKey, {
url: $props.url,
searchUrl: false,
mapKey: $attrs['map-key'],
});
function findKeyInOptions() { function findKeyInOptions() {
if (!$props.options) return; if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length; return filter($props.modelValue, $props.options)?.length;
@ -252,43 +255,41 @@ async function fetchFilter(val) {
} }
async function filterHandler(val, update) { async function filterHandler(val, update) {
if (isLoading.value) return update();
if (!val && lastVal.value === val) {
lastVal.value = val;
return update();
}
lastVal.value = val;
let newOptions; let newOptions;
if (!$props.defaultFilter) return update(); if ($props.filterFn) update($props.filterFn(val));
if ( else if (!val && lastVal.value === val) update();
$props.url && else {
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0)) const makeRequest =
) { ($props.url && $props.limit) ||
newOptions = await fetchFilter(val); (!$props.limit && Object.keys(myOptions.value).length === 0);
} else newOptions = filter(val, myOptionsOriginal.value); newOptions = makeRequest
update( ? await fetchFilter(val)
() => { : filter(val, myOptionsOriginal.value);
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
newOptions.unshift(noOneOpt.value);
myOptions.value = newOptions; update(
}, () => {
(ref) => { if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
if (val !== '' && ref.options.length > 0) { newOptions.unshift(noOneOpt.value);
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true); myOptions.value = newOptions;
} },
}, (ref) => {
); if (val !== '' && ref.options.length > 0) {
ref.setOptionIndex(-1);
ref.moveOptionSelection(1, true);
}
},
);
}
lastVal.value = val;
} }
function nullishToTrue(value) { function nullishToTrue(value) {
return value ?? true; return value ?? true;
} }
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
async function onScroll({ to, direction, from, index }) { async function onScroll({ to, direction, from, index }) {
const lastIndex = myOptions.value.length - 1; const lastIndex = myOptions.value.length - 1;
@ -366,7 +367,7 @@ function getCaption(opt) {
virtual-scroll-slice-size="options.length" virtual-scroll-slice-size="options.length"
hide-bottom-space hide-bottom-space
:input-debounce="useURL ? '300' : '0'" :input-debounce="useURL ? '300' : '0'"
:loading="isLoading" :loading="someIsLoading"
@virtual-scroll="onScroll" @virtual-scroll="onScroll"
@keydown="handleKeyDown" @keydown="handleKeyDown"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'" :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@ -374,7 +375,7 @@ function getCaption(opt) {
> >
<template #append> <template #append>
<QIcon <QIcon
v-show="isClearable && value" v-show="isClearable && value != null && value !== ''"
name="close" name="close"
@click=" @click="
() => { () => {
@ -389,7 +390,7 @@ function getCaption(opt) {
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName"> <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<div v-if="slotName == 'append'"> <div v-if="slotName == 'append'">
<QIcon <QIcon
v-show="isClearable && value" v-show="isClearable && value != null && value !== ''"
name="close" name="close"
@click.stop=" @click.stop="
() => { () => {
@ -414,7 +415,7 @@ function getCaption(opt) {
<QItemLabel> <QItemLabel>
{{ opt[optionLabel] }} {{ opt[optionLabel] }}
</QItemLabel> </QItemLabel>
<QItemLabel caption v-if="getCaption(opt)"> <QItemLabel caption v-if="getCaption(opt) !== false">
{{ `#${getCaption(opt)}` }} {{ `#${getCaption(opt)}` }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>

View File

@ -232,7 +232,7 @@ fr:
pt: Portugais pt: Portugais
pt: pt:
Send SMS: Enviar SMS Send SMS: Enviar SMS
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
Language: Linguagem Language: Linguagem
Phone: Móvel Phone: Móvel
Subject: Assunto Subject: Assunto

View File

@ -0,0 +1,43 @@
import { createWrapper } from 'app/test/vitest/helper';
import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
describe('VnBankDetail Component', () => {
let vm;
let wrapper;
const bankEntities = [
{ id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
{ id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
];
const correctIban = 'ES6621000418401234567891';
beforeAll(() => {
wrapper = createWrapper(VnBankDetailsForm, {
$props: {
iban: null,
bankEntityFk: null,
disableElement: false,
},
});
vm = wrapper.vm;
wrapper = wrapper.wrapper;
});
afterEach(() => {
vi.clearAllMocks();
});
it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic(correctIban);
expect(vm.bankEntityFk).toBe(2100);
});
it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
vm.bankEntities = bankEntities;
await vm.autofillBic('ES1234567891324567891234');
expect(vm.bankEntityFk).toBe(null);
});
});

View File

@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
describe('VnDiscount', () => { describe('VnDiscount', () => {
let vm; let vm;
beforeAll(() => { beforeAll(() => {
vm = createWrapper(VnDiscount, { vm = createWrapper(VnDiscount, {
props: { props: {
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
price: 100, price: 100,
quantity: 2, quantity: 2,
discount: 10, discount: 10,
} mana: 10,
promise: vi.fn(),
},
}).vm; }).vm;
}); });
@ -21,8 +23,8 @@ describe('VnDiscount', () => {
}); });
describe('total', () => { describe('total', () => {
it('should calculate total correctly', () => { it('should calculate total correctly', () => {
expect(vm.total).toBe(180); expect(vm.total).toBe(180);
}); });
}); });
}); });

View File

@ -41,10 +41,12 @@ describe('VnDms', () => {
companyFk: 2, companyFk: 2,
dmsTypeFk: 3, dmsTypeFk: 3,
description: 'This is a test description', description: 'This is a test description',
files: { files: [
name: 'example.txt', {
content: new Blob(['file content'], { type: 'text/plain' }), name: 'example.txt',
}, content: new Blob(['file content'], { type: 'text/plain' }),
},
],
}; };
const expectedBody = { const expectedBody = {
@ -83,7 +85,7 @@ describe('VnDms', () => {
it('should map DMS data correctly and add file to FormData', () => { it('should map DMS data correctly and add file to FormData', () => {
const [formData, params] = vm.mapperDms(data); const [formData, params] = vm.mapperDms(data);
expect(formData.get('example.txt')).toBe(data.files); expect([formData.get('example.txt')]).toStrictEqual(data.files);
expect(expectedBody).toEqual(params.params); expect(expectedBody).toEqual(params.params);
}); });

View File

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

View File

@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
let vm; let vm;
let wrapper; let wrapper;
function generateWrapper(date, outlined, required) { function generateWrapper(outlined = false, required = false) {
wrapper = createWrapper(VnInputDate, { wrapper = createWrapper(VnInputDate, {
props: { props: {
modelValue: date, modelValue: '2000-12-31T23:00:00.000Z',
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
}, },
attrs: { attrs: {
isOutlined: outlined, isOutlined: outlined,
required: required required: required,
}, },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;
}; }
describe('VnInputDate', () => { describe('VnInputDate', () => {
describe('formattedDate', () => {
describe('formattedDate', () => { it('validateAndCleanInput should remove non-numeric characters', async () => {
it('formats a valid date correctly', async () => { generateWrapper();
generateWrapper('2023-12-25', false, false); vm.validateAndCleanInput('10a/1s2/2dd0a23');
await vm.$nextTick(); await vm.$nextTick();
expect(vm.formattedDate).toBe('25/12/2023'); expect(vm.inputValue).toBe('10/12/2023');
}); });
it('updates the model value when a new date is set', async () => { it('manageDate should reverse the date', async () => {
const input = wrapper.find('input'); generateWrapper();
await input.setValue('31/12/2023'); vm.manageDate('10/12/2023');
expect(wrapper.emitted()['update:modelValue']).toBeTruthy(); await vm.$nextTick();
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z'); expect(vm.inputValue).toBe('2023/12/10');
}); });
it('should not update the model value when an invalid date is set', async () => { it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
const input = wrapper.find('input'); const input = wrapper.find('input');
await input.setValue('invalid-date'); await input.setValue('25.12/2002');
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z'); await vm.$nextTick();
}); await vm.formatDate();
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
});
it('should format the date correctly when a valid date is entered with short year', async () => {
const input = wrapper.find('input');
await input.setValue('31.12-23');
await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
});
it('should format the date correctly when a valid date is entered without year', async () => {
const input = wrapper.find('input');
await input.setValue('12.03');
await vm.$nextTick();
await vm.formatDate();
expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
});
}); });
describe('styleAttrs', () => { describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => { it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25', false, false); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
expect(vm.styleAttrs).toEqual({}); expect(vm.styleAttrs).toEqual({});
}); });
it('should set styleAttrs when isOutlined is true', async () => { it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25', true, false); generateWrapper(true, false);
await vm.$nextTick(); await vm.$nextTick();
expect(vm.styleAttrs.outlined).toBe(true); expect(vm.styleAttrs.outlined).toBe(true);
}); });
@ -58,15 +77,15 @@ describe('VnInputDate', () => {
describe('required', () => { describe('required', () => {
it('should not applies required class when isRequired is false', async () => { it('should not applies required class when isRequired is false', async () => {
generateWrapper('2023-12-25', false, false); generateWrapper();
await vm.$nextTick(); await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required'); expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
}); });
it('should applies required class when isRequired is true', async () => { it('should applies required class when isRequired is true', async () => {
generateWrapper('2023-12-25', false, true); generateWrapper(false, true);
await vm.$nextTick(); await vm.$nextTick();
expect(wrapper.find('.vn-input-date').classes()).toContain('required'); expect(wrapper.find('.vn-input-date').classes()).toContain('required');
}); });
}); });
}); });

View File

@ -0,0 +1,81 @@
import { createWrapper } from 'app/test/vitest/helper.js';
import { describe, it, expect, beforeAll } from 'vitest';
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
import vnDateBoot from 'src/boot/vnDate';
let vm;
let wrapper;
beforeAll(() => {
// Initialize the vnDate boot
vnDateBoot();
});
function generateWrapper(date, outlined, showEvent) {
wrapper = createWrapper(VnInputDateTime, {
props: {
modelValue: date,
isOutlined: outlined,
showEvent: showEvent,
},
});
wrapper = wrapper.wrapper;
vm = wrapper.vm;
}
describe('VnInputDateTime', () => {
describe('selectedDate', () => {
it('formats a valid datetime correctly', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.selectedDate).toBe('25-12-2023 10:30');
});
it('handles null date value', async () => {
generateWrapper(null, false, true);
await vm.$nextTick();
expect(vm.selectedDate).not.toBe(null);
});
it('updates the model value when a new datetime is set', async () => {
vm.selectedDate = '31-12-2023 15:45';
await vm.$nextTick();
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
});
});
describe('styleAttrs', () => {
it('should return empty styleAttrs when isOutlined is false', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({});
});
it('should set styleAttrs when isOutlined is true', async () => {
generateWrapper('2023-12-25T10:30:00', true, true);
await vm.$nextTick();
expect(vm.styleAttrs).toEqual({
dense: true,
outlined: true,
rounded: true,
});
});
});
describe('component rendering', () => {
it('should render date and time icons', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const icons = wrapper.findAllComponents({ name: 'QIcon' });
expect(icons.length).toBe(2);
expect(icons[0].props('name')).toBe('today');
expect(icons[1].props('name')).toBe('access_time');
});
it('should render popup proxies for date and time', async () => {
generateWrapper('2023-12-25T10:30:00', false, true);
await vm.$nextTick();
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
expect(popups.length).toBe(2);
});
});
});

View File

@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
const date = new Date('2023-01-01'); const date = new Date('2023-01-01');
const wrapper = buildComponent({ value: date }); const wrapper = buildComponent({ value: date });
const span = wrapper.find('span'); const span = wrapper.find('span');
expect(span.text()).toBe('2023-01-01'); expect(span.text()).toBe('01/01/2023, 01:00:00');
expect(span.classes()).toContain('json-object'); expect(span.classes()).toContain('json-object');
}); });

View File

@ -90,8 +90,10 @@ describe('VnLog', () => {
vm = createWrapper(VnLog, { vm = createWrapper(VnLog, {
global: { global: {
stubs: [], stubs: ['FetchData', 'vue-i18n'],
mocks: {}, mocks: {
fetch: vi.fn(),
},
}, },
propsData: { propsData: {
model: 'Claim', model: 'Claim',

View File

@ -26,7 +26,7 @@ describe('VnNotes', () => {
) { ) {
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] }); vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
wrapper = createWrapper(VnNotes, { wrapper = createWrapper(VnNotes, {
propsData: options, propsData: { ...defaultOptions, ...options },
}); });
wrapper = wrapper.wrapper; wrapper = wrapper.wrapper;
vm = wrapper.vm; vm = wrapper.vm;

View File

@ -1,8 +1,6 @@
<script setup> <script setup>
import { onBeforeMount, watch, computed, ref } from 'vue'; import { watch, ref, onMounted } from 'vue';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { useState } from 'src/composables/useState';
import { useRoute } from 'vue-router';
import VnDescriptor from './VnDescriptor.vue'; import VnDescriptor from './VnDescriptor.vue';
const $props = defineProps({ const $props = defineProps({
@ -20,57 +18,66 @@ const $props = defineProps({
}, },
}); });
const state = useState();
const route = useRoute();
let arrayData; let arrayData;
let store; let store;
let entity; const entity = ref();
const isLoading = ref(false); const isLoading = ref(false);
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName); const containerRef = ref(null);
defineExpose({ getData });
onBeforeMount(async () => { onMounted(async () => {
arrayData = useArrayData($props.dataKey, { let isPopup;
let el = containerRef.value.$el;
while (el) {
if (el.classList?.contains('q-menu')) {
isPopup = true;
break;
}
el = el.parentElement;
}
arrayData = useArrayData($props.dataKey + (isPopup ? 'Proxy' : ''), {
url: $props.url, url: $props.url,
userFilter: $props.filter, userFilter: $props.filter,
skip: 0, skip: 0,
oneRecord: true, oneRecord: true,
}); });
store = arrayData.store; 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( watch(
() => [$props.url, $props.filter], () => [$props.url, $props.filter],
async () => { async () => {
if (!isSameDataKey.value) await getData(); await getData();
},
{ immediate: true },
);
watch(
() => arrayData.store.data,
(newValue) => {
entity.value = newValue;
}, },
); );
}); });
defineExpose({ getData });
const emit = defineEmits(['onFetch']);
async function getData() { async function getData() {
store.url = $props.url; store.url = $props.url;
store.filter = $props.filter ?? {}; store.filter = $props.filter ?? {};
isLoading.value = true; isLoading.value = true;
try { try {
const { data } = await arrayData.fetch({ append: false, updateRouter: false }); await arrayData.fetch({ append: false, updateRouter: false });
state.set($props.dataKey, data); const { data } = store;
emit('onFetch', data); emit('onFetch', data);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }
} }
const emit = defineEmits(['onFetch']);
</script> </script>
<template> <template>
<VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey"> <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey" ref="containerRef">
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName"> <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" /> <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
</template> </template>

View File

@ -89,24 +89,26 @@ function cancel() {
<slot name="customHTML"></slot> <slot name="customHTML"></slot>
</QCardSection> </QCardSection>
<QCardActions align="right"> <QCardActions align="right">
<QBtn <slot name="actions" :actions="{ confirm, cancel }">
:label="t('globals.cancel')" <QBtn
color="primary" :label="t('globals.cancel')"
:disable="isLoading" color="primary"
flat :disable="isLoading"
@click="cancel()" flat
data-cy="VnConfirm_cancel" @click="cancel()"
/> data-cy="VnConfirm_cancel"
<QBtn />
:label="t('globals.confirm')" <QBtn
:title="t('globals.confirm')" :label="t('globals.confirm')"
color="primary" :title="t('globals.confirm')"
:loading="isLoading" color="primary"
@click="confirm()" :loading="isLoading"
unelevated @click="confirm()"
autofocus unelevated
data-cy="VnConfirm_confirm" autofocus
/> data-cy="VnConfirm_confirm"
/>
</slot>
</QCardActions> </QCardActions>
</QCard> </QCard>
</QDialog> </QDialog>

View File

@ -6,6 +6,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useClipboard } from 'src/composables/useClipboard'; import { useClipboard } from 'src/composables/useClipboard';
import VnMoreOptions from './VnMoreOptions.vue'; import VnMoreOptions from './VnMoreOptions.vue';
import { getValueFromPath } from 'src/composables/getValueFromPath';
const entity = defineModel({ type: Object, default: null }); const entity = defineModel({ type: Object, default: null });
const $props = defineProps({ const $props = defineProps({
@ -56,18 +57,6 @@ const routeName = computed(() => {
return `${routeName}Summary`; 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) { function copyIdText(id) {
copyText(id, { copyText(id, {
component: { component: {
@ -170,10 +159,10 @@ const toModule = computed(() => {
<div class="title"> <div class="title">
<span <span
v-if="title" v-if="title"
:title="getValueFromPath(title)" :title="getValueFromPath(entity, title)"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`" :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
> >
{{ getValueFromPath(title) ?? title }} {{ getValueFromPath(entity, title) ?? title }}
</span> </span>
<slot v-else name="description" :entity="entity"> <slot v-else name="description" :entity="entity">
<span <span
@ -189,7 +178,7 @@ const toModule = computed(() => {
class="subtitle" class="subtitle"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`" :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
> >
#{{ getValueFromPath(subtitle) ?? entity.id }} #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
</QItemLabel> </QItemLabel>
<QBtn <QBtn
round round

View File

@ -212,6 +212,7 @@ const getLocale = (label) => {
color="primary" color="primary"
style="position: fixed; z-index: 1; right: 0; bottom: 0" style="position: fixed; z-index: 1; right: 0; bottom: 0"
icon="search" icon="search"
data-cy="vnFilterPanel_search"
@click="search()" @click="search()"
> >
<QTooltip bottom anchor="bottom right"> <QTooltip bottom anchor="bottom right">
@ -229,6 +230,7 @@ const getLocale = (label) => {
<QItemSection top side> <QItemSection top side>
<QBtn <QBtn
@click="clearFilters" @click="clearFilters"
data-cy="clearFilters"
color="primary" color="primary"
dense dense
flat flat
@ -292,6 +294,7 @@ const getLocale = (label) => {
</QList> </QList>
</QForm> </QForm>
<QInnerLoading <QInnerLoading
data-cy="filterPanel-spinner"
:label="t('globals.pleaseWait')" :label="t('globals.pleaseWait')"
:showing="isLoading" :showing="isLoading"
color="primary" color="primary"

View File

@ -6,6 +6,7 @@ import { computed } from 'vue';
const $props = defineProps({ const $props = defineProps({
label: { type: String, default: null }, label: { type: String, default: null },
tooltip: { type: String, default: null },
value: { value: {
type: [String, Boolean, Number], type: [String, Boolean, Number],
default: null, default: null,
@ -40,7 +41,10 @@ const val = computed(() => $props.value);
<template v-else> <template v-else>
<div v-if="label || $slots.label" class="label"> <div v-if="label || $slots.label" class="label">
<slot name="label"> <slot name="label">
<span style="color: var(--vn-label-color)">{{ label }}</span> <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
<span style="color: var(--vn-label-color)">
{{ label }}
</span>
</slot> </slot>
</div> </div>
<div class="value" v-if="value || $slots.value"> <div class="value" v-if="value || $slots.value">

View File

@ -2,7 +2,9 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { useAttrs } from 'vue';
const attrs = useAttrs();
const { t } = useI18n(); const { t } = useI18n();
const props = defineProps({ const props = defineProps({
@ -67,7 +69,7 @@ const props = defineProps({
default: null, default: null,
}, },
searchUrl: { searchUrl: {
type: String, type: [String, Boolean],
default: null, default: null,
}, },
disableInfiniteScroll: { disableInfiniteScroll: {
@ -75,7 +77,7 @@ const props = defineProps({
default: false, default: false,
}, },
mapKey: { mapKey: {
type: String, type: [String, Boolean],
default: '', default: '',
}, },
keyData: { keyData: {
@ -144,14 +146,14 @@ const addFilter = async (filter, params) => {
}; };
async function fetch(params) { async function fetch(params) {
useArrayData(props.dataKey, params); arrayData.setOptions(params);
arrayData.resetPagination(); arrayData.resetPagination();
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false });
return emitStoreData(); return emitStoreData();
} }
async function update(params) { async function update(params) {
useArrayData(props.dataKey, params); arrayData.setOptions(params);
const { limit, skip } = store; const { limit, skip } = store;
store.limit = limit + skip; store.limit = limit + skip;
store.skip = 0; store.skip = 0;

View File

@ -46,7 +46,7 @@ const props = defineProps({
default: null, default: null,
}, },
order: { order: {
type: String, type: [String, Array],
default: '', default: '',
}, },
limit: { limit: {

View File

@ -1,60 +0,0 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
const { t } = useI18n();
const props = defineProps({
usesMana: {
type: Boolean,
required: true,
},
manaCode: {
type: String,
required: true,
},
manaVal: {
type: String,
default: 'mana',
},
manaLabel: {
type: String,
default: 'Promotion mana',
},
manaClaimVal: {
type: String,
default: 'manaClaim',
},
claimLabel: {
type: String,
default: 'Claim mana',
},
});
const manaCode = ref(props.manaCode);
</script>
<template>
<div class="column q-gutter-y-sm q-mt-sm">
<QRadio
v-model="manaCode"
dense
:val="manaVal"
:label="t(manaLabel)"
:dark="true"
class="q-mb-sm"
/>
<QRadio
v-model="manaCode"
dense
:val="manaClaimVal"
:label="t(claimLabel)"
:dark="true"
class="q-mb-sm"
/>
</div>
</template>
<i18n>
es:
Promotion mana: Maná promoción
Claim mana: Maná reclamación
</i18n>

View File

@ -23,10 +23,15 @@ describe('CardSummary', () => {
beforeEach(() => { beforeEach(() => {
wrapper = createWrapper(CardSummary, { wrapper = createWrapper(CardSummary, {
global: {
mocks: {
validate: vi.fn(),
},
},
propsData: { propsData: {
dataKey: 'cardSummaryKey', dataKey: 'cardSummaryKey',
url: 'cardSummaryUrl', url: 'cardSummaryUrl',
filter: 'cardFilter', filter: { key: 'cardFilter' },
}, },
}); });
vm = wrapper.vm; vm = wrapper.vm;
@ -50,7 +55,7 @@ describe('CardSummary', () => {
it('should set correct props to the store', () => { it('should set correct props to the store', () => {
expect(vm.store.url).toEqual('cardSummaryUrl'); expect(vm.store.url).toEqual('cardSummaryUrl');
expect(vm.store.filter).toEqual('cardFilter'); expect(vm.store.filter).toEqual({ key: 'cardFilter' });
}); });
it('should respond to prop changes and refetch data', async () => { it('should respond to prop changes and refetch data', async () => {

View File

@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
let wrapper; let wrapper;
let applyFilterSpy; let applyFilterSpy;
const searchText = 'Bolas de madera'; const searchText = 'Bolas de madera';
const userParams = {staticKey: 'staticValue'}; const userParams = { staticKey: 'staticValue' };
beforeEach(async () => { beforeEach(async () => {
wrapper = createWrapper(VnSearchbar, { wrapper = createWrapper(VnSearchbar, {
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
vm.searchText = searchText; vm.searchText = searchText;
vm.arrayData.store.userParams = userParams; vm.arrayData.store.userParams = userParams;
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {}); applyFilterSpy = vi
.spyOn(vm.arrayData, 'applyFilter')
.mockImplementation(() => {});
}); });
afterEach(() => { afterEach(() => {
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
}); });
it('search resets pagination and applies filter', async () => { it('search resets pagination and applies filter', async () => {
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {}); const resetPaginationSpy = vi
.spyOn(vm.arrayData, 'resetPagination')
.mockImplementation(() => {});
await vm.search(); await vm.search();
expect(resetPaginationSpy).toHaveBeenCalled(); expect(resetPaginationSpy).toHaveBeenCalled();
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
expect(applyFilterSpy).toHaveBeenCalledWith({ expect(applyFilterSpy).toHaveBeenCalledWith({
params: { staticKey: 'staticValue', search: searchText }, params: { staticKey: 'staticValue', search: searchText },
filter: {skip: 0}, filter: { skip: 0 },
}); });
}); });
@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
}); });
expect(vm.to.query.searchParam).toBe(expectedQuery); expect(vm.to.query.searchParam).toBe(expectedQuery);
}); });
}); });

View File

@ -1,5 +1,4 @@
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest'; import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
import axios from 'axios';
import { createWrapper } from 'app/test/vitest/helper'; import { createWrapper } from 'app/test/vitest/helper';
import VnSms from 'src/components/ui/VnSms.vue'; import VnSms from 'src/components/ui/VnSms.vue';
@ -12,6 +11,9 @@ describe('VnSms', () => {
stubs: ['VnPaginate'], stubs: ['VnPaginate'],
mocks: {}, mocks: {},
}, },
propsData: {
url: 'SmsUrl',
},
}).vm; }).vm;
}); });

View File

@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import * as vueRouter from 'vue-router'; import * as vueRouter from 'vue-router';
import { setActivePinia, createPinia } from 'pinia'; import { setActivePinia, createPinia } from 'pinia';
import { defineComponent, h } from 'vue';
import { mount } from '@vue/test-utils';
describe('useArrayData', () => { describe('useArrayData', () => {
const filter = '{"limit":20,"skip":0}'; const filter = '{"limit":20,"skip":0}';
@ -43,7 +45,7 @@ describe('useArrayData', () => {
it('should fetch and replace url with new params', async () => { it('should fetch and replace url with new params', async () => {
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] }); vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
searchUrl: 'params', searchUrl: 'params',
}); });
@ -72,7 +74,7 @@ describe('useArrayData', () => {
data: [{ id: 1 }], data: [{ id: 1 }],
}); });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
navigate: {}, navigate: {},
}); });
@ -94,7 +96,7 @@ describe('useArrayData', () => {
], ],
}); });
const arrayData = useArrayData('ArrayData', { const arrayData = mountArrayData('ArrayData', {
url: 'mockUrl', url: 'mockUrl',
oneRecord: true, oneRecord: true,
}); });
@ -107,3 +109,17 @@ describe('useArrayData', () => {
}); });
}); });
}); });
function mountArrayData(...args) {
let arrayData;
const TestComponent = defineComponent({
setup() {
arrayData = useArrayData(...args);
return () => h('div');
},
});
const asd = mount(TestComponent);
return arrayData;
}

View File

@ -64,88 +64,84 @@ describe('session', () => {
}); });
}); });
describe( describe('login', () => {
'login', const expectedUser = {
() => { id: 999,
const expectedUser = { name: `T'Challa`,
id: 999, nickname: 'Black Panther',
name: `T'Challa`, lang: 'en',
nickname: 'Black Panther', userConfig: {
lang: 'en', darkMode: false,
userConfig: { },
darkMode: false, worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
role: {
name: 'salesPerson',
}, },
worker: { department: { departmentFk: 155 } }, },
}; {
const rolesData = [ role: {
{ name: 'admin',
role: {
name: 'salesPerson',
},
}, },
{ },
role: { ];
name: 'admin', beforeEach(() => {
}, vi.spyOn(axios, 'get').mockImplementation((url) => {
}, if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
]; return Promise.resolve({
beforeEach(() => { data: { roles: rolesData, user: expectedUser },
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
return Promise.resolve({
data: { roles: rolesData, user: expectedUser },
});
}); });
}); });
});
it('should fetch the user roles and then set token in the sessionStorage', async () => { it('should fetch the user roles and then set token in the sessionStorage', async () => {
const expectedRoles = ['salesPerson', 'admin']; const expectedRoles = ['salesPerson', 'admin'];
const expectedToken = 'mySessionToken'; const expectedToken = 'mySessionToken';
const expectedTokenMultimedia = 'mySessionTokenMultimedia'; const expectedTokenMultimedia = 'mySessionTokenMultimedia';
const keepLogin = false; const keepLogin = false;
await session.login({ await session.login({
token: expectedToken, token: expectedToken,
tokenMultimedia: expectedTokenMultimedia, tokenMultimedia: expectedTokenMultimedia,
keepLogin, keepLogin,
});
const roles = state.getRoles();
const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toBeNull();
expect(sessionToken).toEqual(expectedToken);
await session.destroy(); // this clears token and user for any other test
}); });
it('should fetch the user roles and then set token in the localStorage', async () => { const roles = state.getRoles();
const expectedRoles = ['salesPerson', 'admin']; const localToken = localStorage.getItem('token');
const expectedToken = 'myLocalToken'; const sessionToken = sessionStorage.getItem('token');
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
await session.login({ expect(roles.value).toEqual(expectedRoles);
token: expectedToken, expect(localToken).toBeNull();
tokenMultimedia: expectedTokenMultimedia, expect(sessionToken).toEqual(expectedToken);
keepLogin,
});
const roles = state.getRoles(); await session.destroy(); // this clears token and user for any other test
const localToken = localStorage.getItem('token'); });
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles); it('should fetch the user roles and then set token in the localStorage', async () => {
expect(localToken).toEqual(expectedToken); const expectedRoles = ['salesPerson', 'admin'];
expect(sessionToken).toBeNull(); const expectedToken = 'myLocalToken';
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
const keepLogin = true;
await session.destroy(); // this clears token and user for any other test await session.login({
token: expectedToken,
tokenMultimedia: expectedTokenMultimedia,
keepLogin,
}); });
},
{}, const roles = state.getRoles();
); const localToken = localStorage.getItem('token');
const sessionToken = sessionStorage.getItem('token');
expect(roles.value).toEqual(expectedRoles);
expect(localToken).toEqual(expectedToken);
expect(sessionToken).toBeNull();
await session.destroy(); // this clears token and user for any other test
});
});
describe('RenewToken', () => { describe('RenewToken', () => {
const expectedToken = 'myToken'; const expectedToken = 'myToken';

View File

@ -0,0 +1,11 @@
export function getValueFromPath(root, path) {
if (!root || !path) return;
const keys = path.toString().split('.');
let current = root;
for (const key of keys) {
if (current[key] === undefined) return undefined;
else current = current[key];
}
return current;
}

View File

@ -0,0 +1,10 @@
import { ref } from 'vue';
import moment from 'moment';
export default function useWeekdaysOrder() {
const firstDay = moment().weekday(1).day();
const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
return ref(weekdays);
}

View File

@ -0,0 +1,51 @@
import axios from 'axios';
export async function beforeSave(data, getChanges, modelOrigin) {
try {
const changes = data.updates;
if (!changes) return data;
const patchPromises = [];
for (const change of changes) {
let patchData = {};
if ('hasMinPrice' in change.data) {
patchData.hasMinPrice = change.data?.hasMinPrice;
delete change.data.hasMinPrice;
}
if ('minPrice' in change.data) {
patchData.minPrice = change.data?.minPrice;
delete change.data.minPrice;
}
if (Object.keys(patchData).length > 0) {
const promise = axios
.get(`${modelOrigin}/findOne`, {
params: {
filter: {
fields: ['itemFk'],
where: { id: change.where.id },
},
},
})
.then((row) => {
return axios.patch(`Items/${row.data.itemFk}`, patchData);
})
.catch((error) => {
console.error('Error processing change: ', change, error);
});
patchPromises.push(promise);
}
}
await Promise.all(patchPromises);
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
return data;
} catch (error) {
console.error('Error in beforeSave:', error);
throw error;
}
}

View File

@ -1,4 +1,4 @@
import { onMounted, computed } from 'vue'; import { onMounted, computed, ref } from 'vue';
import { useRouter, useRoute } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
import axios from 'axios'; import axios from 'axios';
import { useArrayDataStore } from 'stores/useArrayDataStore'; import { useArrayDataStore } from 'stores/useArrayDataStore';
@ -41,7 +41,7 @@ export function useArrayData(key, userOptions) {
if (key && userOptions) setOptions(); if (key && userOptions) setOptions();
function setOptions() { function setOptions(params = userOptions) {
const allowedOptions = [ const allowedOptions = [
'url', 'url',
'filter', 'filter',
@ -57,14 +57,14 @@ export function useArrayData(key, userOptions) {
'mapKey', 'mapKey',
'oneRecord', 'oneRecord',
]; ];
if (typeof userOptions === 'object') { if (typeof params === 'object') {
for (const option in userOptions) { for (const option in params) {
const isEmpty = userOptions[option] == null || userOptions[option] === ''; const isEmpty = params[option] == null || params[option] === '';
if (isEmpty || !allowedOptions.includes(option)) continue; if (isEmpty || !allowedOptions.includes(option)) continue;
if (Object.hasOwn(store, option)) { if (Object.hasOwn(store, option)) {
const defaultOpts = userOptions[option]; const defaultOpts = params[option];
store[option] = userOptions.keepOpts?.includes(option) store[option] = params.keepOpts?.includes(option)
? Object.assign(defaultOpts, store[option]) ? Object.assign(defaultOpts, store[option])
: defaultOpts; : defaultOpts;
if (option === 'userParams') store.defaultParams = store[option]; if (option === 'userParams') store.defaultParams = store[option];
@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
} }
const totalRows = computed(() => (store.data && store.data.length) || 0); const totalRows = computed(() => (store.data && store.data.length) || 0);
const isLoading = computed(() => store.isLoading || false); const isLoading = ref(store.isLoading || false);
return { return {
fetch, fetch,
@ -367,5 +367,6 @@ export function useArrayData(key, userOptions) {
deleteOption, deleteOption,
reset, reset,
resetPagination, resetPagination,
setOptions,
}; };
} }

View File

@ -78,7 +78,8 @@ export function useValidator() {
if (min >= 0) if (min >= 0)
if (Math.floor(value) < min) return t('inputMin', { value: min }); 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

@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
.q-item__section--main ~ .q-item__section--side { .q-item__section--main ~ .q-item__section--side {
padding-inline: 0; padding-inline: 0;
} }
.calendars-header {
height: 45px;
display: flex;
justify-content: space-between;
align-items: center;
background-color: $primary;
font-weight: bold;
font-size: 16px;
}
.calendars-container {
max-width: 800px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}

View File

@ -18,6 +18,7 @@ $positive: #c8e484;
$negative: #fb5252; $negative: #fb5252;
$info: #84d0e2; $info: #84d0e2;
$warning: #f4b974; $warning: #f4b974;
$neutral: #b0b0b0;
// Pendiente de cuadrar con la base de datos // Pendiente de cuadrar con la base de datos
$success: $positive; $success: $positive;
$alert: $negative; $alert: $negative;
@ -51,3 +52,6 @@ $width-xl: 1600px;
.bg-alert { .bg-alert {
background-color: $negative; background-color: $negative;
} }
.bg-neutral {
background-color: $neutral;
}

View File

@ -6,6 +6,7 @@ globals:
quantity: Quantity quantity: Quantity
entity: Entity entity: Entity
preview: Preview preview: Preview
scrollToTop: Go up
user: User user: User
details: Details details: Details
collapseMenu: Collapse lateral menu collapseMenu: Collapse lateral menu
@ -19,6 +20,7 @@ globals:
logOut: Log out logOut: Log out
date: Date date: Date
dataSaved: Data saved dataSaved: Data saved
openDetail: Open detail
dataDeleted: Data deleted dataDeleted: Data deleted
delete: Delete delete: Delete
search: Search search: Search
@ -160,6 +162,9 @@ globals:
department: Department department: Department
noData: No data available noData: No data available
vehicle: Vehicle vehicle: Vehicle
selectDocumentId: Select document id
document: Document
import: Import from existing
pageTitles: pageTitles:
logIn: Login logIn: Login
addressEdit: Update address addressEdit: Update address
@ -341,6 +346,7 @@ globals:
parking: Parking parking: Parking
vehicleList: Vehicles vehicleList: Vehicles
vehicle: Vehicle vehicle: Vehicle
entryPreAccount: Pre-account
unsavedPopup: unsavedPopup:
title: Unsaved changes will be lost title: Unsaved changes will be lost
subtitle: Are you sure exit without saving? subtitle: Are you sure exit without saving?
@ -877,6 +883,11 @@ components:
active: Is active active: Is active
floramondo: Is floramondo floramondo: Is floramondo
showBadDates: Show future items showBadDates: Show future items
name: Nombre
rate2: Grouping price
rate3: Packing price
minPrice: Min. Price
itemFk: Item id
userPanel: userPanel:
copyToken: Token copied to clipboard copyToken: Token copied to clipboard
settings: Settings settings: Settings

View File

@ -6,6 +6,7 @@ globals:
quantity: Cantidad quantity: Cantidad
entity: Entidad entity: Entidad
preview: Vista previa preview: Vista previa
scrollToTop: Ir arriba
user: Usuario user: Usuario
details: Detalles details: Detalles
collapseMenu: Contraer menú lateral collapseMenu: Contraer menú lateral
@ -20,10 +21,11 @@ globals:
date: Fecha date: Fecha
dataSaved: Datos guardados dataSaved: Datos guardados
dataDeleted: Datos eliminados dataDeleted: Datos eliminados
dataCreated: Datos creados
openDetail: Ver detalle
delete: Eliminar delete: Eliminar
search: Buscar search: Buscar
changes: Cambios changes: Cambios
dataCreated: Datos creados
add: Añadir add: Añadir
create: Crear create: Crear
edit: Modificar edit: Modificar
@ -164,6 +166,9 @@ globals:
noData: Datos no disponibles noData: Datos no disponibles
department: Departamento department: Departamento
vehicle: Vehículo vehicle: Vehículo
selectDocumentId: Seleccione el id de gestión documental
document: Documento
import: Importar desde existente
pageTitles: pageTitles:
logIn: Inicio de sesión logIn: Inicio de sesión
addressEdit: Modificar consignatario addressEdit: Modificar consignatario
@ -344,6 +349,7 @@ globals:
parking: Parking parking: Parking
vehicleList: Vehículos vehicleList: Vehículos
vehicle: Vehículo vehicle: Vehículo
entryPreAccount: Precontabilizar
unsavedPopup: unsavedPopup:
title: Los cambios que no haya guardado se perderán title: Los cambios que no haya guardado se perderán
subtitle: ¿Seguro que quiere salir sin guardar? subtitle: ¿Seguro que quiere salir sin guardar?
@ -961,6 +967,11 @@ components:
to: Hasta to: Hasta
floramondo: Floramondo floramondo: Floramondo
showBadDates: Ver items a futuro showBadDates: Ver items a futuro
name: Nombre
rate2: Precio grouping
rate3: Precio packing
minPrice: Precio mínimo
itemFk: Id item
userPanel: userPanel:
copyToken: Token copiado al portapapeles copyToken: Token copiado al portapapeles
settings: Configuración settings: Configuración

View File

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

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, computed, onMounted } from 'vue'; import { computed } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { toDateHourMinSec, toPercentage } from 'src/filters'; import { toDateHourMinSec, toPercentage } from 'src/filters';
@ -9,7 +9,6 @@ import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/Departme
import EntityDescriptor from 'components/ui/EntityDescriptor.vue'; import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue';
import { getUrl } from 'src/composables/getUrl';
import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue'; import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
import filter from './ClaimFilter.js'; import filter from './ClaimFilter.js';
@ -23,24 +22,13 @@ const $props = defineProps({
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const salixUrl = ref();
const entityId = computed(() => { const entityId = computed(() => {
return $props.id || route.params.id; return $props.id || route.params.id;
}); });
const STATE_COLOR = { function stateColor(entity) {
pending: 'warning', return entity?.claimState?.classColor;
incomplete: 'info',
resolved: 'positive',
canceled: 'negative',
};
function stateColor(code) {
return STATE_COLOR[code];
} }
onMounted(async () => {
salixUrl.value = await getUrl('');
});
</script> </script>
<template> <template>
@ -57,9 +45,8 @@ onMounted(async () => {
<VnLv v-if="entity.claimState" :label="t('claim.state')"> <VnLv v-if="entity.claimState" :label="t('claim.state')">
<template #value> <template #value>
<QBadge <QBadge
:color="stateColor(entity.claimState.code)" :color="stateColor(entity)"
text-color="black" style="color: var(--vn-black-text-color)"
dense
> >
{{ entity.claimState.description }} {{ entity.claimState.description }}
</QBadge> </QBadge>
@ -133,7 +120,7 @@ onMounted(async () => {
size="md" size="md"
icon="assignment" icon="assignment"
color="primary" color="primary"
:href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'" :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
> >
<QTooltip>{{ t('claim.saleTracking') }}</QTooltip> <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
</QBtn> </QBtn>
@ -141,7 +128,7 @@ onMounted(async () => {
size="md" size="md"
icon="visibility" icon="visibility"
color="primary" color="primary"
:href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'" :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
> >
<QTooltip>{{ t('claim.ticketTracking') }}</QTooltip> <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
</QBtn> </QBtn>

View File

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

View File

@ -123,8 +123,8 @@ async function fetchMana() {
async function updateDiscount({ saleFk, discount, canceller }) { async function updateDiscount({ saleFk, discount, canceller }) {
const body = { salesIds: [saleFk], newDiscount: discount }; const body = { salesIds: [saleFk], newDiscount: discount };
const claimId = claim.value.ticketFk; const ticketFk = claim.value.ticketFk;
const query = `Tickets/${claimId}/updateDiscount`; const query = `Tickets/${ticketFk}/updateDiscount`;
await axios.post(query, body, { await axios.post(query, body, {
signal: canceller.signal, signal: canceller.signal,

View File

@ -23,7 +23,7 @@ const claimDms = ref([
]); ]);
const client = ref({}); const client = ref({});
const inputFile = ref(); const inputFile = ref();
const files = ref({}); const files = ref([]);
const spinnerRef = ref(); const spinnerRef = ref();
const claimDmsRef = ref(); const claimDmsRef = ref();
const dmsType = ref({}); const dmsType = ref({});
@ -255,9 +255,8 @@ function onDrag() {
icon="add" icon="add"
color="primary" color="primary"
> >
<QInput <QFile
ref="inputFile" ref="inputFile"
type="file"
style="display: none" style="display: none"
multiple multiple
v-model="files" v-model="files"

View File

@ -108,15 +108,9 @@ const markerLabels = [
{ value: 5, label: t('claim.person') }, { value: 5, label: t('claim.person') },
]; ];
const STATE_COLOR = {
pending: 'warning',
incomplete: 'info',
resolved: 'positive',
canceled: 'negative',
};
function stateColor(code) { function stateColor(code) {
return STATE_COLOR[code]; const claimState = claimStates.value.find((state) => state.code === code);
return claimState?.classColor;
} }
const developmentColumns = ref([ const developmentColumns = ref([
@ -188,7 +182,7 @@ function claimUrl(section) {
<template> <template>
<FetchData <FetchData
url="ClaimStates" url="ClaimStates"
:filter="{ fields: ['id', 'description'] }" :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
@on-fetch="(data) => (claimStates = data)" @on-fetch="(data) => (claimStates = data)"
auto-load auto-load
/> />
@ -346,17 +340,18 @@ function claimUrl(section) {
<template #body="props"> <template #body="props">
<QTr :props="props"> <QTr :props="props">
<QTd v-for="col in props.cols" :key="col.name" :props="props"> <QTd v-for="col in props.cols" :key="col.name" :props="props">
<span v-if="col.name != 'description'">{{ <template v-if="col.name === 'description'">
t(col.value) <span class="link">{{
}}</span> dashIfEmpty(col.field(props.row))
<span class="link" v-if="col.name === 'description'">{{ }}</span>
t(col.value) <ItemDescriptorProxy
}}</span> :id="props.row.sale.itemFk"
<ItemDescriptorProxy :sale-fk="props.row.saleFk"
v-if="col.name == 'description'" />
:id="props.row.sale.itemFk" </template>
:sale-fk="props.row.saleFk" <template v-else>
></ItemDescriptorProxy> {{ dashIfEmpty(col.field(props.row)) }}
</template>
</QTd> </QTd>
</QTr> </QTr>
</template> </template>

View File

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

View File

@ -52,7 +52,7 @@ describe('ClaimLines', () => {
expectedData, expectedData,
{ {
signal: canceller.signal, signal: canceller.signal,
} },
); );
}); });
}); });
@ -69,7 +69,7 @@ describe('ClaimLines', () => {
expect.objectContaining({ expect.objectContaining({
message: 'Discount updated', message: 'Discount updated',
type: 'positive', type: 'positive',
}) }),
); );
}); });
}); });

View File

@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
fetch: vi.fn(), fetch: vi.fn(),
}, },
}, },
propsData: {
ticketId: 1,
},
}).vm; }).vm;
}); });
@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
expect.objectContaining({ expect.objectContaining({
message: 'Lines added to claim', message: 'Lines added to claim',
type: 'positive', type: 'positive',
}) }),
); );
expect(vm.canceller).toEqual(null); expect(vm.canceller).toEqual(null);
}); });

View File

@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
await vm.deleteDms({ index: 0 }); await vm.deleteDms({ index: 0 });
expect(axios.post).toHaveBeenCalledWith( expect(axios.post).toHaveBeenCalledWith(
`ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile` `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
); );
expect(vm.quasar.notify).toHaveBeenCalledWith( expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' }) expect.objectContaining({ type: 'positive' }),
); );
}); });
}); });
@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
data: { index: 1 }, data: { index: 1 },
promise: vm.deleteDms, promise: vm.deleteDms,
}, },
}) }),
); );
}); });
}); });
@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
new FormData(), new FormData(),
expect.objectContaining({ expect.objectContaining({
params: expect.objectContaining({ hasFile: false }), params: expect.objectContaining({ hasFile: false }),
}) }),
); );
expect(vm.quasar.notify).toHaveBeenCalledWith( expect(vm.quasar.notify).toHaveBeenCalledWith(
expect.objectContaining({ type: 'positive' }) expect.objectContaining({ type: 'positive' }),
); );
expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce(); expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

View File

@ -101,7 +101,10 @@ const columns = computed(() => [
name: 'stateCode', name: 'stateCode',
chip: { chip: {
condition: () => true, condition: () => true,
color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey', color: ({ stateCode }) => {
const state = states.value?.find(({ code }) => code === stateCode);
return `bg-${state.classColor}`;
},
}, },
columnFilter: { columnFilter: {
name: 'claimStateFk', name: 'claimStateFk',
@ -131,12 +134,6 @@ const columns = computed(() => [
], ],
}, },
]); ]);
const STATE_COLOR = {
pending: 'bg-warning',
loses: 'bg-negative',
resolved: 'bg-positive',
};
</script> </script>
<template> <template>

View File

@ -77,10 +77,10 @@ const isDefaultAddress = (address) => {
return client?.value?.defaultAddressFk === address.id ? 1 : 0; return client?.value?.defaultAddressFk === address.id ? 1 : 0;
}; };
const setDefault = (address) => { const setDefault = async (address) => {
const url = `Clients/${route.params.id}`; const url = `Clients/${route.params.id}`;
const payload = { defaultAddressFk: address.id }; const payload = { defaultAddressFk: address.id };
axios.patch(url, payload).then((res) => { await axios.patch(url, payload).then((res) => {
if (res.data) { if (res.data) {
client.value.defaultAddressFk = res.data.defaultAddressFk; client.value.defaultAddressFk = res.data.defaultAddressFk;
sortAddresses(); sortAddresses();

View File

@ -131,6 +131,7 @@ const columns = computed(() => [
name: 'isConciliate', name: 'isConciliate',
label: t('Conciliated'), label: t('Conciliated'),
cardVisible: true, cardVisible: true,
component: 'checkbox',
}, },
{ {
align: 'left', align: 'left',

View File

@ -1,5 +1,4 @@
<script setup> <script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
@ -7,28 +6,15 @@ import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue'; import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();
const bankEntitiesRef = ref(null);
const filter = {
fields: ['id', 'bic', 'name'],
order: 'bic ASC'
};
const getBankEntities = (data, formData) => {
bankEntitiesRef.value.fetch();
formData.bankEntityFk = Number(data.id);
};
</script> </script>
<template> <template>
<FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer"> <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
<template #form="{ data, validate }"> <template #form="{ data }">
<VnRow> <VnRow>
<VnSelect <VnSelect
auto-load auto-load
@ -41,44 +27,19 @@ const getBankEntities = (data, formData) => {
/> />
<VnInput :label="t('Due day')" clearable v-model="data.dueDay" /> <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput :label="t('IBAN')" clearable v-model="data.iban"> <VnBankDetailsForm
<template #append> v-model:iban="data.iban"
<QIcon name="info" class="cursor-info"> v-model:bankEntityFk="data.bankEntityFk"
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip> @update-bic="
</QIcon> ({ iban, bankEntityFk }) => {
</template> if (!iban || !bankEntityFk) return;
</VnInput> data.iban = iban;
<VnSelectDialog data.bankEntityFk = bankEntityFk;
:label="t('Swift / BIC')" }
ref="bankEntitiesRef" "
:filter="filter" />
auto-load
url="BankEntities"
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
:rules="validate('Worker.bankEntity')"
hide-selected
option-label="name"
option-value="id"
v-model="data.bankEntityFk"
>
<template #form>
<CreateBankEntityForm
@on-data-saved="getBankEntities($event, data)"
/>
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection v-if="scope.opt">
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectDialog>
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" /> <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
<QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" /> <QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />

View File

@ -18,7 +18,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import VnSelect from 'components/common/VnSelect.vue'; import VnSelect from 'components/common/VnSelect.vue';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
const arrayData = useArrayData('Client'); const arrayData = useArrayData('Customer');
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();
const campaignList = ref(); const campaignList = ref();
@ -260,7 +260,7 @@ const updateDateParams = (value, params) => {
:label="t('globals.campaign')" :label="t('globals.campaign')"
:filled="true" :filled="true"
class="q-px-sm q-pt-none fit" class="q-px-sm q-pt-none fit"
:option-label="(opt) => t(opt.code)" :option-label="(opt) => t(opt.code ?? '')"
:fields="['id', 'code', 'dated', 'scopeDays']" :fields="['id', 'code', 'dated', 'scopeDays']"
@update:model-value="(data) => updateDateParams(data, params)" @update:model-value="(data) => updateDateParams(data, params)"
dense dense

View File

@ -39,7 +39,7 @@ const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const entityId = computed(() => { const entityId = computed(() => {
return $props.id || route.params.id; return Number($props.id || route.params.id);
}); });
const data = ref(useCardDescription()); const data = ref(useCardDescription());

View File

@ -11,7 +11,7 @@ const $props = defineProps({
</script> </script>
<template> <template>
<QPopupProxy> <QPopupProxy data-cy="CustomerDescriptor">
<CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" /> <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
</QPopupProxy> </QPopupProxy>
</template> </template>

View File

@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
:required="true" :required="true"
:rules="validate('client.socialName')" :rules="validate('client.socialName')"
clearable clearable
uppercase="true" :uppercase="true"
v-model="data.socialName" v-model="data.socialName"
> >
<template #append> <template #append>

View File

@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { QBtn, useQuasar } from 'quasar'; import { QBtn, useQuasar } from 'quasar';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import { toDateTimeFormat } from 'src/filters/date'; import { toDateTimeFormat } from 'src/filters/date';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
@ -34,7 +33,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
format: (row) => row.type.description, format: (row) => row?.type?.description,
label: t('Description'), label: t('Description'),
name: 'description', name: 'description',
}, },
@ -74,12 +73,11 @@ const tableRef = ref();
<template> <template>
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="ClientSamples" data-key="CustomerSamples"
auto-load auto-load
:filter="filter" :user-filter="filter"
url="ClientSamples" url="ClientSamples"
:columns="columns" :columns="columns"
:pagination="{ rowsPerPage: 12 }"
:disable-option="{ card: true }" :disable-option="{ card: true }"
:right-search="false" :right-search="false"
:rows="rows" :rows="rows"

View File

@ -25,7 +25,7 @@ const $props = defineProps({
}, },
}); });
const entityId = computed(() => $props.id || route.params.id); const entityId = computed(() => Number($props.id || route.params.id));
const customer = computed(() => summary.value.entity); const customer = computed(() => summary.value.entity);
const summary = ref(); const summary = ref();
const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount); const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
@ -181,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle <VnTitle
:url="`#/customer/${entityId}/billing-data`" :url="`#/customer/${entityId}/billing-data`"
:text="t('customer.summary.billingData')" :text="t('customer.summary.payMethodFk')"
/> />
<VnLv <VnLv
:label="t('customer.summary.payMethod')" :label="t('customer.summary.payMethod')"
:value="entity.payMethod.name" :value="entity.payMethod?.name"
/> />
<VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" /> <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
<VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" /> <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@ -208,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
:text="t('customer.summary.consignee')" :text="t('customer.summary.consignee')"
/> />
<VnLv <VnLv
:label="t('customer.summary.addressName')" :tooltip="t('customer.summary.addressName')"
:label="t('customer.summary.addressNameAbbr')"
:value="entity.defaultAddress.nickname" :value="entity.defaultAddress.nickname"
/> />
<VnLv <VnLv
@ -252,7 +253,8 @@ const sumRisk = ({ clientRisks }) => {
/> />
<VnLv <VnLv
v-if="entity.claimsRatio" v-if="entity.claimsRatio"
:label="t('customer.summary.priceIncreasingRate')" :tooltip="t('customer.summary.priceIncreasingRate')"
:label="t('customer.summary.priceIncreasingRateAbbr')"
:value="toPercentage(priceIncreasingRate)" :value="toPercentage(priceIncreasingRate)"
/> />
<VnLv <VnLv
@ -261,7 +263,8 @@ const sumRisk = ({ clientRisks }) => {
/> />
<VnLv <VnLv
v-if="entity.claimsRatio" v-if="entity.claimsRatio"
:label="t('customer.summary.claimRate')" :label="t('customer.summary.claimRateAbbr')"
:tooltip="t('customer.summary.claimRate')"
:value="toPercentage(claimRate)" :value="toPercentage(claimRate)"
/> />
</QCard> </QCard>
@ -289,7 +292,7 @@ const sumRisk = ({ clientRisks }) => {
<VnLv <VnLv
v-if="entity.creditInsurance" v-if="entity.creditInsurance"
:label="t('customer.summary.securedCredit')" :label="t('customer.summary.securedCredit')"
:value="toCurrency(entity.creditInsurance)" :value="`${toCurrency(entity.creditInsurance)} (${entity.classifications[0]?.insurances[0]?.grade || ''})`"
:info="t('customer.summary.securedCreditInfo')" :info="t('customer.summary.securedCreditInfo')"
/> />
@ -318,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
/> />
<VnLv <VnLv
:label="t('customer.summary.recommendCredit')" :label="t('customer.summary.recommendCreditAbbr')"
:value="entity.recommendedCredit" :tooltip="t('customer.summary.recommendCredit')"
:value="toCurrency(entity.recommendedCredit)"
/> />
</QCard> </QCard>
<QCard class="vn-max"> <QCard class="vn-max">

View File

@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
option-value="id" option-value="id"
option-label="name" option-label="name"
url="Departments" url="Departments"
no-one="true" :no-one="true"
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>

View File

@ -111,14 +111,11 @@ const columns = computed(() => [
component: 'number', component: 'number',
}, },
columnField: { columnField: {
component: null, component: markRaw(VnLinkPhone),
after: { attrs: ({ model }) => {
component: markRaw(VnLinkPhone), return {
attrs: ({ model }) => { 'phone-number': model,
return { };
'phone-number': model,
};
},
}, },
}, },
}, },

View File

@ -100,6 +100,9 @@ const columns = computed(() => [
'row-key': 'id', 'row-key': 'id',
selection: 'multiple', selection: 'multiple',
}" }"
:multi-check="{
expand: true,
}"
v-model:selected="selected" v-model:selected="selected"
:right-search="true" :right-search="true"
:columns="columns" :columns="columns"

View File

@ -98,7 +98,9 @@ onMounted(async () => {
<QBtn color="primary" icon="show_chart" :disable="!selectedRows"> <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
<QPopupProxy ref="popupProxyRef"> <QPopupProxy ref="popupProxyRef">
<QCard class="column q-pa-md"> <QCard class="column q-pa-md">
<span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span> <span class="text-body1 q-mb-sm">{{
t('Campaign consumption', { rows: $props.clients.length })
}}</span>
<VnRow> <VnRow>
<VnSelect <VnSelect
:options="moreFields" :options="moreFields"
@ -140,12 +142,13 @@ onMounted(async () => {
valentinesDay: Valentine's Day valentinesDay: Valentine's Day
mothersDay: Mother's Day mothersDay: Mother's Day
allSaints: All Saints' Day allSaints: All Saints' Day
Campaign consumption: Campaign consumption ({rows})
es: es:
params: params:
valentinesDay: Día de San Valentín valentinesDay: Día de San Valentín
mothersDay: Día de la Madre mothersDay: Día de la Madre
allSaints: Día de Todos los Santos allSaints: Día de Todos los Santos
Campaign consumption: Consumo campaña Campaign consumption: Consumo campaña ({rows})
Campaign: Campaña Campaign: Campaña
From: Desde From: Desde
To: Hasta To: Hasta

View File

@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
expect.objectContaining({ expect.objectContaining({
message: 'Payment confirmed', message: 'Payment confirmed',
type: 'positive', type: 'positive',
}) }),
); );
}); });
}); });

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