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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Issue-413- Slider Image Scheduling (#414)
SUNIL PARISI20406d1da63a
diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.csindex 0a85fb444..b876012a6 100644--- a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs@@ -10,6 +10,7 @@ using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Widgets.Slider.Models;using Widgets.Slider.Services;+using Grand.Business.Core.Interfaces.Common.Directory;namespace Widgets.Slider.Areas.Admin.Controllers{@@ -24,6 +25,7 @@ namespace Widgets.Slider.Areas.Admin.Controllersprivate readonly ILanguageService _languageService;private readonly SliderWidgetSettings _sliderWidgetSettings;private readonly ISettingService _settingService;+ private readonly IDateTimeService _dateTimeService;public WidgetsSliderController(IPictureService pictureService,@@ -31,7 +33,8 @@ namespace Widgets.Slider.Areas.Admin.ControllersISliderService sliderService,ILanguageService languageService,ISettingService settingService,- SliderWidgetSettings sliderWidgetSettings)+ SliderWidgetSettings sliderWidgetSettings,+ IDateTimeService dateTimeService){_pictureService = pictureService;_translationService = translationService;@@ -39,6 +42,7 @@ namespace Widgets.Slider.Areas.Admin.Controllers_languageService = languageService;_settingService = settingService;_sliderWidgetSettings = sliderWidgetSettings;+ _dateTimeService = dateTimeService;}public IActionResult Configure(){@@ -96,7 +100,7 @@ namespace Widgets.Slider.Areas.Admin.Controllers{if (ModelState.IsValid){- var pictureSlider = model.ToEntity();+ var pictureSlider = model.ToEntity(_dateTimeService);pictureSlider.Locales = model.Locales.ToLocalizedProperty();await _sliderService.InsertPictureSlider(pictureSlider);@@ -113,7 +117,7 @@ namespace Widgets.Slider.Areas.Admin.Controllersif (slide == null)return RedirectToAction("Configure");- var model = slide.ToModel();+ var model = slide.ToModel(_dateTimeService);//localesawait AddLocales(_languageService, model.Locales, (locale, languageId) =>@@ -134,7 +138,7 @@ namespace Widgets.Slider.Areas.Admin.Controllersif (ModelState.IsValid){- pictureSlider = model.ToEntity();+ pictureSlider = model.ToEntity(_dateTimeService);pictureSlider.Locales = model.Locales.ToLocalizedProperty();await _sliderService.UpdatePictureSlider(pictureSlider);Success(_translationService.GetResource("Widgets.Slider.Edited"));diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtmlindex 5fd9ce0bc..4afd55f15 100644--- a/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml@@ -142,5 +142,17 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <admin-label asp-for="StartDateUtc" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="StartDateUtc" />+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="EndDateUtc" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="EndDateUtc" />+ </div>+ </div></div></div>diff --git a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.csindex 7edf5bcd6..9f61fec81 100644--- a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs@@ -38,6 +38,9 @@ namespace Widgets.Slider.ViewComponentsvar i = 1;foreach (var item in sliders.OrderBy(x => x.DisplayOrder)){+ if ((item.StartDateUtc.HasValue && item.StartDateUtc > DateTime.UtcNow) || (item.EndDateUtc.HasValue && item.EndDateUtc < DateTime.UtcNow))+ continue;+model.Slide.Add(new PublicInfoModel.Slider() {Link = item.Link,PictureUrl = await GetPictureUrl(item.PictureId),@@ -48,7 +51,6 @@ namespace Widgets.Slider.ViewComponents});i++;}-}public async Task<IViewComponentResult> InvokeAsync(string widgetZone, object additionalData = null)diff --git a/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs b/src/Plugins/Widgets.Slider/Domain/PictureSlider.csindex 4972ced75..d86209e2f 100644--- a/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs+++ b/src/Plugins/Widgets.Slider/Domain/PictureSlider.cs@@ -23,5 +23,7 @@ namespace Widgets.Slider.Domainpublic bool LimitedToStores { get; set; }public IList<string> Stores { get; set; }public IList<TranslationEntity> Locales { get; set; }+ public DateTime? StartDateUtc { get; set; }+ public DateTime? EndDateUtc { get; set; }}}diff --git a/src/Plugins/Widgets.Slider/Extensions.cs b/src/Plugins/Widgets.Slider/Extensions.csindex a7bf28f6c..3f8b2f6cc 100644--- a/src/Plugins/Widgets.Slider/Extensions.cs+++ b/src/Plugins/Widgets.Slider/Extensions.cs@@ -4,19 +4,28 @@ using Grand.Infrastructure.Mapper;using System.Reflection;using Widgets.Slider.Domain;using Widgets.Slider.Models;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Web.Common.Extensions;namespace Widgets.Slider{public static class MyExtensions{- public static SlideModel ToModel(this PictureSlider entity)+ public static SlideModel ToModel(this PictureSlider entity, IDateTimeService dateTimeService){++ var slideModel = entity.MapTo<PictureSlider, SlideModel>();+ slideModel.StartDateUtc = entity.StartDateUtc.ConvertToUserTime(dateTimeService);+ slideModel.EndDateUtc = entity.EndDateUtc.ConvertToUserTime(dateTimeService);return entity.MapTo<PictureSlider, SlideModel>();}- public static PictureSlider ToEntity(this SlideModel model)+ public static PictureSlider ToEntity(this SlideModel model, IDateTimeService dateTimeService){- return model.MapTo<SlideModel, PictureSlider>();+ var pictureSlider = model.MapTo<SlideModel, PictureSlider>();+ pictureSlider.StartDateUtc = model.StartDateUtc.ConvertToUtcTime(dateTimeService);+ pictureSlider.EndDateUtc = model.EndDateUtc.ConvertToUtcTime(dateTimeService);+ return pictureSlider;}@@ -59,7 +68,5 @@ namespace Widgets.Slider{return obj.GetProperty(propertyName) != null;}- }--+ }}\ No newline at end of filediff --git a/src/Plugins/Widgets.Slider/Models/SlideModel.cs b/src/Plugins/Widgets.Slider/Models/SlideModel.csindex ee6ec9431..b84abe6ab 100644--- a/src/Plugins/Widgets.Slider/Models/SlideModel.cs+++ b/src/Plugins/Widgets.Slider/Models/SlideModel.cs@@ -55,6 +55,14 @@ namespace Widgets.Slider.Models[GrandResourceDisplayName("Widgets.Slider.Brand")]public string BrandId { get; set; }+ [GrandResourceDisplayName("Widgets.Slider.StartDate")]+ [UIHint("DateTimeNullable")]+ public DateTime? StartDateUtc { get; set; }++ [GrandResourceDisplayName("Widgets.Slider.EndDate")]+ [UIHint("DateTimeNullable")]+ public DateTime? EndDateUtc { get; set; }+}public class SlideLocalizedModel : ILocalizedModelLocaldiff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.csindex 36e35cf8a..a22430330 100644--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs@@ -125,8 +125,9 @@ namespace Widgets.Sliderawait this.AddOrUpdatePluginTranslateResource(_translationService, _languageService, "Widgets.Slider.SliderType", "Slider type");await this.AddOrUpdatePluginTranslateResource(_translationService, _languageService, "Widgets.Slider.SliderType.Hint", "Choose the slider type. Home page, category or collection page.");await this.AddOrUpdatePluginTranslateResource(_translationService, _languageService, "Widgets.Slider.Stores", "Stores");--+ await this.AddOrUpdatePluginTranslateResource(_translationService, _languageService, "Widgets.Slider.StartDate", "Start Date");+ await this.AddOrUpdatePluginTranslateResource(_translationService, _languageService, "Widgets.Slider.EndDate", "End Date");+await base.Install();}@@ -182,6 +183,8 @@ namespace Widgets.Sliderawait this.DeletePluginTranslationResource(_translationService, _languageService, "Widgets.Slider.SliderType");await this.DeletePluginTranslationResource(_translationService, _languageService, "Widgets.Slider.SliderType.Hint");await this.DeletePluginTranslationResource(_translationService, _languageService, "Widgets.Slider.Stores");+ await this.DeletePluginTranslationResource(_translationService, _languageService, "Widgets.Slider.StartDate");+ await this.DeletePluginTranslationResource(_translationService, _languageService, "Widgets.Slider.EndDate");await base.Uninstall();}diff --git a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.csindex 1628eba5f..4ea6f2434 100644--- a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs@@ -13,6 +13,7 @@ using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Orders;using Grand.Web.Common.DataSource;+using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;using MediatR;diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.csindex 7e39f66f9..8dba7be3b 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Blogs;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Blogs;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.csindex 6cdf9f81c..29f669d3f 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Discounts;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Discounts;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.csindex e7cd5f4b1..141e4f6cb 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Orders;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.csindex e0cf1df4f..844d2bf57 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.News;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.News;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.csindex fe10974d2..9d16ef8b5 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Pages;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Pages;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.csindex 637576820..26176bf5a 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Catalog;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.csindex 050031c83..e1c8a5fc0 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Tasks;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Web.Admin.Models.Tasks;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.csindex 90b0564d5..8aa09ecb9 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs@@ -2,6 +2,7 @@using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;using Grand.Web.Admin.Models.Catalog;+using Grand.Web.Common.Extensions;namespace Grand.Web.Admin.Extensions.Mapping{diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs b/src/Web/Grand.Web.Common/Extensions/DateTimeMappingExtensions.cssimilarity index 93%rename from src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.csrename to src/Web/Grand.Web.Common/Extensions/DateTimeMappingExtensions.csindex f9e3329d5..f2d53c206 100644--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs+++ b/src/Web/Grand.Web.Common/Extensions/DateTimeMappingExtensions.cs@@ -1,6 +1,6 @@using Grand.Business.Core.Interfaces.Common.Directory;-namespace Grand.Web.Admin.Extensions.Mapping+namespace Grand.Web.Common.Extensions{public static class DateTimeMappingExtensions{@@ -22,7 +22,7 @@ namespace Grand.Web.Admin.Extensions.Mappingpublic static DateTime ConvertToUserTime(this DateTime datetime, IDateTimeService dateTimeService){- if(datetime.Kind == DateTimeKind.Utc)+ if (datetime.Kind == DateTimeKind.Utc)return dateTimeService.ConvertToUserTime(datetime, TimeZoneInfo.Utc, dateTimeService.CurrentTimeZone);return datetime;@@ -36,4 +36,6 @@ namespace Grand.Web.Admin.Extensions.Mappingreturn datetime;}}-}\ No newline at end of file+++}