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

2145 Commits

Author SHA1 Message Date
William Buezas 3e124581c4 Remove route import in CustomerCard 2024-04-02 08:37:52 -03:00
William Buezas bafb938e23 VnSmsDialog add default value to template prop as empty string 2024-03-28 17:10:07 -03:00
William Buezas 3cb045936b Replace Customer File management dateTime formatting with new utils 2024-03-28 16:25:02 -03:00
William Buezas 73ea49df63 Replace Customer Greuges dateTime formatting with new utils 2024-03-28 16:21:49 -03:00
William Buezas 093c367d7e Replace Customer Mandates dateTime formatting with new utils 2024-03-28 16:18:36 -03:00
William Buezas fb59ac1f2f Remove single quotes and colon 2024-03-28 16:15:44 -03:00
William Buezas f6b8a73ae2 Improve Customer Notes classes definition 2024-03-28 16:13:39 -03:00
William Buezas e1f8b7217a Replace Customer Notes dateTime formatting with new utils 2024-03-28 16:11:01 -03:00
William Buezas c856adc8d0 Replace customer samples dateTime formatting with new utils 2024-03-28 16:07:20 -03:00
William Buezas d8dc969614 Fix date utils 2024-03-28 16:06:27 -03:00
William Buezas 998561badd Change customer unpaid initial date 2024-03-28 15:58:07 -03:00
William Buezas 643e068863 remove tabs in docker-compose.yml 2024-03-15 10:51:20 -03:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER 2024-03-15 03:12:46 +00:00
carlosfonseca da23ff7ca2 Correcciones generales 2024-03-14 22:11:38 -05:00
carlosfonseca 4a2a855f58 Correcciones generales customers 37 2024-03-14 11:54:22 -05:00
Javier Segarra 278ebbe070 Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev 
Reviewed-on: verdnatura/salix-front#195
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-14 12:44:43 +00:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
 2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER 2024-03-14 10:55:02 +00:00
Alex Moreno 7a75238695 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-14 08:16:15 +01:00
Alex Moreno ab8e1fdc04 Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev 
Reviewed-on: verdnatura/salix-front#201
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-14 06:39:45 +00:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
Javi Gallego e1cf13076f Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev 
Reviewed-on: verdnatura/salix-front#214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-13 14:37:59 +00:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00:00
Javi Gallego 9e87365bd7 Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev 
Reviewed-on: verdnatura/salix-front#234
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-13 14:36:48 +00:00
William Buezas 4925bed845 resolve conflicts 2024-03-13 11:31:55 -03:00
William Buezas fe737324ea Fix unpaid bug 2024-03-13 11:14:11 -03:00
William Buezas 0f85bd25a2 Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER 2024-03-13 10:15:46 -03:00
William Buezas 41e1bad44d Handle more watchs route changes bugs 2024-03-13 10:15:32 -03:00
carlosfonseca 1e9b3f8f0e Solucion a comentarios 36 2024-03-13 07:41:55 -05:00
William Buezas 91bd396eab Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER 2024-03-13 09:33:25 -03:00
William Buezas 0ba7ea86ed Handle customer balance id null on route change exception 2024-03-13 09:33:07 -03:00
carlosfonseca 0aa5a051fb Solucion a comentarios 35 2024-03-13 07:09:13 -05:00
Kevin Martinez 77e29a2b87 Fix tickets feedback 2024-03-12 21:26:17 -03:00
Kevin Martinez e4553659cf Update translation from population to city 2024-03-12 21:23:46 -03:00
carlosfonseca 38d3d49ecb Solucion a comentarios 34 2024-03-12 16:24:27 -05:00
William Buezas ff0b0c8131 Remove innecesary prop 2024-03-12 12:38:44 -03:00
William Buezas bd5eb1a1c3 remove assignPDA translation 2024-03-12 11:34:38 -03:00
William Buezas 632049c13b Assign button change 2024-03-12 11:31:32 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -03:00
William Buezas dad2711311 fix translation 2024-03-12 08:13:27 -03:00
William Buezas 029fc043de Change title translation 2024-03-12 08:08:20 -03:00
William Buezas 319295f2c2 Workers PDA 2024-03-11 16:53:33 -03:00
Javier Segarra 63f00c24d7 Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev 
Reviewed-on: verdnatura/salix-front#233
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-03-11 11:13:05 +00:00
carlosfonseca 5ff90d127b Solucion a comentarios 33 2024-03-10 21:20:19 -05:00
Kevin Martinez 5011fd5f83 Create date and time utility 2024-03-10 21:41:36 -03:00
Javier Segarra 6baa158d43 Merge pull request 'EntryLatestBuysFilters' (!226) from hyervoni/salix-front-mindshore:EntryLatestBuysFilters into dev 
Reviewed-on: verdnatura/salix-front#226
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-08 12:08:56 +00:00
William Buezas 9ced305797 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-08 09:03:33 -03:00
Pablo Natek 3f1a731ac7 Merge pull request 'remove(claimRma): refs #6349 remove all references' (!208) from 6349-removeRma into dev 
Reviewed-on: verdnatura/salix-front#208
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-08 11:27:23 +00:00
Javier Segarra 79801d0be8 Merge pull request '#6940 - Fix CmrList Filter Panel' (!209) from 6940_hotFix_cmrFilterPanel into test 
Reviewed-on: verdnatura/salix-front#209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-08 07:38:14 +00:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00