From ae82ed255446788112cba0a2c394991e9ad408a0 Mon Sep 17 00:00:00 2001 From: YasminLedesma Date: Fri, 31 Mar 2023 16:11:09 -0300 Subject: [PATCH 1/3] carrito --- TestTableFile.pdf | Bin 1375 -> 1211 bytes .../RestauranteFoodiePartyApplication.java | 8 +- .../static/web/assets/scripts/menu.js | 102 ++++++-- src/main/resources/static/web/menu.html | 230 +++++++++++++----- src/main/resources/static/web/pedidos.html | 10 +- 5 files changed, 258 insertions(+), 92 deletions(-) diff --git a/TestTableFile.pdf b/TestTableFile.pdf index 49ae49d3713e0690350026e359b190411f563566..407c3d17b691cfe53fff04accfa572b5c62c1dc8 100644 GIT binary patch delta 606 zcmcc5wVQK-V!g4siN0HAPDyH!zFSUWNvca~a(+sxon3KBQEFl?SH+yUQ_uPxHV|le zU)N>(g@L_iZ<)~Z8Os)GX{l^^b}9O(zoyUvH;+AbeOJABzwXjKr8rUTepQ-TkXcTK zB$olxK|5o{@TeU52^A}JsuQHuD&}>aIdH#vcT(gb;S)Sf*XpHYuI$@z{qg(dcYps; zaX2;S`Me2Ug*L1QT?#AZ7WteCWq5f>`OYr4V|@M()I}=pP5yPWEXv}TAFuVjm5Ig0 z>F0DqnhK_~l(eUvo5A+`;JSR36C!I)ze%0`At}UHJvDLl(M3D9y!VSJeSLTK1j+pQ zG67=W&3wFa_tXmIrhR>}v3^Ub#POIPc}f+bejE|IlR|ms-7)=oCan5PTg>Xdw|?&B z?kjHJm0hv-?$Z~~Ckv_sTA#AGu46y{-nIMji7|<{Y7I^74!9IJUYYmg<7WPZU8Ox+ z`z~JNEWQ1!Q7S|B|4pm2yw`Jg_k{UvW-i_G$v9zG(Rc2EpaS7{zAn|LjqDpGwj^dp z`z&l&CLz8#L!|1Mg6Ln3{m16Vtk@jMG@p^v(A3b<&|KHRcrqi41QJh)#hBUD%wlo` zi>keusfmIC2q@$!aDf>H1}3Iv7-HrIrkG-;29x)&m^-DKm>MOUn_5_;q#2}`Sf->V mB^g;7S{kGnrkWd@8k*bL5K=MOlvSR~($IiQRn^tsjSB$ZfbqTn delta 797 zcmdnZd7o>7V!f%cxxQOwPDyH!zFSUWNvca~a(+sxon3KBQEFl?SH+yAQ}^cGHV|UsW5OV(6~a;`KD4;Bc`(7WHBk-pPUA@*xmEvK6vbKHjgE1TA{U)-=Qd79qi z8OzFRd@j%4%{QCdce+nYe~Q+gEj-f3Xa1kEi}g^`{k-s*L_3%L9P{w*%D1y;&;E7B zzAfSU*6&xjmUiD(7oTzceog(XDaVe!o%|weug!nM@25@HX$jtC*fUd~;|9w{se|3? zS3kXFzW#;n&9LUG^n~{vTi)N*ko~eQsIYbui)%)>Q1R-spU?kpx8HwxN7y!NLz8){ zoeCT?^tJxH+ausSW81n3rL1d(GxKYwsIAf7#KgSz@}1{zFFzBrUjA_6w#H(?)lBug z!jqSBtHe6Ibh+g%zm)T3la8a)OA~YJExQkIYrU3fWv=f3%Q_)wSE)ml_@zrLzqtOg zkoDgFC8Oax_XE9oX6H{>I24z^nxhcz z*y6c-=>t7ozVin+^=MD{{lPmve&ejQuTEF-W;-Uoef$5f{MH24;qq7-AM?78qidhQ^a6 zS diff --git a/src/main/java/com/foodieparty/fodieParty/RestauranteFoodiePartyApplication.java b/src/main/java/com/foodieparty/fodieParty/RestauranteFoodiePartyApplication.java index 0ebeef4..bd35012 100644 --- a/src/main/java/com/foodieparty/fodieParty/RestauranteFoodiePartyApplication.java +++ b/src/main/java/com/foodieparty/fodieParty/RestauranteFoodiePartyApplication.java @@ -45,12 +45,12 @@ public CommandLineRunner initData( usuarioRepositorio.save(juan); Usuario daniel = new Usuario("daniel", "lopez", "dlopez1591@gmail.com", passwordEncoder.encode("daniel123"), "123456"); usuarioRepositorio.save(daniel); - Bebida bebida1 = new Bebida("Agua","botellita de agua","urlImagen", TipoBebida.AGUA,40,100.0); - Bebida bebida2 = new Bebida("Birra","vaso de birra","urlImagen", TipoBebida.ALCOHOLICA,40,350.0); + Bebida bebida1 = new Bebida("Jugo","Jugo de naranja natural","https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/42bb3965-1df3-47cf-a0d4-cb436a9601a2.jpg?alt=media", TipoBebida.AGUA,40,100.0); + Bebida bebida2 = new Bebida("Birra","vaso de birra ipa","https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/9b789c94-465b-48c5-b9d3-7fb22d24c3f0.jpg?alt=media", TipoBebida.ALCOHOLICA,40,350.0); bebidaRepositorio.save(bebida1); bebidaRepositorio.save(bebida2); - Comida comida1 = new Comida("Panchito","ia tu sabe", TipoComida.PRINCIPAL,250.0,"urlImagen",true); - Comida comida2 = new Comida("Burguer","con doble soque", TipoComida.PRINCIPAL,450.0,"urlImagen",true); + Comida comida1 = new Comida("Panchito","Panchito con adereso y papitas", TipoComida.PRINCIPAL,250.0,"https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/dead24cf-2065-4e92-9ba4-27ed2b9c42e7.jpg?alt=media",true); + Comida comida2 = new Comida("Burguer","Hamburguesa Doble Queso", TipoComida.PRINCIPAL,450.0,"https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/0e97cb9c-4252-4875-9143-658e39d91ff3.jpg?alt=media",true); comidaRepositorio.save(comida1); comidaRepositorio.save(comida2); diff --git a/src/main/resources/static/web/assets/scripts/menu.js b/src/main/resources/static/web/assets/scripts/menu.js index 6f6932d..551cabf 100644 --- a/src/main/resources/static/web/assets/scripts/menu.js +++ b/src/main/resources/static/web/assets/scripts/menu.js @@ -8,8 +8,22 @@ createApp({ postre: undefined, bebidas: undefined, cantidadSolicitada: 1, - comidaEnMesa: undefined, - listitaPedido: undefined, + comidaEnMesa: { + "id": 1, + "nombre": "Panchito", + "description": "ia tu sabe", + "tipoComida": "PRINCIPAL", + "precio": 250.0, + "imagen": "urlImagen", + "disponibilidad": true}, + listitaPedido: [], + listaComidasId: [], + listaBebidasId: [], + tipoRetiro: undefined, + direccion: undefined, + total: 0, + number: undefined, + cvv: undefined } }, created(){ @@ -42,24 +56,78 @@ createApp({ console.log("comida en mesa: ",this.comidaEnMesa.nombre, " | id de la comida",this.comidaEnMesa.id) }, - añadirAlCarrito(idComida,cantidadSolicitada){ - console.log("idComida: ",idComida," | cantidad Solicitada: ", cantidadSolicitada) - let miniPedido = [ idComida , cantidadSolicitada] - this.listitaPedido = this.listitaPedido + "," + miniPedido - if(this.listitaPedido.length==0){ - this.listitaPedido = miniPedido - }else{ - console.log(this.listitaPedido) - } - - /* agregar a lista this.equis ++ array con productos?? */ - - /* sweet con temporisador */ + agregarComidas(idComida, cantidadSolicitada){ + //console.log("idComida: ",idComida," | cantidad Solicitada: ", cantidadSolicitada) + let miniPedido = [idComida, cantidadSolicitada] + //console.log(miniPedido) + this.listaComidasId.push(miniPedido) + //console.log(this.listitaPedido) + this.total += this.comidaEnMesa.precio * cantidadSolicitada + this.listitaPedido.push(this.comidaEnMesa) + return this.listaComidasId + }, - } + agregarBebidas(idBebida, cantidadSolicitada){ + //console.log("idComida: ",idBebida," | cantidad Solicitada: ", cantidadSolicitada) + let miniPedido = [idBebida, cantidadSolicitada] + //console.log(miniPedido) + this.listaBebidasId.push(miniPedido) + //console.log(this.listaBebidasId) + this.total += this.comidaEnMesa.precio * cantidadSolicitada + this.listitaPedido.push(this.comidaEnMesa) + return this.listaBebidasId + }, + crearPedido(){ + console.log(this.total) + console.log(this.listaComidasId,this.listaBebidasId) + axios.post("/api/crear/pedido/usuario",{"tipoRetiro":this.tipoRetiro,"direccion":this.direccion,"listaComidasId":this.listaComidasId,"listaBebidasId":this.listaBebidasId}) + .then( + axios.post("https://mindhub-brother-homebanking-production.up.railway.app/api/card/payment",{ + "cardNumber":this.number, + "cardCvv":this.cvv, + "operationAmount":this.total, + "operationDescription":"Delicatezza payment" + })) + .then( + Swal.fire({ + position: 'midle', + icon: 'success', + color: 'var(--bs-highlight-bg)', + background: '#000000c1', + text: 'Pedido realizado con exito', + showConfirmButton: true, + confirmButtonText: 'ir a mis pedidos', + }) + .then((result) => { + if (result.isConfirmed) { + window.location.href = '/web/pedidos.html'; + } + }) + ) + .catch(error => { + console.log(error) + this.error = error.response.data.message; + console.log(error.response.data) + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error.response.data + + }) + }); + }, } }).mount('#app') - + /* sweet con temporisador */ + /* Swal.fire({ + position: 'midle', + icon: 'success', + color: 'var(--bs-highlight-bg)', + background: '#000000c1', + text: 'agregaste un producto a tu carrito', + showConfirmButton: false, + timer: 2000 + }) */ \ No newline at end of file diff --git a/src/main/resources/static/web/menu.html b/src/main/resources/static/web/menu.html index 474dbc3..27f1288 100644 --- a/src/main/resources/static/web/menu.html +++ b/src/main/resources/static/web/menu.html @@ -56,16 +56,16 @@
  • - Inicio + Inicio
  • Menu
  • - Reserva + Reserva
  • - Pedidos + Pedidos
    • - +
@@ -126,34 +119,138 @@

Carrito de Compras

- - - + + + -
+

- Guarniciones

-
+ Bebidas +
- +
-
{{comida.nombre}}
-

{{comida.description}}

+
{{bebida.nombre}}
+

{{bebida.descripcion}}

-
Precio ${{comida.precio}}
+
Precio ${{bebida.precio}}
+ data-bs-target="#agregarBebida" v-on:click="alertAgregar(bebida)">Agregar
@@ -233,26 +332,26 @@
Precio ${{comida.precio}}
- + -
+

- Bebidas

-
+ Postres +
- +
-
{{bebida.nombre}}
-

{{bebida.descripcion}}

+
{{comida.nombre}}
+

{{comida.description}}

-
Precio ${{bebida.precio}}
+
Precio ${{comida.precio}}
+ data-bs-target="#agregarComida" v-on:click="alertAgregar(comida)">Agregar
@@ -260,13 +359,13 @@
Precio ${{bebida.precio}}
- - -
+ + +

- Postres

-
+ Guarniciones +
@@ -280,7 +379,7 @@
{{comida.nombre}}
Precio ${{comida.precio}}
+ data-bs-target="#agregarComida" v-on:click="alertAgregar(comida)">Agregar
@@ -288,7 +387,6 @@
Precio ${{comida.precio}}
- diff --git a/src/main/resources/static/web/pedidos.html b/src/main/resources/static/web/pedidos.html index 393aae4..9aa8361 100644 --- a/src/main/resources/static/web/pedidos.html +++ b/src/main/resources/static/web/pedidos.html @@ -20,7 +20,7 @@ - + @@ -44,13 +44,13 @@
  • - Inicio + Inicio
  • - Menu + Menu
  • - Reserva + Reserva
  • Pedidos @@ -220,7 +220,7 @@

    Equipo de Desarrollo

    - + From a6a7713ca92c2219000408f35cae270792c43796 Mon Sep 17 00:00:00 2001 From: YasminLedesma Date: Fri, 31 Mar 2023 16:28:49 -0300 Subject: [PATCH 2/3] arreglitos nav --- src/main/resources/static/web/index.html | 2 +- src/main/resources/static/web/reserva.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/web/index.html b/src/main/resources/static/web/index.html index f4be7ba..851e8bc 100644 --- a/src/main/resources/static/web/index.html +++ b/src/main/resources/static/web/index.html @@ -49,7 +49,7 @@ Menu
  • - Reserva + Reserva
- +

| Cohort FS041 Full Stack JAVA

- + + src="./assets/imgs/linkedin.png" alt="">

| Fernando Marzialetti

- + + src="./assets/imgs/linkedin.png" alt="">

| Matias Loiza

- + src="./assets/imgs/linkedin.png" alt="">

| Joaquin Alain Fleitas

- + src="./assets/imgs/linkedin.png" alt="">

| Daniel Lopez

- + src="./assets/imgs/linkedin.png" alt="">

| Yasmin Ledesma

diff --git a/src/main/resources/static/web/pedidos.html b/src/main/resources/static/web/pedidos.html index 9aa8361..0cd57e9 100644 --- a/src/main/resources/static/web/pedidos.html +++ b/src/main/resources/static/web/pedidos.html @@ -154,48 +154,48 @@

Equipo de Desarrollo

| Cohort FS041 Full Stack JAVA

+ src="./assets/imgs/github.png" alt=""> | Cohort FS041 Full Stack JAVA

+ target="_blank">

| Fernando Marzialetti

- + src="./assets/imgs/linkedin.png" alt="">

| Matias Loiza

+ src="./assets/imgs/linkedin.png" alt="">

| Joaquin Alain Fleitas

- + src="./assets/imgs/linkedin.png" alt="">

| Daniel Lopez

+ target="_blank">

| Yasmin Ledesma

diff --git a/src/main/resources/static/web/reserva.html b/src/main/resources/static/web/reserva.html index abe43e9..931d0c7 100644 --- a/src/main/resources/static/web/reserva.html +++ b/src/main/resources/static/web/reserva.html @@ -60,15 +60,16 @@