From 5fa35bce7c81f2fca594d668dac3bd648d319b10 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 16 Jan 2023 16:40:56 +0100 Subject: [PATCH] WIP make all injects private --- .../AdvisorActivityKmStartComponent.razor | 2 +- .../AdvisorActivityListComponent.razor.cs | 2 +- .../AdvisorCustomerListComponent.razor.cs | 4 +- .../Components/CatalogGroupComponent.razor.cs | 4 +- .../Components/CatalogListComponent.razor.cs | 2 +- .../CatalogSearchComponent.razor.cs | 2 +- .../Components/CatalogSortComponent.razor.cs | 2 +- .../CustomerInventoryListComponent.razor.cs | 2 +- ...CustomerProductCheckListComponent.razor.cs | 2 +- .../CustomerSearchColumnComponent.razor.cs | 4 +- .../CustomerSearchPhraseComponent.razor.cs | 2 +- .../Components/CustomerSortComponent.razor.cs | 4 +- .../LandingComponentAdvisor.razor.cs | 2 +- .../LandingComponentOffice.razor.cs | 2 +- ...OfficeReportActivityListComponent.razor.cs | 2 +- .../Components/PageSizeComponent.razor.cs | 4 +- .../Components/TaskItemTableComponent.razor | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 22 ++-- .../AdvisorActivityTodayListPage.razor.cs | 14 +-- .../Pages/AdvisorActivityViewPage.razor.cs | 10 +- .../AdvisorCustomerActivityListPage.razor.cs | 6 +- .../Pages/AdvisorCustomerCreatePage.razor.cs | 14 +-- .../AdvisorCustomerInventoryListPage.razor.cs | 14 +-- .../AdvisorCustomerInvoiceListPage.razor.cs | 12 +- .../Pages/AdvisorCustomerListPage.razor.cs | 10 +- .../Pages/AdvisorCustomerViewPage.razor.cs | 18 +-- .../Pages/AdvisorQuoteListPage.razor.cs | 10 +- .../Pages/AdvisorReportCreatePage.razor | 2 +- .../Pages/AdvisorReportCreatePage.razor.cs | 14 +-- .../Pages/AdvisorReportListPage.razor.cs | 8 +- .../Pages/AdvisorReportViewPage.razor.cs | 12 +- .../Pages/AdvisorTaskItemListCrmPage.razor.cs | 12 +- .../Pages/AdvisorTaskItemViewCrmPage.razor.cs | 4 +- .../AdvisorWorkplaceDocumentListPage.razor.cs | 4 +- .../Pages/AdvisorWorkplaceListPage.razor.cs | 6 +- .../Pages/AdvisorWorkplaceViewPage.razor.cs | 8 +- .../Pages/CatalogCountryPage.razor.cs | 12 +- .../Pages/CatalogCountryPrintPage.razor.cs | 6 +- Wonky.Client/Pages/ErrorPage404.razor.cs | 2 +- Wonky.Client/Pages/Login.razor.cs | 6 +- Wonky.Client/Pages/Logout.razor.cs | 6 +- .../OfficeCustomerCountryListPage.razor.cs | 10 +- ...fficeCustomerCreatePhoneOrderPage.razor.cs | 14 +-- .../OfficeCustomerOrderViewPage.razor.cs | 14 +-- ...OfficeUserAdvisorCustomerListPage.razor.cs | 8 +- .../Pages/OfficeUserAdvisorListPage.razor.cs | 4 +- .../OfficeUserAdvisorReportListPage.razor.cs | 8 +- .../OfficeUserAdvisorReportViewPage.razor | 4 +- .../OfficeUserAdvisorReportViewPage.razor.cs | 117 ++++++++++-------- .../OfficeUserAdvisorViewEditPage.razor.cs | 10 +- Wonky.Client/Pages/ReportPrintOrderPage.razor | 5 +- .../Pages/ReportPrintOrderPage.razor.cs | 33 ++--- .../Pages/ReportPrintSummaryPage.razor.cs | 6 +- .../Pages/WarehouseOrderListPage.razor.cs | 8 +- .../Pages/WarehouseOrderViewPage.razor | 2 +- .../Pages/WarehouseOrderViewPage.razor.cs | 10 +- Wonky.Client/Shared/ConfirmationModal.razor | 2 +- .../Shared/ConfirmationModal.razor.cs | 5 +- .../Shared/DraftStateProvider.razor.cs | 2 +- .../Shared/InventoryReorderModal.razor.cs | 2 +- Wonky.Client/Shared/InvoiceViewModal.razor.cs | 4 +- .../Shared/PriceCatalogModal.razor.cs | 6 +- .../Shared/ProductHistoryModal.razor.cs | 2 +- .../Shared/ProductPriceHistoryModal.razor.cs | 2 +- Wonky.Client/Shared/VatLookupDkModal.razor.cs | 6 +- Wonky.Client/wwwroot/appsettings.json | 2 +- 66 files changed, 290 insertions(+), 272 deletions(-) diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index 242a2670..749f83e6 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -8,7 +8,7 @@ @code { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } private int KmMorning { get; set; } private UserPref Prefs { get; set; } = new(); diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs b/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs index 5598f708..c7c528e9 100644 --- a/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs @@ -21,6 +21,6 @@ namespace Wonky.Client.Components; public partial class AdvisorActivityListComponent { [Parameter] public List ActivityList { get; set; } = new(); - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private NavigationManager Navigator { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs index 5afc6009..4cfb03fb 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs @@ -32,8 +32,8 @@ namespace Wonky.Client.Components [Parameter] public List CompanyList { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IJSRuntime Js { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IJSRuntime Js { get; set; } private Lazy BsTooltip = new(); diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index cd9a7b30..72f23c18 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -22,8 +22,8 @@ namespace Wonky.Client.Components; public partial class CatalogGroupComponent { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); diff --git a/Wonky.Client/Components/CatalogListComponent.razor.cs b/Wonky.Client/Components/CatalogListComponent.razor.cs index 12927c43..1f173552 100644 --- a/Wonky.Client/Components/CatalogListComponent.razor.cs +++ b/Wonky.Client/Components/CatalogListComponent.razor.cs @@ -24,5 +24,5 @@ namespace Wonky.Client.Components; public partial class CatalogListComponent { [Parameter] public List ItemList { get; set; } = new(); - [Inject] public IToastService ToastService { get; set; } + [Inject] private IToastService ToastService { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs index dee1c3a4..eee8cf03 100644 --- a/Wonky.Client/Components/CatalogSearchComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSearchComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } /// /// OnChanged event callback diff --git a/Wonky.Client/Components/CatalogSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs index b009fb81..989c3ee1 100644 --- a/Wonky.Client/Components/CatalogSortComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSortComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } /// /// OnChanged callback function diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs index 7dae353c..173b1a55 100644 --- a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs +++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Components; public partial class CustomerInventoryListComponent { - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } // Parameters [Parameter] public List Inventory { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs index 57fea05e..9559e57a 100644 --- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs +++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs @@ -28,7 +28,7 @@ public partial class CustomerProductCheckListComponent { [Parameter] public List ProductList { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } // private variables private bool Descending { get; set; } diff --git a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs index b0dc0298..e771be7d 100644 --- a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs @@ -24,8 +24,8 @@ namespace Wonky.Client.Components; public partial class CustomerSearchColumnComponent : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs { get; set; } = new(); diff --git a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs index 74036aca..158b33eb 100644 --- a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.Components private Timer InputTimer { get; set; } = new(); private string SearchTerm { get; set; } = ""; private UserPref Prefs { get; set; } = new (); - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Components/CustomerSortComponent.razor.cs b/Wonky.Client/Components/CustomerSortComponent.razor.cs index c3e48c35..f2f5567f 100644 --- a/Wonky.Client/Components/CustomerSortComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSortComponent.razor.cs @@ -23,8 +23,8 @@ namespace Wonky.Client.Components { public partial class CustomerSortComponent : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); diff --git a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs index 2282ccd3..d341023e 100644 --- a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs +++ b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentAdvisor { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } private readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions { diff --git a/Wonky.Client/Components/LandingComponentOffice.razor.cs b/Wonky.Client/Components/LandingComponentOffice.razor.cs index f91b6f75..b210bb90 100644 --- a/Wonky.Client/Components/LandingComponentOffice.razor.cs +++ b/Wonky.Client/Components/LandingComponentOffice.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentOffice { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } private readonly JsonSerializerOptions _options = new JsonSerializerOptions { diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs index c8352bbf..4b7dee0c 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.Components; public partial class OfficeReportActivityListComponent { [Parameter] public List ActivityList { get; set; } = new(); - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private static string GetProcessStatus(string processStatus) { diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index 1494c1f2..f0ea009b 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -23,8 +23,8 @@ namespace Wonky.Client.Components { public partial class PageSizeComponent : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor index 7c3b2609..2ae8fea0 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor +++ b/Wonky.Client/Components/TaskItemTableComponent.razor @@ -81,7 +81,7 @@ } - + } else { diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 11462d6a..ba7ce0cc 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -36,17 +36,17 @@ public partial class AdvisorActivityCreatePage : IDisposable [CascadingParameter] DraftStateProvider DraftProvider { get; set; } [Parameter] public string CompanyId { get; set; } // Services - [Inject] public ILogger Logger { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService Profiles { get; set; } - [Inject] public IToastService Toast { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } - [Inject] public IAdvisorCustomerRepository Companies { get; set; } - [Inject] public IAdvisorActivityRepository Actitivites { get; set; } - [Inject] public IAdvisorReportRepository Reports { get; set; } - [Inject] public IAdvisorCustomerHistoryRepository CustomerHistory { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private UserProfileService Profiles { get; set; } + [Inject] private IToastService Toast { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } + [Inject] private IAdvisorCustomerRepository Companies { get; set; } + [Inject] private IAdvisorActivityRepository Actitivites { get; set; } + [Inject] private IAdvisorReportRepository Reports { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository CustomerHistory { get; set; } // variables private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true}; private SalesItemView SelectedItem { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index e94b6e8c..729fc543 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -27,13 +27,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorActivityTodayListPage : IDisposable { - [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] public IToastService Toaster { get; set; } + [Inject] private UserProfileService UserProfileService { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] private IToastService Toaster { get; set; } private ReportStatusView? ReportStatusView { get; set; } = new(); private UserPref UserPref { get; set; } = new(); private DateTime SelectedDate { get; set; } diff --git a/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs index 13d09881..63fa537b 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs @@ -33,11 +33,11 @@ public partial class AdvisorActivityViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public IToastService Toaster { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private ReportItemView ReportItem { get; set; } = new(); private ActivityOfficeNote Note { get; set; } = new(); private EditContext NoteContext { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs index b0571288..7e9279d2 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs @@ -28,9 +28,9 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerActivityListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } private List Activities { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs index 7d3601d9..2de4916b 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs @@ -39,13 +39,13 @@ namespace Wonky.Client.Pages { public partial class AdvisorCustomerCreatePage : IDisposable { - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public VatInfoLookupService VatService { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private VatInfoLookupService VatService { get; set; } private EditContext CompanyContext { get; set; } private CompanyDto Company { get; set; } = new(); private VirkRegInfo CompanyRegInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs index d2287f12..981ab8b4 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs @@ -28,13 +28,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInventoryListPage : IDisposable { - [Inject] public IAdvisorCustomerHistoryRepository CustomerHistory { get; set; } - [Inject] public IAdvisorCustomerRepository Customers { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository CustomerHistory { get; set; } + [Inject] private IAdvisorCustomerRepository Customers { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } [CascadingParameter] public DraftStateProvider DraftStateProvider { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index 12d81396..d55ad114 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -15,12 +15,12 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInvoiceListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ILogger Logger { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs index 96d68f32..e5bb0bb3 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs @@ -30,11 +30,11 @@ namespace Wonky.Client.Pages { public partial class AdvisorCustomerListPage : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } - [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private List Companies { get; set; } = new(); private UserPref Prefs { get; set; } = new(); private UserInfoView UserInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs index 9f43759a..38c08913 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs @@ -34,15 +34,15 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public IAdvisorContactRepository AdvisorContactRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public VatInfoLookupService VatService { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private IAdvisorContactRepository AdvisorContactRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private VatInfoLookupService VatService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } private readonly JsonSerializerOptions _options = new () { PropertyNameCaseInsensitive = true }; private CompanyDto Company { get; set; } = new(); private EditContext ErpContext { get; set; } diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs index c490dc96..7bb21584 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs @@ -16,11 +16,11 @@ namespace Wonky.Client.Pages; public partial class AdvisorQuoteListPage : IDisposable { - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } private List Quotes { get; set; } = new(); private List _quotes { get; set; } = new(); private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor index afa00b38..d24a4702 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor @@ -168,7 +168,7 @@ - + @if (Working) { diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 42b8b62d..3bff34eb 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -29,13 +29,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportCreatePage : IDisposable { - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public IToastService Toaster { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private IToastService Toaster { get; set; } private EditContext ReportContext { get; set; } private ReportDto Report { get; set; } = new(); private List Activities { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs index a250c0fe..ce407b70 100644 --- a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs @@ -24,10 +24,10 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportListPage : IDisposable { - [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private ILogger Logger { get; set; } private List ReportList { get; set; } = new(); private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index e2e6ca37..34a1c68f 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -26,12 +26,12 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportViewPage : IDisposable { [Parameter] public string ReportDate { get; set; } - [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } private UserPref Prefs { get; set; } = new(); private ReportView Report { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index be336254..d5829d4a 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -27,12 +27,12 @@ namespace Wonky.Client.Pages; public partial class AdvisorTaskItemListCrmPage : IDisposable { - [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; } - [Inject] public IToastService Toaster { get; set; } + [Inject] private UserProfileService UserProfileService { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; } + [Inject] private IToastService Toaster { get; set; } private UserPref Prefs { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; private bool ReportExist = false; diff --git a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs index e418bb54..567f4b75 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs @@ -27,8 +27,8 @@ namespace Wonky.Client.Pages; public partial class AdvisorTaskItemViewCrmPage : IDisposable { [Parameter] public string TaskItemId { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private IAdvisorTaskItemRepository AdvisorTaskRepo { get; set; } private TaskItemDto _taskItem = new (); private EditContext _editContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs index b1a42cfb..6dacf017 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs @@ -26,8 +26,8 @@ public partial class AdvisorWorkplaceDocumentListPage [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string WorkplaceId { get; set; } = ""; - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; } private bool Working { get; set; } = true; } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs index 608e5721..63a8afa9 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs @@ -27,9 +27,9 @@ namespace Wonky.Client.Pages; public partial class AdvisorWorkplaceListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } - [Inject] public IAdvisorCustomerRepository _companyRepo { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } + [Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] private IAdvisorCustomerRepository _companyRepo { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } private List _workplaces { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs index d7855125..f40f8ce2 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs @@ -29,10 +29,10 @@ public partial class AdvisorWorkplaceViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string WorkplaceId { get; set; } = ""; - [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } - [Inject] public IAdvisorCustomerRepository _companyRepo { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public NavigationManager _navigator { get; set; } + [Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] private IAdvisorCustomerRepository _companyRepo { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private NavigationManager _navigator { get; set; } private WorkplaceDto Workplace { get; set; } = new(); private EditContext _editContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/CatalogCountryPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPage.razor.cs index 24bf960f..b8d085dc 100644 --- a/Wonky.Client/Pages/CatalogCountryPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPage.razor.cs @@ -27,12 +27,12 @@ namespace Wonky.Client.Pages; public partial class CatalogCountryPage : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private NavigationManager Navigator { get; set; } [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs index 8261553e..82605594 100644 --- a/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs @@ -32,9 +32,9 @@ namespace Wonky.Client.Pages; public partial class CatalogCountryPrintPage : IDisposable { - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } [Parameter] public string CountryCode { get; set; } = ""; private List Items { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/ErrorPage404.razor.cs b/Wonky.Client/Pages/ErrorPage404.razor.cs index 1e4a0d05..33f18895 100644 --- a/Wonky.Client/Pages/ErrorPage404.razor.cs +++ b/Wonky.Client/Pages/ErrorPage404.razor.cs @@ -19,7 +19,7 @@ namespace Wonky.Client.Pages; public partial class ErrorPage404 { - [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] private NavigationManager NavigationManager { get; set; } private void NavigateToHome() { diff --git a/Wonky.Client/Pages/Login.razor.cs b/Wonky.Client/Pages/Login.razor.cs index b885e3e5..3cc13839 100644 --- a/Wonky.Client/Pages/Login.razor.cs +++ b/Wonky.Client/Pages/Login.razor.cs @@ -22,9 +22,9 @@ namespace Wonky.Client.Pages; public partial class Login { - [Inject] public NavigationManager NavigationManager { get; set; } - [Inject] public IAuthenticationService AuthenticationService { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private NavigationManager NavigationManager { get; set; } + [Inject] private IAuthenticationService AuthenticationService { get; set; } + [Inject] private ILogger Logger { get; set; } [Parameter] public string ReturnUrl { get; set; } private CredentialDto _credentialDto = new (); private bool ShowAuthError { get; set; } diff --git a/Wonky.Client/Pages/Logout.razor.cs b/Wonky.Client/Pages/Logout.razor.cs index a855c368..5a9fed52 100644 --- a/Wonky.Client/Pages/Logout.razor.cs +++ b/Wonky.Client/Pages/Logout.razor.cs @@ -22,9 +22,9 @@ namespace Wonky.Client.Pages; public partial class Logout { - [Inject] public IAuthenticationService AuthenticationService { get; set; } - [Inject] public NavigationManager NavigationManager { get; set; } - [Inject] public ILocalStorageService LocalStorage { get; set; } + [Inject] private IAuthenticationService AuthenticationService { get; set; } + [Inject] private NavigationManager NavigationManager { get; set; } + [Inject] private ILocalStorageService LocalStorage { get; set; } protected override async Task OnInitializedAsync() { diff --git a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs index 8d2d5c0f..a52c20de 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs @@ -31,11 +31,11 @@ namespace Wonky.Client.Pages public partial class OfficeCustomerCountryListPage : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } - [Inject] public ICountryCustomerRepository Customers { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } + [Inject] private ICountryCustomerRepository Customers { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private List Companies { get; set; } = new(); private UserPref Prefs { get; set; } = new(); private UserInfoView UserInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs index 8a223538..d4056bf0 100644 --- a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs @@ -28,13 +28,13 @@ namespace Wonky.Client.Pages; public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable { - [Inject] public ILogger Logger { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; } - [Inject] public ICountryReportRepository ReportRepo { get; set; } - [Inject] public ISystemUserRepository UserRepo { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } + [Inject] private ICountryCustomerHistoryRepository InventoryRepo { get; set; } + [Inject] private ICountryReportRepository ReportRepo { get; set; } + [Inject] private ISystemUserRepository UserRepo { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } // parameters [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.cs index 10358ff0..07d9324b 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.cs @@ -34,13 +34,13 @@ public partial class OfficeCustomerOrderViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] public ISystemSendMailService MailService { get; set; } - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } - [Inject] public ILogger Logger { get; set; } - [Inject] public IToastService Toast { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] private ISystemSendMailService MailService { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private ISystemUserRepository SystemUserRepo { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private IToastService Toast { get; set; } private ReportItemView _reportItem { get; set; } = new(); private bool _isNotified { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs index 99590636..bca81efe 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs @@ -27,10 +27,10 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } + [Inject] private UserProfileService UserProfileService { get; set; } + [Inject] private ISystemUserRepository UserRepo { get; set; } private List CompanyList { get; set; } = new(); private MetaData ResponseMeta { get; set; } = new(); private CustomerPaging Paging = new(); diff --git a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs index afd82e6f..53bb4e7e 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs @@ -8,8 +8,8 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorListPage :IDisposable { - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ISystemUserRepository SystemUserRepo { get; set; } [Parameter] public string CountryCode { get; set; } = ""; private List SalesReps { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs index 4e4116d6..5e41ba3c 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs @@ -27,10 +27,10 @@ public partial class OfficeUserAdvisorReportListPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public ICountryReportRepository ReportRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private ICountryReportRepository ReportRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ISystemUserRepository SystemUserRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; private WebUserInfoView UserInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor index 94269610..97255209 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor @@ -32,7 +32,7 @@
- +
@@ -71,3 +71,5 @@ } } + + diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs index 23afe24c..d5bf79d5 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs @@ -14,78 +14,44 @@ // using Blazored.LocalStorage; +using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using Wonky.Client.Helpers; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.Models; using Wonky.Client.Services; +using Wonky.Client.Shared; +using Wonky.Entity.DTO; using Wonky.Entity.Views; namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorReportViewPage : IDisposable { - /// - /// Country code from url parameter - /// - [Parameter] - public string CountryCode { get; set; } = ""; - - /// - /// User entity Id from url parameter - /// - [Parameter] - public string UserId { get; set; } = ""; - - /// - /// Report Date - /// - [Parameter] - public string ReportDate { get; set; } = ""; - - /// - /// Injected interceptor service - /// - [Inject] - public HttpInterceptorService Interceptor { get; set; } - - /// - /// Injected administrative report http repo - /// - [Inject] - public ICountryReportRepository ReportRepo { get; set; } - - /// - /// Navigation Manager - /// - [Inject] - public NavigationManager Navigator { get; set; } - - /// - /// Logger service - /// - [Inject] - public ILogger Logger { get; set; } - - /// - /// Storage service - /// - [Inject] - public ILocalStorageService Storage { get; set; } - - /// - /// Preference service - /// - [Inject] - public UserProfileService ProfileService { get; set; } - + [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string ReportDate { get; set; } = ""; + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private ICountryReportRepository ReportRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } + [Inject] private IJSRuntime JSRuntime { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private IOrderProcessRepository ProcessRepo { get; set; } + private IJSObjectReference JsModule { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); private bool Working { get; set; } = true; 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() { Interceptor.RegisterEvent(); @@ -97,6 +63,14 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable await FetchUserReport(ReportDate); } + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + JsModule = await JSRuntime + .InvokeAsync("import", "/scripts/print-invoke.js"); + } + } private void Print(PTarget target) { ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; @@ -116,7 +90,40 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable throw new ArgumentOutOfRangeException(nameof(target), target, null); } } + + 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() + { + var current = 0; + var all = Report.ReportItems.Count; + foreach (var item in Report.ReportItems) + { + Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst"); + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState + { + OrderId = item.ActivityId, + ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) + }); + } + Toaster.ShowInfo("Ordrer er klar til udskrift."); + await Print(); + } + private void OnCancelCallback() + { + Print(); + } + + private async Task Print() + { + await JsModule.InvokeVoidAsync("printInvoke"); + } + /// /// Work date component event handler /// diff --git a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs index fb5bad54..2351faa2 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs @@ -30,11 +30,11 @@ public partial class OfficeUserAdvisorViewEditPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } - [Inject] public ILogger _logger { get; set; } - [Inject] public NavigationManager _navigator { get; set; } - [Inject] public IToastService _toast { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private ISystemUserRepository SystemUserRepo { get; set; } + [Inject] private ILogger _logger { get; set; } + [Inject] private NavigationManager _navigator { get; set; } + [Inject] private IToastService _toast { get; set; } private WebUserInfoView UserInfo { get; set; } = new(); private EditContext _editContext { get; set; } private UserUpdateDto _updateInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor b/Wonky.Client/Pages/ReportPrintOrderPage.razor index 0e86b307..55c8c314 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor @@ -28,7 +28,10 @@ - + + + + diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs index dbdb6e67..24cddc88 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs @@ -14,6 +14,7 @@ // using Blazored.LocalStorage; +using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using Wonky.Client.Helpers; @@ -30,11 +31,12 @@ public partial class ReportPrintOrderPage [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IOrderProcessRepository ProcessRepo { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IOrderProcessRepository ProcessRepo { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private ILogger Logger { get; set; } + [Inject] private IToastService Toaster { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } @@ -68,21 +70,24 @@ public partial class ReportPrintOrderPage private async Task OnOkCallBack() { - foreach (var process in Report.ReportItems.Select(item => new OrderProcessState - { - OrderId = item.ActivityId, - ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) - })) + var current = 0; + var all = Items.Count; + foreach (var item in Items) { - await ProcessRepo.UpdateWarehouseOrderStatus(process); - } - + Toaster.ShowInfo($"Behandler {current++} af {all} ordrer. Vent venligst"); + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState + { + OrderId = item.ActivityId, + ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) + }); + } + Toaster.ShowInfo("Ordrer er klar til udskrift."); await Print(); } - private async Task OnCancelCallback() + private void OnCancelCallback() { - await Print(); + Print(); } private async Task Print() diff --git a/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs b/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs index 039f12c8..f1646300 100644 --- a/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs @@ -27,10 +27,10 @@ public partial class ReportPrintSummaryPage [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; - [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private ILocalStorageService Storage { get; set; } + [Inject] private NavigationManager Navigator { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs index 124b0b03..5fe729c9 100644 --- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs @@ -12,9 +12,9 @@ public partial class WarehouseOrderListPage : IDisposable { [Parameter] public string Status { get; set; } = "none"; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } - [Inject] public NavigationManager Navigator { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IOrderProcessRepository OrderProcessRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } private List OrderList { get; set; } private bool Working { get; set; } = true; private string Header { get; set; } = "Ubehandlet"; @@ -32,7 +32,7 @@ public partial class WarehouseOrderListPage : IDisposable OrderList = new List(); switch (status) { - case PStatus.None: + case PStatus.None or PStatus.Accepted: Header = "Ubehandlede ordrer"; ReadyToShip = false; break; diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor index 42dd5c0b..cb95d92f 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor @@ -106,7 +106,7 @@
- @if (Order.ProcessStatusEnum.ToLower() == "none") + @if (Order.ProcessStatusEnum.ToLower() is "none" or "accepted") { } diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index 9a9326ab..d562feb2 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -29,11 +29,11 @@ namespace Wonky.Client.Pages; public partial class WarehouseOrderViewPage : IDisposable { [Parameter] public string OrderId { get; set; } = ""; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } - [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IToastService Toast { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IOrderProcessRepository OrderProcessRepo { get; set; } + [Inject] private NavigationManager Navigator { get; set; } + [Inject] private IToastService Toast { get; set; } + [Inject] private ILogger Logger { get; set; } private WarehouseOrderView Order { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Shared/ConfirmationModal.razor b/Wonky.Client/Shared/ConfirmationModal.razor index f229e67c..3127f08d 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor +++ b/Wonky.Client/Shared/ConfirmationModal.razor @@ -26,7 +26,7 @@ @((MarkupString) BodyMessage)
- +
diff --git a/Wonky.Client/Shared/ConfirmationModal.razor.cs b/Wonky.Client/Shared/ConfirmationModal.razor.cs index cb603014..a3d287b2 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor.cs +++ b/Wonky.Client/Shared/ConfirmationModal.razor.cs @@ -23,7 +23,7 @@ public partial class ConfirmationModal private bool _showBackdrop; [Parameter] public string BodyMessage { get; set; } = ""; [Parameter] public EventCallback OnOkClicked { get; set; } - [Parameter] public EventCallback? OnCancelClicked { get; set; } + [Parameter] public EventCallback OnCancelClicked { get; set; } private void OkSelected() { @@ -33,7 +33,8 @@ public partial class ConfirmationModal private void CancelSelected() { - OnCancelClicked?.InvokeAsync(); + if(OnCancelClicked.HasDelegate) + OnCancelClicked.InvokeAsync(); Hide(); } diff --git a/Wonky.Client/Shared/DraftStateProvider.razor.cs b/Wonky.Client/Shared/DraftStateProvider.razor.cs index 843783e6..fc76e87b 100644 --- a/Wonky.Client/Shared/DraftStateProvider.razor.cs +++ b/Wonky.Client/Shared/DraftStateProvider.razor.cs @@ -23,7 +23,7 @@ public partial class DraftStateProvider { [Parameter] public RenderFragment ChildContent { get; set; } [Parameter] public string DraftId { get; set; } = ""; - [Inject] public ILocalStorageService LocalStorageService { get; set; } + [Inject] private ILocalStorageService LocalStorageService { get; set; } public Draft Draft { get; set; } = new(); private bool _hasLoaded; diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor.cs b/Wonky.Client/Shared/InventoryReorderModal.razor.cs index a4700b87..54d6e849 100644 --- a/Wonky.Client/Shared/InventoryReorderModal.razor.cs +++ b/Wonky.Client/Shared/InventoryReorderModal.razor.cs @@ -29,7 +29,7 @@ public partial class InventoryReorderModal { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public SalesItemView SalesItem { get; set; } = new(); - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } [Parameter] public EventCallback OnSelected { get; set; } private List? History { get; set; } = new(); private DraftItem SelectedItem { get; set; } = new(); diff --git a/Wonky.Client/Shared/InvoiceViewModal.razor.cs b/Wonky.Client/Shared/InvoiceViewModal.razor.cs index 2f014a10..5988eaad 100644 --- a/Wonky.Client/Shared/InvoiceViewModal.razor.cs +++ b/Wonky.Client/Shared/InvoiceViewModal.razor.cs @@ -29,8 +29,8 @@ public partial class InvoiceViewModal : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string InvoiceId { get; set; } = ""; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; private InvoiceView Invoice { get; set; } = new(); diff --git a/Wonky.Client/Shared/PriceCatalogModal.razor.cs b/Wonky.Client/Shared/PriceCatalogModal.razor.cs index fba3c4c6..9312d158 100644 --- a/Wonky.Client/Shared/PriceCatalogModal.razor.cs +++ b/Wonky.Client/Shared/PriceCatalogModal.razor.cs @@ -28,9 +28,9 @@ public partial class PriceCatalogModal : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public EventCallback OnSelected { get; set; } - [Inject] public ICountryCatalogRepository Catalog { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] private ICountryCatalogRepository Catalog { get; set; } + [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] private UserProfileService ProfileService { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/Shared/ProductHistoryModal.razor.cs b/Wonky.Client/Shared/ProductHistoryModal.razor.cs index 9089b133..6decf23b 100644 --- a/Wonky.Client/Shared/ProductHistoryModal.razor.cs +++ b/Wonky.Client/Shared/ProductHistoryModal.razor.cs @@ -29,7 +29,7 @@ public partial class ProductHistoryModal // [Parameter] public EventCallback OnSelected { get; set; } [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string ItemSku { get; set; } = ""; - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private List? History { get; set; } private string ProductName { get; set; } = ""; private string _modalDisplay = ""; diff --git a/Wonky.Client/Shared/ProductPriceHistoryModal.razor.cs b/Wonky.Client/Shared/ProductPriceHistoryModal.razor.cs index 0dc5f6c2..0e0ab3c9 100644 --- a/Wonky.Client/Shared/ProductPriceHistoryModal.razor.cs +++ b/Wonky.Client/Shared/ProductPriceHistoryModal.razor.cs @@ -29,7 +29,7 @@ public partial class ProductPriceHistoryModal [Parameter] public EventCallback OnSelected { get; set; } [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string Sku { get; set; } = ""; - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private List? History { get; set; } private string ProductName { get; set; } = ""; private string _modalDisplay = ""; diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor.cs b/Wonky.Client/Shared/VatLookupDkModal.razor.cs index 46b5731d..165c916b 100644 --- a/Wonky.Client/Shared/VatLookupDkModal.razor.cs +++ b/Wonky.Client/Shared/VatLookupDkModal.razor.cs @@ -35,9 +35,9 @@ public partial class VatLookupDkModal [Parameter] public string EntityName { get; set; } = ""; [Parameter] public string VatNumber { get; set; } = ""; [Parameter] public EventCallback OnSelectedCompany { get; set; } - [Inject] public VatInfoLookupService VatService { get; set; } - [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] private VatInfoLookupService VatService { get; set; } + [Inject] private IToastService Toaster { get; set; } + [Inject] private ILogger Logger { get; set; } private VirkRegInfo CompanyRegInfo { get; set; } = new(); private List VatInfos { get; set; } = new(); private VatAddress _vatAddress { get; set; } = new(); diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 0761c387..c0a3f8b8 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -7,7 +7,7 @@ "image": "grumpy-coder.png" }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory",