diff --git a/Aberwyn/Controllers/FoodMenuController.cs b/Aberwyn/Controllers/FoodMenuController.cs index 6a663c9..feb5b12 100644 --- a/Aberwyn/Controllers/FoodMenuController.cs +++ b/Aberwyn/Controllers/FoodMenuController.cs @@ -96,7 +96,7 @@ namespace Aberwyn.Controllers order.CustomerName = customerName.Trim(); order.PizzaName = pizzaName.Trim(); order.IngredientsJson = ingredients; - order.Status = "Ej bekräftad"; // ĺterställ status om du vill + order.Status = "Unconfirmed";// ĺterställ status om du vill _context.SaveChanges(); TempData["Success"] = $"Din beställning har uppdaterats!"; @@ -110,7 +110,7 @@ namespace Aberwyn.Controllers CustomerName = customerName.Trim(), PizzaName = pizzaName.Trim(), IngredientsJson = ingredients, - Status = "Ej bekräftad", + Status = "Unconfirmed", OrderedAt = DateTime.Now }; @@ -139,11 +139,11 @@ namespace Aberwyn.Controllers .ToList(); ViewBag.ActiveOrders = allOrders - .Where(o => o.Status != "Klar") + .Where(o => o.Status != "Finished") .ToList(); ViewBag.CompletedOrders = allOrders - .Where(o => o.Status == "Klar") + .Where(o => o.Status == "Finished") .ToList(); return View(); diff --git a/Aberwyn/Models/PizzaOrder.cs b/Aberwyn/Models/PizzaOrder.cs index ddeee67..1eb2c90 100644 --- a/Aberwyn/Models/PizzaOrder.cs +++ b/Aberwyn/Models/PizzaOrder.cs @@ -14,7 +14,7 @@ namespace Aberwyn.Models public string? IngredientsJson { get; set; } // lista i JSON-form - public string Status { get; set; } = "Ej bekräftad"; // "Ej bekräftad", "Bekräftad", "Klar" + public string Status { get; set; } = "Unconfirmed"; // "Ej bekräftad", "Bekräftad", "Klar" public DateTime OrderedAt { get; set; } = DateTime.Now; } diff --git a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml index b0b5a2d..859bce9 100644 --- a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml +++ b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml @@ -88,12 +88,13 @@ ingredients = order.IngredientsJson.Split('\n').ToList(); } - var cardClass = order.Status switch - { - "Bekräftad" => "border-warning", - "Klar" => "border-success", - _ => "border-info" - }; +var cardClass = order.Status switch +{ + "Confirmed" => "border-warning", + "Ready" => "border-success", + _ => "border-info" +}; +
@order.CustomerName
@@ -109,16 +110,17 @@
- @if (order.Status == "Ej bekräftad") + @if (order.Status == "Unconfirmed") { - - + + } - else if (order.Status == "Bekräftad") + else if (order.Status == "Confirmed") { - - + + } +