From c523e9a4757c9d3e92b4145c601c9767340cf0be Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 5 Jun 2023 07:15:39 +0200 Subject: [PATCH] Rename ActivityButton to ActionButton - implement action button Rename RPC variable to sync Added force parameter to sync URL (TODO - make it work) Add headers to modals to ensure the close button is pushed to the right Make ConfirmDeleteModal a generic ConfirmActionModel --- ...ctivityButton.razor => ActionButton.razor} | 0 ...yButton.razor.cs => ActionButton.razor.cs} | 2 +- .../AdvisorCustomerListComponent.razor | 2 +- .../CountryCustomerHistoryRepository.cs | 2 +- .../CrmCustomerHistoryRepository.cs | 9 ++-- .../ICrmCustomerHistoryRepository.cs | 3 +- .../CustomerActivityViewOverlay.razor | 3 +- .../CustomerInvoiceListOverlay.razor | 5 +- .../CustomerInvoiceViewOverlay.razor | 5 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 2 +- .../Pages/AdvisorCustomerViewEditPage.razor | 43 ++++++++++------- .../AdvisorCustomerViewEditPage.razor.cs | 47 +++++++++++++++++-- ...AdvisorCustomerWorkplaceViewEditPage.razor | 4 +- ...isorCustomerWorkplaceViewEditPage.razor.cs | 10 ++-- ...teModal.razor => ConfirmActionModal.razor} | 6 +-- ...l.razor.cs => ConfirmActionModal.razor.cs} | 2 +- Wonky.Client/wwwroot/appsettings.json | 6 +-- Wonky.Entity/Configuration/ApiConfig.cs | 4 +- 18 files changed, 99 insertions(+), 56 deletions(-) rename Wonky.Client/Components/{ActivityButton.razor => ActionButton.razor} (100%) rename Wonky.Client/Components/{ActivityButton.razor.cs => ActionButton.razor.cs} (97%) rename Wonky.Client/Shared/{ConfirmDeleteModal.razor => ConfirmActionModal.razor} (89%) rename Wonky.Client/Shared/{ConfirmDeleteModal.razor.cs => ConfirmActionModal.razor.cs} (97%) diff --git a/Wonky.Client/Components/ActivityButton.razor b/Wonky.Client/Components/ActionButton.razor similarity index 100% rename from Wonky.Client/Components/ActivityButton.razor rename to Wonky.Client/Components/ActionButton.razor diff --git a/Wonky.Client/Components/ActivityButton.razor.cs b/Wonky.Client/Components/ActionButton.razor.cs similarity index 97% rename from Wonky.Client/Components/ActivityButton.razor.cs rename to Wonky.Client/Components/ActionButton.razor.cs index 6ff76580..53d379e2 100644 --- a/Wonky.Client/Components/ActivityButton.razor.cs +++ b/Wonky.Client/Components/ActionButton.razor.cs @@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Components; -public partial class ActivityButton +public partial class ActionButton { [Parameter]public string CompanyId { get; set; } = ""; [Parameter] public int Enabled { get; set; } diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor b/Wonky.Client/Components/AdvisorCustomerListComponent.razor index fcd71d04..10cb1357 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor @@ -56,7 +56,7 @@ @company.City - diff --git a/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs index f9ed4f9a..3f071bf7 100644 --- a/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs @@ -133,7 +133,7 @@ public class CountryCustomerHistoryRepository : ICountryCustomerHistoryRepositor public async Task RequestErpToCrmSync(string countryCode, string companyId, string syncDate) { var response = await _client - .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/{_api.SyncRpcInvoiceExt}/{syncDate}"); + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/{_api.SyncInvoice}/{syncDate}"); var content = await response.Content.ReadAsStringAsync(); diff --git a/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs index c6348a7d..55298c30 100644 --- a/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs @@ -112,13 +112,14 @@ public class CrmCustomerHistoryRepository : ICrmCustomerHistoryRepository } - public async Task InvoiceErpToCrmRpc(string companyId, string syncDate) + public async Task GetRecycledInvoiceList(string companyId, string syncDate, bool force) { - var x = await _client.GetAsync($"{_api.SyncRpc}/companies/{companyId}/invoices/{syncDate}"); - if (!x.IsSuccessStatusCode) + var x = await _client.GetAsync($"{_api.SyncInvoice}/{companyId}/{syncDate}?force={force}"); + var content = await x.Content.ReadAsStringAsync(); + if (!x.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) { return string.Empty; } - return await x.Content.ReadAsStringAsync(); + return content.Trim('"'); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs index 8bfb2ef1..71e880f4 100644 --- a/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs @@ -72,6 +72,7 @@ public interface ICrmCustomerHistoryRepository /// /// /// + /// /// - Task InvoiceErpToCrmRpc(string companyId, string syncDate); + Task GetRecycledInvoiceList(string companyId, string syncDate, bool force); } \ No newline at end of file diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor index 251a71b9..e3beada5 100644 --- a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor @@ -17,13 +17,14 @@
+

Besøg

-

Besøg - @ReportItem.Company.Name

+

@ReportItem.Company.Name

diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor index bae12430..400c8210 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor @@ -20,10 +20,7 @@
- @if (!string.IsNullOrWhiteSpace(Company.Name)) - { -

@Company.Name - Faktura Oversigt

- } +

@Company.Name - Faktura Oversigt

diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor index 961fa59a..a3364efd 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor @@ -19,10 +19,7 @@
- @if (!string.IsNullOrWhiteSpace(Invoice.Company.Name)) - { -

Faktura @Invoice.DocumentNumber

- } +

Faktura @Invoice.DocumentNumber

diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index bf42fe88..f5b7e6aa 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -282,7 +282,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // product inventory has not been updated // request backend to sync ERP to CRM Toaster.ShowInfo("Vent mens data synkroniseres ..."); - var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); + var ts = await HistoryRepo.GetRecycledInvoiceList(CompanyId, Company.HistorySync, false); await Task.Delay(250); // save pDate await Storage.SetItemAsync($"{CompanyId}-pDate", ts); diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor index 95adab3c..82539c42 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor @@ -33,17 +33,13 @@ @Company.Name (@Company.Account)
-
- @if (AppInfo!.Value!.Rc) +
+ @if (UserInfo.CountryCode is "DK") { - @if (UserInfo.CountryCode is "DK") - { - Arbejdssted - } + Arbejdssted } -
-
- Tilbage + @* *@ + Tilbage
@@ -129,7 +125,7 @@
-
+
} @@ -152,6 +148,7 @@
@* vat number*@ +
@@ -195,27 +192,36 @@
@if (!Kanvas) { - Faktura + }
@if (!Kanvas) { - Tidl. Besøg + }
- @if (!Kanvas) + @if (!Kanvas ) { - Produkter + }
- - +
@@ -306,6 +312,7 @@
} +
@@ -328,4 +335,6 @@ @ref="VatLookupPopup" OnSelectedCompany="SelectedCompanyCallback"/> \ No newline at end of file + @ref="ContactViewPopup" OnSaveClicked="WriteContactCallback" OnDeleteClicked="DeleteContactCallback"/> + + \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs index 6fc59bcb..a37a8026 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs @@ -66,7 +66,6 @@ public partial class AdvisorCustomerViewEditPage : IDisposable private string CountryCode { get; set; } = "dk"; private string VisitState { get; set; } = "the-ugly"; private int EnableActivity { get; set; } = 1; - private string ActionLink { get; set; } = ""; private bool Working { get; set; } = true; private bool CountryIsDk { get; set; } = true; private bool ErpEditDisabled { get; set; } = true; @@ -79,6 +78,13 @@ public partial class AdvisorCustomerViewEditPage : IDisposable private ContactDto DefaultContact { get; set; } = new(); private ContactViewEditModal ContactViewPopup { get; set; } = new(); private VatLookupDkModal VatLookupPopup { get; set; } = new(); + private string RemoveHistoryWarning { get; set; } = ""; + private ConfirmActionModal ConfirmActionHistory { get; set; } + private string InventoryLink { get; set; } = ""; + private string ActivityLink { get; set; } = ""; + private string InvoiceLink { get; set; } = ""; + private string NewActivityLink { get; set; } = ""; + private int EnableLink { get; set; } = 1; protected override async Task OnInitializedAsync() { @@ -89,6 +95,12 @@ public partial class AdvisorCustomerViewEditPage : IDisposable // initialize default contact DefaultContact = new ContactDto { CompanyId = CompanyId, ContactId = "", FirstName = "" }; + // navigation button links + InventoryLink = $"/advisor/customers/{CompanyId}/history/inventory"; + ActivityLink = $"/advisor/customers/{CompanyId}/activities"; + InvoiceLink = $"/advisor/customers/{CompanyId}/invoices"; + NewActivityLink = $"/advisor/customers/{CompanyId}/activities/new"; + // setup form context ErpContext = new EditContext(Company); @@ -114,9 +126,6 @@ public partial class AdvisorCustomerViewEditPage : IDisposable if (Company.Account.StartsWith("KANVAS")) Kanvas = true; - // action link passed to activity button component - ActionLink = $"/advisor/customers/{CompanyId}/activities/new"; // used when drawing visit button - // only execute if the company a 'real' customer if (!Kanvas) { @@ -186,6 +195,34 @@ public partial class AdvisorCustomerViewEditPage : IDisposable VatEditDisabled = !VatEditDisabled; } + + private void ConfirmReloadHistory() + { + // $"Bekræft at du sletter
{Workplace.Name} fra {Workplace.CompanyName}?
AL INFORMATION slettes og handlingen er uigenkaldelig."; + RemoveHistoryWarning = $"Denne process kan tage lang tid.
Bekræft at al historik gendannes for
{Company.Account} {Company.Name}"; + ConfirmActionHistory.Show(); + } + + + private async Task ReloadHistory() + { + if (Working) + return; + Toaster.ShowWarning("Vent venligst ...."); + Working = true; + EnableLink = 0; + EnableActivity = 0; + var result = await HistoryRepo.GetRecycledInvoiceList(CompanyId, Company.HistorySync, true); + await Task.Delay(1000); + Working = false; + if (!string.IsNullOrWhiteSpace(result)) + { + Toaster.ShowInfo("Historik gendannelse er færdig"); + EnableLink = 1; + EnableActivity = 1; + } + } + private async Task ToggleVisibility() { @@ -202,7 +239,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable if (Working) return; Working = true; - Company.HistorySync = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); + Company.HistorySync = await HistoryRepo.GetRecycledInvoiceList(CompanyId, Company.HistorySync, false); Working = false; } diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor index e250f9da..7da535e8 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor @@ -186,5 +186,5 @@ } - - + + diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs index 7a33fde7..3b65cdaf 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs @@ -54,7 +54,7 @@ public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable private bool Working { get; set; } = true; private WorkplaceDocInfo WorkplaceDocInfo { get; set; } = new(); private List DocViews { get; set; } = new(); - private ConfirmDeleteModal ConfirmDeleteWorkplace { get; set; } + private ConfirmActionModal ConfirmActionWorkplace { get; set; } private string DeleteMessage { get; set; } = ""; private string LinkRecipients { get; set; } = ""; private const string CopyText = "Kopier"; @@ -74,7 +74,7 @@ public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable private string _linkButtonText = LinkText; private string _linkButtonStyle = LinkStyle; - private ConfirmDeleteModal ConfirmDeleteVariant { get; set; } + private ConfirmActionModal ConfirmActionVariant { get; set; } private DocView SelectedItem { get; set; } = new(); private bool OnlyOne { get; set; } = true; @@ -193,7 +193,7 @@ public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable Logger.LogDebug("ConfirmDeleteWorkplace"); - ConfirmDeleteWorkplace.Show(); + ConfirmActionWorkplace.Show(); } @@ -204,7 +204,7 @@ public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable Working = true; await Workplaces.DeleteWorkplace(CompanyId, WorkplaceId); - + Toaster.ShowInfo("Arbejdssted er slettet."); Navigator.NavigateTo($"/advisor/customers/{CompanyId}/workplaces"); @@ -217,7 +217,7 @@ public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable DeleteMessage = $"Bekræft at du sletter
{selectedItem.VariantName} fra {Workplace.CompanyName}?
AL INFORMATION slettes og handlingen er uigenkaldelig."; Logger.LogDebug("ConfirmDeleteProduct"); - ConfirmDeleteVariant.Show(); + ConfirmActionVariant.Show(); } diff --git a/Wonky.Client/Shared/ConfirmDeleteModal.razor b/Wonky.Client/Shared/ConfirmActionModal.razor similarity index 89% rename from Wonky.Client/Shared/ConfirmDeleteModal.razor rename to Wonky.Client/Shared/ConfirmActionModal.razor index f6c96c9f..eb0b47b6 100644 --- a/Wonky.Client/Shared/ConfirmDeleteModal.razor +++ b/Wonky.Client/Shared/ConfirmActionModal.razor @@ -18,15 +18,15 @@
-

Bekræft Sletning

+

Bekræft

@((MarkupString)BodyMessage)
- - + +
diff --git a/Wonky.Client/Shared/ConfirmDeleteModal.razor.cs b/Wonky.Client/Shared/ConfirmActionModal.razor.cs similarity index 97% rename from Wonky.Client/Shared/ConfirmDeleteModal.razor.cs rename to Wonky.Client/Shared/ConfirmActionModal.razor.cs index 1d0bde1c..4471f1ba 100644 --- a/Wonky.Client/Shared/ConfirmDeleteModal.razor.cs +++ b/Wonky.Client/Shared/ConfirmActionModal.razor.cs @@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Shared; -public partial class ConfirmDeleteModal +public partial class ConfirmActionModal { private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 627399a6..cae1441b 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "157.1", + "version": "158.0", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -43,8 +43,8 @@ "serviceVatEu": "api/v2/services/vies", "servicesVatNo": "api/v2/services/brReg", "servicesAuth": "v2/token", - "syncRpc": "api/v2/rpc", - "syncRpcInvoiceExt": "invoices", + "sync": "api/v2/sync", + "syncInvoice": "api/v2/sync/invoices", "systemDocStringUrl": "api/v2/admin/doc", "systemLabels": "api/v2/admin/doc/labels", "systemTexts": "api/v2/admin/doc/texts", diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs index 80111d77..fbd62d58 100644 --- a/Wonky.Entity/Configuration/ApiConfig.cs +++ b/Wonky.Entity/Configuration/ApiConfig.cs @@ -140,12 +140,12 @@ public class ApiConfig /// /// Base sync url /// - public string SyncRpc { get; set; } = ""; + public string Sync { get; set; } = ""; /// /// Application uri for updating customer product sale request /// - public string SyncRpcInvoiceExt { get; set; } = ""; + public string SyncInvoice { get; set; } = ""; /// /// Generic system string endpoint