0
0
Fork 0
Commit Graph

5752 Commits

Author SHA1 Message Date
Javier Segarra c3510aea60 feat: add Options Style in AddressList from TicketCrete 2024-11-26 00:18:42 +01:00
Javier Segarra 60590f6c97 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 12:28:23 +00:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-25 13:02:58 +01:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons 2024-11-25 12:54:15 +01:00
Jon Elias f3429297cf Merge branch 'master' into Fix-ZoneLocationsTree2 2024-11-25 11:20:17 +00:00
Jon Elias d191d88e81 refactor: modified button to prevent submit 2024-11-25 12:19:20 +01:00
Javier Segarra 424dfc0a5c Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 11:18:18 +00:00
Jorge Penadés e994ae72b6 fix: refs #8207 add filter to reset 2024-11-25 12:08:37 +01:00
Jorge Penadés a1284cefc2 refactor: refs #8207 add update fn 2024-11-25 12:01:28 +01:00
Jon Elias c558636799 refactor: requested changes 2024-11-25 11:12:11 +01:00
Jorge Penadés a3f56aaf24 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions 2024-11-25 10:27:00 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2 2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location 2024-11-25 09:21:20 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated 2024-11-24 11:53:40 +01:00
Javier Segarra a45bf4c83b perf: remove comments 2024-11-24 08:49:03 +01:00
Javier Segarra 8d59cfa9c3 perf: use FetchData instead VnPAginate 2024-11-24 08:48:56 +01:00
Javier Segarra 083706885c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_itemFixedPrice 2024-11-23 01:15:36 +01:00
Javier Segarra 4fa5d47481 test: more e2e customer tests 2024-11-23 01:12:59 +01:00
Javier Segarra 8a1a748c92 test: add data-cy 2024-11-23 00:51:33 +01:00
Javier Segarra 4233385267 Merge branch 'hotfix_8217_updateCustomerCredit' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_8217_updateCustomerCredit 2024-11-23 00:33:36 +01:00
Javier Segarra 276dc233c1 perf: remove almost fonseca code 2024-11-23 00:33:30 +01:00
Javier Segarra 12dcb51fbe fix: problem from CustomerDescriptor 2024-11-23 00:33:11 +01:00
Jorge Penadés 8b52629b0b refactor: refs #8207 improve logic 2024-11-22 15:55:30 +01:00
Jorge Penadés 3a4c0e729a refactor: refs #8207 improve logic 2024-11-22 15:52:22 +01:00
Javier Segarra 148e255665 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-22 14:49:36 +00:00
Jorge Penadés 9d8698fa2f refactor: refs #8207 improve logic 2024-11-22 15:49:07 +01:00
Javier Segarra 87d3dd6fa8 feat: use mapper 2024-11-22 15:49:01 +01:00
Jorge Penadés 661cc0b5ee refactor: refs #8207 improve logic 2024-11-22 15:37:48 +01:00
Alex Moreno 01ffb663f1 fix(ClaimList): stateCode orderBy priority 2024-11-22 15:14:03 +01:00
Jorge Penadés 0eeb22d40a chore: refs #8207 drop useless code 2024-11-22 13:56:30 +01:00
Jorge Penadés 7048f96565 refactor: refs #8207 imrove logic 2024-11-22 13:55:22 +01:00
Jorge Penadés 50fbf64cf9 fix: refs #8207 update btn wip 2024-11-22 13:33:35 +01:00
Jorge Penadés c72fa52851 fix: refs #8207 auto-refresh 2024-11-22 13:03:23 +01:00
Alex Moreno 14d2ddfa83 fix: merge errors 2024-11-22 12:40:07 +01:00
Alex Moreno 4913cf2c29 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 12:10:04 +01:00
Alex Moreno 94361f18fa Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 10:23:10 +00:00
Alex Moreno 142302193e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 11:21:33 +01:00
Alex Moreno 9d7f2b95e8 revert: VnVisibleColumn try catch 2024-11-22 11:21:08 +01:00
Alex Moreno 2db0369b74 fix: resetCategory 2024-11-22 11:05:48 +01:00
Javier Segarra 1c2c2538ed perf: formModel 2024-11-22 11:05:19 +01:00
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 10:52:30 +01:00
Javier Segarra 4ea0d04b86 perf: formModel 2024-11-22 10:48:03 +01:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Javier Segarra 8a4a6061e7 test: add e2e 2024-11-22 10:16:56 +01:00
Javier Segarra c6b547bc55 perf: change fn name 2024-11-22 10:04:17 +01:00
Javier Segarra e2f092948e Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-22 08:24:44 +00:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error 2024-11-22 08:39:46 +01:00
Alex Moreno 8cbf40f465 fix(TicketSummary): observationTypes use .description 2024-11-22 07:45:49 +01:00
Alex Moreno 3b03f0dfee fix(TicketNotes): observationTypes use .description 2024-11-22 07:43:59 +01:00
Javier Segarra 94514a3254 feat: #8217 send just changes 2024-11-21 20:14:54 +01:00
Carlos Andrés 5268140d8b feat: refs#8087 Redadas en travel 2024-11-21 15:51:27 +01:00
Carlos Satorres 518ed40c91 Merge branch 'master' into hotfix-clientAddress 2024-11-21 09:26:45 +00:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 10:26:29 +01:00
Carlos Satorres 8a972507a4 fix: remove s 2024-11-21 10:20:42 +01:00
Carlos Satorres 837f42d21f fix: provinceName 2024-11-21 10:18:25 +01:00
Jon Elias 747bc4af76 Merge branch 'master' into Hotfix-ZoneLocationsTree 2024-11-21 09:13:42 +00:00
Jon Elias 5ff95c2b93 fix: locations tree 2024-11-21 10:10:44 +01:00
Javier Segarra e5434e7436 warmfix: ItemLastEntries to date 2024-11-21 09:08:52 +00:00
Javier Segarra 0434332ec4 Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-21 08:27:13 +00:00
Alex Moreno 6b8470d6e1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 07:59:42 +01:00
Alex Moreno 44f2ecca28 chore: requested changes 2024-11-21 07:49:10 +01:00
Alex Moreno c5acde22a3 chore: requested changes 2024-11-21 07:42:00 +01:00
Javier Segarra 3b5d385d22 fix: use id instead description to open InvoiceOutDescriptor 2024-11-20 22:43:04 +01:00
Jorge Penadés 7039b68bba fix: refs #7874 show name 2024-11-20 17:23:40 +01:00
Alex Moreno 42d24359cd Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-20 12:40:39 +00:00
Alex Moreno abd79283ff fix(CatalogFilterValueDialog): from dev and fix 2024-11-20 13:38:22 +01:00
Javi Gallego 2a1cc49499 fix: ticketDescriptor 2024-11-20 13:15:40 +01:00
Javier Segarra 79c53adc30 perf: #7260 remove unnussed code 2024-11-20 11:20:34 +01:00
Javier Segarra 09c0a590cd perf: #7260 change params by filter 2024-11-20 11:19:58 +01:00
Javier Segarra 74f1ce88c7 Merge branch 'master' into hotfix_itemFixedPrice 2024-11-20 10:07:41 +01:00
Carlos Satorres 131cd2de8c fix: options 2024-11-20 09:53:52 +01:00
Carlos Satorres 2d5d1c549b Merge branch 'hotfix-createBankEntity' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-createBankEntity 2024-11-20 09:52:14 +01:00
Carlos Satorres c59baf9cf5 fix: fix code 2024-11-20 09:52:11 +01:00
Javier Segarra ea3569e81a feat: #7260 remove comment 2024-11-20 09:45:55 +01:00
Javier Segarra cb2aa2845d Merge branch 'master' into hotfix_itemFixedPrice 2024-11-20 09:43:21 +01:00
Alex Moreno 51beef3cbe Merge branch 'master' into hotfix-createBankEntity 2024-11-20 08:27:58 +00:00
Alex Moreno 32fdc836f9 fix(OrderCatalogFilter): fix field value 2024-11-20 09:26:38 +01:00
Carlos Satorres 2806c94fdb fix: fix create bankEntity 2024-11-20 09:22:50 +01:00
Alex Moreno e032d5988b Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-20 07:04:36 +00:00
Alex Moreno 44134a8fec Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-20 07:42:25 +01:00
Alex Moreno fef7dd9ac1 fix(MonitorOrders): translation sendDate → landed 2024-11-20 07:41:39 +01:00
Alex Moreno fdafeee39d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-19 14:49:22 +01:00
Alex Moreno 14e6b870ac Merge branch 'test' into warmFix_vnSelect 2024-11-19 13:29:15 +00:00
Alex Moreno 8714980595 fix(VnSelect): setOptions when applyFilter 2024-11-19 14:28:43 +01:00
Jon Elias 1b68d3c5ea Merge branch 'test' into Fix-WorkerCreateE2E 2024-11-19 13:16:41 +00:00
Jon Elias f43e974bbc fix: worker test e2e 2024-11-19 14:14:50 +01:00
Robert Ferrús 8a1db719e3 fix(Supplier): change isSerious to isReal 2024-11-19 11:58:16 +01:00
Jorge Penadés 1faab668b1 fix: refs #7323 show advanced fields 2024-11-19 11:53:33 +01:00
Jorge Penadés 38ccf464b7 fix: refs #7323 locale #7396 2024-11-19 11:52:00 +01:00
Alex Moreno 5d58bb0c13 fix(VnPaginate): disable pagination 2024-11-19 09:47:59 +01:00
Alex Moreno e7b431e9ec fix(VnPaginate): disable pagination 2024-11-19 09:32:35 +01:00
Alex Moreno afaf2df2ee Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 07:56:04 +01:00
Alex Moreno c2db7be8cd fix(orderCatalogFilter): fix searchByTag 2024-11-18 15:06:09 +01:00
Alex Moreno 00fdbfa2e4 fix(OrderCatalogFilter): hotFix use search-url="params" 2024-11-18 13:41:54 +01:00
Alex Moreno f3ca51aab4 Merge branch 'master' into hotfix-orderTickets 2024-11-18 12:30:22 +00:00
Carlos Satorres d3993442b6 fix: hotfix OrderTickets 2024-11-18 13:26:27 +01:00
Jon Elias 0c0b9ca648 fix: changed route.query 2024-11-18 12:27:07 +01:00
Alex Moreno dd490888cf merge test in dev 2024-11-18 11:23:36 +01:00
Alex Moreno 5b4299114b Merge branch 'master' into hotFix_ticketSummary_add_ticketDescriptorMenu 2024-11-18 10:00:54 +00:00