Update - Mise à jour du site de manage

sheaft-app · Nov 30, 2020 · c005726 · c005726
1 parent b004d8c
commit c005726
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 37 deletions.
diff --git a/Sheaft.Application.Mappers/TagProfile.cs b/Sheaft.Application.Mappers/TagProfile.cs
@@ -1,16 +1,19 @@
 using AutoMapper;
 using Sheaft.Domain.Models;
 using Sheaft.Application.Models;
-using System;
+using Sheaft.Core.Extensions;
+using Sheaft.Core.Models;
 
 namespace Sheaft.Application.Mappers
 {
     public class TagProfile : Profile
     {
         public TagProfile()
         {
-            CreateMap<Tag, TagDto>();
-            CreateMap<Tag, TagViewModel>();
+            CreateMap<Tag, TagDto>()
+                .ForMember(d => d.Picture, opt => opt.MapFrom(r => CoreProductExtensions.GetPictureUrl(r.Picture, PictureSize.LARGE)));
+            CreateMap<Tag, TagViewModel>()
+                .ForMember(d => d.Picture, opt => opt.MapFrom(r => CoreProductExtensions.GetPictureUrl(r.Picture, PictureSize.LARGE)));
         }
     }
 }
diff --git a/Sheaft.Web.Manage/Controllers/AgreementsController.cs b/Sheaft.Web.Manage/Controllers/AgreementsController.cs
@@ -34,7 +34,7 @@ public AgreementsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, AgreementStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, AgreementStatus? status = null, int page = 0, int take = 25)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/BankAccountsController.cs b/Sheaft.Web.Manage/Controllers/BankAccountsController.cs
@@ -33,9 +33,8 @@ public BankAccountsController(
             _logger = logger;
         }
 
-
         [HttpGet]
-        public async Task<IActionResult> CreateBankAccount(Guid userId, CancellationToken token)
+        public async Task<IActionResult> Create(Guid userId, CancellationToken token)
         {
             var entity = await _context.Users.OfType<Business>()
                 .AsNoTracking()
@@ -55,7 +54,7 @@ public async Task<IActionResult> CreateBankAccount(Guid userId, CancellationToke
 
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> CreateBankAccount(BankAccountViewModel model, CancellationToken token)
+        public async Task<IActionResult> Create(BankAccountViewModel model, CancellationToken token)
         {
             var result = await _mediatr.Process(new CreateBankAccountCommand(await GetRequestUser(token))
             {
@@ -74,26 +73,44 @@ public async Task<IActionResult> CreateBankAccount(BankAccountViewModel model, C
                 return View(model);
             }
 
-            return RedirectToAction("Edit", new { id = model.OwnerId });
+            return RedirectToAction("Edit", new { id = result.Data });
         }
 
         [HttpGet]
-        public async Task<IActionResult> UpdateBankAccount(Guid bankAccountId, CancellationToken token)
+        public async Task<IActionResult> Edit(Guid id, CancellationToken token)
         {
-            var entity = await _context.BankAccounts.Get(c => c.Id == bankAccountId)
-                .ProjectTo<BankAccountViewModel>(_configurationProvider)
-                .SingleOrDefaultAsync(token);
+            var entity = await _context.BankAccounts
+                .SingleOrDefaultAsync(c => c.Id == id, token);
 
             if (entity == null)
                 throw new NotFoundException();
 
             ViewBag.Countries = await GetCountries(token);
-            return View(entity);
+
+            return View(new BankAccountViewModel
+            {
+                Id = entity.Id,
+                Identifier = entity.Identifier,
+                BIC = entity.BIC,
+                IBAN = entity.IBAN,
+                IsActive = entity.IsActive,
+                Name = entity.Name,
+                Owner = entity.Owner,
+                OwnerId = entity.User.Id,
+                Address = new AddressViewModel
+                {
+                    Line1 = entity.Line1,
+                    Line2 = entity.Line2,
+                    City = entity.City,
+                    Zipcode = entity.Zipcode,
+                    Country = entity.Country
+                }
+            });
         }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> UpdateBankAccount(BankAccountViewModel model, CancellationToken token)
+        public async Task<IActionResult> Edit(BankAccountViewModel model, CancellationToken token)
         {
             var result = await _mediatr.Process(new UpdateBankAccountCommand(await GetRequestUser(token))
             {
@@ -112,7 +129,7 @@ public async Task<IActionResult> UpdateBankAccount(BankAccountViewModel model, C
                 return View(model);
             }
 
-            return RedirectToAction("Edit", new { id = model.OwnerId });
+            return RedirectToAction("Edit", new { id = model.Id });
         }
     }
 }
diff --git a/Sheaft.Web.Manage/Controllers/ConsumersController.cs b/Sheaft.Web.Manage/Controllers/ConsumersController.cs
@@ -35,7 +35,7 @@ public ConsumersController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/DeclarationsController.cs b/Sheaft.Web.Manage/Controllers/DeclarationsController.cs
@@ -35,7 +35,7 @@ public DeclarationsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 25)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/DeliveryModesController.cs b/Sheaft.Web.Manage/Controllers/DeliveryModesController.cs
@@ -32,7 +32,7 @@ public DeliveryModesController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/DepartmentsController.cs b/Sheaft.Web.Manage/Controllers/DepartmentsController.cs
@@ -32,7 +32,7 @@ public DepartmentsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 200)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/DonationsController.cs b/Sheaft.Web.Manage/Controllers/DonationsController.cs
@@ -33,7 +33,7 @@ public DonationsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/JobsController.cs b/Sheaft.Web.Manage/Controllers/JobsController.cs
@@ -33,7 +33,7 @@ public JobsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, ProcessStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, ProcessStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/LegalsController.cs b/Sheaft.Web.Manage/Controllers/LegalsController.cs
@@ -35,7 +35,7 @@ public LegalsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, LegalKind? kind = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, LegalKind? kind = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/LevelsController.cs b/Sheaft.Web.Manage/Controllers/LevelsController.cs
@@ -32,7 +32,7 @@ public LevelsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/OrdersController.cs b/Sheaft.Web.Manage/Controllers/OrdersController.cs
@@ -33,7 +33,7 @@ public OrdersController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, OrderStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, OrderStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/PayinsController.cs b/Sheaft.Web.Manage/Controllers/PayinsController.cs
@@ -35,7 +35,7 @@ public PayinsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/PayoutsController.cs b/Sheaft.Web.Manage/Controllers/PayoutsController.cs
@@ -35,7 +35,7 @@ public PayoutsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/ProducersController.cs b/Sheaft.Web.Manage/Controllers/ProducersController.cs
@@ -35,7 +35,7 @@ public ProducersController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/ProductsController.cs b/Sheaft.Web.Manage/Controllers/ProductsController.cs
@@ -38,7 +38,7 @@ public ProductsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/PurchaseOrdersController.cs b/Sheaft.Web.Manage/Controllers/PurchaseOrdersController.cs
@@ -34,7 +34,7 @@ public PurchaseOrdersController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, PurchaseOrderStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, PurchaseOrderStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/RegionsController.cs b/Sheaft.Web.Manage/Controllers/RegionsController.cs
@@ -32,7 +32,7 @@ public RegionsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 20)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/ReturnablesController.cs b/Sheaft.Web.Manage/Controllers/ReturnablesController.cs
@@ -34,7 +34,7 @@ public ReturnablesController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/RewardsController.cs b/Sheaft.Web.Manage/Controllers/RewardsController.cs
@@ -35,7 +35,7 @@ public RewardsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/StoresController.cs b/Sheaft.Web.Manage/Controllers/StoresController.cs
@@ -35,7 +35,7 @@ public StoresController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/TagsController.cs b/Sheaft.Web.Manage/Controllers/TagsController.cs
@@ -34,7 +34,7 @@ public TagsController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Controllers/TransfersController.cs b/Sheaft.Web.Manage/Controllers/TransfersController.cs
@@ -35,7 +35,7 @@ public TransfersController(
         }
 
         [HttpGet]
-        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 10)
+        public async Task<IActionResult> Index(CancellationToken token, TransactionStatus? status = null, int page = 0, int take = 50)
         {
             if (page < 0)
                 page = 0;

diff --git a/Sheaft.Web.Manage/Views/BankAccounts/Create.cshtml b/Sheaft.Web.Manage/Views/BankAccounts/Create.cshtml
@@ -8,7 +8,7 @@
     <h2 class="display-4">New producer bank account</h2>
     <br />
 
-    @using (Html.BeginForm("CreateBankAccount", "Producers", FormMethod.Post))
+    @using (Html.BeginForm("Create", "BankAccounts", FormMethod.Post))
     {
         @Html.AntiForgeryToken()
         @Html.ValidationSummary(true, "", new { @class = "text-danger" })

diff --git a/...b.Manage/Views/BankAccounts/Update.cshtml → ...Web.Manage/Views/BankAccounts/Edit.cshtml b/...b.Manage/Views/BankAccounts/Update.cshtml → ...Web.Manage/Views/BankAccounts/Edit.cshtml
@@ -8,7 +8,7 @@
     <h2 class="display-4">Update producer bank account</h2>
     <br />
 
-    @using (Html.BeginForm("UpdateBankAccount", "Producers", FormMethod.Post))
+    @using (Html.BeginForm("Edit", "BankAccounts", FormMethod.Post))
     {
         @Html.AntiForgeryToken()
         @Html.ValidationSummary(true, "", new { @class = "text-danger" })