From a3a434991e1000a85f7b778911eb0c2e9e206252 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 17 Jan 2023 11:49:20 +0100 Subject: [PATCH] v.0.100.1 - Adjusted office print - set PStatus.Accepted in the background --- .../Overlays/CustomerInventoryOverlay.razor | 5 +++++ .../CustomerInventoryOverlay.razor.cs | 6 ++++++ .../Overlays/CustomerInvoiceOverlay.razor | 5 +++++ .../Overlays/CustomerInvoiceOverlay.razor.cs | 6 ++++++ .../OfficeUserAdvisorReportViewPage.razor | 4 +--- .../OfficeUserAdvisorReportViewPage.razor.cs | 20 +----------------- Wonky.Client/Pages/ReportPrintOrderPage.razor | 6 ++---- .../Pages/ReportPrintOrderPage.razor.cs | 21 +++++-------------- Wonky.Client/wwwroot/appsettings.json | 2 +- 9 files changed, 32 insertions(+), 43 deletions(-) create mode 100644 Wonky.Client/Overlays/CustomerInventoryOverlay.razor create mode 100644 Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs create mode 100644 Wonky.Client/Overlays/CustomerInvoiceOverlay.razor create mode 100644 Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs diff --git a/Wonky.Client/Overlays/CustomerInventoryOverlay.razor b/Wonky.Client/Overlays/CustomerInventoryOverlay.razor new file mode 100644 index 00000000..dc237434 --- /dev/null +++ b/Wonky.Client/Overlays/CustomerInventoryOverlay.razor @@ -0,0 +1,5 @@ +

CustomerInventoryOverlay

+ +@code { + +} \ No newline at end of file diff --git a/Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs b/Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs new file mode 100644 index 00000000..7aa66122 --- /dev/null +++ b/Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs @@ -0,0 +1,6 @@ +namespace Wonky.Client.Overlays; + +public partial class CustomerInventoryOverlay +{ + +} \ No newline at end of file diff --git a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor new file mode 100644 index 00000000..93998911 --- /dev/null +++ b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor @@ -0,0 +1,5 @@ +

CustomerInvoiceOverlay

+ +@code { + +} \ No newline at end of file diff --git a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs new file mode 100644 index 00000000..74503b56 --- /dev/null +++ b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs @@ -0,0 +1,6 @@ +namespace Wonky.Client.Overlays; + +public partial class CustomerInvoiceOverlay +{ + +} \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor index 8cc2a237..e000f4b7 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor @@ -32,7 +32,7 @@
- +
@@ -71,5 +71,3 @@ } } - - diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs index 51ead1c3..77c815ec 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs @@ -49,8 +49,6 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable private UserPref Prefs = new(); private string ReturnUrl = ""; private string PrintUrl = ""; - private ConfirmationModal ConfirmAccepted { get; set; } - private string BodyMessage { get; set; } = ""; protected override async Task OnParametersSetAsync() { @@ -91,13 +89,7 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable } } - private void ShowConfirmationModal() - { - BodyMessage = "

Vil du sætte ordrestatus til accepteret i CRM?

Dette sikrer at ordrelisten kun udskrives en gang.

"; - ConfirmAccepted.Show(); - } - - private async Task OnOkCallBack() + private async Task Print() { var current = 0; var orders = Report.ReportItems @@ -113,16 +105,6 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable }); } Toaster.ClearAll(); - await Print(); - } - - private void OnCancelCallback() - { - Print(); - } - - private async Task Print() - { await JsModule.InvokeVoidAsync("printInvoke"); } diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor b/Wonky.Client/Pages/ReportPrintOrderPage.razor index 98cbbb2a..7bb79bbf 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor @@ -26,7 +26,7 @@
- + @@ -49,6 +49,4 @@ else

Der er ingen ordrer til udskrivning

-} - - \ No newline at end of file +} \ No newline at end of file diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs index 7d538ed8..aadd874d 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs @@ -41,8 +41,7 @@ public partial class ReportPrintOrderPage private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; - private ConfirmationModal ConfirmAccepted { get; set; } - private string BodyMessage { get; set; } = ""; + protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -61,14 +60,8 @@ public partial class ReportPrintOrderPage Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); Items = Report.ReportItems; } - - private void ShowConfirmationModal() - { - BodyMessage = "

Vil du sætte ordrestatus til accepteret i CRM?

Dette sikrer at ordrelisten kun udskrives en gang.

"; - ConfirmAccepted.Show(); - } - private async Task OnOkCallBack() + private async Task OfficePrint() { var current = 0; var orders = Report.ReportItems @@ -82,14 +75,10 @@ public partial class ReportPrintOrderPage OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) }); - } + } Toaster.ClearAll(); - await Print(); - } - - private void OnCancelCallback() - { - Print(); + await JsModule.InvokeVoidAsync("printInvoke"); + Navigator.NavigateTo(ReturnUrl); } private async Task Print() diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 53990200..a49b71ef 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.100.x", + "version": "0.100.1", "rc": true, "sandBox": false, "image": "grumpy-coder.png"