diff --git a/Wonky.Client/Components/LandingComponentOffice.razor b/Wonky.Client/Components/LandingComponentOffice.razor index 94d4906b..8cd7ab49 100644 --- a/Wonky.Client/Components/LandingComponentOffice.razor +++ b/Wonky.Client/Components/LandingComponentOffice.razor @@ -29,9 +29,11 @@ Sælgere + @* - Tlf.Ordre + Tlf.Ordre + *@ Priser @@ -50,9 +52,11 @@ Sælgere + @* Tlf.Ordre + *@ Priser @@ -71,9 +75,11 @@ Sælgere + @* Tlf.Ordre + *@ Priser diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index 1dc3dc4c..6127319b 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -20,6 +20,7 @@ @if (CompanyList.Any()) { + @*
@@ -40,8 +41,39 @@
+ *@ +
@foreach (var company in CompanyList) { +
+
+
+
+ @company.Name +
+
+
Konto
+
@company.Account
+ +
CVR / ORG
+
@company.VatNumber
+
+
+
Telefon
+
@company.Phone
+
+
+
Adresse
+
@company.Address1 @(string.IsNullOrWhiteSpace(company.Address2) ? "" : ",") @company.Address2
+
+
+
Post By
+
@company.CountryCode.ToUpper()-@company.ZipCode @company.City
+
+
+
+
+ @*
@@ -61,6 +93,7 @@
+ *@ }
} diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor b/Wonky.Client/Pages/AdvisorCustomerListPage.razor index 669bb27b..2b6b0e17 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerListPage.razor @@ -35,10 +35,17 @@
+ + + @*
+ *@
diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs index e5bb0bb3..8b1cf069 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs @@ -43,6 +43,7 @@ namespace Wonky.Client.Pages private bool Working { get; set; } = true; private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); + private string ButtonFoldedText { get; set; } = "Vis Ophørte"; protected override void OnParametersSet() { @@ -66,24 +67,26 @@ namespace Wonky.Client.Pages Paging.SearchTerm = SavedSearch; // get companies - await FetchCompanies(); + await FetchCustomers(); Working = false; } private async Task OnFoldedClick() { + Working = true; IncludeFolded = !IncludeFolded; + ButtonFoldedText = IncludeFolded ? "Vis Aktive" : "Vis Ophørte"; Companies = new List(); Paging.PageNumber = 1; Paging.HasFolded = IncludeFolded ? 1 : 0; - await FetchCompanies(); + await FetchCustomers(); } private async Task SelectedPage(int page) { Companies = new List(); Paging.PageNumber = page; - await FetchCompanies(); + await FetchCustomers(); } private async Task SetSearchCol(string searchColumn) @@ -91,14 +94,14 @@ namespace Wonky.Client.Pages Companies = new List(); Paging.SearchColumn = searchColumn; Paging.PageNumber = 1; - await FetchCompanies(); + await FetchCustomers(); } private async Task SetPageSize(string pageSize) { Companies = new List(); Paging.PageSize = Convert.ToInt32(pageSize); Paging.PageNumber = 1; - await FetchCompanies(); + await FetchCustomers(); } private async Task SetSearchPhrase(string searchTerm) @@ -106,14 +109,14 @@ namespace Wonky.Client.Pages Companies = new List(); Paging.PageNumber = 1; Paging.SearchTerm = searchTerm; - await FetchCompanies(); + await FetchCustomers(); } private async Task SetSortCol(string orderBy) { Companies = new List(); Paging.OrderBy = orderBy; - await FetchCompanies(); + await FetchCustomers(); } /// @@ -126,10 +129,10 @@ namespace Wonky.Client.Pages await CompanyRepo.DeleteCompany(companyId); if (Paging.PageNumber > 1 && Companies.Count == 1) Paging.PageNumber--; - await FetchCompanies(); + await FetchCustomers(); } - private async Task FetchCompanies() + private async Task FetchCustomers() { Working = true; var pageRes = await CompanyRepo.GetCompanies(Paging); diff --git a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor index 445d210c..703ef319 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor +++ b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor @@ -37,15 +37,27 @@
+ + @*
+ *@
- + +
+
+
+ +
-
diff --git a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs index a52c20de..1cc9acc2 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryListPage.razor.cs @@ -33,7 +33,7 @@ namespace Wonky.Client.Pages [Parameter] public string CountryCode { get; set; } = ""; [Inject] private ILocalStorageService Storage { get; set; } [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private ICountryCustomerRepository Customers { get; set; } + [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } [Inject] private HttpInterceptorService Interceptor { get; set; } [Inject] private NavigationManager Navigator { get; set; } private List Companies { get; set; } = new(); @@ -42,14 +42,17 @@ namespace Wonky.Client.Pages private string SavedSearch { get; set; } = ""; private bool IncludeFolded { get; set; } private bool Working { get; set; } = true; - private MetaData ResponseMeta { get; set; } = new(); + private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); + private string ButtonFoldedText { get; set; } = "Vis Ophørte"; protected override async Task OnParametersSetAsync() { + Working = true; + Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - + // set preferences Prefs = await ProfileService.GetPreferences(); UserInfo = await Storage.GetItemAsync("_xu"); @@ -64,13 +67,13 @@ namespace Wonky.Client.Pages // get companies await FetchCustomers(); - Working = false; - } private async Task OnFoldedClick() { + Working = true; IncludeFolded = !IncludeFolded; + ButtonFoldedText = IncludeFolded ? "Vis Aktive" : "Vis Ophørte"; Companies = new List(); Paging.PageNumber = 1; Paging.HasFolded = IncludeFolded ? 1 : 0; @@ -79,6 +82,7 @@ namespace Wonky.Client.Pages private async Task SelectedPage(int page) { + Working = true; Companies = new List(); Paging.PageNumber = page; await FetchCustomers(); @@ -86,6 +90,7 @@ namespace Wonky.Client.Pages private async Task SetSearchCol(string searchColumn) { + Working = true; Companies = new List(); Paging.SearchColumn = searchColumn; Paging.PageNumber = 1; @@ -93,6 +98,7 @@ namespace Wonky.Client.Pages } private async Task SetPageSize(string pageSize) { + Working = true; Companies = new List(); Paging.PageSize = Convert.ToInt32(pageSize); Paging.PageNumber = 1; @@ -101,6 +107,7 @@ namespace Wonky.Client.Pages private async Task SetSearchPhrase(string searchTerm) { + Working = true; Companies = new List(); Paging.PageNumber = 1; Paging.SearchTerm = searchTerm; @@ -109,6 +116,7 @@ namespace Wonky.Client.Pages private async Task SetSortCol(string orderBy) { + Working = true; Companies = new List(); Paging.OrderBy = orderBy; await FetchCustomers(); @@ -117,10 +125,18 @@ namespace Wonky.Client.Pages private async Task FetchCustomers() { Working = true; - var pageRes = await Customers.GetCompaniesPaged(CountryCode, Paging); + var response = await CustomerRepo.GetCompaniesPaged(CountryCode, Paging); Working = false; - Companies = pageRes.Items; - ResponseMeta = pageRes.MetaData; + if (response.Items.Any()) + { + Companies = response.Items; + PageData = response.MetaData; + } + else + { + Companies = new List(); + PageData = new MetaData(); + } } public void Dispose() => Interceptor.DisposeEvent(); diff --git a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor index e12938b3..abb27222 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor @@ -31,9 +31,11 @@ @if (_reportItem.Express) { + @*
+ *@ @if (_reportItem.ProcessStatusEnum == "None") { diff --git a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.css b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.css index 6396fa53..fed02a26 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.css +++ b/Wonky.Client/Pages/OfficeCustomerOrderViewPage.razor.css @@ -1,6 +1,6 @@ #watermark { - position: fixed; - z-index: 999; + position: absolute; + z-index: -999; top: 10px; right: 0; } \ No newline at end of file diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 5841b7d1..01cd8dd3 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -53,6 +53,21 @@ Sælgere +
+ + Kunder DK + +
+
+ + Kunder NO + +
+
+ + Kunder SE + +
Forsendelse diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 56e6b0fb..a11d6449 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,14 +1,14 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.106.13", + "version": "0.107.3", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "Logging": { "LogLevel": { - "Default": "Debug", + "Default": "Information", "System": "Information", "Microsoft": "Information" },