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

299 Commits

Author SHA1 Message Date
William Buezas 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03: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
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
Jorge Penadés f3a1800cb0 fix breadcrumbs & header: refs #5835 2023-12-20 15:43:09 +01: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
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
William Buezas d309f04a8f Merge with dev 2023-12-18 12:00:26 -03:00
carlosfonseca b34a5f1d89 Se crea tabla y filtros de extended list 2023-12-18 09:41:10 -05: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
William Buezas 2eac632b32 resolve conflicts 2023-12-13 13:44:25 -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
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 9a477c2c25 Create order page 2023-12-11 10:47:16 -04: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 ea12508fff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 08:27:07 +01: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
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
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 f8031734fa resolve conflicts 2023-12-05 12:27:53 -03:00
William Buezas e64960d234 Extra community 2023-12-05 12:25:25 -03:00
carlosfonseca ce72b52e88 Reubicacion de textos i18n a global 2023-12-04 12:54:40 -05:00
Jorge Penadés b43985b9db refs #5835 refactor 2023-12-04 15:26:19 +01:00
Jorge Penadés a3d6275b2f refs #6545 counters created 2023-12-04 10:38:35 +01:00
William Buezas 9b6ec56011 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-23-ExtraCommunity 2023-12-01 09:42:47 -03:00
Kevin Martinez f6067a6803 Merge branch 'dev' into feature/shelving 2023-12-01 08:25:47 -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 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
William Buezas db81ab8acf Cambios solicitados 2023-11-29 14:21:26 -03:00
William Buezas 62a806b813 WIP 2023-11-29 09:07:44 -03:00
Kevin Martinez 008dfd1be8 Fix merge conflicts 2023-11-28 11:58:42 -03:00
Carlos Fonseca cc79d699f6 Merge pull request 'Add csv download feature and add descriptors' (#15) from feature/ms-29-NegativeBasesDetails into dev 
Reviewed-on: hyervoni/salix-front-mindshore#15
 2023-11-28 13:26:38 +00:00
William Buezas 7646934431 Add csv download feature and add descriptors 2023-11-28 10:11:24 -03: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
William Buezas c1c0dbf1f8 Details 2023-11-27 18:11:06 -03:00
William Buezas df599f1e8d add header options menu in travel summary 2023-11-25 21:19:22 -03:00
William Buezas 4eb57ab90e resolve conflicts when pulling dev 2023-11-25 20:04:20 -03:00
William Buezas e8b1d0fe7e travel WIP 2023-11-25 19:02:26 -03: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
Kevin Martinez bffe6b0664 Add create shelving page 2023-11-23 20:27:06 -03: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 78a5c3895e resolve conflict 2023-11-22 15:19:37 -03:00
William Buezas 14788b7f7c Suppliers list and suppliers create view 2023-11-22 15:05:12 -03:00
Carlos Fonseca 199bf3fdda Merge pull request 'Se hacen las mejoras en las tarjetas y menu lateral' (#5) from features/ms_15_mejoras_tarjeta_buscador into dev 
Reviewed-on: hyervoni/salix-front-mindshore#5
 2023-11-22 15:35:34 +00:00
carlosfonseca 737d3020fe Se hacen las mejoras en las tarjetas y menu lateral 2023-11-22 09:33:47 -05:00
Joel Crespo 010ddd01a6 fix i18n headers 2023-11-22 07:32:20 -03:00
Joel Crespo 5246427e8d The negative bases view was created for issued invoices. 2023-11-22 07:15:07 -03:00
William Buezas c3b9f013f6 form integration and view content 2023-11-20 14:58:41 -03:00
Joel Crespo 97f732d3cf wip 2023-11-20 13:06:14 -03:00
William Buezas 505052d84d [WIP] global invoices 2023-11-16 16:44:35 -03:00
Jorge Penadés 46ee2a0075 ref #5835 fix test 2023-11-09 13:26:03 +01:00
Jorge Penadés c31b4fa770 ref #5835 e2e & unit tests done 2023-11-09 10:29:28 +01:00
Carlos Satorres 08060d276a refs #6157 fix arraydata, and internal error 2023-11-03 13:41:10 +01:00
Jorge Penadés 112e057cfa ref #5835 invoiceIn created 2023-10-31 08:56:51 +01:00
Jorge Penadés 3e5c079c00 ref #6104 merge confilcts 2023-10-30 16:20:31 +01:00
Carlos Satorres 6dc1767b56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-19 14:00:03 +02:00
Carlos Satorres f230fcbca2 refs #6157 claimAction 2023-10-17 17:32:47 +02:00
Alex Moreno 468ed95702 refs #6067 feat: add transalation 2023-10-02 14:58:42 +02:00
Jorge Penadés dd09683802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-29 08:30:42 +02:00
Jorge Penadés d0de690dc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-09-28 13:55:38 +02:00
Jorge Penadés 36a0f36f8a ref #6104 fix conflicts 2023-09-27 14:05:37 +02:00
Alex Moreno 149e611ae3 Merge branch 'dev' into 5673-claim-development 2023-09-26 12:59:46 +00:00
Jorge Penadés 79fc503a01 ref #6104 recreate vnlog 2023-09-18 14:35:21 +02:00
Guillermo Bonet 394a7f7bb7 Merge branch 'master' into 5995-improvedExternalCmr 2023-09-18 05:17:30 +00:00
Guillermo Bonet 71c6b865b6 refs #5995 Improved external CMR 2023-09-01 12:11:56 +02:00
Jorge Penadés 3a3ae14dc5 ref #6175 VnLinkPhone and MicroSIP icon created 2023-08-31 09:05:21 +02:00
Guillermo Bonet 6786ac97e4 refs #5995 Improved external CMR 2023-08-30 12:53:18 +02:00
Alex Moreno a09b4ff548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 10:48:27 +02:00
Jorge Penadés 330db88ccc refs #6105 replaced css by QuasarComponents 2023-08-24 14:56:26 +02:00
Alex Moreno 6c8329ec53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-18 09:01:04 +02:00
Alex Moreno a307486fcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-17 09:01:07 +02:00
Jorge Penadés b7e9aee1d5 refs 5987 var-colors 2023-08-17 08:50:10 +02:00
Alex Moreno 4207e564be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-14 14:17:52 +02:00
Alex Moreno c64ae1ccee refs #5990 feat(summarys): redesigned 2023-08-14 13:52:25 +02:00
Jorge Penadés 4318641bc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5987-redisgnCards 2023-08-11 08:11:22 +02:00
Guillermo Bonet 96cfea8a41 Merge branch 'test' into dev 2023-08-11 07:48:25 +02:00
Guillermo Bonet e875dcb064 refs #5995 Bug i18n fixed 2023-08-11 06:28:38 +02:00
Jorge Penadés a194ec745b refs 5987 index cards and light mode 2023-08-10 13:20:32 +02:00
Alex Moreno d9dd0a4931 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-10 11:02:36 +02:00
Alex Moreno 13dc57a89c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2023-08-10 11:00:35 +02:00
Guillermo Bonet 9f29a64d4a refs #5995 Changed transitions 2023-08-10 08:37:15 +02:00
Guillermo Bonet 58372ef9e8 refs #5995 Href to lilium api link 2023-08-10 07:49:57 +02:00
Alex Moreno 87d6304218 Merge branch 'dev' into 6076-2FA 2023-08-09 13:01:11 +00:00
Jorge Penadés ad17737947 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors 2023-08-09 14:31:09 +02:00
Alex Moreno 458de4e849 Merge branch 'dev' into 6076-2FA 2023-08-09 11:41:05 +00:00
Alex Moreno 911327a59b Merge branch 'dev' into 6076-2FA 2023-08-09 10:24:55 +00:00
Jorge Penadés 32ca81ebad refs #5986 WorkerDescriptorProxy added 2023-08-09 12:16:08 +02:00
Guillermo Bonet 4a41ba1247 refs #5995 Changes 2023-08-09 12:02:15 +02:00
Guillermo Bonet d16c215936 refs #5995 Added left space to subsection 2023-08-09 09:43:24 +02:00
Guillermo Bonet fa120ffa17 refs #5995 Added module route and external cmrs 2023-08-08 14:24:51 +02:00
Jorge Penadés f94f87590a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5986-redisgnDescriptors 2023-08-08 10:26:56 +02:00
Jorge Penadés b12ab288da refs #5986 WIP descriptors replaced 2023-08-08 10:24:01 +02:00
Alex Moreno 1f573b9922 refs #6083 feat: ticketSms section 2023-08-07 14:02:22 +02:00
Alex Moreno f01fe1c922 refs #6076 refactor: login use outLayout, feat: twoFactor section 2023-08-04 13:29:31 +02:00
Alex Moreno b7bbb4ba41 refs #5673 feat(claim_development): add translation 2023-07-27 16:05:23 +02:00
Alex Moreno 352e65c529 refs #5673 feat(claim): add development section 2023-07-26 15:17:00 +02:00
Alexandre Riera ba9d8b3c21 refs #4797 section code refactored 2023-05-02 07:22:09 +02:00
Alexandre Riera 9dfcaaf056 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4797-worker-notification-selector 2023-04-27 14:24:23 +02:00
Alexandre Riera e90449766d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4800-finish-claim-summary 2023-04-18 10:13:47 +02:00
Alexandre Riera 1a31de7ae9 refs #4800 added sections 2023-04-18 10:13:19 +02:00
Alexandre Riera 4e8e2b2e82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5056-gestion-vagones 2023-04-14 07:47:59 +02:00
Joan Sanchez 9a7be5f217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5431-claim_lines 2023-03-28 08:15:13 +02:00
Alexandre Riera 8a33815688 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5056-gestion-vagones 2023-03-24 07:30:59 +01:00
Alexandre Riera a92bc8c713 refs #5056 refresh list when delete 2023-03-23 10:34:22 +01:00
Joan Sanchez b75eda0830 Added translations 2023-03-21 14:57:50 +01:00
Alexandre Riera 42511dc5bd refs #5056 working on tests 2023-03-21 12:47:43 +01:00
Alexandre Riera 99672200d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5056-gestion-vagones 2023-03-21 12:28:53 +01:00
Alexandre Riera f4286b5d28 refs #5056 new sections 2023-03-21 10:46:51 +01:00
Joan Sanchez 26a7e58c05 Added missing translation 2023-03-21 09:51:34 +01:00
Joan Sanchez 526a7dd628 feature(POS): added responsive table 2023-03-20 14:57:09 +01:00
Alexandre Riera b95ee3c247 refs #5056 before making position dynamic 2023-03-15 11:58:31 +01:00
Alexandre Riera 31c0a58cec refs #5056 working on section wagonTypeCreate 2023-03-14 14:20:37 +01:00
Joan Sanchez b21fb2ca5b Default filter params & added VnDate 2023-03-13 10:07:52 +01:00
Joan Sanchez 4edc16d68f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4834-create-worker-module 2023-03-07 12:34:41 +01:00
Joan Sanchez cfadaa8e38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4834-create-worker-module 2023-03-07 08:28:15 +01:00
Joan Sanchez 34e5814b06 feat(claimLog): added claim log section 
Refs: #5340
 2023-03-06 14:29:21 +01:00
Alex Moreno ed2aedd9d4 feat(claim_photo): drag&drop 2023-02-20 15:12:48 +01:00
Alex Moreno 38a6b93a5d feat(claim_photo): add upload button 2023-02-16 14:10:17 +01:00
Alex Moreno 0b0e73d65b feat(claim_photo): fix html add uploadFile 2023-02-15 15:15:59 +01:00
Pau 7ef50bcbe9 Merge branch 'dev' into 4834-create-worker-module 2023-01-09 09:25:17 +01:00
Joan Sanchez 3242d2fd8c Merge branch 'dev' into #5018-pinned-modules-popover 2023-01-04 07:30:29 +00:00
Pau a4975f8eda added default msg when there isnt a pinned module 2023-01-03 09:20:18 +01:00
joan 186fe472e3 Added extra folder aliases & dynamic language import 2022-12-20 14:01:58 +01:00
joan ebf4a791a1 Added project files 2022-12-20 12:30:25 +01:00
Pau f98c82185f Merge branch '4834-create-worker-module' into 4797-worker-notification-selector 2022-12-20 12:09:25 +01:00
joan 121b6390e1 Added new structure 2022-12-20 12:00:36 +01:00
joan 6f760a0580 Moved to old folder 2022-12-20 11:55:54 +01:00
Pau df5eb9f27e refactor styles and add image not found to worker descriptor 2022-12-20 11:01:13 +01:00
Pau 6e2425fd5a Merge branch 'dev' into 4834-create-worker-module 2022-12-20 08:49:02 +01:00
Joan Sanchez 5a397a5302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4722-routes_refactor 2022-12-13 13:38:47 +01:00
Joan Sanchez 6c2a1d95b4 Merge branch 'dev' into 4833-new_module_invoiceOut 2022-12-13 11:58:07 +00:00
joan edf05bb7a9 Pinned refactor 2022-11-29 14:45:48 +01:00
Alexandre Riera 7ee8dbf2d6 refs #4801 fetched tags added 2022-11-28 09:10:13 +01:00
Alexandre Riera 04693529d7 refs #4801 working on fetched tags 2022-11-25 15:54:35 +01:00
Pau cbeeea8f88 refs #4797 @2,30h 2022-11-24 09:32:15 +01:00
Pau baaf6b6c74 refs #4797 @6h 2022-11-23 14:50:05 +01:00
Pau ef0ea4f503 missing translations 2022-11-23 07:55:31 +01:00