Skip to content

carrito #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlopez1591 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

carrito #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae82ed2
carrito
YasminLedesma Mar 31, 2023
a6a7713
arreglitos nav
YasminLedesma Mar 31, 2023
f7ad0a7
arreglo nav y footer
YasminLedesma Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified TestTableFile.pdf
View file
Open in desktop
Binary file not shown.
14 changes: 8 additions & 6 deletions src/main/java/com/foodieparty/fodieParty/RestauranteFoodiePartyApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,22 @@ 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);

Comida postre1 = new Comida ("Helado","bochita",TipoComida.POSTRE,500.0,
"https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/6f171418-8f6d-46e5-b15a-d677df87f102.jpg?alt=media",true);
Comida postre2 = new Comida ("Flan","un flansito",TipoComida.POSTRE,800.0,
"https://firebasestorage.googleapis.com/v0/b/delicatezza-20007.appspot.com/o/caa98a39-ea5a-4173-b514-c3c1b66fb500.jpg?alt=media",true);

comidaRepositorio.save(postre1);
comidaRepositorio.save(postre2);

Expand Down
102 changes: 85 additions & 17 deletions src/main/resources/static/web/assets/scripts/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand Down Expand Up @@ -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
}) */
6 changes: 5 additions & 1 deletion src/main/resources/static/web/assets/styles/reserva.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,11 @@ nav .material-symbols-outlined{
.formula2{
max-width: 60%;
}

.active-1{
color: rgba(236, 217, 45, 0.861) !important;
box-shadow: rgba(236, 217, 45, 0.861) -1px -4px 43px;
border: 1px solid rgba(236, 217, 45, 0.861);
}


@media (max-width: 650px) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<a class="nav-link" href="./menu.html"><i class="bi bi-egg-fried"></i>Menu</a>
</li>
<li class="nav-item button" type="button">
<a class="nav-link" href="#"><i class="bi bi-check2-circle"></i> Reserva</a>
<a class="nav-link" href="./reserva.html"><i class="bi bi-check2-circle"></i> Reserva</a>
</li>
<button type="button" class="nav-item button " data-bs-toggle="modal"
data-bs-target="#staticBackdrop">
Expand Down
Loading