-
+
@if (Working)
{
diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
index c761fc3d..92c29a17 100644
--- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs
@@ -45,30 +45,28 @@ public partial class CatalogCountryPagedListPage : IDisposable
private List
Items { get; set; } = new();
private MetaData PageData { get; set; } = new();
private CatalogPager Paging { get; set; } = new();
- private UserPreference Profiles { get; set; } = new();
+ private UserPreference Preference { get; set; } = new();
private UserManagerEditView XUserInfo { get; set; } = new();
private bool Working { get; set; }
private string CountryName { get; set; } = "";
-
-
+
+
protected override async Task OnInitializedAsync()
{
- Profiles = await PreferenceService.GetProfile();
- XUserInfo = await UserInfoService.GetUserInfo();
-
- Paging.OrderBy = Profiles.ItemSort;
-
- Paging.SearchColumn = Profiles.ItemSearch;
- Paging.PageSize = Convert.ToInt32(Profiles.PageSize);
-
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
+
+ Preference = await PreferenceService.GetPreference();
+ Paging.PageSize = Convert.ToInt32(Preference.PageSize);
+ Paging.OrderBy = Preference.ItemSort;
+ Paging.SearchColumn = Preference.ItemSearch;
+
+ XUserInfo = await UserInfoService.GetUserInfo();
+ await Task.Delay(100);
+
if (string.IsNullOrWhiteSpace(CountryCode))
{
- while (string.IsNullOrWhiteSpace(XUserInfo.CountryCode))
- await Task.Delay(500);
-
CountryCode = XUserInfo.CountryCode.ToLower();
Navigator.NavigateTo($"/catalog/{CountryCode}", false, true);
}
@@ -79,6 +77,20 @@ public partial class CatalogCountryPagedListPage : IDisposable
}
+ private async Task GetCatalogPaged()
+ {
+ if (string.IsNullOrWhiteSpace(CountryCode))
+ return;
+ if (Working)
+ return;
+ Working = true;
+ var page = await Catalog.GetSalesItemsPaged(CountryCode, Paging);
+ Items = page.Items!;
+ PageData = page.MetaData!;
+ Working = false;
+ }
+
+
private async Task SetSearchPhrase(string searchTerm)
{
Items = new List();
@@ -131,20 +143,6 @@ public partial class CatalogCountryPagedListPage : IDisposable
}
- private async Task GetCatalogPaged()
- {
- if (string.IsNullOrWhiteSpace(CountryCode))
- return;
- if (Working)
- return;
- Working = true;
- var page = await Catalog.GetSalesItemsPaged(CountryCode, Paging);
- Items = page.Items!;
- PageData = page.MetaData!;
- Working = false;
- }
-
-
public void Dispose() => Interceptor.DisposeEvent();
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/CatalogCountryProductPage.razor b/Wonky.Client/Pages/CatalogCountryProductPage.razor
new file mode 100644
index 00000000..59d99534
--- /dev/null
+++ b/Wonky.Client/Pages/CatalogCountryProductPage.razor
@@ -0,0 +1,15 @@
+@using Wonky.Client.Components
+@using System.Text.Json
+@page "/catalog/{CountryCode}/{sku}"
+
+CatalogCountryProductPage
+
+@if (!string.IsNullOrWhiteSpace(_item.Sku))
+{
+ @JsonSerializer.Serialize(_item)
+}
+
+@if (_working)
+{
+
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs b/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs
new file mode 100644
index 00000000..ac5b6bf3
--- /dev/null
+++ b/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Components;
+using Toolbelt.Blazor;
+using Wonky.Client.HttpInterceptors;
+using Wonky.Client.HttpRepository;
+using Wonky.Entity.Views;
+
+#pragma warning disable CS8618
+
+namespace Wonky.Client.Pages;
+
+public partial class CatalogCountryProductPage
+{
+ // ##############################################################
+ [Inject] public HttpInterceptorService Interceptor { get; set; }
+ [Inject] public ICountryCatalogRepository Catalog { get; set; }
+
+ // ##############################################################
+ [Parameter] public string CountryCode { get; set; } = "";
+ [Parameter] public string Sku { get; set; } = "";
+
+ // ##############################################################
+ private SalesItemView _item = new();
+ private bool _working = true;
+
+ protected override async Task OnInitializedAsync()
+ {
+ Interceptor.RegisterEvent();
+ Interceptor.RegisterBeforeSendEvent();
+
+ _item = await Catalog.GetSalesItemSku(CountryCode, Sku);
+ _working = false;
+ }
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
index 17cdf796..b6e0c1d3 100644
--- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs
@@ -57,7 +57,7 @@ public partial class OfficeAdvisorCustomerPagedListPage : IDisposable
SalesRep = await UserRepo.GetUserInfo(UserId);
// set preferences
- UserPreference = await UserPreferenceService.GetProfile();
+ UserPreference = await UserPreferenceService.GetPreference();
Paging.OrderBy = UserPreference.CompanySort;
Paging.SearchColumn = UserPreference.CompanySearch;
Paging.PageSize = Convert.ToInt32(UserPreference.PageSize);
diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
index fdc61f66..67510b5f 100644
--- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs
@@ -41,91 +41,37 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
// #############################################################
private List Companies { get; set; } = new();
- private UserPreference Profiles { get; set; } = new();
- private UserManagerEditView UserInfo { get; set; } = new();
+ private UserPreference Preference { get; set; } = new();
+ private UserManagerEditView XUserInfo { get; set; } = new();
private string SavedSearch { get; set; } = "";
private bool ShowFolded { get; set; }
private bool Working { get; set; } = true;
private MetaData PageData { get; set; } = new();
private CustomerPaging Paging { get; set; } = new();
private string ToggleFoldedText { get; set; } = "Vis Lukkede";
-
- protected override async Task OnParametersSetAsync()
+
+
+ protected override async Task OnInitializedAsync()
{
- Working = true;
-
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
// set preferences
- Profiles = await PreferenceService.GetProfile();
- UserInfo = await UserInfoService.GetUserInfo();
- Paging.OrderBy = Profiles.CompanySort;
- Paging.SearchColumn = Profiles.CompanySearch;
- Paging.PageSize = Convert.ToInt32(Profiles.PageSize);
+ Preference = await PreferenceService.GetPreference();
+ XUserInfo = await UserInfoService.GetUserInfo();
+
+ Paging.OrderBy = Preference.CompanySort;
+ Paging.SearchColumn = Preference.CompanySearch;
+ Paging.PageSize = Convert.ToInt32(Preference.PageSize);
Paging.HasFolded = ShowFolded ? 1 : 0;
-
+
// load saved search
- SavedSearch = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase;
- Paging.SearchTerm = SavedSearch;
-
- // get companies
- await FetchCustomers();
+ SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase;
+ await SetSearchPhrase(SavedSearch);
+ Working = false;
}
- private async Task ToggleFolded()
- {
- Working = true;
- ShowFolded = !ShowFolded;
- ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
- Companies = new List();
- Paging.PageNumber = 1;
- Paging.HasFolded = ShowFolded ? 1 : 0;
- await FetchCustomers();
- }
- private async Task SetSelectedPage(int page)
- {
- Working = true;
- Companies = new List();
- Paging.PageNumber = page;
- await FetchCustomers();
- }
-
- private async Task SetSearchCol(string searchColumn)
- {
- Working = true;
- Companies = new List();
- Paging.SearchColumn = searchColumn;
- Paging.PageNumber = 1;
- await FetchCustomers();
- }
- private async Task SetPageSize(string pageSize)
- {
- Working = true;
- Companies = new List();
- Paging.PageSize = Convert.ToInt32(pageSize);
- Paging.PageNumber = 1;
- await FetchCustomers();
- }
-
- private async Task SetSearchPhrase(string searchTerm)
- {
- Working = true;
- Companies = new List();
- Paging.PageNumber = 1;
- Paging.SearchTerm = searchTerm;
- await FetchCustomers();
- }
-
- private async Task SetSortCol(string orderBy)
- {
- Working = true;
- Companies = new List();
- Paging.OrderBy = orderBy;
- await FetchCustomers();
- }
-
private async Task FetchCustomers()
{
Working = true;
@@ -143,5 +89,66 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
}
}
+
+ private async Task ToggleFolded()
+ {
+ Working = true;
+ ShowFolded = !ShowFolded;
+ ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
+ Companies = new List();
+ Paging.PageNumber = 1;
+ Paging.HasFolded = ShowFolded ? 1 : 0;
+ await FetchCustomers();
+ }
+
+
+ private async Task SetSelectedPage(int page)
+ {
+ Working = true;
+ Companies = new List();
+ Paging.PageNumber = page;
+ await FetchCustomers();
+ }
+
+
+ private async Task SetSearchCol(string searchColumn)
+ {
+ Working = true;
+ Companies = new List();
+ Paging.SearchColumn = searchColumn;
+ Paging.PageNumber = 1;
+ await FetchCustomers();
+ }
+
+
+ private async Task SetPageSize(string pageSize)
+ {
+ Working = true;
+ Companies = new List();
+ Paging.PageSize = Convert.ToInt32(pageSize);
+ Paging.PageNumber = 1;
+ await FetchCustomers();
+ }
+
+
+ private async Task SetSearchPhrase(string searchTerm)
+ {
+ Working = true;
+ Companies = new List();
+ Paging.PageNumber = 1;
+ Paging.SearchTerm = searchTerm;
+ await FetchCustomers();
+ }
+
+
+ private async Task SetSortCol(string orderBy)
+ {
+ Working = true;
+ Companies = new List();
+ Paging.OrderBy = orderBy;
+ await FetchCustomers();
+ }
+
+
public void Dispose() => Interceptor.DisposeEvent();
}
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 69e78afb..0a39953e 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "185.0",
+ "version": "188.0",
"rc": true,
"sandBox": true,
"image": "grumpy-coder.png",