wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
6,805 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

6805 Commits

Author SHA1 Message Date
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 651b67e98f Merge pull request 'fix: orderCatalogFilter and fix useArrayData' (!989) from hotFix_orderCatalogFilter_refactor_fix into master 
Reviewed-on: verdnatura/salix-front#989
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-22 10:24:18 +00:00
Alex Moreno 94361f18fa Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 10:23:10 +00: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
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 9019d4ff90 Merge pull request 'fix: remove all try catch(err) (error) console.error' (!988) from hotFix_tryCatch_badPractice into master 
Reviewed-on: verdnatura/salix-front#988
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-22 09:47:32 +00:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01: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
Carlos Satorres 69498cccf9 Merge pull request 'hotfix-clientAddress' (!983) from hotfix-clientAddress into master 
Reviewed-on: verdnatura/salix-front#983
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 09:28:38 +00:00
Carlos Satorres 518ed40c91 Merge branch 'master' into hotfix-clientAddress 2024-11-21 09:26:45 +00: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 0cefe391cb Merge pull request 'Hotfix: Show only the correct path of the search' (!954) from Hotfix-ZoneLocationsTree into master 
Reviewed-on: verdnatura/salix-front#954
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 09:15:45 +00: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
Alex Moreno 0c3581f3dc Merge pull request 'hotFix(orderCatalogFilter): fix searchByTag' (!961) from hotFix_orderCatalogFilter_values into master 
Reviewed-on: verdnatura/salix-front#961
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-21 09:09:51 +00:00
Javier Segarra 0434332ec4 Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-21 08:27:13 +00:00
Javier Segarra 350c28eef0 Merge pull request 'HOTfix: use id instead description to open InvoiceOutDescriptor' (!980) from hotFix_customer_balance_email into master 
Reviewed-on: verdnatura/salix-front#980
 2024-11-21 06:52:01 +00: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
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 093e6cb0e8 Merge pull request 'fix: fix create bankEntity' (!976) from hotfix-createBankEntity into master 
Reviewed-on: verdnatura/salix-front#976
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-20 09:02:01 +00: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 fef7dd9ac1 fix(MonitorOrders): translation sendDate → landed 2024-11-20 07:41:39 +01:00
Robert Ferrús ff272ab6c3 Merge pull request 'fix(Supplier): change isSerious to isReal' (!966) from hotFix_supplier_isReal into master 
Reviewed-on: verdnatura/salix-front#966
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-19 11:07:15 +00:00
Robert Ferrús 8a1db719e3 fix(Supplier): change isSerious to isReal 2024-11-19 11:58:16 +01:00
Alex Moreno bbb20ec4e6 Merge pull request 'fix(VnPaginate): disable pagination' (!964) from hotFix_disable_pagination into master 
Reviewed-on: verdnatura/salix-front#964
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-19 08:48:52 +00: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 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 8f526798f9 Merge pull request 'fix: hotfix OrderTickets' (!960) from hotfix-orderTickets into master 
Reviewed-on: verdnatura/salix-front#960
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-18 12:31:06 +00:00
Alex Moreno f3ca51aab4 Merge branch 'master' into hotfix-orderTickets 2024-11-18 12:30:22 +00:00