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

982 Commits

Author SHA1 Message Date
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
Jorge Penadés 9b069fbddd add filter: refs #6606 2024-01-02 11:38:43 +01: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
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
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
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