ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used TagHelper instead of Razor to render partial view

Browse Source
This commit is contained in:
rafsanulhasan 2018-09-01 02:16:00 +06:00
parent b0b9045a08
commit 12b1be780e
8 changed files with 367 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Web/WebMVC/Views/Campaigns/Details.cshtml
View File

@ -1,28 +1,30 @@
@{ @{
ViewData["Title"] = "Campaign details"; ViewData["Title"] = "Campaign details";
@model CampaignItem var headers = new List<Header>{
new Header { Controller = "Campaigns", Text = "Back to Campaigns" },
new Header { Controller = "Catalog", Text = "Back to catalog" }
};
@model CampaignItem
} }
<section class="esh-campaigns-hero"> <section class="esh-campaigns-hero">
<div class="container"> <div class="container">
<img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> <img class="esh-campaigns-title" src="~/images/main_banner_text.png" />
</div> </div>
</section> </section>
@Html.Partial("_Header", new List<Header>() { <partial name="_Header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" },
new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } })
<div class="container"> <div class="container">
<div class="card esh-campaigns-items"> <div class="card esh-campaigns-items">
<img class="card-img-top" src="@Model.PictureUri" alt="Card image cap"> <img class="card-img-top" src="@Model.PictureUri" alt="Card image cap">
<div class="card-block"> <div class="card-block">
<h4 class="card-title">@Model.Name</h4> <h4 class="card-title">@Model.Name</h4>
<p class="card-text">@Model.Description</p> <p class="card-text">@Model.Description</p>
<p class="card-text"> <p class="card-text">
<small class="text-muted"> <small class="text-muted">
From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy") From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy")
</small> </small>
</p> </p>
</div> </div>
</div> </div>
</div> </div>

117
src/Web/WebMVC/Views/Campaigns/Index.cshtml
View File

@ -1,72 +1,75 @@
@{ @{
ViewData["Title"] = "Campaigns"; ViewData["Title"] = "Campaigns";
@model WebMVC.ViewModels.CampaignViewModel @model WebMVC.ViewModels.CampaignViewModel
var headers = new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" } };
} }
<section class="esh-campaigns-hero"> <section class="esh-campaigns-hero">
<div class="container"> <div class="container">
<img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> <img class="esh-campaigns-title" src="~/images/main_banner_text.png" />
</div> </div>
</section> </section>
@Html.Partial("_Header", new List<Header>() { <partial name="_Header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" } })
<div class="container"> <div class="container">
<br /> <br />
<div class="row"> <div class="row">
@if (!ViewData.ModelState.IsValid)
{
<div class="alert alert-warning">
@Html.ValidationSummary(false)
</div>
}
<div class="col-md-12"> @if (!ViewData.ModelState.IsValid)
<div class="esh-campaigns-items" style="font-weight: 300;"> {
UPDATE USER LOCATION <div class="alert alert-warning">
</div> @Html.ValidationSummary(false)
</div>
}
<form class="form-inline" asp-action="CreateNewUserLocation" method="post"> <div class="col-md-12">
<label class="sr-only" for="longitudeInput">Name</label> <div class="esh-campaigns-items" style="font-weight: 300;">
UPDATE USER LOCATION
<div class="input-group mb-2 mr-sm-2 mb-sm-0"> </div>
<div class="input-group-addon">Lat</div>
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude">
</div>
<div class="input-group mb-2 mr-sm-2 mb-sm-0"> <form class="form-inline" asp-action="CreateNewUserLocation" method="post">
<div class="input-group-addon">Lon</div> <label class="sr-only" for="longitudeInput">Name</label>
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude">
</div>
<div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2">
<input type="submit" value="Update" class="btn esh-campaigns-form-button" />
</div>
</form>
</div>
</div>
<br />
@if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any())
{
<div class="card-group esh-campaigns-items row">
@foreach (var catalogItem in Model.CampaignItems)
{
<div class="esh-campaigns-item col-md-4">
@Html.Partial("_campaign", catalogItem)
</div>
}
</div>
@Html.Partial("_pagination", Model.PaginationInfo) <div class="input-group mb-2 mr-sm-2 mb-sm-0">
} <div class="input-group-addon">Lat</div>
else <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude">
{ </div>
<div class="esh-campaigns-items row">
THERE ARE NO CAMPAIGNS <div class="input-group mb-2 mr-sm-2 mb-sm-0">
</div> <div class="input-group-addon">Lon</div>
} <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude">
</div>
<div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2">
<input type="submit" value="Update" class="btn esh-campaigns-form-button" />
</div>
</form>
</div>
</div>
<br />
@if (Model != null && Model.CampaignItems != null && Model.CampaignItems.Any())
{
<div class="card-group esh-campaigns-items row">
@foreach (var catalogItem in Model.CampaignItems)
{
<div class="esh-campaigns-item col-md-4">
@*@Html.Partial("_campaign", catalogItem)*@
<partial name="_campaign" model="catalogItem" />
</div>
}
</div>
@*@Html.Partial("_pagination", Model.PaginationInfo)*@
<partial name="_pagination" model="Model.PaginationInfo" />
}
else
{
<div class="esh-campaigns-items row">
THERE ARE NO CAMPAIGNS
</div>
}
</div> </div>

14
src/Web/WebMVC/Views/Cart/Index.cshtml
View File

@ -5,14 +5,14 @@
@inject IIdentityParser<ApplicationUser> UserManager @inject IIdentityParser<ApplicationUser> UserManager
@{ @{
ViewData["Title"] = "My Cart"; ViewData["Title"] = "My Cart";
var headers = new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" } };
} }
<form method="post" id="cartForm"> <form method="post" id="cartForm">
<div class="esh-basket"> <div class="esh-basket">
@Html.Partial("_Header", new List<Header>() { <partial name="_header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" } }) @await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) })
</div>
@await Component.InvokeAsync("CartList", new { user = UserManager.Parse(User) })
</div>
</form> </form>

88
src/Web/WebMVC/Views/Catalog/Index.cshtml
View File

@ -1,57 +1,57 @@
@{ @{
ViewData["Title"] = "Catalog"; ViewData["Title"] = "Catalog";
@model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel
} }
<section class="esh-catalog-hero"> <section class="esh-catalog-hero">
<div class="container"> <div class="container">
<img class="esh-catalog-title" src="~/images/main_banner_text.png" /> <img class="esh-catalog-title" src="~/images/main_banner_text.png" />
</div> </div>
</section> </section>
<section class="esh-catalog-filters"> <section class="esh-catalog-filters">
<div class="container"> <div class="container">
<form asp-action="Index" asp-controller="Catalog" method="post"> <form asp-action="Index" asp-controller="Catalog" method="post">
<label class="esh-catalog-label" data-title="brand"> <label class="esh-catalog-label" data-title="brand">
<select asp-for="@Model.BrandFilterApplied" asp-items="@Model.Brands" class="esh-catalog-filter"></select> <select asp-for="@Model.BrandFilterApplied" asp-items="@Model.Brands" class="esh-catalog-filter"></select>
</label> </label>
<label class="esh-catalog-label" data-title="type"> <label class="esh-catalog-label" data-title="type">
<select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select> <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select>
</label> </label>
<input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" /> <input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" />
</form> </form>
</div> </div>
</section> </section>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<br /> <br />
@if(ViewBag.BasketInoperativeMsg != null) @if (ViewBag.BasketInoperativeMsg != null)
{ {
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
&nbsp;@ViewBag.BasketInoperativeMsg &nbsp;@ViewBag.BasketInoperativeMsg
</div> </div>
} }
</div> </div>
@if (Model.CatalogItems.Count() > 0) @if (Model.CatalogItems.Count() > 0)
{ {
@Html.Partial("_pagination", Model.PaginationInfo) <partial name="_pagination" model="Model.PaginationInfo" />
<div class="esh-catalog-items row"> <div class="esh-catalog-items row">
@foreach (var catalogItem in Model.CatalogItems) @foreach (var catalogItem in Model.CatalogItems)
{ {
<div class="esh-catalog-item col-md-4"> <div class="esh-catalog-item col-md-4">
@Html.Partial("_product", catalogItem) <partial name="_product" , model="catalogItem" />
</div> </div>
} }
</div> </div>
@Html.Partial("_pagination", Model.PaginationInfo) <partial name="_pagination" model="Model.PaginationInfo" />
} }
else else
{ {
<div class="esh-catalog-items row"> <div class="esh-catalog-items row">
THERE ARE NO RESULTS THAT MATCH YOUR SEARCH THERE ARE NO RESULTS THAT MATCH YOUR SEARCH
</div> </div>
} }
</div> </div>

184
src/Web/WebMVC/Views/Order/Create.cshtml
View File

@ -3,103 +3,105 @@
@inject IIdentityParser<ApplicationUser> UserManager @inject IIdentityParser<ApplicationUser> UserManager
@{ @{
ViewData["Title"] = "New Order"; ViewData["Title"] = "New Order";
var header = new Header { Controller = "Cart", Text = "Back to cart" };
} }
@Html.Partial("_Header", new List<Header>() { <partial name="_header" model="new List<Header> { header }" />
new Header() { Controller = "Cart", Text = "Back to cart" } })
<div class="container"> <div class="container">
<form method="post" asp-controller="Order" asp-action="Checkout"> <form method="post" asp-controller="Order" asp-action="Checkout">
<section class="esh-orders_new-section"> <section class="esh-orders_new-section">
<div class="row"> <div class="row">
@foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors)) { @foreach (var error in ViewData.ModelState.Values.SelectMany(err => err.Errors))
<div class="alert alert-warning" role="alert"> {
&nbsp;@error.ErrorMessage <div class="alert alert-warning" role="alert">
</div> &nbsp;@error.ErrorMessage
} </div>
</div> }
<h4 class="esh-orders_new-title">Shipping address</h4> </div>
<div class="row"> <h4 class="esh-orders_new-title">Shipping address</h4>
<div class="col-md-6"> <div class="row">
<div class="form-group"> <div class="col-md-6">
<label asp-for="Street" class="esh-orders_new-title">Address</label> <div class="form-group">
<input asp-for="Street" class="form-control form-input" type="text" placeholder="Street"/> <label asp-for="Street" class="esh-orders_new-title">Address</label>
<span asp-validation-for="Street" class="alert alert-danger" /> <input asp-for="Street" class="form-control form-input" type="text" placeholder="Street" />
</div> <span asp-validation-for="Street" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="City" class="esh-orders_new-title">City</label> <div class="form-group">
<input asp-for="City" class="form-control form-input" type="text" placeholder="City"/> <label asp-for="City" class="esh-orders_new-title">City</label>
<span asp-validation-for="City" class="alert alert-danger" /> <input asp-for="City" class="form-control form-input" type="text" placeholder="City" />
</div> <span asp-validation-for="City" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="State" class="esh-orders_new-title">State</label> <div class="form-group">
<input asp-for="State" class="form-control form-input" type="text" placeholder="State"/> <label asp-for="State" class="esh-orders_new-title">State</label>
<span asp-validation-for="State" class="alert alert-danger" /> <input asp-for="State" class="form-control form-input" type="text" placeholder="State" />
</div> <span asp-validation-for="State" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="Country" class="esh-orders_new-title">Country</label> <div class="form-group">
<input asp-for="Country" class="form-control form-input" type="text" placeholder="Country"/> <label asp-for="Country" class="esh-orders_new-title">Country</label>
<span asp-validation-for="Country" class="alert alert-danger" /> <input asp-for="Country" class="form-control form-input" type="text" placeholder="Country" />
</div> <span asp-validation-for="Country" class="alert alert-danger" />
</div> </div>
</div> </div>
</section> </div>
<section class="esh-orders_new-section"> </section>
<h4 class="esh-orders_new-title">Payment method</h4> <section class="esh-orders_new-section">
<div class="row"> <h4 class="esh-orders_new-title">Payment method</h4>
<div class="col-md-6"> <div class="row">
<div class="form-group"> <div class="col-md-6">
<label asp-for="CardNumber" class="esh-orders_new-title">Card number</label> <div class="form-group">
<input asp-for="CardNumber" class="form-control form-input" type="text" placeholder="000000000000000"/> <label asp-for="CardNumber" class="esh-orders_new-title">Card number</label>
<span asp-validation-for="CardNumber" class="alert alert-danger" /> <input asp-for="CardNumber" class="form-control form-input" type="text" placeholder="000000000000000" />
</div> <span asp-validation-for="CardNumber" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="CardHolderName" class="esh-orders_new-title">Cardholder name</label> <div class="form-group">
<input asp-for="CardHolderName" class="form-control form-input" type="text" placeholder="Cardholder"/> <label asp-for="CardHolderName" class="esh-orders_new-title">Cardholder name</label>
<span asp-validation-for="CardHolderName" class="alert alert-danger" /> <input asp-for="CardHolderName" class="form-control form-input" type="text" placeholder="Cardholder" />
</div> <span asp-validation-for="CardHolderName" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="CardExpirationShort" class="esh-orders_new-title">Expiration date</label> <div class="form-group">
<input asp-for="CardExpirationShort" class="form-control form-input form-input-medium" type="text" placeholder="MM/YY"/> <label asp-for="CardExpirationShort" class="esh-orders_new-title">Expiration date</label>
<span asp-validation-for="CardExpirationShort" class="alert alert-danger" /> <input asp-for="CardExpirationShort" class="form-control form-input form-input-medium" type="text" placeholder="MM/YY" />
</div> <span asp-validation-for="CardExpirationShort" class="alert alert-danger" />
</div> </div>
<div class="col-md-6"> </div>
<div class="form-group"> <div class="col-md-6">
<label asp-for="CardSecurityNumber" class="esh-orders_new-title">Security code</label> <div class="form-group">
<input asp-for="CardSecurityNumber" class="form-control form-input form-input-small" type="text" placeholder="000"/> <label asp-for="CardSecurityNumber" class="esh-orders_new-title">Security code</label>
<span asp-validation-for="CardSecurityNumber" class="alert alert-danger" /> <input asp-for="CardSecurityNumber" class="form-control form-input form-input-small" type="text" placeholder="000" />
</div> <span asp-validation-for="CardSecurityNumber" class="alert alert-danger" />
</div> </div>
</div> </div>
</section> </div>
</section>
@await Html.PartialAsync("_OrderItems") <partial name="_OrderItems" />
<section class="esh-orders_new-section"> <section class="esh-orders_new-section">
<div class="form-group"> <div class="form-group">
<div class="col-md-9"> <div class="col-md-9">
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<input type="submit" value="[ Place Order ]" name="action" class="btn esh-orders_new-placeOrder" /> <input type="submit" value="[ Place Order ]" name="action" class="btn esh-orders_new-placeOrder" />
</div> </div>
</div> </div>
</section> </section>
<input asp-for="ZipCode" type="hidden" /> <input asp-for="ZipCode" type="hidden" />
<input asp-for="RequestId" type="hidden" value="@Guid.NewGuid().ToString()"/> <input asp-for="RequestId" type="hidden" value="@Guid.NewGuid().ToString()" />
</form> </form>
</div> </div>
@section Scripts { @section Scripts {
@{await Html.RenderPartialAsync("_ValidationScriptsPartial");} <partial name="_ValidationScriptsPartial" />
} }

141
src/Web/WebMVC/Views/Order/Detail.cshtml
View File

@ -3,88 +3,89 @@
@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order @model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order
@{ @{
ViewData["Title"] = "Order Detail"; ViewData["Title"] = "Order Detail";
var headers = new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" } };
} }
<div class="esh-orders_detail"> <div class="esh-orders_detail">
@Html.Partial("_Header", new List<Header>() { <partial name="_Header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" } })
<div class="container"> <div class="container">
<section class="esh-orders_detail-section"> <section class="esh-orders_detail-section">
<article class="esh-orders_detail-titles row"> <article class="esh-orders_detail-titles row">
<section class="esh-orders_detail-title col-xs-3">Order number</section> <section class="esh-orders_detail-title col-xs-3">Order number</section>
<section class="esh-orders_detail-title col-xs-3">Date</section> <section class="esh-orders_detail-title col-xs-3">Date</section>
<section class="esh-orders_detail-title col-xs-3">Total</section> <section class="esh-orders_detail-title col-xs-3">Total</section>
<section class="esh-orders_detail-title col-xs-3">Status</section> <section class="esh-orders_detail-title col-xs-3">Status</section>
</article> </article>
<article class="esh-orders_detail-items row"> <article class="esh-orders_detail-items row">
<section class="esh-orders_detail-item col-xs-3">@Model.OrderNumber</section> <section class="esh-orders_detail-item col-xs-3">@Model.OrderNumber</section>
<section class="esh-orders_detail-item col-xs-3">@Model.Date</section> <section class="esh-orders_detail-item col-xs-3">@Model.Date</section>
<section class="esh-orders_detail-item col-xs-3">$@Model.Total</section> <section class="esh-orders_detail-item col-xs-3">$@Model.Total</section>
<section class="esh-orders_detail-title col-xs-3">@Model.Status</section> <section class="esh-orders_detail-title col-xs-3">@Model.Status</section>
</article> </article>
</section> </section>
<section class="esh-orders_detail-section">
<article class="esh-orders_detail-titles row">
<section class="esh-orders_detail-title col-xs-12">Description</section>
</article>
<article class="esh-orders_detail-items row"> <section class="esh-orders_detail-section">
<section class="esh-orders_detail-item col-xs-12">@Model.Description</section> <article class="esh-orders_detail-titles row">
</article> <section class="esh-orders_detail-title col-xs-12">Description</section>
</section> </article>
<section class="esh-orders_detail-section"> <article class="esh-orders_detail-items row">
<article class="esh-orders_detail-titles row"> <section class="esh-orders_detail-item col-xs-12">@Model.Description</section>
<section class="esh-orders_detail-title col-xs-12">Shiping address</section> </article>
</article> </section>
<article class="esh-orders_detail-items row"> <section class="esh-orders_detail-section">
<section class="esh-orders_detail-item col-xs-12">@Model.Street</section> <article class="esh-orders_detail-titles row">
</article> <section class="esh-orders_detail-title col-xs-12">Shiping address</section>
</article>
<article class="esh-orders_detail-items row"> <article class="esh-orders_detail-items row">
<section class="esh-orders_detail-item col-xs-12">@Model.City</section> <section class="esh-orders_detail-item col-xs-12">@Model.Street</section>
</article> </article>
<article class="esh-orders_detail-items row"> <article class="esh-orders_detail-items row">
<section class="esh-orders_detail-item col-xs-12">@Model.Country</section> <section class="esh-orders_detail-item col-xs-12">@Model.City</section>
</article> </article>
</section>
<section class="esh-orders_detail-section"> <article class="esh-orders_detail-items row">
<article class="esh-orders_detail-titles row"> <section class="esh-orders_detail-item col-xs-12">@Model.Country</section>
<section class="esh-orders_detail-title col-xs-12">ORDER DETAILS</section> </article>
</article> </section>
@for (int i = 0; i < Model.OrderItems.Count; i++) <section class="esh-orders_detail-section">
{ <article class="esh-orders_detail-titles row">
var item = Model.OrderItems[i]; <section class="esh-orders_detail-title col-xs-12">ORDER DETAILS</section>
<article class="esh-orders_detail-items esh-orders_detail-items--border row"> </article>
<section class="esh-orders_detail-item col-md-4 hidden-md-down">
<img class="esh-orders_detail-image" src="@item.PictureUrl">
</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-4">@item.ProductName</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ @item.UnitPrice.ToString("N2")</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">@item.Units</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
</article>
}
</section>
<section class="esh-orders_detail-section esh-orders_detail-section--right"> @for (int i = 0; i < Model.OrderItems.Count; i++)
<article class="esh-orders_detail-titles esh-basket-titles--clean row"> {
<section class="esh-orders_detail-title col-xs-9"></section> var item = Model.OrderItems[i];
<section class="esh-orders_detail-title col-xs-2">TOTAL</section> <article class="esh-orders_detail-items esh-orders_detail-items--border row">
</article> <section class="esh-orders_detail-item col-md-4 hidden-md-down">
<img class="esh-orders_detail-image" src="@item.PictureUrl">
</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-4">@item.ProductName</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ @item.UnitPrice.ToString("N2")</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">@item.Units</section>
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
</article>
}
</section>
<article class="esh-orders_detail-items row"> <section class="esh-orders_detail-section esh-orders_detail-section--right">
<section class="esh-orders_detail-item col-xs-9"></section> <article class="esh-orders_detail-titles esh-basket-titles--clean row">
<section class="esh-orders_detail-item esh-orders_detail-item--mark col-xs-2">$ @Model.Total</section> <section class="esh-orders_detail-title col-xs-9"></section>
</article> <section class="esh-orders_detail-title col-xs-2">TOTAL</section>
</section> </article>
</div>
<article class="esh-orders_detail-items row">
<section class="esh-orders_detail-item col-xs-9"></section>
<section class="esh-orders_detail-item esh-orders_detail-item--mark col-xs-2">$ @Model.Total</section>
</article>
</section>
</div>
</div> </div>

72
src/Web/WebMVC/Views/Order/Index.cshtml
View File

@ -3,45 +3,47 @@
@model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order> @model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order>
@{ @{
ViewData["Title"] = "My Orders"; ViewData["Title"] = "My Orders";
var headers = new List<Header>() {
new Header() { Controller = "Catalog", Text = "Back to catalog" },
new Header() { Text = " / " },
new Header() { Controller = "OrderManagement", Text = "Orders Management" }
};
} }
<div class="esh-orders"> <div class="esh-orders">
@Html.Partial("_Header", new List<Header>() { <partial name="_Header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" },
new Header() { Text = " / " },
new Header() { Controller = "OrderManagement", Text = "Orders Management" } })
<div class="container"> <div class="container">
<article class="esh-orders-titles row"> <article class="esh-orders-titles row">
<section class="esh-orders-title col-xs-2">Order number</section> <section class="esh-orders-title col-xs-2">Order number</section>
<section class="esh-orders-title col-xs-4">Date</section> <section class="esh-orders-title col-xs-4">Date</section>
<section class="esh-orders-title col-xs-2">Total</section> <section class="esh-orders-title col-xs-2">Total</section>
<section class="esh-orders-title col-xs-2">Status</section> <section class="esh-orders-title col-xs-2">Status</section>
<section class="esh-orders-title col-xs-2"></section> <section class="esh-orders-title col-xs-2"></section>
</article> </article>
@if (Model != null && Model.Any()) @if (Model != null && Model.Any())
{ {
foreach (var item in Model) foreach (var item in Model)
{ {
<article class="esh-orders-items row"> <article class="esh-orders-items row">
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section> <section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
<section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section> <section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section>
<section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section> <section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section> <section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section>
<section class="esh-orders-item col-xs-1"> <section class="esh-orders-item col-xs-1">
<a class="esh-orders-link" asp-controller="Order" asp-action="Detail" asp-route-orderId="@item.OrderNumber">Detail</a> <a class="esh-orders-link" asp-controller="Order" asp-action="Detail" asp-route-orderId="@item.OrderNumber">Detail</a>
</section> </section>
<section class="esh-orders-item col-xs-1"> <section class="esh-orders-item col-xs-1">
@if (item.Status.ToLower() == "submitted") @if (item.Status.ToLower() == "submitted")
{ {
<a class="esh-orders-link" asp-controller="Order" asp-action="cancel" asp-route-orderId="@item.OrderNumber">Cancel</a> <a class="esh-orders-link" asp-controller="Order" asp-action="cancel" asp-route-orderId="@item.OrderNumber">Cancel</a>
} }
</section> </section>
</article> </article>
} }
} }
</div> </div>
</div> </div>

65
src/Web/WebMVC/Views/OrderManagement/Index.cshtml
View File

@ -3,41 +3,42 @@
@model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order> @model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order>
@{ @{
ViewData["Title"] = "My Orders"; ViewData["Title"] = "My Orders";
var headers = new List<Header>() {
new Header { Controller = " Catalog", Text="Back to catalog" } };
} }
<div class="esh-orders"> <div class="esh-orders">
@Html.Partial("_Header", new List<Header>() { <partial name="_Header" model="headers" />
new Header() { Controller = "Catalog", Text = "Back to catalog" } })
<div class="container"> <div class="container">
<article class="esh-orders-titles row"> <article class="esh-orders-titles row">
<section class="esh-orders-title col-xs-2">Order number</section> <section class="esh-orders-title col-xs-2">Order number</section>
<section class="esh-orders-title col-xs-4">Date</section> <section class="esh-orders-title col-xs-4">Date</section>
<section class="esh-orders-title col-xs-2">Total</section> <section class="esh-orders-title col-xs-2">Total</section>
<section class="esh-orders-title col-xs-2">Status</section> <section class="esh-orders-title col-xs-2">Status</section>
<section class="esh-orders-title col-xs-2"></section> <section class="esh-orders-title col-xs-2"></section>
</article> </article>
@foreach (var item in Model) @foreach (var item in Model)
{ {
<article class="esh-orders-items row"> <article class="esh-orders-items row">
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section> <section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
<section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section> <section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section>
<section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section> <section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section> <section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section>
<section class="esh-orders-item col-xs-2"> <section class="esh-orders-item col-xs-2">
<form asp-action="OrderProcess" id="orderForm+@item.OrderNumber" method="post"> <form asp-action="OrderProcess" id="orderForm+@item.OrderNumber" method="post">
<input type="hidden" name="orderId" value="@item.OrderNumber" /> <input type="hidden" name="orderId" value="@item.OrderNumber" />
<select name="actionCode" asp-items="@item.ActionCodeSelectList" <select name="actionCode" asp-items="@item.ActionCodeSelectList"
disabled=@(item.Status != "paid") disabled=@(item.Status != "paid")
onchange="document.getElementById('orderForm+@item.OrderNumber').submit()"> onchange="document.getElementById('orderForm+@item.OrderNumber').submit()">
<option value="">&nbsp;&nbsp;Select Action</option> <option value="">&nbsp;&nbsp;Select Action</option>
<option value="">------------------</option> <option value="">------------------</option>
</select> </select>
</form> </form>
</section> </section>
</article> </article>
} }
</div> </div>
</div> </div>