nathalie
|
3203f48f76
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-05-10 12:15:04 -03:00 |
|
|
|
4acc2b0605
|
Canasta 89
|
2023-05-10 11:35:24 -03:00 |
|
nathalie
|
55a94cb05b
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-04-10 16:16:10 -03:00 |
|
|
|
ddb09d56e7
|
Arreglo de | que deberian ser ,
|
2023-04-10 16:13:29 -03:00 |
|
nathalie
|
835cb14042
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-04-10 16:07:35 -03:00 |
|
|
|
474e6871e3
|
Canasta 88
|
2023-04-10 15:53:42 -03:00 |
|
nathalie
|
13a445ef64
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
Arreglado bug de bonos de ollas
|
2023-03-20 21:29:12 -03:00 |
|
nathalie
|
ee7cdc8d10
|
Config
|
2023-03-20 21:27:25 -03:00 |
|
|
|
e712d3265f
|
deshecho cambio en docker-compose.yml
|
2023-03-20 21:11:13 -03:00 |
|
|
|
11ec71cd7e
|
Merge branch 'fix/csv-bonos-ollas'
|
2023-03-20 21:06:42 -03:00 |
|
|
|
7b94e05d0a
|
Merge pull request 'Sacados bonos de pdfs por estar la tabla de bonos en admin' (#15) from adminUI into master
Reviewed-on: #15
|
2023-03-20 21:06:15 -03:00 |
|
|
|
bc8e6cad10
|
Arreglado error por el que no aparecia el bono de ollas en la template
|
2023-03-20 20:59:59 -03:00 |
|
nathalie
|
9e55955970
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-03-08 15:35:57 -03:00 |
|
Ale
|
334da613fa
|
Canasta 87
|
2023-03-07 17:07:44 -03:00 |
|
Ale
|
1593a84b34
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-03-07 16:25:20 -03:00 |
|
nathalie
|
a340647df4
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-01-11 08:15:28 -03:00 |
|
nat
|
c8054a5272
|
canasta 85 - fix
|
2023-01-11 08:14:35 -03:00 |
|
nathalie
|
b56d82fff1
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2023-01-11 07:55:08 -03:00 |
|
nat
|
9e1ea6299d
|
canasta 85
|
2023-01-11 07:46:24 -03:00 |
|
nathalie
|
78a5e8ad61
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-12-07 06:26:08 -03:00 |
|
nat
|
e61ad02dc2
|
Canasta 84 dic 2022
|
2022-12-06 20:51:45 -03:00 |
|
Ale
|
bb122c5e39
|
Sacados bonos de pdds por estar la tabla de bonos en admin
|
2022-11-14 11:51:03 -03:00 |
|
Ale
|
2b68c2ea8d
|
Revert "Planillas en pdf sin bonos por haber agregado la pantalla de bonos"
This reverts commit d52382c1dc.
|
2022-11-14 11:49:34 -03:00 |
|
Ale
|
d52382c1dc
|
Planillas en pdf sin bonos por haber agregado la pantalla de bonos
|
2022-11-14 11:48:46 -03:00 |
|
nathalie
|
f9f72cf830
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-11-13 21:40:47 -03:00 |
|
|
|
eea1f2c3a2
|
Merge pull request 'adminUI' (#14) from adminUI into master
Reviewed-on: #14
|
2022-11-13 21:22:13 -03:00 |
|
|
|
aa70fa1c8d
|
Merge pull request 'Fix-ExportarPedido' (#13) from Fix-ExportarPedido into master
Reviewed-on: #13
|
2022-11-13 21:22:01 -03:00 |
|
Ale
|
896baf18dd
|
Agregados bonos de transporte y cambio de estilo
|
2022-11-13 18:01:01 -03:00 |
|
Ale
|
1a961c0732
|
pestaña de pedidos y de bonos en la pantalla de admin
|
2022-11-13 17:34:33 -03:00 |
|
Ale
|
6005cc01b7
|
Agregada tabla de bonos a la pantalla de admin
|
2022-11-13 17:00:24 -03:00 |
|
Ale
|
323b77f6dc
|
Pequeño refactor y cambio de nombre de componentes de admin pedidos
|
2022-11-12 21:16:35 -03:00 |
|
Ale
|
f572b5a6bc
|
Merge branch 'Fix-ExportarPedido' into adminUI
|
2022-11-12 20:23:28 -03:00 |
|
Ale
|
733e13ff66
|
Agregado dropdown con opciones para descargar pedido y renombre de componentes
|
2022-11-12 20:20:13 -03:00 |
|
Ale
|
f8484959d6
|
Las planillas se descargan automáticamente y tienen el nombre del barrio
|
2022-11-12 18:53:06 -03:00 |
|
Ale
|
cf82e1e21e
|
Solo se generan pdfs de pedidos aprobados. Los pdfs ahora incluyen bonos
|
2022-11-12 18:44:22 -03:00 |
|
Ale
|
b76f114ab0
|
Merge branch 'master' into adminUI
|
2022-11-10 22:12:29 -03:00 |
|
nathalie
|
1b519ca440
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-11-08 15:56:50 -03:00 |
|
nat
|
f67232f55c
|
Deshabilita botones de eportar pedido barrial e imprimir planillas cuando no hay subpedidos aprobados
|
2022-11-08 15:55:49 -03:00 |
|
nathalie
|
426052ba09
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-11-08 14:34:17 -03:00 |
|
nat
|
85f0a5a06b
|
Canasta 83
|
2022-11-08 14:28:44 -03:00 |
|
|
|
cf77fc5e61
|
Merge pull request 'mostrar-password' (#12) from mostrar-password into master
Reviewed-on: #12
|
2022-11-04 16:16:08 -03:00 |
|
Ale
|
3e426d088d
|
Agregado boton para mostrar contraseña en login de admin
|
2022-10-24 22:40:30 -03:00 |
|
Ale
|
4da7ff2431
|
Agregado nombre a Login.vue
|
2022-10-24 22:39:55 -03:00 |
|
Ale
|
4906d2bb4d
|
Arreglado error de booleanos pasados como string y warning de keys
|
2022-10-24 22:39:23 -03:00 |
|
Ale
|
69b244d074
|
Agregado botón para mostrar la contraseña en el login del barrio
|
2022-10-24 22:22:20 -03:00 |
|
Ale
|
155a86975c
|
Cambio de boton a switch y estilos
|
2022-10-21 19:17:52 -03:00 |
|
Ale
|
5c134989d2
|
El csv del pedido incluye los bonos de transporte
|
2022-10-14 19:14:24 -03:00 |
|
Ale
|
3f34483fd5
|
Agregado middleware autorizacion admin
|
2022-10-14 17:36:49 -03:00 |
|
nathalie
|
e0d5bc5739
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-10-04 12:51:08 -03:00 |
|
nat
|
f4d269721a
|
productos y barrios canasta 82
|
2022-10-04 12:49:36 -03:00 |
|
