From f2f3458373afa0e0961b46cb164671a59b306f2b Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 31 May 2023 07:26:46 +0200 Subject: [PATCH] FEAT: Adding ESalesNumber on activity list. Formatted timestamp on visit --- .../AdvisorActivityListComponent.razor | 4 +++- .../CustomerActivityViewOverlay.razor | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 23 ++++++++++++------- .../Pages/AdvisorActivityViewEditPage.razor | 3 ++- .../AdvisorCustomerInventoryListPage.razor | 2 +- .../Pages/AdvisorCustomerViewEditPage.razor | 2 +- Wonky.Client/wwwroot/appsettings.json | 2 +- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor b/Wonky.Client/Components/AdvisorActivityListComponent.razor index aa0a8607..cc12a959 100644 --- a/Wonky.Client/Components/AdvisorActivityListComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor @@ -31,6 +31,7 @@ + E Nr. @@ -43,7 +44,7 @@ @activity.Sales @activity.OfficeNote @($"{activity.SasAmount:N2}") - @(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}") + @(activity.StatusTypeEnum == "Quote" ? "{0:N2}" : $"{activity.OrderAmount:N2}") @if (activity.OurRef.Contains("T:")) {} @@ -62,6 +63,7 @@ } + @activity.ESalesNumber } diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor index af13aabb..c16e0faa 100644 --- a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor @@ -28,7 +28,7 @@
- +
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 6b6a539c..bf42fe88 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -259,7 +259,7 @@ public partial class AdvisorActivityCreatePage : IDisposable await CreateActivity(); return; } - + // check if product has been checked // fetch products from storage var pStorage = await Storage.GetItemAsStringAsync($"{CompanyId}-products"); @@ -267,7 +267,9 @@ public partial class AdvisorActivityCreatePage : IDisposable // fetch pDate from storage var pDate = await Storage.GetItemAsync($"{CompanyId}-pDate"); if (string.IsNullOrWhiteSpace(pDate)) + { pDate = $"{DateTime.Now.AddDays(-1):yyyy-MM-dd}"; + } Logger.LogDebug("pDate => {}", pDate); // check if product data is valid and updated today @@ -275,14 +277,13 @@ public partial class AdvisorActivityCreatePage : IDisposable { Working = true; // pop a message - Toaster.ShowError( + Toaster.ShowInfo( "Produkt gennemgang mangler. Vent mens produkt oversigt indlæses. Gå ikke væk fra siden!"); // product inventory has not been updated - // send rpc call to sync ERP to CRM + // request backend to sync ERP to CRM Toaster.ShowInfo("Vent mens data synkroniseres ..."); var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); - while (string.IsNullOrWhiteSpace(ts)) - await Task.Delay(250); + await Task.Delay(250); // save pDate await Storage.SetItemAsync($"{CompanyId}-pDate", ts); // request products from backend @@ -290,8 +291,9 @@ public partial class AdvisorActivityCreatePage : IDisposable CheckList = await HistoryRepo.FetchInventory(CompanyId); if (CheckList.Any()) + { CheckList = CheckList.OrderBy(x => x.Description).ToList(); - + } await Storage.SetItemAsync($"{CompanyId}-products", CheckList); Working = false; } @@ -300,7 +302,9 @@ public partial class AdvisorActivityCreatePage : IDisposable // deserialize storage data CheckList = JsonSerializer.Deserialize>(pStorage) ?? new List(); if (CheckList.Any()) + { CheckList = CheckList.OrderBy(x => x.Description).ToList(); + } } // Show CheckList modal @@ -311,7 +315,9 @@ public partial class AdvisorActivityCreatePage : IDisposable private void ShowPriceHistoryOverlay() { if (ShowItem) + { PriceOverlay.Show(); + } } @@ -356,12 +362,12 @@ public partial class AdvisorActivityCreatePage : IDisposable private async Task ConfirmProductCheckCallback() { ConfirmationCheckOverlay.Hide(); - await CreateActivity(); foreach (var item in CheckList) { item.Check = false; } await Storage.SetItemAsync($"{CompanyId}-products", CheckList); + await CreateActivity(); } // workdate confirm callback @@ -427,7 +433,7 @@ public partial class AdvisorActivityCreatePage : IDisposable { return; } - + // working flag is raised after the following validations Logger.LogDebug("view kanvas activity => {}", JsonSerializer.Serialize(Activity)); switch (Kanvas) { @@ -460,6 +466,7 @@ public partial class AdvisorActivityCreatePage : IDisposable Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives."); return; } + // every checks // raise working flag Working = true; // reset selected item diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor index 75dcb1a8..e7434b39 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor @@ -29,9 +29,10 @@

@ReportItem.Company.Name

+

@ReportItem.ESalesNumber

@if (ReportItem.StatusTypeEnum.ToLower() is "quote") { -

TILBUD @ReportItem.ESalesNumber

+

TILBUD

} @if (ReportItem.VisitTypeEnum.ToLower() == "phone" || ReportItem.OurRef.Contains("T:")) { diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor index 972acd58..98f3eb4e 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Wonky.Client.OverlayCustomer @using Microsoft.AspNetCore.Authorization -@page "/advisor/customers/{CompanyId}/h/i" +@page "/advisor/customers/{CompanyId}/history/inventory" @attribute [Authorize(Roles = "Advisor")] Produkt oversigt for @Company.Name
diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor index 6f6d40c5..0c6a4701 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor @@ -207,7 +207,7 @@
@if (!Kanvas) { - Produkter + Produkter }
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 4f3b4dd3..926ada16 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "152.0", + "version": "153.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png"