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

589 Commits

Author SHA1 Message Date
Jorge Penadés 0eb7d0f1b0 fix: refs #6630 resolve conficts 2024-01-10 15:35:01 +01:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01: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
William Buezas 5511e365aa WIP 2024-01-09 10:46:27 -03: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
Javier Segarra 8861ee038d refs #6384 fix: redirect to same path when id change 2024-01-09 10:35:39 +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
William Buezas 865a13aafa Submodulos de suppliers: Accounts, Contacts y Addresses 2024-01-08 16:16:42 -03:00
William Buezas 473e96ffb4 wip 2024-01-08 11:32:42 -03: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
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
Pablo Natek ad2844d88d fix(workerDescriptor): refs #6611 fix workerpopUp 2024-01-08 08:37:36 +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 27616b9bd4 improve TableVisibleColumns code 2024-01-05 10:57:43 -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 e8fa564bc2 Agregar * a inputs de campos required via css 2024-01-04 18:13:31 -03: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
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
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 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 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
Carlos Satorres 6b23c988b3 refs #6618 component vnSubToolBar 2024-01-03 11:06:03 +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
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord 2024-01-03 08:16:56 +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
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
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03: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 1ab31a1e51 Extended List big modifications and column add column filter component 2023-12-29 11:08:11 -03: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
William Buezas 893b1bb4c8 Add department basic data 2023-12-26 16:15:46 -03: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 f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03: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
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms 2023-12-21 18:59:13 +01:00
Kevin Martinez bcfb34475b Merge branch 'dev' into feature/order 2023-12-20 13:58:51 -04: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 9a4a3e846e refs #6256 remove hypens 2023-12-20 13:28:58 +01:00
Javier Segarra bce4551847 refs #6098 feat: copy userToken to clipboard 2023-12-20 09:51:57 +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
William Buezas f2a0c731ad Aplicar VnSelectCreate a los inputs de postcode 2023-12-19 12:10:58 -03:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04: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
Jorge Penadés 94278e2f53 refactor: refs #5835 2023-12-18 15:36:56 +01: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
Kevin Martinez 17dd42dd5c Create order filter 2023-12-14 21:53:47 -04: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
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
William Buezas b3e0f4979a add is-outlined prop to VnInputDate and merge with dev 2023-12-13 14:31:48 -03:00
William Buezas d4b9dcc0b9 WIP 2023-12-13 12:09:23 -03:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01: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 cded128c4c WIP 2023-12-12 08:45:08 -03:00
Jorge Penadés 2c5dc276b2 refs #5835 2023-12-12 09:01:32 +01:00
Kevin Martinez 8db1b0f9ac Create Input date 2023-12-11 13:10:28 -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
carlosfonseca 1313c50e0f Se hace cambio de color usando la paleta 2023-12-11 07:42:19 -05: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
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 97789f2cdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-12-07 15:51:58 +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
William Buezas baca1281bf Input text refactor 2023-12-06 13:23:32 -03: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
carlosfonseca 9f3fe3665b Se cambia visualmente el componente que controla las descargas 2023-12-04 12:02:47 -05: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
Kevin Martinez f6067a6803 Merge branch 'dev' into feature/shelving 2023-12-01 08:25:47 -03:00
William Buezas 815231fec9 resolve conflict 2023-12-01 08:23:06 -03:00
William Buezas dc29c51cf4 merge with dev 2023-12-01 08:17:47 -03:00
Kevin Martinez 11a029289b Merge branch 'dev' into feature/shelving 2023-12-01 08:16:17 -03:00
William Buezas 5bab462aa4 New general improvements 2023-11-30 17:46:07 -03:00
Kevin Martinez b11253ba28 Implement shelving filter 2023-11-30 17:02:18 -03:00
Kevin Martinez 524e89319e Implement shelving logs 2023-11-30 15:57:54 -03:00
carlosfonseca 820ebe00af Se cambia nombre y se implementa en todos los componentes 2023-11-30 11:37:42 -05:00
Kevin Martinez babaf47653 Update Form Model component 2023-11-30 08:47:40 -03:00
William Buezas 50d5e38130 visual refactors 2023-11-29 16:10:44 -03:00
carlosfonseca 22cf914dc6 Correcciones post PR 2023-11-29 11:48:06 -05:00
Kevin Martinez ce4f7d79ed Fix MR 2023-11-28 12:08:33 -03:00
Kevin Martinez 008dfd1be8 Fix merge conflicts 2023-11-28 11:58:42 -03:00
carlosfonseca f002fd2a98 Se agrega condicional para mostrar checkbox 2023-11-28 08:51:55 -05:00
carlosfonseca 2d08e55c85 Se mejora logica de descarga csv 2023-11-28 08:11:32 -05:00
Jorge Penadés f75b81db71 refs #5835 fix conflicts 2023-11-28 12:08:20 +01:00
Jorge Penadés 0282f8dde8 refs #5835 rate fixed & options descriptor created 2023-11-28 12:05:39 +01:00
Kevin Martinez d65f331d1f Merge branch 'dev' into feature/ms-18-shelving-list 2023-11-28 00:16:37 -03:00
Alex Moreno 54379b3e65 typo 2023-11-24 13:32:20 +01:00
Alex Moreno 023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder 2023-11-24 13:31:08 +01:00
Pablo Natek 0114de4db5 feat(preview): refs #6475 add preview icon on descriptor 2023-11-24 09:41:57 +01:00
Jorge Penadés bc2256a021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 09:25:29 +01:00
Carlos Satorres c3d9085a57 refs #6157 minorFix 2023-11-24 08:10:44 +01:00
Kevin Martinez ca7aae6315 Update filter implementation 2023-11-23 20:26:50 -03:00
carlosfonseca 8a47fa0d0b Se hace corrección en el desplegable 2023-11-23 12:28:51 -05:00
Carlos Satorres d03092f41d refs #6157 arrayData 2023-11-23 15:50:42 +01:00
Kevin Martinez 8e0ee45901 Create Shelving list module 
Adds shelving list, preview and update
 2023-11-23 01:17:23 -03:00
William Buezas d0cb96ce23 merge with dev 2023-11-22 15:26:59 -03:00
William Buezas 14788b7f7c Suppliers list and suppliers create view 2023-11-22 15:05:12 -03:00