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 |
 nathalie
|
a88e7ffb87
|
Merge pull request 'exportar csv de pedidos' (#11) from exportar-planilla-de-pedido into master
Reviewed-on: #11
|
2022-10-04 12:25:49 -03:00 |
|
nat
|
60e8725ac3
|
exportar csv de pedidos
|
2022-10-01 15:29:31 -03:00 |
|
Ale
|
c0dd9c1124
|
Merge branch 'master' into adminUI
|
2022-09-21 10:06:15 -03:00 |
|
Ale
|
8284b793d3
|
bash script de comandos para levantar la pagina al desarrollar
|
2022-09-21 10:02:44 -03:00 |
|
nathalie
|
be4ea4906a
|
Merge pull request 'Import de productos a partir de la planilla de compras con numero de filas' (#10) from importar-productos into master
Reviewed-on: #10
|
2022-09-19 02:21:07 -03:00 |
|
nat
|
f0a1a68144
|
exportar todas las planillas en un formato apto para copiar y pegar a la planilla de compras
|
2022-09-19 02:18:39 -03:00 |
|
nat
|
098b23b864
|
Import de productos a partir de la planilla de compras con numero de filas
|
2022-09-11 02:51:38 -03:00 |
|
nathalie
|
cdb8522f65
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-09-07 08:15:47 -03:00 |
 Alejandro Tasistro
|
b1f1444a0c
|
Merge pull request 'exportar-planillas' (#9) from exportar-planillas into master
Reviewed-on: #9
|
2022-09-06 21:48:10 -03:00 |
|
Ale
|
4939dbbd83
|
Se pueden exportar las planillas de un barrio a pdf
|
2022-09-06 21:43:56 -03:00 |
|
Ale
|
25d5830462
|
esto debería estar en gitignore jeje
|
2022-09-06 21:39:09 -03:00 |
|
Ale
|
ac13e0a3f2
|
agregado mpdf
|
2022-09-06 21:38:52 -03:00 |
|
Ale
|
1aa112aac2
|
funciones para exportar planillas
|
2022-09-06 21:38:01 -03:00 |
|
nathalie
|
7468ca9086
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-09-05 23:21:12 -03:00 |
|
nat
|
11cd073a51
|
canasta 81
|
2022-09-05 23:20:21 -03:00 |
|
nathalie
|
50cdbe57e8
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-09-05 23:12:50 -03:00 |
|
nat
|
a3a4ecdd33
|
canasta 81
|
2022-09-05 23:06:19 -03:00 |
|
nathalie
|
6a00c6db22
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-08-09 23:15:07 -03:00 |
|
nat
|
401c0e888f
|
canasta 80
|
2022-08-09 23:13:46 -03:00 |
|
nathalie
|
75401556aa
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-07-06 18:39:34 -03:00 |
|
nat
|
53a203b067
|
Productos canasta 79
|
2022-07-06 18:39:05 -03:00 |
|
nathalie
|
33d59073e3
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-07-06 17:30:54 -03:00 |
|
nathalie
|
c06a3ed38c
|
Merge pull request 'ajuste-tabla-admin' (#7) from ajuste-tabla-admin into master
Reviewed-on: #7
|
2022-07-06 17:17:53 -03:00 |
|
nathalie
|
eda9d5ce6c
|
Merge pull request 'adminUI' (#6) from adminUI into master
Reviewed-on: #6
|
2022-07-06 17:16:47 -03:00 |
|
rodrigo
|
4160f72615
|
Cambios de estilo
|
2022-06-28 19:24:15 -03:00 |
|
rodrigo
|
498c550a15
|
Ajuste para arreglar layout de admin
Saqué dos clases que estaban haciendo conflicto
|
2022-06-28 19:16:07 -03:00 |
|
nathalie
|
b733100269
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-06-11 11:09:06 -03:00 |
|
nat
|
8502fb72d9
|
Endpoint regenera vistas
|
2022-06-11 10:49:39 -03:00 |
|
Ale
|
0d5551406a
|
Arreglado bug de totales con coma
|
2022-06-09 20:09:18 -03:00 |
|
nat
|
72bbaac9a6
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-06-09 15:48:16 -03:00 |
|
nat
|
ee916afdfd
|
Readme
|
2022-06-09 15:47:29 -03:00 |
|
Ale
|
ece866a3ec
|
Arreglado bug que mostraba los pedidos de todos los barrios en la pantalla de admin de cualquier barrio
|
2022-06-09 10:34:28 -03:00 |
|
Ale
|
77bdccdf86
|
Suma el total de los pedidos aprobados
|
2022-06-08 23:33:33 -03:00 |
|
nathalie
|
c8768665e0
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-06-08 22:39:47 -03:00 |
|
nathalie
|
f2dee0359f
|
Merge pull request 'adminUI' (#5) from adminUI into master
Reviewed-on: #5
|
2022-06-08 22:29:28 -03:00 |
|
Ale
|
5b18461bd9
|
la pantalla de admin se comunica correctamente con la bd
|
2022-06-08 22:19:44 -03:00 |
|
Ale
|
b0f25de000
|
lista de subpedidos del barrio loggeado
|
2022-06-08 20:32:50 -03:00 |
|
nathalie
|
509ceaeefe
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-06-08 20:15:09 -03:00 |
|
nat
|
bcb1e1b2c8
|
productos canasta 78
|
2022-06-08 20:14:20 -03:00 |
|
nat
|
aa416b7ee4
|
install npm through dockerfile
|
2022-06-08 19:32:20 -03:00 |
|
nathalie
|
9e554b0a65
|
Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
|
2022-06-08 18:31:42 -03:00 |
|
nat
|
b2e84204ce
|
puerto db expuesto
|
2022-06-08 18:26:38 -03:00 |
|
Ale
|
dd1b66bd06
|
pantalla de login de admin de barrio y botoncito pa acceder
|
2022-06-08 15:18:14 -03:00 |
|
nat
|
8d5e780f94
|
refactor
|
2022-05-25 19:03:29 -03:00 |
|
nathalie
|
dce0620365
|
Merge pull request 'Actualizar docker-compose.yml para optimizarlo para puesta en produccion.' (#4) from felix/pedi2:master into master
Reviewed-on: #4
|
2022-05-21 19:34:17 -03:00 |
 Félix González
|
323ab09238
|
Modifico web.php para que sirva todo el contenido en https cuando esta en produccion
|
2022-05-19 15:30:11 -03:00 |
|
Félix González
|
3a2ffde0ab
|
Actualizar docker-compose.yml para optimizarlo para puesta en produccion.
|
2022-05-19 14:53:42 -03:00 |
|
Felix
|
a9bb6df711
|
arreglos del docker-compose.yml referentes al deploy en prod
|
2022-05-19 14:46:30 -03:00 |