Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

#64 - fixed format of datetime

DanielŻuławskiafc7ebc0c99c
diff --git a/src/Web/Grand.Web/Views/Account/Reviews.cshtml b/src/Web/Grand.Web/Views/Account/Reviews.cshtml
index 2af31a75b..e3bcf16e7 100644
--- a/src/Web/Grand.Web/Views/Account/Reviews.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Reviews.cshtml
@@ -1,9 +1,12 @@
@model CustomerProductReviewsModel
@using Grand.Web.Models.Customer;
@inject IPageHeadBuilder pagebuilder
+@inject IWorkContext workContext
@{
Layout = "_TwoColumns";
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(Loc["Title.Account"]);
}
@@ -23,9 +26,17 @@
<header class="card-header">
<div class="review-info d-inline-flex w-100">
<b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
- <small class="date text-muted">
- <span>@Loc["Reviews.Date"]:</span>
- <span>@review.CreatedOn.ToString("g")</span>
+ <small class="date d-flex text-muted">
+ @if (supportRtl)
+ {
+ <span class="ml-1">@Loc["Reviews.Date"]:</span>
+ <span>@Convert.ToDateTime(review.CreatedOn).ToString("tt HH:mm yyyy/MM/dd")</span>
+ }
+ else
+ {
+ <span class="mr-1">@Loc["Reviews.Date"]:</span>
+ <span>@review.CreatedOn.ToString("g")</span>
+ }
</small>
</div>
</header>
diff --git a/src/Web/Grand.Web/Views/Blog/BlogPost.cshtml b/src/Web/Grand.Web/Views/Blog/BlogPost.cshtml
index f4a95cb65..d8b722936 100644
--- a/src/Web/Grand.Web/Views/Blog/BlogPost.cshtml
+++ b/src/Web/Grand.Web/Views/Blog/BlogPost.cshtml
@@ -1,9 +1,12 @@
@model BlogPostModel
@using Grand.Web.Models.Blogs;
@inject IPageHeadBuilder pagebuilder
+@inject IWorkContext workContext
@{
Layout = "_TwoColumns";
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Title);
pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);
@@ -30,9 +33,9 @@
</span>
</div>
@await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_before_body", additionalData = Model.Id })
- <div class="card-body">
- @Html.Raw(Model.Body)
- </div>
+ <div class="card-body">
+ @Html.Raw(Model.Body)
+ </div>
</div>
@await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_before_products", additionalData = Model.Id })
@@ -71,7 +74,7 @@
<div class="form-fields">
<div class="form-group">
<label asp-for="AddNewComment.CommentText" class="col-form-label">@Loc["Blog.Comments.CommentText"]:</label>
- <textarea asp-for="AddNewComment.CommentText" class="enter-comment-text form-control" v-validate="'required'" ></textarea>
+ <textarea asp-for="AddNewComment.CommentText" class="enter-comment-text form-control" v-validate="'required'"></textarea>
<span class="field-validation-error">{{veeErrors.first('AddNewComment.CommentText')}}</span>
<span asp-validation-for="AddNewComment.CommentText"></span>
</div>
@@ -99,15 +102,23 @@
<div class="d-inline-flex w-100">
<h6 class="mb-0">@comment.CustomerName</h6>
<b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
- <small class="date text-muted">
- <span>@Loc["Blog.Comments.CreatedOn"]:</span>
- <span>@comment.CreatedOn.ToString("g")</span>
+ <small class="date d-flex text-muted">
+ @if (supportRtl)
+ {
+ <span class="ml-1">@Loc["Blog.Comments.CreatedOn"]:</span>
+ <span>@Convert.ToDateTime(comment.CreatedOn).ToString("tt HH:mm yyyy/MM/dd")</span>
+ }
+ else
+ {
+ <span class="mr-1">@Loc["Blog.Comments.CreatedOn"]:</span>
+ <span>@comment.CreatedOn.ToString("g")</span>
+ }
</small>
</div>
</div>
- <div class="col-12 px-0">
+ <div class="col-12">
<div class="row">
- <div class="col">
+ <div class="col p-3">
@comment.CommentText
</div>
</div>
diff --git a/src/Web/Grand.Web/Views/News/NewsItem.cshtml b/src/Web/Grand.Web/Views/News/NewsItem.cshtml
index 2a34057f2..038620545 100644
--- a/src/Web/Grand.Web/Views/News/NewsItem.cshtml
+++ b/src/Web/Grand.Web/Views/News/NewsItem.cshtml
@@ -1,8 +1,11 @@
@model NewsItemModel
@inject IPageHeadBuilder pagebuilder
+@inject IWorkContext workContext
@{
Layout = "_TwoColumns";
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Title);
pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);
@@ -74,26 +77,34 @@
<div class="comments">
@foreach (var comment in Model.Comments)
{
- <div class="card mb-3">
- <div class="card-header">
- <div class="d-inline-flex w-100">
- <h6 class="mb-0">@comment.CustomerName</h6>
- <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
- <small class="date text-muted">
- <span>@Loc["News.Comments.CreatedOn"]:</span>
- <span>@comment.CreatedOn.ToString("g")</span>
- </small>
+ <div class="card mb-3">
+ <div class="card-header">
+ <div class="d-inline-flex w-100">
+ <h6 class="mb-0">@comment.CustomerName</h6>
+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
+ <small class="date d-flex text-muted">
+ @if (supportRtl)
+ {
+ <span class="ml-1">@Loc["News.Comments.CreatedOn"]:</span>
+ <span>@Convert.ToDateTime(comment.CreatedOn).ToString("tt HH:mm yyyy/MM/dd")</span>
+ }
+ else
+ {
+ <span class="mr-1">@Loc["News.Comments.CreatedOn"]:</span>
+ <span>@comment.CreatedOn.ToString("g")</span>
+ }
+ </small>
+ </div>
</div>
- </div>
- <div class="col-12 px-0">
- <div class="row">
- <div class="col">
- <h5>@comment.CommentTitle</h5>
- @comment.CommentText
+ <div class="col-12">
+ <div class="row">
+ <div class="col p-3">
+ <h5>@comment.CommentTitle</h5>
+ @comment.CommentText
+ </div>
</div>
</div>
</div>
- </div>
}
</div>
</div>
diff --git a/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml b/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
index f61cad24c..1618bebab 100644
--- a/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
+++ b/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
@@ -1,8 +1,11 @@
@model CustomerOrderListModel
@inject IPageHeadBuilder pagebuilder
+@inject IWorkContext workContext
@{
Layout = "_TwoColumns";
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(Loc["Title.Account"]);
}
@@ -27,9 +30,22 @@
</div>
<div class="card-body">
<ul class="info mb-0 px-0">
- <li><span>@Loc["Account.CustomerOrders.OrderStatus"]:</span> <span class="order-status">@order.OrderStatus</span></li>
- <li><span class="order-date"><span>@Loc["Account.CustomerOrders.OrderDate"]:</span> <span>@order.CreatedOn.ToString()</span></span></li>
- <li><span>@Loc["Account.CustomerOrders.OrderTotal"]:</span> <span class="order-total">@order.OrderTotal</span></li>
+ <li class="d-flex"><span class="mx-1">@Loc["Account.CustomerOrders.OrderStatus"]:</span> <span class="order-status">@order.OrderStatus</span></li>
+ <li>
+ <span class="order-date d-flex">
+ @if (supportRtl)
+ {
+ <span class="ml-1">@Loc["Account.CustomerOrders.OrderDate"]:</span>
+ <span>@Convert.ToDateTime(order.CreatedOn).ToString("tt HH:mm yyyy/MM/dd")</span>
+ }
+ else
+ {
+ <span class="mr-1">@Loc["Account.CustomerOrders.OrderDate"]:</span>
+ <span>@order.CreatedOn.ToString("g")</span>
+ }
+ </span>
+ </li>
+ <li class="d-flex"><span class="mx-1">@Loc["Account.CustomerOrders.OrderTotal"]:</span> <span class="order-total">@order.OrderTotal</span></li>
</ul>
</div>
<div class="card-footer">
diff --git a/src/Web/Grand.Web/Views/Order/Details.cshtml b/src/Web/Grand.Web/Views/Order/Details.cshtml
index 40b1667ac..8373d918f 100644
--- a/src/Web/Grand.Web/Views/Order/Details.cshtml
+++ b/src/Web/Grand.Web/Views/Order/Details.cshtml
@@ -1,7 +1,7 @@
@model OrderDetailsModel
@inject SeoSettings seoSettings
@inject IPageHeadBuilder pagebuilder
-
+@inject IWorkContext workContext
@{
if (!Model.PrintMode)
{
@@ -12,6 +12,9 @@
{
Layout = "_Print";
}
+
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(Loc["Title.OrderDetails"]);
}
@@ -58,23 +61,32 @@
<ul class="order-overview px-0">
<li class="title">
<h5 class="order-number h4">
- <strong>@Loc["Order.Order#"]@Model.OrderNumber</strong>
+ <span class="d-flex"><strong>@Loc["Order.Order#"]</strong><strong>@Model.OrderNumber</strong></span>
</h5>
</li>
@if (!string.IsNullOrEmpty(Model.OrderCode))
{
- <li class="order-code">
- @Loc["Order.OrderCode"]: @Model.OrderCode
+ <li class="order-code d-flex">
+ <span class="mx-1">@Loc["Order.OrderCode"]:</span><span>@Model.OrderCode</span>
</li>
}
- <li class="order-date">
- @Loc["Order.OrderDate"]: @Model.CreatedOn.ToString("D")
+ <li class="order-date d-flex">
+ @if (supportRtl)
+ {
+ <span class="mx-1">@Loc["Order.OrderDate"]:</span>
+ <span>@Convert.ToDateTime(Model.CreatedOn).ToString("yyyy, MMMM ,dddd")</span>
+ }
+ else
+ {
+ <span class="mx-1">@Loc["Order.OrderDate"]:</span>
+ <span>@Model.CreatedOn.ToString("D")</span>
+ }
</li>
- <li class="order-status">
- @Loc["Order.OrderStatus"]: @Model.OrderStatus
+ <li class="order-status d-flex">
+ <span class="mx-1">@Loc["Order.OrderStatus"]:</span><span>@Model.OrderStatus</span>
</li>
- <li class="order-total">
- @Loc["Order.OrderTotal"]: <span class="h5 mb-0"><strong>@Model.OrderTotal</strong></span>
+ <li class="order-total d-flex">
+ <span class="mx-1">@Loc["Order.OrderTotal"]:</span><span class="h5 mb-0"><strong>@Model.OrderTotal</strong></span>
</li>
@await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_overview", additionalData = Model.Id })
</ul>
@@ -127,8 +139,8 @@
</li>
}
@if (Model.BillingAddress.CityEnabled ||
- Model.BillingAddress.StateProvinceEnabled ||
- Model.BillingAddress.ZipPostalCodeEnabled)
+ Model.BillingAddress.StateProvinceEnabled ||
+ Model.BillingAddress.ZipPostalCodeEnabled)
{
<li class="city-state-zip">
@if (Model.BillingAddress.CityEnabled)
@@ -366,9 +378,9 @@
</div>
}
</div>
- </div>
</div>
</div>
+ </div>
@if (Model.Items.Any())
{
@@ -624,28 +636,48 @@
@item.TrackingNumber
</div>
<div class="shipped-date col-md-3 col-sm-12">
- @if (item.ShippedDate.HasValue)
- {
- <strong class="d-lg-none">@Loc["Order.Shipments.ShippedDate"]: </strong>
- <span>@item.ShippedDate.Value.ToString("D")</span>
- }
- else
- {
- <strong class="d-lg-none">@Loc["Order.Shipments.ShippedDate"]: </strong>
- <span>@Loc["Order.Shipments.ShippedDate.NotYet"]</span>
- }
+ <div class="d-flex">
+ @if (item.ShippedDate.HasValue)
+ {
+ if (supportRtl)
+ {
+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.ShippedDate"]:</strong>
+ <span>@Convert.ToDateTime(item.ShippedDate.Value).ToString("yyyy, MMMM ,dddd")</span>
+ }
+ else
+ {
+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.ShippedDate"]:</strong>
+ <span>@item.ShippedDate.Value.ToString("D")</span>
+ }
+ }
+ else
+ {
+ <strong class="d-lg-none">@Loc["Order.Shipments.ShippedDate"]: </strong>
+ <span>@Loc["Order.Shipments.ShippedDate.NotYet"]</span>
+ }
+ </div>
</div>
<div class="delivery-date col-md-3 col-sm-12">
- @if (item.DeliveryDate.HasValue)
- {
- <strong class="d-lg-none">@Loc["Order.Shipments.DeliveryDate"]: </strong>
- <span>@item.DeliveryDate.Value.ToString("D")</span>
- }
- else
- {
- <span class="d-lg-none">@Loc["Order.Shipments.ViewDetails"]</span>
- <span>@Loc["Order.Shipments.DeliveryDate.NotYet"]</span>
- }
+ <div class="d-fle">
+ @if (item.DeliveryDate.HasValue)
+ {
+ if (supportRtl)
+ {
+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.OrderDate"]:</strong>
+ <span>@Convert.ToDateTime(item.DeliveryDate.Value).ToString("yyyy, MMMM ,dddd")</span>
+ }
+ else
+ {
+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.OrderDate"]:</strong>
+ <span>@item.DeliveryDate.Value.ToString("D")</span>
+ }
+ }
+ else
+ {
+ <span class="d-lg-none">@Loc["Order.Shipments.ViewDetails"]</span>
+ <span>@Loc["Order.Shipments.DeliveryDate.NotYet"]</span>
+ }
+ </div>
</div>
<div class="view-details col-md-2 col-sm-12">
<a class="btn btn-sm btn-secondary" href="@Url.RouteUrl("ShipmentDetails", new { shipmentId = item.Id })" title="@Loc["Order.Shipments.ViewDetails"]">@Loc["Order.Shipments.ViewDetails"]</a>
diff --git a/src/Web/Grand.Web/Views/Product/ProductReviews.cshtml b/src/Web/Grand.Web/Views/Product/ProductReviews.cshtml
index e08979b8a..ad070a5c3 100644
--- a/src/Web/Grand.Web/Views/Product/ProductReviews.cshtml
+++ b/src/Web/Grand.Web/Views/Product/ProductReviews.cshtml
@@ -1,10 +1,13 @@
@model ProductReviewsModel
@inject IPageHeadBuilder pagebuilder
+@inject IWorkContext workContext
<script asp-location="Footer" src="/theme/script/product.reviews.js"></script>
@{
Layout = "_SingleColumn";
+ var supportRtl = workContext.WorkingLanguage.Rtl;
+
//title
pagebuilder.AddTitleParts(Model.ProductName);
pagebuilder.AddTitleParts(Loc["Title.ProductReviews"]);
@@ -61,47 +64,55 @@
@foreach (var review in Model.Items)
{
int ratingStars = review.Rating;
- <div class="card product-review-item mb-3" data-url="@Url.RouteUrl("SetProductReviewHelpfulness")" data-id="@Model.ProductId" data-reviewid="@review.Id" data-title="@Loc["Reviews.Helpfulness.WasHelpful?"]">
- <div class="card-header">
- <div class="review-info d-inline-flex w-100">
- <div class="user d-inline-flex align-items-center">
- <small class="text-muted mr-2">@Loc["Reviews.From"]:</small>
- <h6 class="mb-0">@review.CustomerName</h6>
+ <div class="card product-review-item mb-3" data-url="@Url.RouteUrl("SetProductReviewHelpfulness")" data-id="@Model.ProductId" data-reviewid="@review.Id" data-title="@Loc["Reviews.Helpfulness.WasHelpful?"]">
+ <div class="card-header">
+ <div class="review-info d-inline-flex w-100">
+ <div class="user d-inline-flex align-items-center">
+ <small class="text-muted mr-2">@Loc["Reviews.From"]:</small>
+ <h6 class="mb-0">@review.CustomerName</h6>
+ </div>
+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
+ <small class="date text-muted">
+ @if (supportRtl)
+ {
+ <span class="ml-1">@Loc["Reviews.Date"]:</span>
+ <span>@Convert.ToDateTime(review.WrittenOnStr).ToString("tt HH:mm yyyy/MM/dd")</span>
+ }
+ else
+ {
+ <span class="mr-1">@Loc["Reviews.Date"]:</span>
+ <span>@review.WrittenOnStr</span>
+ }
+ </small>
+ </div>
</div>
- <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>
- <small class="date text-muted">
- <span>@Loc["Reviews.Date"]:</span>
- <span>@review.WrittenOnStr</span>
- </small>
- </div>
- </div>
- <div class="card-body">
- <div class="review-title mb-3">
- <h5 class="mb-0">@review.Title</h5>
- <b-form-rating id='rating-inline2' class='p-0' variant='warning' no-border size='sm' show-value precision='2' readonly inline value='@(ratingStars)'></b-form-rating>
- </div>
- <div class="review-content">
- <div class="review-text">
- @review.ReviewText
+ <div class="card-body">
+ <div class="review-title mb-3">
+ <h5 class="mb-0">@review.Title</h5>
+ <b-form-rating id='rating-inline2' class='p-0' variant='warning' no-border size='sm' show-value precision='2' readonly inline value='@(ratingStars)'></b-form-rating>
+ </div>
+ <div class="review-content">
+ <div class="review-text">
+ @review.ReviewText
+ </div>
+ </div>
+ </div>
+ @if (!string.IsNullOrEmpty(review.ReplyText))
+ {
+ <div class="reply-content">
+ <blockquote class="administration-response px-3">
+ <h5 class="administration-response-header">@Loc["Reviews.AdministrationResponse"]</h5>
+ <span>@review.ReplyText</span>
+ <figcaption class="blockquote-footer">
+ @review.Signature
+ </figcaption>
+ </blockquote>
+ </div>
+ }
+ <div class="card-footer">
+ <partial name="_ProductReviewHelpfulness" model="review.Helpfulness" />
</div>
</div>
- </div>
- @if (!string.IsNullOrEmpty(review.ReplyText))
- {
- <div class="reply-content">
- <blockquote class="administration-response px-3">
- <h5 class="administration-response-header">@Loc["Reviews.AdministrationResponse"]</h5>
- <span>@review.ReplyText</span>
- <figcaption class="blockquote-footer">
- @review.Signature
- </figcaption>
- </blockquote>
- </div>
- }
- <div class="card-footer">
- <partial name="_ProductReviewHelpfulness" model="review.Helpfulness" />
- </div>
- </div>
}
</div>
}