From 8d4d8338aa1e5a1413f504b21b88d303e99ce063 Mon Sep 17 00:00:00 2001 From: MET18937 <79221078+MET18937@users.noreply.github.com> Date: Sun, 25 Jun 2023 16:42:33 +0200 Subject: [PATCH] Add complete vorbestellungsfunktion --- src/WebApi/Models/Bestellungsposition.cs | 2 +- src/y4f/Pages/ShoppingCart.razor | 2 +- src/y4f/Pages/SpeisekarteCnDetails.razor | 2 +- src/y4f/Pages/SpeisekarteDrDetails.razor | 2 +- src/y4f/Pages/SpeisekarteEtcDetails.razor | 2 +- src/y4f/Pages/SpeisekarteJpDetails.razor | 2 +- src/y4f/Shared/Bestellabschluss.razor | 17 ++++++++++++----- src/y4f/Shared/Bestellbestätigung.razor | 19 ++++++------------- src/y4f/Shared/Kontoverwaltung.razor | 4 ++++ 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/WebApi/Models/Bestellungsposition.cs b/src/WebApi/Models/Bestellungsposition.cs index 7eeef97..f641a12 100644 --- a/src/WebApi/Models/Bestellungsposition.cs +++ b/src/WebApi/Models/Bestellungsposition.cs @@ -13,7 +13,7 @@ public partial class Bestellungsposition public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde? KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Pages/ShoppingCart.razor b/src/y4f/Pages/ShoppingCart.razor index 9064693..b2c912b 100644 --- a/src/y4f/Pages/ShoppingCart.razor +++ b/src/y4f/Pages/ShoppingCart.razor @@ -249,7 +249,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Pages/SpeisekarteCnDetails.razor b/src/y4f/Pages/SpeisekarteCnDetails.razor index b43edb3..7666c33 100644 --- a/src/y4f/Pages/SpeisekarteCnDetails.razor +++ b/src/y4f/Pages/SpeisekarteCnDetails.razor @@ -148,7 +148,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Pages/SpeisekarteDrDetails.razor b/src/y4f/Pages/SpeisekarteDrDetails.razor index b591b8f..155512d 100644 --- a/src/y4f/Pages/SpeisekarteDrDetails.razor +++ b/src/y4f/Pages/SpeisekarteDrDetails.razor @@ -154,7 +154,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Pages/SpeisekarteEtcDetails.razor b/src/y4f/Pages/SpeisekarteEtcDetails.razor index d015804..20db45a 100644 --- a/src/y4f/Pages/SpeisekarteEtcDetails.razor +++ b/src/y4f/Pages/SpeisekarteEtcDetails.razor @@ -156,7 +156,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Pages/SpeisekarteJpDetails.razor b/src/y4f/Pages/SpeisekarteJpDetails.razor index 06ee43c..61b4777 100644 --- a/src/y4f/Pages/SpeisekarteJpDetails.razor +++ b/src/y4f/Pages/SpeisekarteJpDetails.razor @@ -150,7 +150,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Shared/Bestellabschluss.razor b/src/y4f/Shared/Bestellabschluss.razor index 9d42670..2f9e952 100644 --- a/src/y4f/Shared/Bestellabschluss.razor +++ b/src/y4f/Shared/Bestellabschluss.razor @@ -116,12 +116,19 @@ DateTime abholzeit = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, minute, 0); bestellungsposition.Datum = abholzeit; // latest possible rabatt - bestellungsposition.RabattIdrabatt = rabatt.Idrabatt; + if (rabattEinloesen) + { + bestellungsposition.RabattIdrabatt = rabatt.Idrabatt; + } + else + { + bestellungsposition.RabattIdrabatt = null; + } bestellungsposition.KundeIdkunde = kunde.Idkunde; Http.PostAsJsonAsync("https://localhost:7076/api/bestellungspositionen", bestellungsposition); - //Add menuitems to bestellungspositionHasMenuItem + //Add menuitems to bestellungspositionHasMenuItem BestellungspositionHasMenuitem bestellungspositionHasMenuItem = new BestellungspositionHasMenuitem(); bestellungspositionHasMenuItem.Bestellungsposition_IDBestellung = bestellungsposition.Idbestellung; bestellungspositionHasMenuItem.MenuItem_IDMenuItem = item.Key; @@ -131,8 +138,8 @@ // delete all localStorage localStorage.SetItem("MenuItemIds", new Dictionary()); - localStorage.SetItem("Hour", 0); - localStorage.SetItem("Minute", 0); + //localStorage.SetItem("Hour", 0); + //localStorage.SetItem("Minute", 0); localStorage.SetItem("Summe", 0); localStorage.SetItem("RabattEinloesen", false); @@ -227,7 +234,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } } diff --git a/src/y4f/Shared/Bestellbestätigung.razor b/src/y4f/Shared/Bestellbestätigung.razor index 169dece..02d16c2 100644 --- a/src/y4f/Shared/Bestellbestätigung.razor +++ b/src/y4f/Shared/Bestellbestätigung.razor @@ -29,8 +29,7 @@




- - @**@ +
@@ -60,17 +59,11 @@ public decimal summe; - public void Vorbestellen() + + + public void BestellungsUuebersicht() { - // set rabattEinloesen - if (rabattEinloesen) - localStorage.SetItem("RabattEinloesen", true); - else - localStorage.SetItem("RabattEinloesen", false); - - _navigationManager.NavigateTo("/Bestellbestätigung"); - - + _navigationManager.NavigateTo("/Kontoverwaltung"); } // allergien, bestellungsposition, kunde, menuitem, menuitemkategorie, menuitemueberkategorie, rabatt @@ -161,7 +154,7 @@ public int KundeIdkunde { get; set; } - public int RabattIdrabatt { get; set; } + public int? RabattIdrabatt { get; set; } public virtual Kunde KundeIdkundeNavigation { get; set; } = null!; diff --git a/src/y4f/Shared/Kontoverwaltung.razor b/src/y4f/Shared/Kontoverwaltung.razor index 779eda1..27e45e7 100644 --- a/src/y4f/Shared/Kontoverwaltung.razor +++ b/src/y4f/Shared/Kontoverwaltung.razor @@ -1,5 +1,9 @@ @page "/Kontoverwaltung" +@inject HttpClient Http +@inject Blazored.LocalStorage.ISyncLocalStorageService localStorage +@inject NavigationManager _navigationManager +

Wichtige Informationen