From baf2c8c813805e6f513d5e90426a69fa84b8b7a5 Mon Sep 17 00:00:00 2001 From: samg Date: Wed, 8 Sep 2021 15:50:01 +1200 Subject: [PATCH 1/5] refactor dialog into confirmation component --- .../Pages/BulkReversals.razor | 23 ++------------ .../Pages/BulkReversals.razor.cs | 31 ++++++++++--------- .../Shared/BulkReversalConfirmation.razor | 25 +++++++++++++++ 3 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor b/SmartPower.Client.Blazor/Pages/BulkReversals.razor index 0b89f49..805728d 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor @@ -21,26 +21,7 @@ else { @if (DirtyPendingReversals) { - + }
@@ -56,7 +37,7 @@ else
  • - +
  • diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs index 7bbd0ee..8010730 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs @@ -28,26 +28,24 @@ protected async Task ClearList() await OnInitializedAsync(); } - protected void CloseDialog() + protected async Task BulkReversal() { - DirtyPendingReversals = false; + var batchNumber = await BulkReversalService.CreateReversals(Constant.CurrentUser); + + BatchProcessedMessage = $"{Constant.BulkReversal.Message.BatchCreatedAction} {batchNumber}"; + + Reset(); + + await OnInitializedAsync(); } - protected async Task BulkReversal(bool dirtyPendingReversalsConfirmation) + protected async Task ValidatedBulkReversal() { - if (dirtyPendingReversalsConfirmation) - { - var batchNumber = await BulkReversalService.CreateReversals(Constant.CurrentUser); + DirtyPendingReversals = await BulkReversalService.ValidatePendingReversals(Constant.CurrentUser); - BatchProcessedMessage = $"{Constant.BulkReversal.Message.BatchCreatedAction} {batchNumber}"; - - Reset(); - - await OnInitializedAsync(); - } - else + if (!DirtyPendingReversals) { - DirtyPendingReversals = await BulkReversalService.ValidatePendingReversals(Constant.CurrentUser); + await BulkReversal(); } } @@ -56,6 +54,11 @@ protected void NavigateToBulkReversalInput() NavigationManager.NavigateTo("bulk-reversal-input"); } + protected void CloseDialog() + { + DirtyPendingReversals = false; + } + private void Reset() { DirtyPendingReversals = false; diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor b/SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor new file mode 100644 index 0000000..5540c7b --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor @@ -0,0 +1,25 @@ + + +@code { + [Parameter] public EventCallback OnContinue { get; set; } + [Parameter] public EventCallback OnClose { get; set; } +} From 290799c130e6754eddf12eef4538c6aaa1e6555e Mon Sep 17 00:00:00 2001 From: samg Date: Wed, 8 Sep 2021 22:20:21 +1200 Subject: [PATCH 2/5] refactor init --- SmartPower.Client.Blazor/Automapper.cs | 1 + .../Pages/BulkReversalInput.razor | 13 +------ .../Pages/BulkReversalInput.razor.cs | 13 +++++-- .../Pages/BulkReversals.razor | 6 ---- .../Pages/BulkReversals.razor.cs | 11 ++++++ SmartPower.Client.Blazor/Pages/Invoice.razor | 19 ++++++++++ .../Pages/Invoice.razor.cs | 27 ++++++++++++++ .../Shared/BulkReversalBreadcrumbs.razor | 5 +++ .../Shared/BulkReversalList.razor | 20 +++++++---- .../Shared/InvoiceRow.razor | 9 +++++ .../Shared/InvoiceRow.razor.cs | 11 ++++++ .../Shared/InvoiceRowHeader.razor | 11 ++++++ SmartPower.Client.Blazor/Shared/Toaster.razor | 19 +++++++++- SmartPower.Client.Blazor/Startup.cs | 2 ++ SmartPower.Client.Blazor/_Imports.razor | 2 +- SmartPower.Common/Constant.cs | 9 +++++ .../Model/Projection/InvoiceSummary.cs | 16 +++++++++ SmartPower.Data.Entity/Repository/IInvoice.cs | 10 ++++++ SmartPower.Data.Entity/Repository/Invoice.cs | 35 +++++++++++++++++++ SmartPower.Dto/Response/InvoiceSummary.cs | 16 +++++++++ 20 files changed, 226 insertions(+), 29 deletions(-) create mode 100644 SmartPower.Client.Blazor/Pages/Invoice.razor create mode 100644 SmartPower.Client.Blazor/Pages/Invoice.razor.cs create mode 100644 SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor create mode 100644 SmartPower.Client.Blazor/Shared/InvoiceRow.razor create mode 100644 SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs create mode 100644 SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor create mode 100644 SmartPower.Data.Entity/Model/Projection/InvoiceSummary.cs create mode 100644 SmartPower.Data.Entity/Repository/IInvoice.cs create mode 100644 SmartPower.Data.Entity/Repository/Invoice.cs create mode 100644 SmartPower.Dto/Response/InvoiceSummary.cs diff --git a/SmartPower.Client.Blazor/Automapper.cs b/SmartPower.Client.Blazor/Automapper.cs index 7afd13d..741d2f1 100644 --- a/SmartPower.Client.Blazor/Automapper.cs +++ b/SmartPower.Client.Blazor/Automapper.cs @@ -7,6 +7,7 @@ public class AutoMapper : Profile public AutoMapper() { CreateMap(); + CreateMap(); } } } diff --git a/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor b/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor index 6a8dfdb..f47e588 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor +++ b/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor @@ -1,17 +1,6 @@ @page "/bulk-reversal-input" -@using global::AutoMapper - -@inject NavigationManager NavigationManager -@inject IMapper Mapper -@inject Domain.Service.IBulkReversal BulkReversalService - - +

    Bulk Reversal Input

    diff --git a/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor.cs b/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor.cs index 0d28d8a..ad8fdd9 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor.cs +++ b/SmartPower.Client.Blazor/Pages/BulkReversalInput.razor.cs @@ -1,16 +1,25 @@ using System.Threading.Tasks; +using AutoMapper; +using Microsoft.AspNetCore.Components; namespace SmartPower.Client.Blazor.Pages { partial class BulkReversalInput { + [Inject] + public NavigationManager NavigationManager { get; set; } + + [Inject] + public IMapper Mapper { get; set; } + + [Inject] + public Domain.Service.IBulkReversal BulkReversalService { get; set; } + public BulkReversalInput() { BulkReversal = new Dto.Request.BulkReversal { BatchNumber = 2, UserName = Common.Constant.CurrentUser }; } - public string OrgSpinText { get; set; } - public Dto.Request.BulkReversal BulkReversal { get; set; } private async Task HandleValidSubmit() diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor b/SmartPower.Client.Blazor/Pages/BulkReversals.razor index 805728d..f8c2afd 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor @@ -1,11 +1,5 @@ @page "/bulk-reversals" -@using global::AutoMapper - -@inject NavigationManager NavigationManager -@inject IMapper Mapper -@inject Domain.Service.IBulkReversal BulkReversalService - @if (!string.IsNullOrEmpty(BatchProcessedMessage)) { diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs index 8010730..18e0a1f 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs @@ -1,11 +1,22 @@ using System.Collections.Generic; using System.Threading.Tasks; +using AutoMapper; +using Microsoft.AspNetCore.Components; using SmartPower.Common; namespace SmartPower.Client.Blazor.Pages { partial class BulkReversals { + [Inject] + public NavigationManager NavigationManager { get; set; } + + [Inject] + public IMapper Mapper { get; set; } + + [Inject] + public Domain.Service.IBulkReversal BulkReversalService { get; set; } + public List BulkReversalList { get; set; } public bool DirtyPendingReversals { get; set; } diff --git a/SmartPower.Client.Blazor/Pages/Invoice.razor b/SmartPower.Client.Blazor/Pages/Invoice.razor new file mode 100644 index 0000000..7e5368c --- /dev/null +++ b/SmartPower.Client.Blazor/Pages/Invoice.razor @@ -0,0 +1,19 @@ +@page "/invoice/{spInvoiceNumber:int}" + +@using SmartPower.Common + + + +@if (InvoiceSummary == null) +{ + +} +else +{ + + + + + +
    +} diff --git a/SmartPower.Client.Blazor/Pages/Invoice.razor.cs b/SmartPower.Client.Blazor/Pages/Invoice.razor.cs new file mode 100644 index 0000000..72f5a6d --- /dev/null +++ b/SmartPower.Client.Blazor/Pages/Invoice.razor.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using AutoMapper; +using Microsoft.AspNetCore.Components; + +namespace SmartPower.Client.Blazor.Pages +{ + public partial class Invoice + { + [Inject] + public IMapper Mapper { get; set; } + + [Inject] + public SmartPower.Data.Entity.Repository.IInvoice InvoiceRepository { get; set; } + + [Parameter] + public int SpInvoiceNumber { get; set; } + + public Dto.Response.InvoiceSummary InvoiceSummary { get; set; } + + protected override async Task OnParametersSetAsync() + { + var invoice = await InvoiceRepository.GetInvoice(SpInvoiceNumber); + + InvoiceSummary = Mapper.Map(invoice); + } + } +} diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor b/SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor new file mode 100644 index 0000000..ad63a44 --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor @@ -0,0 +1,5 @@ + diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalList.razor b/SmartPower.Client.Blazor/Shared/BulkReversalList.razor index db6d35e..9a7c670 100644 --- a/SmartPower.Client.Blazor/Shared/BulkReversalList.razor +++ b/SmartPower.Client.Blazor/Shared/BulkReversalList.razor @@ -1,8 +1,4 @@ -@using global::AutoMapper -@inject IMapper Mapper -@inject Domain.Service.IBulkReversal BulkReversalService - - +
    @@ -20,9 +16,19 @@ - + - + } diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor b/SmartPower.Client.Blazor/Shared/InvoiceRow.razor new file mode 100644 index 0000000..4e30833 --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/InvoiceRow.razor @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs b/SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs new file mode 100644 index 0000000..8d23a2f --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Components; +using SmartPower.Dto.Response; + +namespace SmartPower.Client.Blazor.Shared +{ + public partial class InvoiceRow + { + [Parameter] + public InvoiceSummary InvoiceSummary { get; set; } + } +} diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor b/SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor new file mode 100644 index 0000000..143c6ad --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Shared/Toaster.razor b/SmartPower.Client.Blazor/Shared/Toaster.razor index e0db8f3..bb78927 100644 --- a/SmartPower.Client.Blazor/Shared/Toaster.razor +++ b/SmartPower.Client.Blazor/Shared/Toaster.razor @@ -1,6 +1,6 @@ @if (!string.IsNullOrEmpty(Message)) { -
    Results@bulkReversal.RevResults @bulkReversal.RevStatus @bulkReversal.NewSpInvNumber + @if (bulkReversal.NewSpInvNumber.HasValue) + { + Invoice + } + @bulkReversal.OrgSpinvNumber + @if (bulkReversal.NewSpInvNumber.HasValue) + { + Invoice + } +
    @InvoiceSummary.InvNumber@InvoiceSummary.SpinvNumber@InvoiceSummary.BatchNo@InvoiceSummary.SiteNo@InvoiceSummary.RetailerCode@InvoiceSummary.InvStartDate?.ToString(Common.Constant.DateStringFormat)@InvoiceSummary.InvEndDate?.ToString(Common.Constant.DateStringFormat)
    Invoice NumberSp Invoice NumberBatch NoSite NoRetailer CodeInvoice Start DateInvoice End Date
    diff --git a/SmartPower.Client.Blazor/Pages/Invoice.razor.cs b/SmartPower.Client.Blazor/Pages/Invoice.razor.cs index 72f5a6d..da2760e 100644 --- a/SmartPower.Client.Blazor/Pages/Invoice.razor.cs +++ b/SmartPower.Client.Blazor/Pages/Invoice.razor.cs @@ -10,7 +10,7 @@ public partial class Invoice public IMapper Mapper { get; set; } [Inject] - public SmartPower.Data.Entity.Repository.IInvoice InvoiceRepository { get; set; } + public Application.Entity.Repository.IInvoice InvoiceRepository { get; set; } [Parameter] public int SpInvoiceNumber { get; set; } diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalBreadcrumbs.razor similarity index 83% rename from SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor rename to SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalBreadcrumbs.razor index ad63a44..69bd006 100644 --- a/SmartPower.Client.Blazor/Shared/BulkReversalBreadcrumbs.razor +++ b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalBreadcrumbs.razor @@ -1,5 +1,5 @@  diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor similarity index 100% rename from SmartPower.Client.Blazor/Shared/BulkReversalConfirmation.razor rename to SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor diff --git a/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalInputConfirmation.razor b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalInputConfirmation.razor new file mode 100644 index 0000000..a43b342 --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalInputConfirmation.razor @@ -0,0 +1,24 @@ + + +@code { + [Parameter] public EventCallback OnAccept { get; set; } + [Parameter] public EventCallback OnClose { get; set; } +} diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalList.razor b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalList.razor similarity index 100% rename from SmartPower.Client.Blazor/Shared/BulkReversalList.razor rename to SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalList.razor diff --git a/SmartPower.Client.Blazor/Shared/BulkReversalList.razor.cs b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalList.razor.cs similarity index 51% rename from SmartPower.Client.Blazor/Shared/BulkReversalList.razor.cs rename to SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalList.razor.cs index 34dd9dd..2cbf1d8 100644 --- a/SmartPower.Client.Blazor/Shared/BulkReversalList.razor.cs +++ b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalList.razor.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Components; -namespace SmartPower.Client.Blazor.Shared +namespace SmartPower.Client.Blazor.Shared.BulkReversal { partial class BulkReversalList { [Parameter] - public List BulkReversals { get; set; } + public List BulkReversals { get; set; } } } \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor new file mode 100644 index 0000000..df2f73e --- /dev/null +++ b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor @@ -0,0 +1,12 @@ +@using SmartPower.Common + + + + + + + + + + + \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor.cs similarity index 80% rename from SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs rename to SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor.cs index 8d23a2f..a70dae1 100644 --- a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor.cs +++ b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using SmartPower.Dto.Response; -namespace SmartPower.Client.Blazor.Shared +namespace SmartPower.Client.Blazor.Shared.Invoice { public partial class InvoiceRow { diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRowHeader.razor similarity index 85% rename from SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor rename to SmartPower.Client.Blazor/Shared/Invoice/InvoiceRowHeader.razor index 143c6ad..72c70d1 100644 --- a/SmartPower.Client.Blazor/Shared/InvoiceRowHeader.razor +++ b/SmartPower.Client.Blazor/Shared/Invoice/InvoiceRowHeader.razor @@ -5,6 +5,7 @@ + diff --git a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor b/SmartPower.Client.Blazor/Shared/InvoiceRow.razor deleted file mode 100644 index 4e30833..0000000 --- a/SmartPower.Client.Blazor/Shared/InvoiceRow.razor +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Shared/Toaster.razor b/SmartPower.Client.Blazor/Shared/Toaster.razor index bb78927..e93fcd8 100644 --- a/SmartPower.Client.Blazor/Shared/Toaster.razor +++ b/SmartPower.Client.Blazor/Shared/Toaster.razor @@ -14,19 +14,5 @@ public string Message { get; set; } [Parameter] - public bool? ErrorMessage { get; set; } - public string AlertClass { get; set; } - - protected void OnParametersSet() - { - if (ErrorMessage.HasValue && ErrorMessage.Value) - { - AlertClass = "danger"; - } - else - { - AlertClass = "success"; - } - } } diff --git a/SmartPower.Client.Blazor/SmartPower.Client.Blazor.csproj b/SmartPower.Client.Blazor/SmartPower.Client.Blazor.csproj index 2c8b049..5fb6800 100644 --- a/SmartPower.Client.Blazor/SmartPower.Client.Blazor.csproj +++ b/SmartPower.Client.Blazor/SmartPower.Client.Blazor.csproj @@ -12,9 +12,8 @@ + - - diff --git a/SmartPower.Client.Blazor/Startup.cs b/SmartPower.Client.Blazor/Startup.cs index fdd3e69..8d9c287 100644 --- a/SmartPower.Client.Blazor/Startup.cs +++ b/SmartPower.Client.Blazor/Startup.cs @@ -25,15 +25,14 @@ public void ConfigureServices(IServiceCollection services) services.AddAutoMapper(typeof(Startup)); services.AddRazorPages(); services.AddServerSideBlazor(); - services.AddBlazoredModal(); - services.AddDbContext(options => + services.AddDbContext(options => options.UseSqlServer(Configuration.GetConnectionString("SmartPowerDatabaseConnectionstring"))); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddSingleton(); } diff --git a/SmartPower.Client.Blazor/_Imports.razor b/SmartPower.Client.Blazor/_Imports.razor index acd1ab5..b1f5283 100644 --- a/SmartPower.Client.Blazor/_Imports.razor +++ b/SmartPower.Client.Blazor/_Imports.razor @@ -9,4 +9,6 @@ @using SmartPower.Client.Blazor @using SmartPower.Client.Blazor.Shared @using Blazored.Modal -@using Blazored.Modal.Services \ No newline at end of file +@using Blazored.Modal.Services +@using SmartPower.Client.Blazor.Shared.BulkReversal +@using SmartPower.Client.Blazor.Shared.Invoice diff --git a/SmartPower.Common/Constant.cs b/SmartPower.Common/Constant.cs index f927433..624b296 100644 --- a/SmartPower.Common/Constant.cs +++ b/SmartPower.Common/Constant.cs @@ -3,6 +3,7 @@ public static class Constant { public const string CurrentUser = "samg"; + public const int ItemCount = 10; public const string DateStringFormat = "dd/MM/yyyy h:mmtt"; diff --git a/SmartPower.Common/Enumeration/AlertClass.cs b/SmartPower.Common/Enumeration/AlertClass.cs new file mode 100644 index 0000000..5184e13 --- /dev/null +++ b/SmartPower.Common/Enumeration/AlertClass.cs @@ -0,0 +1,13 @@ +using System.ComponentModel.DataAnnotations; + +namespace SmartPower.Common.Enumeration +{ + public enum AlertClass + { + [Display(Name = "success")] + Success, + + [Display(Name = "danger")] + Error + } +} \ No newline at end of file diff --git a/SmartPower.Common/Extension.cs b/SmartPower.Common/Extension.cs index 9de0e22..2db0a80 100644 --- a/SmartPower.Common/Extension.cs +++ b/SmartPower.Common/Extension.cs @@ -1,10 +1,33 @@ using System; using System.ComponentModel; +using System.Globalization; namespace SmartPower.Common { public static class Extension { + public static string ToCurrency(this decimal d, bool includeCurrencySymbol = true) + { + var currencyFormat = new CultureInfo(CultureInfo.CurrentCulture.ToString()).NumberFormat; + + currencyFormat.CurrencyNegativePattern = 1; + + var currency = d.ToString("C", currencyFormat); + var suffix = ".00"; + + if (currency.EndsWith(suffix)) + { + currency = currency.Substring(0, currency.Length - suffix.Length); + } + + return includeCurrencySymbol ? currency : currency.Replace("$", string.Empty); + } + + public static string ToCurrency(this decimal? d, bool includeCurrencySymbol = true) + { + return d.HasValue ? d.Value.ToCurrency(includeCurrencySymbol) : string.Empty; + } + public static string GetEnumerationDescription(this Enum en) { return GetEnumerationValueDescriptionAttribute(en)?.Description ?? en.ToString(); @@ -28,3 +51,4 @@ private static DescriptionAttribute GetEnumerationValueDescriptionAttribute(Enum } } } + diff --git a/SmartPower.Data.Entity/Model/Projection/BulkReversalSummary.cs b/SmartPower.Data.Entity/Model/Projection/BulkReversalSummary.cs new file mode 100644 index 0000000..6e2f8ff --- /dev/null +++ b/SmartPower.Data.Entity/Model/Projection/BulkReversalSummary.cs @@ -0,0 +1,10 @@ +namespace SmartPower.Data.Entity.Model.Projection +{ + public class BulkReversalSummary + { + public int? NewSpInvNumber { get; set; } + public int? OrgSpinvNumber { get; set; } + public string RevStatus { get; set; } + public string RevResults { get; set; } + } +} diff --git a/SmartPower.Data.Entity/Repository/BulkReversal.cs b/SmartPower.Data.Entity/Repository/BulkReversal.cs index 2b0da06..e2127c1 100644 --- a/SmartPower.Data.Entity/Repository/BulkReversal.cs +++ b/SmartPower.Data.Entity/Repository/BulkReversal.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; +using SmartPower.Data.Entity.Model.Projection; namespace SmartPower.Data.Entity.Repository { @@ -16,9 +17,19 @@ public BulkReversal(DbContext dbContext) _dbContext = dbContext; } - public async Task> GetReversalList(string userName) + public async Task> GetBulkReversals(string userName) { - return await _dbContext.TReversalsBulkLists.AsNoTracking().Where(r => r.UserName == userName).ToListAsync(); + return await _dbContext.TReversalsBulkLists + .AsNoTracking() + .Where(b => b.UserName == userName) + .Select(b => new BulkReversalSummary + { + RevStatus = b.RevStatus, + RevResults = b.RevResults, + NewSpInvNumber = b.NewSpInvNumber, + OrgSpinvNumber = b.OrgSpinvNumber + }) + .ToListAsync(); } public async Task CreateReversalListItem(string userName, int orgSpinvNumber) diff --git a/SmartPower.Data.Entity/Repository/IBulkReversal.cs b/SmartPower.Data.Entity/Repository/IBulkReversal.cs index e348685..14ca56f 100644 --- a/SmartPower.Data.Entity/Repository/IBulkReversal.cs +++ b/SmartPower.Data.Entity/Repository/IBulkReversal.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; using System.Threading.Tasks; +using SmartPower.Data.Entity.Model.Projection; namespace SmartPower.Data.Entity.Repository { public interface IBulkReversal { - Task> GetReversalList(string userName); + Task> GetBulkReversals(string userName); Task CreateReversalListItem(string userName, int orgSpinvNumber); Task ClearReversals(string userName); Task UpdateReversalStatus(string userName); diff --git a/SmartPower.Domain/Service/BulkReversal.cs b/SmartPower.Domain/Service/BulkReversal.cs deleted file mode 100644 index 6ed0e6a..0000000 --- a/SmartPower.Domain/Service/BulkReversal.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace SmartPower.Domain.Service -{ - public class BulkReversal : IBulkReversal - { - private readonly Data.Entity.Repository.IBulkReversal _bulkReversalRepository; - - public BulkReversal(Data.Entity.Repository.IBulkReversal bulkReversalRepository) - { - _bulkReversalRepository = bulkReversalRepository; - } - - public async Task> GetReversalList(string userName) - { - return await _bulkReversalRepository.GetReversalList(userName); - } - - public async Task CreateReversal(string userName, int orgSpinvNumber) - { - await _bulkReversalRepository.CreateReversalListItem(userName, orgSpinvNumber); - - await _bulkReversalRepository.UpdateReversalStatus(userName); - } - - public async Task ValidatePendingReversals(string userName) - { - return await _bulkReversalRepository.TestSuppliedInvoices(userName); - } - - public async Task CreateReversals(string userName) - { - return await _bulkReversalRepository.CreateReversals(userName); - } - - public async Task ClearReversals(string userName) - { - await _bulkReversalRepository.ClearReversals(userName); - } - - public async Task ReversalListStringExport(string userName) - { - var bulkReversals = await GetReversalList(userName); - - var stringBuilder = new StringBuilder(); - - stringBuilder.AppendLine(Common.Constant.BulkReversal.ExportStringHeaders); - - foreach (var bulkReversal in bulkReversals) - { - stringBuilder.AppendLine($"{bulkReversal.RevResults},{bulkReversal.RevStatus},{bulkReversal.NewSpInvNumber},{bulkReversal.OrgSpinvNumber}"); - } - - return stringBuilder.ToString(); - } - } -} diff --git a/SmartPower.Domain/Service/IBulkReversal.cs b/SmartPower.Domain/Service/IBulkReversal.cs deleted file mode 100644 index 8f7446e..0000000 --- a/SmartPower.Domain/Service/IBulkReversal.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SmartPower.Domain.Service -{ - public interface IBulkReversal - { - Task> GetReversalList(string userName); - Task CreateReversal(string userName, int orgSpinvNumber); - Task ValidatePendingReversals(string userName); - Task CreateReversals(string userName); - Task ReversalListStringExport(string userName); - Task ClearReversals(string userName); - } -} \ No newline at end of file diff --git a/SmartPower.Domain/SmartPower.Domain.csproj b/SmartPower.Domain/SmartPower.Domain.csproj deleted file mode 100644 index 298a7f3..0000000 --- a/SmartPower.Domain/SmartPower.Domain.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net5.0 - - - - - - - - diff --git a/SmartPower.Dto/Response/BulkReversal.cs b/SmartPower.Dto/Response/BulkReversalSummary.cs similarity index 68% rename from SmartPower.Dto/Response/BulkReversal.cs rename to SmartPower.Dto/Response/BulkReversalSummary.cs index ef4de49..83a4ea9 100644 --- a/SmartPower.Dto/Response/BulkReversal.cs +++ b/SmartPower.Dto/Response/BulkReversalSummary.cs @@ -1,12 +1,10 @@ namespace SmartPower.Dto.Response { - public class BulkReversal + public class BulkReversalSummary { - public int RevId { get; set; } + public int? NewSpInvNumber { get; set; } public int? OrgSpinvNumber { get; set; } public string RevStatus { get; set; } - public int? NewSpInvNumber { get; set; } public string RevResults { get; set; } - public string UserName { get; set; } } } diff --git a/SmartPower.sln b/SmartPower.sln index b77fec9..5d6985f 100644 --- a/SmartPower.sln +++ b/SmartPower.sln @@ -9,10 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{523361 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Client.Blazor", "SmartPower.Client.Blazor\SmartPower.Client.Blazor.csproj", "{F0F2E1EC-DB27-4AEC-B064-58AEC9DDE459}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Data.Entity", "SmartPower.Data.Entity\SmartPower.Data.Entity.csproj", "{D4D85628-4F16-44B9-A4E3-1F80295593DF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Domain", "SmartPower.Domain\SmartPower.Domain.csproj", "{2DF6681F-51F7-4CA5-96F6-B231039EF2F8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Dto", "SmartPower.Dto\SmartPower.Dto.csproj", "{39DAC5A5-9DAF-4C53-84D6-C2F4D54C50C2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Common", "SmartPower.Common\SmartPower.Common.csproj", "{0CCA64A6-C574-41A0-AB24-5DC554C706A2}" @@ -28,6 +24,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{92 sp-updates\sp_imwc_bulkrev_sels_test_supplied_invoices.sql = sp-updates\sp_imwc_bulkrev_sels_test_supplied_invoices.sql EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartPower.Application", "SmartPower.Application\SmartPower.Application.csproj", "{7F1A803C-AE4B-4508-AFF3-9518A6222909}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,14 +36,6 @@ Global {F0F2E1EC-DB27-4AEC-B064-58AEC9DDE459}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0F2E1EC-DB27-4AEC-B064-58AEC9DDE459}.Release|Any CPU.ActiveCfg = Release|Any CPU {F0F2E1EC-DB27-4AEC-B064-58AEC9DDE459}.Release|Any CPU.Build.0 = Release|Any CPU - {D4D85628-4F16-44B9-A4E3-1F80295593DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4D85628-4F16-44B9-A4E3-1F80295593DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4D85628-4F16-44B9-A4E3-1F80295593DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4D85628-4F16-44B9-A4E3-1F80295593DF}.Release|Any CPU.Build.0 = Release|Any CPU - {2DF6681F-51F7-4CA5-96F6-B231039EF2F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DF6681F-51F7-4CA5-96F6-B231039EF2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DF6681F-51F7-4CA5-96F6-B231039EF2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DF6681F-51F7-4CA5-96F6-B231039EF2F8}.Release|Any CPU.Build.0 = Release|Any CPU {39DAC5A5-9DAF-4C53-84D6-C2F4D54C50C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39DAC5A5-9DAF-4C53-84D6-C2F4D54C50C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {39DAC5A5-9DAF-4C53-84D6-C2F4D54C50C2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -58,17 +48,20 @@ Global {DA1E9EC9-87A9-4E21-A546-378E5AED892E}.Debug|Any CPU.Build.0 = Debug|Any CPU {DA1E9EC9-87A9-4E21-A546-378E5AED892E}.Release|Any CPU.ActiveCfg = Release|Any CPU {DA1E9EC9-87A9-4E21-A546-378E5AED892E}.Release|Any CPU.Build.0 = Release|Any CPU + {7F1A803C-AE4B-4508-AFF3-9518A6222909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F1A803C-AE4B-4508-AFF3-9518A6222909}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F1A803C-AE4B-4508-AFF3-9518A6222909}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F1A803C-AE4B-4508-AFF3-9518A6222909}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {F0F2E1EC-DB27-4AEC-B064-58AEC9DDE459} = {523361D2-F61B-4F5B-BAAD-8710CD3FCEAF} - {D4D85628-4F16-44B9-A4E3-1F80295593DF} = {EBAD812B-CB76-4CFE-B9CD-D6F97E81F0E9} - {2DF6681F-51F7-4CA5-96F6-B231039EF2F8} = {EBAD812B-CB76-4CFE-B9CD-D6F97E81F0E9} {39DAC5A5-9DAF-4C53-84D6-C2F4D54C50C2} = {EBAD812B-CB76-4CFE-B9CD-D6F97E81F0E9} {0CCA64A6-C574-41A0-AB24-5DC554C706A2} = {EBAD812B-CB76-4CFE-B9CD-D6F97E81F0E9} {DA1E9EC9-87A9-4E21-A546-378E5AED892E} = {5BEEFCF4-5DBB-4420-B4B5-05AB5299BFCB} + {7F1A803C-AE4B-4508-AFF3-9518A6222909} = {EBAD812B-CB76-4CFE-B9CD-D6F97E81F0E9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {58317927-800A-41A0-8F2A-57AA9C4ABB6E} From 10421eba81a9c2e26ba3a22113930a54d1eac984 Mon Sep 17 00:00:00 2001 From: samg Date: Thu, 9 Sep 2021 15:18:25 +1200 Subject: [PATCH 4/5] more factoring --- .../Entity/Repository/BulkReversal.cs | 3 +- .../Entity/Repository/IInvoice.cs | 4 +- .../Entity/Repository/Invoice.cs | 22 ++++++++++- SmartPower.Client.Blazor/App.razor | 22 +++++------ .../Pages/BulkReversals.razor | 2 +- .../Pages/BulkReversals.razor.cs | 15 +++++++- SmartPower.Client.Blazor/Pages/Invoice.razor | 21 ---------- .../Pages/Invoice.razor.cs | 27 ------------- .../Pages/InvoiceDetail.razor | 13 +++++++ SmartPower.Client.Blazor/Pages/_Host.cshtml | 2 +- .../BulkReversalConfirmation.razor | 15 +++++--- .../BulkReversalInputConfirmation.razor | 24 ------------ SmartPower.Client.Blazor/Shared/Invoice.razor | 38 +++++++++++++++++++ .../Shared/Invoice.razor.cs | 31 +++++++++++++++ .../Shared/Invoice/InvoiceRow.razor | 12 ------ .../Shared/Invoice/InvoiceRow.razor.cs | 11 ------ .../Shared/Invoice/InvoiceRowHeader.razor | 12 ------ .../SmartPower.Client.Blazor.csproj | 1 - SmartPower.Client.Blazor/Startup.cs | 3 +- SmartPower.Client.Blazor/_Imports.razor | 3 -- SmartPower.Common/Enumeration/AlertClass.cs | 11 ++++-- .../Enumeration/ReversalStatus.cs | 8 ++-- .../Enumeration/ReversalStatusResult.cs | 8 ++-- 23 files changed, 160 insertions(+), 148 deletions(-) delete mode 100644 SmartPower.Client.Blazor/Pages/Invoice.razor delete mode 100644 SmartPower.Client.Blazor/Pages/Invoice.razor.cs create mode 100644 SmartPower.Client.Blazor/Pages/InvoiceDetail.razor delete mode 100644 SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalInputConfirmation.razor create mode 100644 SmartPower.Client.Blazor/Shared/Invoice.razor create mode 100644 SmartPower.Client.Blazor/Shared/Invoice.razor.cs delete mode 100644 SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor delete mode 100644 SmartPower.Client.Blazor/Shared/Invoice/InvoiceRow.razor.cs delete mode 100644 SmartPower.Client.Blazor/Shared/Invoice/InvoiceRowHeader.razor diff --git a/SmartPower.Application/Entity/Repository/BulkReversal.cs b/SmartPower.Application/Entity/Repository/BulkReversal.cs index 5af0c0d..ab60988 100644 --- a/SmartPower.Application/Entity/Repository/BulkReversal.cs +++ b/SmartPower.Application/Entity/Repository/BulkReversal.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; diff --git a/SmartPower.Application/Entity/Repository/IInvoice.cs b/SmartPower.Application/Entity/Repository/IInvoice.cs index 90b6b26..617672a 100644 --- a/SmartPower.Application/Entity/Repository/IInvoice.cs +++ b/SmartPower.Application/Entity/Repository/IInvoice.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using SmartPower.Application.Entity.Model.Projection; namespace SmartPower.Application.Entity.Repository @@ -6,5 +7,6 @@ namespace SmartPower.Application.Entity.Repository public interface IInvoice { Task GetInvoice(int spInvoiceNumber); + Task> GetInvoices(List spInvoiceNumbers); } } \ No newline at end of file diff --git a/SmartPower.Application/Entity/Repository/Invoice.cs b/SmartPower.Application/Entity/Repository/Invoice.cs index 4cea8db..0192bd5 100644 --- a/SmartPower.Application/Entity/Repository/Invoice.cs +++ b/SmartPower.Application/Entity/Repository/Invoice.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using SmartPower.Application.Entity.Model.Projection; @@ -31,5 +32,24 @@ public async Task GetInvoice(int spInvoiceNumber) }) .SingleOrDefaultAsync(i => i.SpinvNumber == spInvoiceNumber); } + + public async Task> GetInvoices(List spInvoiceNumbers) + { + return await _dbContext.TInvoices + .AsNoTracking() + .Where(i => spInvoiceNumbers.Contains(i.SpinvNumber)) + .Select(s => new InvoiceSummary + { + SpinvNumber = s.SpinvNumber, + BatchNo = s.BatchNo, + InvEndDate = s.InvEndDate, + InvNumber = s.InvNumber, + InvOpeningBalance = s.InvOpeningBalance, + InvStartDate = s.InvStartDate, + RetailerCode = s.RetailerCode, + SiteNo = s.SiteNo + }) + .ToListAsync(); + } } } diff --git a/SmartPower.Client.Blazor/App.razor b/SmartPower.Client.Blazor/App.razor index dbc8b6f..4d022c9 100644 --- a/SmartPower.Client.Blazor/App.razor +++ b/SmartPower.Client.Blazor/App.razor @@ -1,12 +1,10 @@ - - - - - - - -

    Sorry, there's nothing at this address.

    -     -     -     -     \ No newline at end of file + + + + + + +

    Sorry, there's nothing at this address.

    +     +     +     \ No newline at end of file diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor b/SmartPower.Client.Blazor/Pages/BulkReversals.razor index 3384557..bc07437 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor @@ -17,7 +17,7 @@ else { @if (DirtyPendingReversals) { - + }
    diff --git a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs index 28b57c9..d2e2f6f 100644 --- a/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs +++ b/SmartPower.Client.Blazor/Pages/BulkReversals.razor.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using AutoMapper; using Microsoft.AspNetCore.Components; using SmartPower.Common; +using SmartPower.Common.Enumeration; namespace SmartPower.Client.Blazor.Pages { @@ -14,11 +16,13 @@ partial class BulkReversals [Inject] public IMapper Mapper { get; set; } - [Inject] + [Inject] public Application.Entity.Repository.IBulkReversal BulkReversalRepository { get; set; } public List BulkReversalSummaryList { get; set; } + public List InvoiceIds { get; set; } + public bool DirtyPendingReversals { get; set; } public string BatchProcessedMessage { get; set; } @@ -28,6 +32,15 @@ protected override async Task OnInitializedAsync() var bulkReversals = await BulkReversalRepository.GetBulkReversals(Constant.CurrentUser); BulkReversalSummaryList = Mapper.Map>(bulkReversals); + + InitInvoiceIds(); + } + + public void InitInvoiceIds() + { + InvoiceIds = BulkReversalSummaryList + .Where(i => i.RevStatus == ReversalStatus.Found.GetEnumerationDescription() && i.RevResults == null && i.OrgSpinvNumber.HasValue) + .Select(i => i.OrgSpinvNumber.Value).ToList(); } protected async Task ClearList() diff --git a/SmartPower.Client.Blazor/Pages/Invoice.razor b/SmartPower.Client.Blazor/Pages/Invoice.razor deleted file mode 100644 index 76ef133..0000000 --- a/SmartPower.Client.Blazor/Pages/Invoice.razor +++ /dev/null @@ -1,21 +0,0 @@ -@page "/invoice/{spInvoiceNumber:int}" - -@using SmartPower.Common - - - -@if (InvoiceSummary == null) -{ - -} -else -{ -

    Invoice - @InvoiceSummary.SpinvNumber

    - -
    @InvoiceSummary.InvNumber@InvoiceSummary.SpinvNumber@InvoiceSummary.BatchNo@InvoiceSummary.SiteNo@InvoiceSummary.RetailerCode@InvoiceSummary.InvOpeningBalance.ToCurrency()@InvoiceSummary.InvStartDate?.ToString(Constant.DateStringFormat)@InvoiceSummary.InvEndDate?.ToString(Constant.DateStringFormat)
    Batch No Site No Retailer CodeInvoice Opening Balance Invoice Start Date Invoice End Date
    @InvoiceSummary.InvNumber@InvoiceSummary.SpinvNumber@InvoiceSummary.BatchNo@InvoiceSummary.SiteNo@InvoiceSummary.RetailerCode@InvoiceSummary.InvStartDate?.ToString(Common.Constant.DateStringFormat)@InvoiceSummary.InvEndDate?.ToString(Common.Constant.DateStringFormat)
    - - - - -
    -} diff --git a/SmartPower.Client.Blazor/Pages/Invoice.razor.cs b/SmartPower.Client.Blazor/Pages/Invoice.razor.cs deleted file mode 100644 index da2760e..0000000 --- a/SmartPower.Client.Blazor/Pages/Invoice.razor.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Threading.Tasks; -using AutoMapper; -using Microsoft.AspNetCore.Components; - -namespace SmartPower.Client.Blazor.Pages -{ - public partial class Invoice - { - [Inject] - public IMapper Mapper { get; set; } - - [Inject] - public Application.Entity.Repository.IInvoice InvoiceRepository { get; set; } - - [Parameter] - public int SpInvoiceNumber { get; set; } - - public Dto.Response.InvoiceSummary InvoiceSummary { get; set; } - - protected override async Task OnParametersSetAsync() - { - var invoice = await InvoiceRepository.GetInvoice(SpInvoiceNumber); - - InvoiceSummary = Mapper.Map(invoice); - } - } -} diff --git a/SmartPower.Client.Blazor/Pages/InvoiceDetail.razor b/SmartPower.Client.Blazor/Pages/InvoiceDetail.razor new file mode 100644 index 0000000..571da3c --- /dev/null +++ b/SmartPower.Client.Blazor/Pages/InvoiceDetail.razor @@ -0,0 +1,13 @@ +@page "/invoice/{spInvoiceNumber:int}" + + + + + +@code +{ + [Parameter] + public int SpInvoiceNumber { get; set; } + + public List InvoiceIds => new List { SpInvoiceNumber }; +} diff --git a/SmartPower.Client.Blazor/Pages/_Host.cshtml b/SmartPower.Client.Blazor/Pages/_Host.cshtml index 87eb05a..06ca3b8 100644 --- a/SmartPower.Client.Blazor/Pages/_Host.cshtml +++ b/SmartPower.Client.Blazor/Pages/_Host.cshtml @@ -18,7 +18,7 @@ - +
    diff --git a/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor index 5540c7b..a7f3f29 100644 --- a/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor +++ b/SmartPower.Client.Blazor/Shared/BulkReversal/BulkReversalConfirmation.razor @@ -1,15 +1,16 @@ -