diff --git a/src/Web/WebMVC/Views/Order/Detail.cshtml b/src/Web/WebMVC/Views/Order/Detail.cshtml index 483d3e628..92535ab6a 100644 --- a/src/Web/WebMVC/Views/Order/Detail.cshtml +++ b/src/Web/WebMVC/Views/Order/Detail.cshtml @@ -1,75 +1,79 @@ +@using Microsoft.eShopOnContainers.WebMVC.Models + @model Microsoft.eShopOnContainers.WebMVC.Models.Order @{ ViewData["Title"] = "Order Detail"; } -
- -
+
+ @Html.Partial("_Header", new Header() { Controller = "Order", Text = "Back to list" }) +
+
+
+
Order number
+
Date
+
Total
+
Status
+
-
-
-
- ORDER NUMBER
- @Model.OrderNumber -
-
- DATE
- @Model.Date -
-
- TOTAL
- $ @Model.Total -
-
- STATUS
- @Model.Status -
-
-
-
- SHIPING ADDRESS
- @Model.Street
- @Model.City
- @*@Model.ShippingAddress.ZipCode
*@ - @Model.Country
-
-
-
-
ORDER DETAILS
-
- - - @for (int i = 0; i < Model.OrderItems.Count; i++) - { - var item = Model.OrderItems[i]; +
+
@Model.OrderNumber
+
@Model.Date
+
$ @Model.Total
+
@Model.Status
+
+ + +
+
+
Shiping address
+
+ +
+
@Model.Street
+
-
- - - - - - - - } - -
@item.ProductNameROSLYN$ @Math.Round(item.UnitPrice, 2)@item.Units$ @Math.Round(item.Units * item.UnitPrice,2)
-
-
+
+
@Model.City
+
-
-
+
+
@Model.Country
+
+
+ +
+
+
Order details
+
+ + @for (int i = 0; i < Model.OrderItems.Count; i++) + { + var item = Model.OrderItems[i]; +
+
+ +
+
@item.ProductName
+
$ @Math.Round(item.UnitPrice, 2)
+
@item.Units
+
$ @Math.Round(item.Units * item.UnitPrice, 2)
+
+ } +
+ +
+
+
+
Total
+
+ +
+
+
$ @Model.Total
+
-
-
-
-
TOTAL
-
$ @Model.Total
-
diff --git a/src/Web/WebMVC/Views/Order/Index.cshtml b/src/Web/WebMVC/Views/Order/Index.cshtml index c1546c90c..347f0fd9d 100644 --- a/src/Web/WebMVC/Views/Order/Index.cshtml +++ b/src/Web/WebMVC/Views/Order/Index.cshtml @@ -1,52 +1,34 @@ +@using Microsoft.eShopOnContainers.WebMVC.Models + @model IEnumerable @{ ViewData["Title"] = "My Orders"; } -
- + +
+ @Html.Partial("_Header", new Header() { Controller = "Catalog", Text = "Back to catalog" }) + +
+
+
Order number
+
Date
+
Total
+
Status
+
+
+ + @foreach (var item in Model) + { +
+
@Html.DisplayFor(modelItem => item.OrderNumber)
+
@Html.DisplayFor(modelItem => item.Date)
+
$ @Html.DisplayFor(modelItem => item.Total)
+
@Html.DisplayFor(modelItem => item.Status)
+
+ Detail +
+
+ } +
-
- - - - - - - - - - - - @foreach (var item in Model) { - - - - - - - - } - -
- ORDER NUMBER - - DATE - - TOTAL - - STATUS -
- @Html.DisplayFor(modelItem => item.OrderNumber) - - @Html.DisplayFor(modelItem => item.Date) - - $ @Html.DisplayFor(modelItem => item.Total) - - @Html.DisplayFor(modelItem => item.Status) - - Detail -
-
\ No newline at end of file