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

1348 Commits

Author SHA1 Message Date
William Buezas 5d9e48c979 Merge branch 'feature/EntrySubmodules' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-141-EntrySubmoduleNotes 2024-01-16 16:33:21 -03:00
William Buezas 64a4a800f7 Entry buys import 2024-01-16 16:11:23 -03:00
William Buezas 596904c4f8 Entry submodules: Log, Basic data, Buys (WIP) 2024-01-16 13:26:12 -03:00
carlosfonseca 29418d22bb Se crea formulario de actualización de un agente de aduanas y observaciones 2024-01-16 09:48:30 -05:00
Kevin Martinez 3e272537aa Merge branch 'dev' into bugfix/travel-cards 2024-01-16 11:53:33 +00:00
Javier Segarra a94fb6026a refs #6704: remove bad code 2024-01-16 12:14:48 +01:00
Javier Segarra b58f9bee2e refs #6704: fix bug 2024-01-16 11:24:28 +01:00
Javier Segarra 9daffdfa22 refs #6704: posible fix 2024-01-16 08:40:03 +01:00
Javier Segarra e480b17edc refs #6704: fix2 2024-01-16 07:24:41 +01:00
carlosfonseca c471a4febc Se crea el formulario para la creacion de un agente de aduanas 2024-01-15 09:16:50 -05:00
Javier Segarra 972c340fad refs #6704: fix1 2024-01-15 14:44:38 +01:00
Javier Segarra 84b53131c7 refs #6280 feat: deepFind as composable 2024-01-15 09:22:01 +01:00
Javier Segarra 20835471a3 refs #6280 feat: handle option selected from VnLocation 2024-01-15 09:14:42 +01:00
William Buezas 91f675ec99 small table visual change in entry summary 2024-01-14 21:12:39 -03:00
William Buezas 129cacb88b Merge pull request 'feature/ms-115-EntryListView' (#68) from feature/ms-115-EntryListView into dev 
Reviewed-on: hyervoni/salix-front-mindshore#68
 2024-01-14 23:57:12 +00:00
William Buezas b41da81f3e Merge pull request 'feature/ms-95-postcode-autocomplete' (#67) from feature/ms-95-postcode-autocomplete into dev 
Reviewed-on: hyervoni/salix-front-mindshore#67
 2024-01-12 20:05:45 +00:00
William Buezas f64ac5c70d Entry summary 2024-01-12 17:02:52 -03:00
Carlos Fonseca 7432f754f5 Merge branch 'dev' into features/ms_118_consignees_cart 2024-01-12 15:42:33 +00:00
Kevin Martinez 3d98bf578e Create route list 2024-01-12 10:03:18 -04:00
William Buezas 207a5a5908 changes 2024-01-12 10:36:42 -03:00
William Buezas 4bf16da814 Improve autocompletion 2024-01-12 09:49:34 -03:00
William Buezas 2d49beab63 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-95-postcode-autocomplete 2024-01-12 09:14:07 -03:00
Javier Segarra b6a03e6a9f Merge branch 'dev' into 6280_vnLocation 2024-01-12 11:36:47 +00:00
carlosfonseca bf19ce630d Nueva correccion por comentario 2024-01-12 05:28:58 -05:00
Javier Segarra 4b3ca3bbd9 refs #6280 feat: return geoFk VnLocation 2024-01-12 11:27:54 +01:00
Javier Segarra 67d4471f42 refs #6280 feat: improve VnLocation 2024-01-12 10:57:50 +01:00
Javier Segarra 68ba851e6e refs #6280 feat use VnLocation in CustomerCreate 2024-01-12 09:58:24 +01:00
Javier Segarra 810dd81b34 refs #6280 feat VnLocation approach 2024-01-12 09:58:12 +01:00
Carlos Satorres 334b4dc928 refs #6353 remove rating 2024-01-12 09:13:36 +01:00
Carlos Satorres bcc35ca0e7 Merge branch 'dev' into 6325-tasaClaim 2024-01-12 07:47:39 +00:00
Alex Moreno c265465b1d Merge branch 'dev' into 6325-tasaClaim 2024-01-12 06:54:00 +00:00
carlosfonseca f9cbf03991 Se corrige el componente por comentario en pr 2024-01-11 13:12:44 -05:00
William Buezas 2b6faf8186 merge with dev 2024-01-11 14:59:18 -03:00
William Buezas 627226d3cd Entry list 2024-01-11 14:58:22 -03:00
Jorge Penadés 3f720e0571 fix: refs #6630 fix flush selectfilter in vnlog 2024-01-11 16:29:20 +01:00
Jorge Penadés ae94ff014d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6630-fixCssVnLog 2024-01-11 15:59:04 +01:00
Jorge Penadés 8df915e0ef fix: refs #6630 remove autoload 2024-01-11 15:53:31 +01:00
carlosfonseca d2ee8a98eb Se crea la tarjeta que muestra el listado de consignatarios existentes y la tarjeta de creacion 2024-01-11 08:25:59 -05:00
Javier Segarra 0f1cfc0041 Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 12:37:35 +00:00
William Buezas 19d793a939 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-11 09:33:22 -03:00
Alex Moreno b3f412a6f7 Merge branch 'dev' into hyervoni-branch-PR-2 2024-01-11 12:13:02 +00:00
Alex Moreno 489ea94d3f refs #6595 fix invoiceInBasicData 2024-01-11 13:12:55 +01:00
Carlos Satorres 98810657a1 Merge branch 'dev' into removeId 2024-01-11 11:29:08 +00:00
Alex Moreno 13d24e936e Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 11:22:14 +00:00
Alex Moreno 7b974a2f32 refs #6595 fix: remove duplicated 2024-01-11 12:13:38 +01:00
Alex Moreno bc46435299 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-11 12:09:16 +01:00
Jorge Penadés 77d4e72968 fix: refs #6630 fix click event propagation 2024-01-11 12:08:06 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
Jorge Penadés 88b68ef399 fix: refs #6630 large click event 2024-01-11 12:02:33 +01:00
Jorge Penadés 1bc2abdab2 fix: refs #6630 drop unused imports 2024-01-11 11:44:53 +01:00
Carlos Satorres 375154b18d refs #6325 claimingRate 2024-01-11 10:26:15 +01:00
Carlos Satorres b36cdbf721 refs #6664 scss 2024-01-11 08:33:57 +01:00
Jorge Penadés 3c8022ac45 feat: refs #6630 VnAvatar letter feature added 2024-01-10 16:49:09 +01:00
William Buezas 9aeba37140 Autocomplete postcodes 2024-01-10 12:11:49 -03:00
Jorge Penadés cdadb57af3 fix: refs #6630 resolve conficts 2024-01-10 15:41:00 +01:00
Jorge Penadés 0eb7d0f1b0 fix: refs #6630 resolve conficts 2024-01-10 15:35:01 +01:00
Jorge Penadés fb4c371371 fix: refs #6643 remove console log 2024-01-10 14:36:30 +01:00
Carlos Satorres f2006663b7 refs #6664 popup 2024-01-10 14:29:01 +01:00
William Buezas 53a832ae6a supplier consumption submodule 2024-01-10 09:54:23 -03:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01:00
Jorge Penadés 7b8ad3720e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink 2024-01-10 10:41:49 +01:00
Carlos Satorres fa62eb0292 Merge branch 'dev' into 6420-claimNotesSummary 2024-01-10 07:23:42 +00:00
carlosfonseca 9bc60ff3c3 Se crea tarjeta de formas de pago 2024-01-09 11:59:36 -05:00
Javier Segarra d4968d060b Revert "refs #6384 perf: replace code with VnSubToolbar" 
This reverts commit d139d670f1.
 2024-01-09 17:02:21 +01:00
carlosfonseca dfb716eb04 Mejora solicitada 2024-01-09 09:22:29 -05:00
Jorge Penadés 57eca9b267 fix: refs #6630 getLogTree grouping fixed 2024-01-09 15:21:26 +01:00
Carlos Satorres b83a773278 refs #6420 fix pr 2024-01-09 14:55:52 +01:00
Carlos Satorres a4a7a48fb6 refs #6383 fix 2024-01-09 14:48:47 +01:00
William Buezas 5511e365aa WIP 2024-01-09 10:46:27 -03:00
Carlos Satorres 9e314276bd refs #6383 set dark 2024-01-09 14:37:44 +01:00
Jorge Penadés 5438ce5c33 fix: refs #6630 fix css 2024-01-09 14:34:25 +01:00
Jorge Penadés 3e8744c837 fix: refs #6630 fix css 2024-01-09 14:24:29 +01:00
carlosfonseca 091446178b Se crea tarjeta de data fiscal 2024-01-09 08:23:19 -05:00
Carlos Satorres bdbc34d4e7 refs #6325 claimRatio 2024-01-09 14:00:51 +01:00
Javier Segarra d139d670f1 refs #6384 perf: replace code with VnSubToolbar 2024-01-09 10:37:59 +01:00
Javier Segarra 8861ee038d refs #6384 fix: redirect to same path when id change 2024-01-09 10:35:39 +01:00
Carlos Satorres a59a86dfd6 refs #6383 darkMode 2024-01-09 08:36:50 +01:00
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-09 07:47:55 +01:00
Alex Moreno bc8b9501c0 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-09 07:43:29 +01:00
Carlos Fonseca dab2fa9d90 Merge pull request 'Se crea el formulario para agregar nuevas observaciones en la tablade morosos' (#62) from features/ms_116_add_new_observations into dev 
Reviewed-on: hyervoni/salix-front-mindshore#62
 2024-01-08 23:09:20 +00:00
carlosfonseca dd8373ea22 Se hacen mejoras al momento de hacer las peticiones y se refresca la data actualizada 2024-01-08 17:28:56 -05:00
William Buezas 725bd7a180 Merge pull request 'feature/SupplierSubmodules' (#61) from feature/SupplierSubmodules into dev 
Reviewed-on: hyervoni/salix-front-mindshore#61
 2024-01-08 22:20:49 +00:00
carlosfonseca c21afccf75 Se crea el formulario para agregar nuevas observaciones en la tablade morosos 2024-01-08 14:25:21 -05:00
William Buezas 865a13aafa Submodulos de suppliers: Accounts, Contacts y Addresses 2024-01-08 16:16:42 -03:00
Kevin Martinez 1f12609a05 Merge pull request 'Order Catalog Filter' (#59) from feature/order-catalog-filter into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#59
 2024-01-08 15:05:15 +00:00
William Buezas 8a2a6fe1c9 Cambiar traducción de fiscalData 2024-01-08 11:51:20 -03:00
William Buezas 473e96ffb4 wip 2024-01-08 11:32:42 -03: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
Carlos Satorres 63b1c53ca9 refs #6420 scss fix 2024-01-08 14:17:40 +01:00
Carlos Satorres 651cc6b1ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary 2024-01-08 13:46:33 +01:00
Jorge Penadés 647bb58148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink 2024-01-08 13:41:04 +01:00
Alex Moreno 94e4bb383a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-08 12:02:00 +01:00
Alex Moreno dcedc314f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-08 12:01:38 +01:00
Alex Moreno 80276100f5 refs #6062 fix: console.logs 2024-01-08 11:42:21 +01:00
Alex Moreno 75d2c9ac32 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-01-08 11:39:22 +01:00
Alex Moreno 1775ac85e2 refs #6062 fix(claimAction): pagination. fix(claimDevelopment): alignament. fix(claimSummary): object can be null 2024-01-08 11:39:21 +01:00
Carlos Satorres b90da9f622 Merge branch 'dev' into removeId 2024-01-08 08:37:25 +00:00
Carlos Satorres a9c4d514bc remove ID 2024-01-08 09:27:34 +01:00
Jorge Penadés a002231d3d refactor: refs #6643 drop payments title 2024-01-08 08:52:17 +01:00
Pablo Natek ad2844d88d fix(workerDescriptor): refs #6611 fix workerpopUp 2024-01-08 08:37:36 +01:00
Pablo Natek eca2413630 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-08 07:23:28 +00:00
Alex Moreno babc217083 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-08 08:00:23 +01:00
Alex Moreno 741ce4c274 refs #6062 fix: invoiceOuts translation 2024-01-08 08:00:06 +01: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
Kevin Martinez c997d19a5e Implement tag filter 2024-01-05 13:04:06 -04:00
William Buezas aa1f8c4f3b Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules-2 2024-01-05 11:07:22 -03:00
William Buezas 27616b9bd4 improve TableVisibleColumns code 2024-01-05 10:57:43 -03:00
William Buezas 4d0d051c8a supplier log submodule 2024-01-05 08:51:03 -03:00
William Buezas edb1c1c71a Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules 2024-01-05 08:27:23 -03:00
William Buezas 8cb6ed136a mover clase de selector de css para añadir * a inputs requeridos a archivo de css global 2024-01-04 19:37:46 -03:00
William Buezas 073a8f5c70 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-04 18:13:46 -03:00
William Buezas e8fa564bc2 Agregar * a inputs de campos required via css 2024-01-04 18:13:31 -03:00
carlosfonseca bd8acbe084 Correcciones solicitadas 2024-01-04 13:12:58 -05:00
carlosfonseca 6b3bed0085 Mejoras en las correcciones de codigo 2024-01-04 11:37:46 -05:00
carlosfonseca 64777bb804 Se hacen correcciones en base a comentarios en el PR 2024-01-04 10:23:55 -05:00
Pablo Natek 11a37b7716 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-04 14:47:46 +00:00
William Buezas 3ba4e56204 merge with dev 2024-01-04 11:19:40 -03:00
Carlos Satorres 7ae05f23fc refs #6420 notes 2024-01-04 14:38:33 +01:00
William Buezas cfac9acbe8 Small corrections 2024-01-04 09:58:37 -03:00
William Buezas de8996d596 Fixes PR 2024-01-04 09:34:24 -03:00
Carlos Satorres d30d16bced Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary 2024-01-04 12:23:09 +01:00
Carlos Satorres 96acd00469 refs #6618 remove import 2024-01-04 10:33:11 +01:00
Alex Moreno c651becb76 Merge branch 'dev' into 5858-fiscalData-validations 2024-01-04 09:20:06 +00:00
Kevin Martinez b622f9cca7 Add order orderBy filter 2024-01-04 02:27:43 -04:00
Kevin Martinez 5e9006bf33 Fix travel summary cards 2024-01-04 00:58:08 -04:00
William Buezas bdbc3209f4 Merge pull request 'feature/ms-114-ImproveExtendedListFilters' (#53) from feature/ms-114-ImproveExtendedListFilters into dev 
Reviewed-on: hyervoni/salix-front-mindshore#53
 2024-01-03 19:58:24 +00:00
William Buezas aee4696bb2 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-03 16:56:11 -03:00
William Buezas 8fc7a5ea12 Aplicar clases a close-icon en el css 2024-01-03 16:55:48 -03:00
carlosfonseca ead8bb4992 Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas 2024-01-03 14:53:01 -05:00
William Buezas 142bac7a43 agregar data por default en tabla extended list 2024-01-03 13:49:08 -03:00
Kevin Martinez 467f32d9e0 Merge remote-tracking branch 'origin/branch-PR-2' into branch-PR-2 2024-01-03 10:50:42 -04:00
Kevin Martinez 2af176a502 Fix catalog filter 2024-01-03 10:50:26 -04:00
Kevin Martinez 54d77c9851 Fix Icon sizing 2024-01-03 10:02:14 -04:00
William Buezas a66b88ba8e add delete department popup translation 2024-01-03 10:59:11 -03:00
William Buezas 24fdc1ff97 wip 2024-01-03 10:56:13 -03:00
Alex Moreno b62a317a66 refs #6595 fix: customerExtendedListFilter 2024-01-03 14:17:09 +01:00
Alex Moreno 5994b4e08e Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-03 14:16:26 +01:00
Carlos Satorres 9cd20439a6 refs #6618 fix name 2024-01-03 14:09:29 +01:00
Carlos Satorres 9a9bb2fa44 refs #6618 invoiceOut fix 2024-01-03 13:24:49 +01:00
Carlos Satorres 3c98d099b3 refs #6618 component Cards 2024-01-03 13:00:45 +01:00
Carlos Satorres 92127b766b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar 2024-01-03 13:00:25 +01:00
Kevin Martinez 733baa1310 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
 2024-01-03 06:51:38 -04:00
Jorge Penadés a1b6698819 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-01-03 11:34:07 +01:00
Carlos Satorres 6b23c988b3 refs #6618 component vnSubToolBar 2024-01-03 11:06:03 +01:00
Carlos Satorres 3acc4b0d58 vn qtoolbar 2024-01-03 09:59:27 +01:00
Javier Segarra 6a6e38bb60 Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy 2024-01-03 09:39:31 +01:00
Javier Segarra c4cf9842cb refs #6098 perf: add vite-ignore 2024-01-03 09:39:28 +01:00
Javier Segarra e05a49e7b7 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-03 08:22:20 +00:00
Javier Segarra b00b2941c7 refs #6098 perf: define locale equivalences in i18n folder 2024-01-03 09:18:35 +01:00
Javier Segarra 899ccc097a refs #6098 perf: remove import.meta.glob 2024-01-03 09:18:13 +01:00
Javier Segarra ac660fadd7 refs #6098 feat: add translate for copyToken 2024-01-03 09:17:28 +01:00
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord 2024-01-03 08:16:56 +00:00
Alex Moreno 09cd5464fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:42 +01:00
Alex Moreno 0a44c43715 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:39 +01:00
Alex Moreno ba0b3f260f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-03 09:00:13 +01:00
Jorge Penadés a93ffda59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-03 08:59:09 +01:00
Carlos Satorres f2c29baeb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines 2024-01-03 08:20:40 +01:00
Alex Moreno 046b69d89e warmFix(ticketSummary): change this. → .value 2024-01-03 07:47:38 +01:00
Alex Moreno 41066387f9 Merge branch 'dev' into 6578-orderClaim 2024-01-03 06:45:19 +00:00
Pablo Natek 660906fa0e Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-02 17:35:31 +00:00
Kevin Martinez a5cbc55a7e Fix form model feedback 2024-01-02 12:36:09 -04:00
Kevin Martinez c29586632c Fix order feedback 2024-01-02 12:29:34 -04:00
William Buezas 36ae5ab538 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-02 12:57:35 -03:00
William Buezas 49bb222343 create form popup reutilizable component 2024-01-02 12:57:13 -03:00
Kevin Martinez 606f4f0892 Implement orders catalog tag filter 2024-01-02 11:40:07 -04:00
carlosfonseca b0b8205b52 Solucion comentario 2024-01-02 10:28:52 -05:00
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03:00
carlosfonseca bf259b5fad Correcciones a branch pr 2 2024-01-02 08:12:44 -05:00
carlosfonseca 677660f5cc Se hacen maquetado general de menu izquierdo en summary de clientes 2024-01-02 06:54:15 -05:00
Jorge Penadés 34e71c1900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 12:48:03 +01:00
William Buezas 9b9ac4dfe1 PR fixes 2024-01-02 08:47:38 -03:00
William Buezas a2c96d276e Supplier Basic data, Billing data and Fiscal data 2024-01-02 08:17:04 -03:00
Jorge Penadés 9b069fbddd add filter: refs #6606 2024-01-02 11:38:43 +01:00
Javier Segarra 17dc491cc6 Merge branch 'dev' into 5858-fiscalData-validations 2024-01-02 09:25:26 +00:00
Javier Segarra 855164015a Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 09:22:12 +00:00
Javier Segarra 9c6de604f3 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 09:18:50 +00:00
Alex Moreno 7f3cfddb25 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-02 09:21:06 +01:00
Alex Moreno 24818f5daa refs #5835 fix(invoiceOutSummary): add ?. 2024-01-02 09:19:29 +01:00
carlosfonseca 31467a2bef Correccion de conflicto 2024-01-02 03:17:23 -05:00
Jorge Penadés 61d69f7cf7 change btn & prevent error: refs #5835 2024-01-02 09:05:59 +01:00
Jorge Penadés 85d056b491 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:00:36 +01:00
Alex Moreno 82536847f5 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 07:32:56 +00:00
Alex Moreno deeebd68d1 Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 07:32:22 +00:00
Alex Moreno 10a3a39b03 Merge branch 'dev' into 6578-orderClaim 2024-01-02 07:31:06 +00:00
William Buezas d476d504e1 Merge pull request 'Extended List big modifications and column add column filter component' (#48) from feature/ms-100-ExtendedListColumnFilter into dev 
Reviewed-on: hyervoni/salix-front-mindshore#48
 2023-12-31 01:17:18 +00:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
William Buezas 8b24ac9fe4 change suppliers submodules titles casing 2023-12-29 14:43:20 -03:00
William Buezas 2edaf71e40 change suppliers submodules titles casing 2023-12-29 14:19:44 -03:00
William Buezas c4c344f07a Add descriptor and submodules to supplier card left menu 2023-12-29 14:00:32 -03:00
William Buezas 1ab31a1e51 Extended List big modifications and column add column filter component 2023-12-29 11:08:11 -03:00
Jorge Penadés d374709d4a logs added: refs #6605 2023-12-29 08:58:32 +01:00
carlosfonseca 9ede2912f3 Correccion, elimine sin darme cuenta 2023-12-28 10:36:47 -05:00
carlosfonseca eebefca919 Correccion de conflictos 2023-12-28 10:31:15 -05:00
carlosfonseca 5729204a3b Se crea tabla y filtros de morosos en clientes 2023-12-28 10:25:23 -05:00
William Buezas 59e2e20827 Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev 
Reviewed-on: hyervoni/salix-front-mindshore#45
 2023-12-28 15:07:33 +00:00
Jorge Penadés 232827ef48 WIP: corrective section created: refs #4466 2023-12-28 16:02:04 +01:00
Carlos Satorres 6f78e1a173 refs #6420 importClaimNotes 2023-12-27 13:58:30 +01:00
Kevin Martinez 4de1b52c30 Implement orders no results 2023-12-27 08:08:19 -04:00
Kevin Martinez e3fd9bf54b Add order confirmation 2023-12-27 07:52:47 -04:00
Kevin Martinez b22fcddcd3 Create order lines 2023-12-26 17:45:54 -04:00
Kevin Martinez 1166a79669 Fix order descriptor total 2023-12-26 15:59:52 -04:00
William Buezas 893b1bb4c8 Add department basic data 2023-12-26 16:15:46 -03:00
Carlos Fonseca 5e1e49e253 Merge pull request 'Se crea tabla de notificaciones, tarjeta por identificador y filtros' (#44) from features/ms_93_customer_notifications_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#44
 2023-12-26 13:56:09 +00:00
Carlos Fonseca a10b773b29 Merge pull request 'Create order volume' (#42) from feature/order into dev 
Reviewed-on: hyervoni/salix-front-mindshore#42
 2023-12-26 13:55:47 +00:00
Carlos Satorres 191114cf85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6256-breakWord 2023-12-26 11:54:51 +01:00
Pablo Natek 11224733e8 Merge branch '6259-ticketSmsToClientSms' of https://gitea.verdnatura.es/verdnatura/salix-front into 6259-ticketSmsToClientSms 2023-12-26 09:53:49 +01:00
Pablo Natek f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00
Jorge Penadés cf99f910a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2023-12-26 09:16:10 +01:00
Pablo Natek 0c1850626b Merge branch 'dev' into 6259-ticketSmsToClientSms 2023-12-26 06:37:42 +00:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
carlosfonseca 899b9536b6 Se crea tabla de notificaciones, tarjeta por identificador y filtros 2023-12-22 08:29:21 -05:00
William Buezas 465b595a92 correct qicon sizes 2023-12-22 08:32:49 -03:00
William Buezas c3dcf18596 correct qicons size 2023-12-22 08:31:02 -03:00
William Buezas 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03:00
Javier Segarra 3cdaa57403 Merge branch 'dev' into 6098_lilium_token_copy 2023-12-22 11:25:13 +00:00
Javier Segarra e6f4bea466 Merge branch 'dev' into 6363_lilium_darkMode_login 2023-12-22 11:25:07 +00:00
Javier Segarra 9ef102ac5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5858-fiscalData-validations 2023-12-22 10:33:14 +01:00
Javier Segarra 4ccb11997e refs #5878 lint: eslint 2023-12-22 10:32:57 +01:00
Kevin Martinez 3ea1fc775d Fix order summary address 2023-12-22 01:01:51 -04:00
Kevin Martinez fdbad9c2cb Fix order description warning 2023-12-22 00:50:31 -04:00
Kevin Martinez 06637cd89c Fix card list class 2023-12-22 00:50:07 -04:00
Kevin Martinez 36344d112b Create order volume 2023-12-22 00:34:18 -04:00
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms 2023-12-21 18:59:13 +01:00
Carlos Satorres f71f341aad refs #6128 change stateColor 2023-12-21 12:15:01 +01:00
Carlos Satorres 8499bcbe19 refs #6218 refactor dmsFilter 2023-12-21 08:28:03 +01:00
William Buezas 2c604b842d Merge branch 'features/ms_64_extended_list_correcciones' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-12-20 15:18:44 -03:00
Kevin Martinez bcfb34475b Merge branch 'dev' into feature/order 2023-12-20 13:58:51 -04:00
Carlos Fonseca 19ab09ee08 Merge pull request 'Se crea tabla y filtros de extended list' (#37) from features/ms_64_extended_list into dev 
Reviewed-on: hyervoni/salix-front-mindshore#37
 2023-12-20 17:16:16 +00:00
carlosfonseca af3183b3d4 Se mergea la rama inicial 2023-12-20 11:16:20 -05:00
William Buezas 1d590e9916 Merge pull request 'Add nested modals to postcode form' (#40) from feature/ms-63-ClientsFormNestedModals into dev 
Reviewed-on: hyervoni/salix-front-mindshore#40
 2023-12-20 16:00:42 +00:00
William Buezas 4b0c7ba893 Merge pull request 'Eliminar invoiceOut.service y delegar integraciones al store' (#38) from feature/ms-90-RefactorInvoiceOutService into dev 
Reviewed-on: hyervoni/salix-front-mindshore#38
 2023-12-20 16:00:25 +00:00
carlosfonseca 8f4bd3478b Se implementa funcionalidades varias del extended list 2023-12-20 10:34:14 -05:00
William Buezas 28904011f6 Add nested modals to postcode form 2023-12-20 12:23:42 -03:00
Jorge Penadés f3a1800cb0 fix breadcrumbs & header: refs #5835 2023-12-20 15:43:09 +01:00
Carlos Satorres 350bc5a3c9 refs #6128 recharge photo 2023-12-20 15:25:45 +01:00
Javier Segarra ce447b4b76 refs #6363: style: remove !important darkMode for LoginMain 2023-12-20 14:12:28 +01:00
William Buezas 8a5bb1480f Merge pull request 'feature/ms-67-WorkersCreationForm' (#32) from feature/ms-67-WorkersCreationForm into dev 
Reviewed-on: hyervoni/salix-front-mindshore#32
 2023-12-20 12:45:36 +00:00
Kevin Martinez 4e40fbbfe0 Update dash 2023-12-20 08:41:18 -04:00
Carlos Satorres 9a4a3e846e refs #6256 remove hypens 2023-12-20 13:28:58 +01:00
Kevin Martinez 6e76e6e1a7 Update with feedback 2023-12-20 08:27:35 -04:00
Carlos Satorres d286e35f99 refs #6584 refactor 2023-12-20 13:25:55 +01:00
Carlos Satorres 7ef10bb7a9 refs #6420 change url 2023-12-20 12:23:39 +01:00
Carlos Satorres db1c9f8c9b refs #6578 order claimState 2023-12-20 10:00:43 +01:00
Javier Segarra bce4551847 refs #6098 feat: copy userToken to clipboard 2023-12-20 09:51:57 +01:00
Javier Segarra da5b78c2fc refs #6363: style: fix darkMode for LoginMain 2023-12-20 09:12:11 +01:00
Carlos Satorres f78d5b41a4 refs #6584 hotfix await 2023-12-20 09:11:16 +01:00
Kevin Martinez af5f87a6a1 Add catalog filter 2023-12-20 01:52:28 -04:00
Kevin Martinez ecad464366 Add search filter 2023-12-19 21:33:38 -04:00
Kevin Martinez 827a3a4e5a Update order summary 2023-12-19 12:45:11 -04:00
William Buezas f2a0c731ad Aplicar VnSelectCreate a los inputs de postcode 2023-12-19 12:10:58 -03:00
Kevin Martinez 612fe9d605 Add translation 2023-12-19 09:58:18 -04:00
Kevin Martinez a65db2f4cf Create order catalog section 2023-12-19 09:15:54 -04:00
Jorge Penadés 5b79c2ace9 fix margin: refs #5835 2023-12-19 14:03:58 +01:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
William Buezas 40c0edfeb3 Eliminar invoiceOut.service y delegar integraciones al store 2023-12-18 17:17:12 -03:00
William Buezas a52e75f51c Add i18n to negative bases table header 2023-12-18 12:24:13 -03:00
William Buezas 65251f9b13 modificaciones necesarias para aplicar a VnSelectCreate 2023-12-18 12:06:07 -03:00
William Buezas d309f04a8f Merge with dev 2023-12-18 12:00:26 -03:00
William Buezas ab549b6e6a Agregar funcionalidades al formulario y al InputSelectCreate 2023-12-18 11:57:56 -03:00
carlosfonseca b34a5f1d89 Se crea tabla y filtros de extended list 2023-12-18 09:41:10 -05:00
Jorge Penadés 94278e2f53 refactor: refs #5835 2023-12-18 15:36:56 +01:00
William Buezas 5a1d4e90c9 Se asigno directamente la data fetcheada desde los componentes FetchData y se borró las funciones que se usaban para esto 2023-12-15 16:52:46 -03:00
William Buezas c4af2e3cf7 Merge pull request 'Invoice out negative bases refactor' (#36) from feature/ms-71-RefactorNegativeBases into dev 
Reviewed-on: hyervoni/salix-front-mindshore#36
 2023-12-15 19:42:49 +00:00
William Buezas 433823c2ac Invoice out negative bases refactor 2023-12-15 10:23:57 -03:00
Javier Segarra 1dfe071b7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5858-fiscalData-validations 2023-12-15 13:09:28 +01:00
Kevin Martinez 0509c15001 Create order summary 2023-12-14 21:57:53 -04:00
Kevin Martinez 17dd42dd5c Create order filter 2023-12-14 21:53:47 -04:00
Carlos Fonseca 4c55896dfb Merge pull request 'Se crea formulario de creacion de cliente' (#34) from features/ms_63_client_create into dev 
Reviewed-on: hyervoni/salix-front-mindshore#34
 2023-12-14 16:43:16 +00:00
William Buezas 1350c4f0d9 Merge pull request 'Add left menu to travel card' (#35) from feature/ms-82-AddLeftMenuToTravelCard into dev 
Reviewed-on: hyervoni/salix-front-mindshore#35
 2023-12-14 13:38:58 +00:00
carlosfonseca 672b4fd732 Se hacen correcciones solicitadas para aprobacion de pr 2023-12-14 07:57:55 -05:00
carlosfonseca 0a41ce6aa9 Se crea formulario de creacion de cliente 2023-12-14 06:49:40 -05:00
William Buezas cf68542b7b merge with dev and resolve conflicts 2023-12-14 08:48:59 -03:00
William Buezas a8c6b6f638 Update input select create 2023-12-14 08:46:17 -03:00
William Buezas 0b80e8cacc Add left menu to travel card 2023-12-14 08:42:52 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
 2023-12-14 07:08:58 -04:00
Carlos Satorres 3eb0b38633 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines 2023-12-14 12:07:57 +01:00
Carlos Satorres 126e1323bf refs #6334 refresh 2023-12-14 12:06:25 +01:00
William Buezas d369ce7152 more filters adaptations 2023-12-13 14:57:27 -03:00
William Buezas b3e0f4979a add is-outlined prop to VnInputDate and merge with dev 2023-12-13 14:31:48 -03:00
William Buezas 2eac632b32 resolve conflicts 2023-12-13 13:44:25 -03:00
William Buezas d4b9dcc0b9 WIP 2023-12-13 12:09:23 -03:00
Alex Moreno a149928015 refs #6062 fix: invoiceIn translation 2023-12-13 14:44:56 +01:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
carlosfonseca c90e4196d4 Se cambian textos a internacionalizacion 2023-12-13 07:09:20 -05:00
William Buezas c12f3f150b remove id label from wagon list card 2023-12-12 15:40:22 -03:00
William Buezas fdb417cf13 Fix and improve select cards logic in invoice out list 2023-12-12 15:23:06 -03:00
William Buezas 11839c7811 WIP 2023-12-12 14:00:56 -03:00
William Buezas 806a0a1d8b Merge branch 'feature/ms-69-VnSelectCreate' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-67-WorkersCreationForm 2023-12-12 11:59:47 -03:00
William Buezas c93a418dd3 WIP 2023-12-12 11:58:44 -03:00
William Buezas d75ca32d1b Add title to ticket card 2023-12-12 08:53:39 -03:00
William Buezas cded128c4c WIP 2023-12-12 08:45:08 -03:00
Jorge Penadés d1a5029ef7 refs #5835 refactor 2023-12-12 12:11:45 +01:00
Jorge Penadés 2c5dc276b2 refs #5835 2023-12-12 09:01:32 +01:00
William Buezas 2432496eaf more color palet corrections 2023-12-11 15:01:51 -03:00
William Buezas 2315940e83 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-12-11 14:47:30 -03:00
William Buezas 4c4334aa55 fix QField cant be clicked in extra community table 2023-12-11 14:47:15 -03:00
Kevin Martinez 8db1b0f9ac Create Input date 2023-12-11 13:10:28 -04:00
Kevin Martinez 9eab901be4 Fix worker descriptor image 2023-12-11 10:52:10 -04:00
Kevin Martinez 57b06f7d1f Update shelving filter fields 2023-12-11 10:51:40 -04:00
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
William Buezas bd69d0cb34 merge with dev 2023-12-11 10:27:05 -03:00
William Buezas e0215e5216 Change more forms styling 2023-12-11 10:14:45 -03:00
Carlos Fonseca 71e729c0f4 Merge pull request 'Se hace cambio de color usando la paleta' (#31) from features/ms_correcciones_pr_3 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#31
 2023-12-11 12:52:51 +00:00
Jorge Penadés 22a634e7eb refs #5835 refactor taxRate 2023-12-11 13:49:50 +01:00
William Buezas 02e220ea42 cambios varios en id de cards y travel summary layout data 2023-12-11 09:47:51 -03:00
carlosfonseca 1313c50e0f Se hace cambio de color usando la paleta 2023-12-11 07:42:19 -05:00
William Buezas bc6ef24cd8 use vn-dark css variable 2023-12-11 08:56:27 -03:00
Jorge Penadés 61955268f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 12:36:07 +01:00
Jorge Penadés d2e9a4cde4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 12:00:10 +01:00
Jorge Penadés 63372df35a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-12-11 11:59:46 +01:00
Jorge Penadés 52622d9a00 refs #6104 fix tests 2023-12-11 11:59:01 +01:00
Carlos Satorres f5e89a9edc Merge branch 'dev' into 5633-accountNumberComponent 2023-12-11 08:31:08 +00:00
Jorge Penadés 42c34f7a46 refs #6104 merge conflicts 2023-12-11 09:11:39 +01:00
Jorge Penadés ea12508fff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 08:27:07 +01:00
Pablo Natek e7d22052a7 merge(dev): refs #6475 merge dev 2023-12-11 06:45:48 +01:00
Pablo Natek 1c3fc57e3d feat: refs #6475 open descriptor proxy an show summary dialog button 2023-12-11 06:35:54 +01:00
William Buezas f9fe504969 Apply dark/light colors to cards secondary button 2023-12-07 17:20:27 -03:00
William Buezas ec9e8ec4e0 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-12-07 14:54:58 -03:00
William Buezas d91c6ff11f new requested changes 2023-12-07 14:54:53 -03:00
carlosfonseca 02027d4392 Se corrige error por falta de importacion 2023-12-07 12:43:07 -05:00
Carlos Fonseca 0e624bdfd3 Merge pull request 'Se hacen correcciones segun solicititud para aprobacion del PR' (#29) from features/ms_correcciones_pr into dev 
Reviewed-on: hyervoni/salix-front-mindshore#29
 2023-12-07 17:39:01 +00:00
carlosfonseca c2705ec603 Se hacen correcciones segun solicititud para aprobacion del PR 2023-12-07 12:36:29 -05:00
Kevin Martinez 4fd2b05137 Fix shelving pages 2023-12-07 13:33:11 -04:00
Jorge Penadés 479c782492 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-12-07 16:25:13 +01:00
Jorge Penadés e15b14cd81 refs #5876 use palette color 2023-12-07 16:18:16 +01:00
Jorge Penadés 4ac353bcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5876-spinnerOnLoading 2023-12-07 16:07:56 +01:00
Jorge Penadés 97789f2cdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-12-07 15:51:58 +01:00
Jorge Penadés 2f63a7f1fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-07 15:49:53 +01:00
William Buezas 8b112f3409 create componente VnSelectCreate 2023-12-07 11:29:49 -03:00
Pablo Natek fd1f46ffc6 feat(claimList): refs #6475 claimList add links 2023-12-07 12:51:47 +01:00
Javi Gallego dfabdeb706 Merge branch 'test' into dev 2023-12-07 07:54:36 +01:00
William Buezas baca1281bf Input text refactor 2023-12-06 13:23:32 -03:00
Pablo Natek 735eac5137 feat: refs #6545 isTray 2023-12-06 15:17:50 +01:00
Pablo Natek 6c524932ee feat(addSpecific): refs #6545 add feats and fixes 2023-12-06 14:14:47 +01:00
Pablo Natek e963eddfe6 feat(wagonCounter): refs #6545 add +30 button and correct images 2023-12-06 12:09:03 +01:00
Pablo Natek 9a566ba87c feat(wagonCounter): refs #6545 move to test 2023-12-06 09:48:51 +01:00
William Buezas f8031734fa resolve conflicts 2023-12-05 12:27:53 -03:00
William Buezas e64960d234 Extra community 2023-12-05 12:25:25 -03:00
Carlos Satorres d328951ac1 refs #6256 refactor line break 2023-12-05 14:26:11 +01:00
Jorge Penadés e22c400326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6545-trolleyCounter 2023-12-05 08:32:15 +01:00
Jorge Penadés 7fb78ac298 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-05 08:31:44 +01:00
carlosfonseca ce72b52e88 Reubicacion de textos i18n a global 2023-12-04 12:54:40 -05:00
carlosfonseca 9f3fe3665b Se cambia visualmente el componente que controla las descargas 2023-12-04 12:02:47 -05:00
Jorge Penadés b43985b9db refs #5835 refactor 2023-12-04 15:26:19 +01:00
Jorge Penadés a730f2c073 refs #6545 refactor 2023-12-04 15:07:40 +01:00
Jorge Penadés 3d046e4bf7 refs #5835 summary grid updated 2023-12-04 14:21:29 +01:00
Carlos Satorres b400a23d43 refs #5633 remove emit 2023-12-04 13:06:07 +01:00
Carlos Satorres b2b366032f refs #5633 create componente VnAccountNumber 2023-12-04 12:24:39 +01:00
Carlos Satorres 03e42f676b refs #6334 remove class 2023-12-04 12:02:27 +01:00