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

276 Commits

Author SHA1 Message Date
Jon Elias e5cd9d4b8f refactor: refs #7132 global translations files changed 2024-10-21 12:56:09 +02:00
Jon Elias 11bf70d76c fix: category and tags filters 2024-10-18 14:12:23 +02:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files 2024-10-18 12:54:21 +02:00
Pablo Natek 7f1ae16270 fix: refs #8004 fix conflict 2024-10-16 06:20:41 +02:00
Alex Moreno d87e8ec4ae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-15 08:01:22 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic 2024-10-14 12:00:05 +02:00
Pablo Natek b32c8dd9f0 fix: refs #8004 more list style issues 2024-10-13 11:20:51 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems 2024-10-10 07:20:33 +02:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-08 12:24:39 +02:00
Javier Segarra 43da6ea1b8 Merge branch 'master' into hotfix_vnImg_zoom_resolution 2024-10-07 12:00:12 +00:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property 2024-10-07 13:02:40 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Javier Segarra 04b2a4d9ce perf: clean warnings 2024-10-05 00:31:41 +02:00
Jon Elias aee23c75e8 fix: order module 2024-10-04 14:31:39 +02:00
Jon Elias 3a21f6aadb fix: order catalog 2024-10-04 14:22:00 +02:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter 2024-10-04 09:58:23 +02:00
Javi Gallego fc3a025047 feat: manualInvoice with address 2024-10-01 13:03:55 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 2024-09-23 10:21:30 +02:00
Jon Elias 2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-20 09:08:13 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes 2024-09-20 09:04:31 +02:00
Javier Segarra 08bec59a37 add_circle 2024-09-19 00:04:58 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog 2024-09-05 22:20:57 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias 75e18a1e2f fix: added missing descriptors and small details 2024-09-03 09:55:58 +02:00
Carlos Satorres 8300109394 refs #6896 fix searchbar 2024-08-29 09:30:10 +02:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Alex Moreno 3222a7a42c fix(orderLines): reload when delete and redirect when confirm 2024-08-12 11:51:21 +02:00
Alex Moreno 190579e7fd fix: orderCatalogFilter order 2024-08-12 10:22:52 +02:00
Alex Moreno e11e51f432 fix: order description to vnTable 2024-08-12 09:17:51 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes 2024-08-09 14:55:49 +02:00
Alex Moreno dc7c686508 feat(orderList): correct create order 2024-08-09 14:19:08 +02:00
Alex Moreno ee71ae9d24 feat(orderList): use orderFilter and fixed this 2024-08-09 13:07:37 +02:00
Jon Elias 3f76b5496a fix: refs #7717 fix order sections 2024-08-09 07:46:32 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Jon Elias 7e3bfce732 fix: refs #7717 fix basic data form & minor errors 2024-07-30 13:31:12 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Alex Moreno c5927f14c3 warmFix: rollback VnRow 2024-07-26 09:27:38 +02:00
Jon Elias 3a9116987c Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-24 08:35:24 +00:00
Jon Elias cc518d5a80 perf: refs #7717 right menu filter 2024-07-24 10:33:22 +02:00
Javier Segarra e013e5571d perf: use ref at component start 2024-07-23 20:18:53 +02:00
Javier Segarra 1ac0a85969 updates 2024-07-23 15:09:42 +02:00
Jon Elias ce6a94bab8 fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) 2024-07-23 11:46:21 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Javier Segarra 368b8404fa updates: OrderCatlago 2024-07-22 15:13:03 +02:00
Jon Elias def3ca33a2 fix: refs #7717 fixed searchbar filter with rightmenu filters' applied 2024-07-22 12:52:58 +02:00
Jon Elias eb2df02ad6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-19 14:55:09 +02:00
Jon Elias 7f376c8ea4 fix: refs #7717 fix catalog filter, searchbar redirect and search 2024-07-19 14:53:44 +02:00
Alex Moreno 493081254d feat: improve to set time 2024-07-16 10:11:27 +02:00
Guillermo Bonet dc20b7f027 Merge branch 'dev' into 6769-itemDiary 2024-07-12 05:20:10 +00:00
Alex Moreno 5232df2595 feat: claimList better support vnTable, claimSummary redesign. 
BREAKING CHANGE: VnTable default-mode table
 2024-07-11 15:03:39 +02:00
Guillermo Bonet f701b6387a Merge branch 'dev' into 6769-itemDiary 2024-07-10 12:05:26 +02:00
Jon Elias 24368d99b5 fix: refs #6896 fixed list & lines error 2024-07-09 14:09:04 +02:00
Alex Moreno bb8f0b43f0 Merge branch 'dev' into 6336-migrationClaim-v5 2024-07-09 09:27:16 +00:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End 2024-07-08 13:01:34 +00:00
Javier Segarra 286fbc5aba fix: Right menu double icon 2024-07-08 14:59:12 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Jon Elias 2f173ac2e7 refactor: refs #6896 requested changes & deleted basicData and Lines warnings 2024-07-05 13:35:45 +02:00
Jon Elias 44edccb905 refactor: refs #6896 fixed create order function 2024-07-05 09:27:20 +02:00
Alex Moreno 12ca0faf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-05 07:23:20 +02:00
Guillermo Bonet 317746b1f5 hotfix: refs #6769 Changes 2024-07-05 07:10:41 +02:00
William Buezas ad61bf61fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TicketPhotos 2024-07-04 08:49:18 -03:00
William Buezas 9b1f73d30f Rename catalog item 2024-07-04 08:45:51 -03:00
Jon Elias 1b839a89f7 refactor: refs #6896 Order migration 2024-07-04 13:35:27 +02:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Alex Moreno 2340aaba0b feat: list use vnTable, fix descriptor 2024-07-03 14:39:15 +02:00
Jorge Penadés 218cc47834 fix: refs #6151 searchbar 2024-07-03 13:44:35 +02:00
Jon Elias ff420d2b04 Merge branch 'dev' into 6151-FixOrderModule 2024-07-01 07:47:47 +00:00
Alex Moreno 4cf389e00c fixes: fix vnFilter params and redirect 2024-06-28 17:45:04 +02:00
Jon Elias ec5eeaa308 fix: refs #6151 fixed filters and styles 2024-06-28 10:14:24 +02:00
Jon Elias 42df3894ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-06-26 07:16:42 +02:00
Jorge Penadés b0cd40ab2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 13:41:12 +02:00
Alex Moreno d7cc983f29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:19 +02:00
Jorge Penadés ff33923b7a feat: refs #7578 add data-key attribute to CardSummary components 2024-06-25 12:49:54 +02:00
Jorge Penadés 3c810254a4 fix: refs #7623 redirect 2024-06-25 11:40:07 +02:00
Jon Elias e8111502c0 refactor: refs #7014 deleted main files and changed route files 2024-06-25 10:28:48 +02:00
Jorge Penadés 0765166423 fix: refs #7623 disable router update 2024-06-24 13:56:50 +02:00
Jon Elias 9207b37419 refactor: refs #7014 refactor <module>Main.vue 2024-06-24 13:46:06 +02:00
Jon Elias a84c20f2ce refactor: refs #6896 changes requested in PR 2024-06-20 08:33:29 +02:00
Javier Segarra 3fdad15f21 fix: comments 2024-06-19 13:43:32 +02:00
Jon Elias a5f4f85c80 refactor: refs #6896 requested changes 2024-06-18 10:46:13 +02:00
Jon Elias fe47215bf7 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-17 09:58:21 +02:00
Jon Elias 7c64df6600 refactor: refs #6896 fixed styles 2024-06-17 09:58:20 +02:00
Jon Elias 9c1e79ebee Merge branch 'dev' into 6896-EndOrderMigration 2024-06-17 07:57:16 +00:00
Jon Elias 42008ef74b feat: refs #6896 created VnImg and added to order module 2024-06-17 09:56:16 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Jon Elias 93744fce65 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-04 09:54:47 +02:00
Jon Elias adf7c3a139 feat: refs #6896 new filters 2024-06-04 09:54:45 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition 2024-06-03 14:11:40 +02:00
Jon Elias f4f8dcfd71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-03 11:43:56 +02:00
Javier Segarra 0ad839dfc6 src/pages/Order/Card/OrderCatalogItemDialog.vue 2024-05-31 14:40:16 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +02:00
Jon Elias 6e59f3ae12 refactor: refs #6896 fix qdrawer 2024-05-23 14:05:58 +02:00
Jon Elias 8967abf1c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-05-23 13:59:08 +02:00
Jon Elias 98159de257 refactor: refs #6896 end migration orders 2024-05-23 13:55:06 +02:00
jcasado 96719884fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-05-22 12:46:56 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
Jorge Penadés 1654fb93d4 fix: refs #6598 build 2024-05-16 09:06:12 +02:00
Jorge Penadés 3cb02d5e5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-15 15:42:13 +02:00
Jorge Penadés 628fc888ba fix: refs #7281 fix warnings 2024-05-15 14:31:51 +02:00
Jorge Penadés d55dc638d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-13 15:23:37 +02:00
Jorge Penadés 07c67b0df2 feat: refs #6891 keep arrayData opts 2024-05-08 12:30:44 +02:00
Jorge Penadés 0703de350c fix: refs #6891 rollback order & route searchbar 2024-05-07 13:04:27 +02:00
Jorge Penadés 48bba65baf fix: refs #6891 use vnCard searchbar 2024-05-07 09:30:59 +02:00
jcasado c4748cc9b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-04-29 09:42:09 +02:00
Jon Elias e6dc7b9862 refactor: refs #6767 fix all conflicts 2024-04-26 09:47:44 +02:00
jcasado c6c925a105 refs: #6764 fixConflicts 2024-04-25 08:50:12 +02:00
jcasado 716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter 2024-04-24 08:02:19 +02:00
jcasado 7f07b9780c refs: #6764 rename VnSelectFilter 2024-04-23 13:03:32 +02:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Jon Elias 6839b5aac2 refactor: refs #6767 deleted <div class="col"> 2024-04-17 13:26:08 +02:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary 2024-04-11 11:37:11 +00:00
jcasado c640ba1298 fix set 2024-04-10 09:31:38 +02:00
Jorge Penadés 5e43af9efd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-03-27 11:42:50 +01:00
Jon Elias 2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:35:23 +01:00
Pablo Natek 2fa5b1303d remove(vnChip): refs #7001 remove component 2024-03-20 11:28:50 +01:00
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Pablo Natek 2386090c15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-18 13:56:18 +01:00
Jon Elias 2321ca6605 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-15 12:54:05 +01:00
Pablo Natek 00a47cd5b2 refactor(style): refs #7001 add style font vnTitle vnChip 2024-03-14 15:06:06 +01:00
Jon Elias 37a2c33f9f refactor: #6993 set default QTable pagination 2024-03-14 08:51:26 +01:00
William Buezas a0f9c811ff resolve conflicts 2024-02-28 12:56:13 -03:00
Javier Segarra fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-02-28 10:58:22 +00:00
Jorge Penadés f8d1b3d935 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-02-28 08:36:59 +01:00
Jorge Penadés ba1dea32a5 fix: refs #6911 save onKeyup enter 2024-02-27 11:24:49 +01:00
Javier Segarra 4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia 2024-02-26 07:11:33 +01:00
William Buezas 1b67b7ab36 Customer description corrections and creation of tickets create view 2024-02-22 10:38:15 -03:00
carlosfonseca 01d68734b6 Correccion de conflictos 2024-02-20 12:15:27 -05:00
carlosfonseca 86199d8197 Solucion a comentarios 14 2024-02-19 11:27:24 -05:00
Alex Moreno aa4d5bffc3 refs #5509 feat: VnDms & VnDmsList 2024-02-12 15:06:20 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
William Buezas 9d90a3808f apply item descriptor in OrderCatalogItem 2024-01-26 16:40:59 -03:00
William Buezas 41605db454 Make card-list a global class 2024-01-23 11:45:25 -03:00
William Buezas 78f37f57c4 move QList element and classes inside VnFilterPanel 2024-01-23 11:42:26 -03:00
Carlos Satorres 334b4dc928 refs #6353 remove rating 2024-01-12 09:13:36 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
Kevin Martinez 5c2b995659 Add order catalog sort filter 2024-01-08 10:28:55 -04:00
Kevin Martinez fbd5abb330 Fix fallowing feedback 2024-01-08 10:00:04 -04:00
Kevin Martinez 8a6e78a143 Merge branch 'dev' into feature/order-catalog-filter 
# Conflicts:
#	src/components/ui/VnFilterPanel.vue
#	src/pages/Order/Card/OrderCatalogFilter.vue
#	src/pages/Order/OrderCatalog.vue
 2024-01-05 13:13:03 -04:00