Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Adam 2024-11-12 16:44:02 +01:00
parent fb106f2fe6
commit 62934c1058
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Nop.Plugin.Misc.AuctionPlugin/Controllers/AnnouncementController.cs
View File

@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Nop.Plugin.Misc.AuctionPlugin.Domains; using Nop.Plugin.Misc.AuctionPlugin.Domains;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
using Nop.Plugin.Misc.AuctionPlugin.Hubs; using Nop.Plugin.Misc.AuctionPlugin.Hubs;
using Nop.Plugin.Misc.AuctionPlugin.Models; using Nop.Plugin.Misc.AuctionPlugin.Models;
using Nop.Plugin.Misc.AuctionPlugin.Services; using Nop.Plugin.Misc.AuctionPlugin.Services;
@ -37,16 +38,16 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
#region Methods #region Methods
public IActionResult Announcement() public IActionResult GetAnnouncementViewModel()
{ {
var model = new AnnouncementViewModel(); var model = new AnnouncementViewModel();
return View("~/Plugins/Misc.AuctionPlugin/Admin/Views/Announcement.cshtml", model); return View("~/Plugins/Misc.AuctionPlugin/Admin/Views/Announcement.cshtml", model);
} }
[HttpPost] [HttpPost]
public async Task<IActionResult> Announcement(AnnouncementViewModel viewModel) public async Task<IActionResult> GetAnnouncementViewModel(AnnouncementViewModel viewModel)
{ {
AnnouncementEntity objOfAnnouncementDomain = new AnnouncementEntity(); Announcement objOfAnnouncementDomain = new Announcement();
objOfAnnouncementDomain.Name = viewModel.Name; objOfAnnouncementDomain.Name = viewModel.Name;
objOfAnnouncementDomain.Body = viewModel.Body; objOfAnnouncementDomain.Body = viewModel.Body;
objOfAnnouncementDomain.IsActive = viewModel.IsActive; objOfAnnouncementDomain.IsActive = viewModel.IsActive;
@ -62,7 +63,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
} }
[HttpPost] [HttpPost]
public async Task<IActionResult> Edit(AnnouncementEntity model) public async Task<IActionResult> Edit(Announcement model)
{ {
var entity = await _announcementService.GetAnnouncementByIdAsync(model.Id); var entity = await _announcementService.GetAnnouncementByIdAsync(model.Id);
entity.Name = model.Name; entity.Name = model.Name;
@ -82,7 +83,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Controllers
public async Task<IActionResult> Edit(int Id) public async Task<IActionResult> Edit(int Id)
{ {
var singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id); var singleAnnouncement = await _announcementService.GetAnnouncementByIdAsync(Id);
var model = new AnnouncementEntity(); var model = new Announcement();
model.Id = singleAnnouncement.Id; model.Id = singleAnnouncement.Id;
model.Name = singleAnnouncement.Name; model.Name = singleAnnouncement.Name;
model.Body = singleAnnouncement.Body; model.Body = singleAnnouncement.Body;

1
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Announcement.cs
View File

@ -6,7 +6,6 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities
{ {
public class Announcement : BaseEntity, IEntityInt, ITimeStampCreated public class Announcement : BaseEntity, IEntityInt, ITimeStampCreated
{ {
public string Name { get; set; } public string Name { get; set; }

12
Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AnnouncementBuilder.cs
View File

@ -2,13 +2,14 @@
using FluentMigrator.Builders.Create.Table; using FluentMigrator.Builders.Create.Table;
using Nop.Data.Mapping.Builders; using Nop.Data.Mapping.Builders;
using Nop.Plugin.Misc.AuctionPlugin.Domains; using Nop.Plugin.Misc.AuctionPlugin.Domains;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders; namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders;
/// <summary> /// <summary>
/// Represents a pickup point entity builder /// Represents a pickup point entity builder
/// </summary> /// </summary>
public class AnnouncementBuilder : NopEntityBuilder<AnnouncementEntity> public class AnnouncementBuilder : NopEntityBuilder<Announcement>
{ {
#region Methods #region Methods
@ -18,16 +19,17 @@ public class AnnouncementBuilder : NopEntityBuilder<AnnouncementEntity>
/// <param name="table">Create table expression builder</param> /// <param name="table">Create table expression builder</param>
public override void MapEntity(CreateTableExpressionBuilder table) public override void MapEntity(CreateTableExpressionBuilder table)
{ {
table.WithColumn(nameof(AnnouncementEntity.Name)) table.WithColumn(nameof(Announcement.Name))
.AsString(250) .AsString(250)
.NotNullable() .NotNullable()
.WithColumn(nameof(AnnouncementEntity.IsActive)) .WithColumn(nameof(Announcement.IsActive))
.AsBoolean() .AsBoolean()
.NotNullable().WithDefault(0) .NotNullable().WithDefault(0)
.WithColumn(nameof(AnnouncementEntity.Body)) .WithColumn(nameof(Announcement.Body))
.AsString(500) .AsString(500)
.NotNullable() .NotNullable()
.WithColumn(nameof(AnnouncementEntity.Created)).AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime); .WithColumn(nameof(Announcement.Created))
.AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime);
} }

1
Nop.Plugin.Misc.AuctionPlugin/Nop.Plugin.Misc.AuctionPlugin.csproj
View File

@ -101,6 +101,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MessagePack.Annotations" Version="2.5.192" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
</ItemGroup> </ItemGroup>