diff --git a/Wonky.Client/Components/VatAddressInputComponent.razor b/Wonky.Client/Components/VatAddressInputComponent.razor index d79d1c37..90b99462 100644 --- a/Wonky.Client/Components/VatAddressInputComponent.razor +++ b/Wonky.Client/Components/VatAddressInputComponent.razor @@ -18,22 +18,23 @@
-
- - + +
+ +
-
- - +
+ +
-
- - +
+ +
-
+
diff --git a/Wonky.Client/Components/VatEntityNameInputComponent.razor b/Wonky.Client/Components/VatCompanyNameInputComponent.razor similarity index 70% rename from Wonky.Client/Components/VatEntityNameInputComponent.razor rename to Wonky.Client/Components/VatCompanyNameInputComponent.razor index cc5e063c..091635ba 100644 --- a/Wonky.Client/Components/VatEntityNameInputComponent.razor +++ b/Wonky.Client/Components/VatCompanyNameInputComponent.razor @@ -17,14 +17,15 @@ -
-
- - +
+ +
+ +
-
- +
+
\ No newline at end of file diff --git a/Wonky.Client/Components/VatEntityNameInputComponent.razor.cs b/Wonky.Client/Components/VatCompanyNameInputComponent.razor.cs similarity index 87% rename from Wonky.Client/Components/VatEntityNameInputComponent.razor.cs rename to Wonky.Client/Components/VatCompanyNameInputComponent.razor.cs index 00bddf3e..a638f01d 100644 --- a/Wonky.Client/Components/VatEntityNameInputComponent.razor.cs +++ b/Wonky.Client/Components/VatCompanyNameInputComponent.razor.cs @@ -19,21 +19,21 @@ using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.Models; namespace Wonky.Client.Components; -public partial class VatEntityNameInputComponent : IDisposable +public partial class VatCompanyNameInputComponent : IDisposable { - [Parameter] public string EntityName { get; set; } = ""; + [Parameter] public string CompanyName { get; set; } = ""; private EditContext _editName { get; set; } private bool _formInvalid = true; [Parameter] public EventCallback OnValidSubmit { get; set; } protected override void OnInitialized() { - _editName = new EditContext(EntityName); + _editName = new EditContext(CompanyName); _editName.OnFieldChanged += HandleFieldChanged; } private async Task SubmitForm() { - await OnValidSubmit.InvokeAsync(EntityName); + await OnValidSubmit.InvokeAsync(CompanyName); } private void HandleFieldChanged(object? sender, FieldChangedEventArgs e) { diff --git a/Wonky.Client/Components/VatNumberInputComponent.razor b/Wonky.Client/Components/VatNumberInputComponent.razor index 02829362..fbbe119e 100644 --- a/Wonky.Client/Components/VatNumberInputComponent.razor +++ b/Wonky.Client/Components/VatNumberInputComponent.razor @@ -18,13 +18,15 @@
-
+
CVR/ORG
+
-
- +
+
+
\ No newline at end of file diff --git a/Wonky.Client/HttpInterfaces/IOfficeCustomerHttpRepository.cs b/Wonky.Client/HttpInterfaces/IOfficeCustomerHttpRepository.cs index 8824f107..a64468ce 100644 --- a/Wonky.Client/HttpInterfaces/IOfficeCustomerHttpRepository.cs +++ b/Wonky.Client/HttpInterfaces/IOfficeCustomerHttpRepository.cs @@ -23,6 +23,5 @@ public interface IOfficeCustomerHttpRepository { Task> GetCompaniesPaged(CompanyPagingParams pagingParameters); Task> GetCompaniesPagedSalesRep(string salesRepId, CompanyPagingParams pagingParameters); - Task> GetCompaniesPagedCountry(string countryCode, CompanyPagingParams pagingParameters); Task GetCompanyById(string companyId); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/OfficeCustomerHttpRepository.cs b/Wonky.Client/HttpRepository/OfficeCustomerHttpRepository.cs index 5f76821e..8f0dd134 100644 --- a/Wonky.Client/HttpRepository/OfficeCustomerHttpRepository.cs +++ b/Wonky.Client/HttpRepository/OfficeCustomerHttpRepository.cs @@ -44,7 +44,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository private readonly NavigationManager _navigation; private ILogger _logger; private readonly HttpClient _client; - private readonly ApiConfig _apiConfig; + private readonly ApiConfig _api; public OfficeCustomerHttpRepository(HttpClient client, ILogger logger, @@ -54,39 +54,9 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository _client = client; _logger = logger; _navigation = navigation; - _apiConfig = apiConfig.Value; + _api = apiConfig.Value; } - - /// - /// get a paged list of all customer entities - /// - /// - /// - public async Task> GetCompaniesPaged(CompanyPagingParams pagingParameters) - { - var queryString = new Dictionary - { - ["pageNumber"] = pagingParameters.PageNumber.ToString(), - ["pageSize"] = pagingParameters.PageSize.ToString(), - ["searchTerm"] = pagingParameters.SearchTerm, - ["searchColumn"] = pagingParameters.SearchColumn, - ["orderBy"] = pagingParameters.OrderBy, - ["isHidden"] = pagingParameters.IsHidden.ToString(), - ["hasFolded"] = pagingParameters.HasFolded.ToString() - }; - var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.OfficeCustomers}", queryString)); - - var content = await response.Content.ReadAsStringAsync(); - - var pagingResponse = new PagingResponse - { - Items = JsonSerializer.Deserialize>(content, _options), - MetaData = JsonSerializer.Deserialize(response.Headers.GetValues("X-Pagination").First(), _options) - }; - return pagingResponse; - - } - + /// /// Get paged list of customer entities by sales rep id /// @@ -105,7 +75,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository ["isHidden"] = pagingParameters.IsHidden.ToString(), ["hasFolded"] = pagingParameters.HasFolded.ToString() }; - var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.OfficeCustomers}/salesRep/{salesRepId}", queryString)); + var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/salesRep/{salesRepId}", queryString)); var content = await response.Content.ReadAsStringAsync(); @@ -121,10 +91,9 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository /// /// Get paged list of customer companies by country code /// - /// /// /// - public async Task> GetCompaniesPagedCountry(string countryCode, CompanyPagingParams pagingParameters) + public async Task> GetCompaniesPaged(CompanyPagingParams pagingParameters) { var queryString = new Dictionary { @@ -136,7 +105,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository ["isHidden"] = pagingParameters.IsHidden.ToString(), ["hasFolded"] = pagingParameters.HasFolded.ToString() }; - var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.OfficeCustomers}/country/{countryCode}", queryString)); + var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}", queryString)); var content = await response.Content.ReadAsStringAsync(); @@ -155,7 +124,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository /// public async Task GetCompanyById(string companyId) { - var company = await _client.GetFromJsonAsync($"{_apiConfig.OfficeCustomers}/id/{companyId}"); + var company = await _client.GetFromJsonAsync($"{_api.OfficeCustomers}/id/{companyId}"); return company ?? new CompanyDto(); } @@ -166,7 +135,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository /// company id public async Task CreateCompany(CompanyDto model) { - var response = await _client.PostAsJsonAsync($"{_apiConfig.OfficeCustomers}", model); + var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}", model); var content = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize(content, _options); return result.CompanyId; @@ -180,7 +149,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository /// public async Task UpdateCompany(string companyId, CompanyDto model) { - var response = await _client.PutAsJsonAsync($"{_apiConfig.OfficeCustomers}/{companyId}", model); + var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{companyId}", model); var content = await response.Content.ReadAsStringAsync(); Console.WriteLine(content); return response.IsSuccessStatusCode; @@ -193,7 +162,7 @@ public class OfficeCustomerHttpRepository : IOfficeCustomerHttpRepository /// public async Task DeleteCompany(string companyId) { - var response = await _client.DeleteAsync($"{_apiConfig.OfficeCustomers}/{companyId}"); + var response = await _client.DeleteAsync($"{_api.OfficeCustomers}/{companyId}"); return response.IsSuccessStatusCode; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmNewCustomerPage.razor b/Wonky.Client/Pages/CrmNewCustomerPage.razor index c1b21f8e..1cfb7ffd 100644 --- a/Wonky.Client/Pages/CrmNewCustomerPage.razor +++ b/Wonky.Client/Pages/CrmNewCustomerPage.razor @@ -26,28 +26,32 @@ - - - - - @if (_dk) - { - - } + + @if (_dk) + { - - @if (_dk) - { - - } + } + + + + @if (_dk) + { + + + + } + @if (_vInfos.Any() && _showInfos) { diff --git a/Wonky.Client/Pages/CrmNewCustomerPage.razor.cs b/Wonky.Client/Pages/CrmNewCustomerPage.razor.cs index c5a43c41..19313077 100644 --- a/Wonky.Client/Pages/CrmNewCustomerPage.razor.cs +++ b/Wonky.Client/Pages/CrmNewCustomerPage.razor.cs @@ -80,6 +80,17 @@ namespace Wonky.Client.Pages } + private async Task GetInfoFromName(string entityName) + { + _toast.ShowInfo("Vent for firma info ..."); + _vInfos = await _vatService + .QueryVirkRegistry(new VirkParams {EntityName = entityName}); + if (!_vInfos.Any()) + { + _toast.ShowError($"Firma med navn '{entityName}' findes ikke."); + } + } + private async Task GetInfoFromAddress(VatAddress address) { _showInfos = true; @@ -93,7 +104,7 @@ namespace Wonky.Client.Pages }); if (!_vInfos.Any()) { - _toast.ShowWarning($"Ingen data fundet ..."); + _toast.ShowWarning($"Ingen data for adresse ..."); } } private async Task GetInfoFromVat(string vatNumber) diff --git a/Wonky.Client/Pages/CrmNewReportPage.razor b/Wonky.Client/Pages/CrmNewReportPage.razor index 6d301eae..4f34eec9 100644 --- a/Wonky.Client/Pages/CrmNewReportPage.razor +++ b/Wonky.Client/Pages/CrmNewReportPage.razor @@ -263,3 +263,4 @@ + diff --git a/Wonky.Client/Pages/CrmNewReportPage.razor.cs b/Wonky.Client/Pages/CrmNewReportPage.razor.cs index ec355bb8..a1a4e43c 100644 --- a/Wonky.Client/Pages/CrmNewReportPage.razor.cs +++ b/Wonky.Client/Pages/CrmNewReportPage.razor.cs @@ -24,6 +24,7 @@ using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.HttpRepository; using Wonky.Client.Services; +using Wonky.Client.Shared; using Wonky.Entity.DTO; using Wonky.Entity.Models; using Wonky.Entity.Views; @@ -52,6 +53,8 @@ public partial class CrmNewReportPage : IDisposable private TimeOnly _checkOut { get; set; } = new(12, 0); private DateTime _leaveBegin { get; set; } = DateTime.Now; private DateTime _leaveEnd { get; set; } = DateTime.Now; + private Confirmation _confirmReport { get; set; } + private string _prompt { get; set; } = ""; protected override async Task OnInitializedAsync() { @@ -93,7 +96,20 @@ public partial class CrmNewReportPage : IDisposable _editContext.OnValidationStateChanged += ValidationChanged; } - private async Task SubmitReport() + private async Task ReportSaveConfirmed() + { + _working = true; + + var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", _report); + await _userPrefs.SetKmMorning(0); + + _toast.ShowInfo($"Rapport oprettet {_workDate}"); + _working = false; + _navigator.NavigateTo("/home"); + + } + + private void SubmitReport() { if (string.IsNullOrWhiteSpace(_report.DayTypeEnum)) { @@ -107,8 +123,6 @@ public partial class CrmNewReportPage : IDisposable return; } - _working = true; - DateTime checkIn; DateTime checkOut; if (_report.DayTypeEnum.ToLower().Contains("leave")) @@ -132,13 +146,11 @@ public partial class CrmNewReportPage : IDisposable _logger.LogDebug("_workDate => {workDate}", $"{_workDate:yyyy-MM-dd}"); _logger.LogDebug("_report => {report}", JsonSerializer.Serialize(_report)); + + _prompt = $"Rapport for {_workDate.ToLongDateString()}?"; - var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", _report); - await _userPrefs.SetKmMorning(0); + _confirmReport.Show(); - _toast.ShowInfo($"Rapport oprettet {_workDate}"); - _working = false; - _navigator.NavigateTo("/home"); } private void OnTimeChanged() diff --git a/Wonky.Client/Pages/CrmViewCompanyPage.razor.cs b/Wonky.Client/Pages/CrmViewCompanyPage.razor.cs index d4e417be..ed1abfd9 100644 --- a/Wonky.Client/Pages/CrmViewCompanyPage.razor.cs +++ b/Wonky.Client/Pages/CrmViewCompanyPage.razor.cs @@ -176,7 +176,7 @@ public partial class CrmViewCompanyPage : IDisposable return; } _toast.ShowInfo("Vent venligst ...."); - _hideButtons = true; + //_hideButtons = true; _company.LastVisit = $"{_lastVisit:yyyy-MM-dd}"; _company.NextVisit = $"{_nextVisit:yyyy-MM-dd}"; _company.IsHidden = 0; @@ -188,19 +188,16 @@ public partial class CrmViewCompanyPage : IDisposable _company.IsDirty = _isDirty; var success = await _companyRepo.UpdateCompany(CompanyId, _company ); - if (success) + _toast.ShowSuccess("Opdatering er afsendt. Der går nogle minutter inden data er opdateret."); + _company = await _companyRepo.GetCompanyById(_company.CompanyId); + _company.ValidVat = 1; + _enableActivity = 1; + if (_virkRegInfo.States[0].State.ToLower() != "normal") { - _toast.ShowSuccess("Opdatering er afsendt. Der går nogle minutter inden data er opdateret."); - _company = await _companyRepo.GetCompanyById(_company.CompanyId); - _company.ValidVat = 1; - _enableActivity = _company.ValidVat; - if (_virkRegInfo.States[0].State.ToLower() != "normal") - { - _company.HasFolded = 1; - } - StateHasChanged(); + _company.HasFolded = 1; } - _hideButtons = false; + StateHasChanged(); + //_hideButtons = false; } private async Task GetInfoFromAddress(VatAddress address) diff --git a/Wonky.Client/Pages/OfficeListCustomerPage.razor.cs b/Wonky.Client/Pages/OfficeListCustomerPage.razor.cs index ae07c3a7..5405de5c 100644 --- a/Wonky.Client/Pages/OfficeListCustomerPage.razor.cs +++ b/Wonky.Client/Pages/OfficeListCustomerPage.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.Pages; public partial class OfficeListCustomerPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; - [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public string CountryCode { get; set; } = "dk"; [Inject] public ILogger _logger { get; set; } [Inject] public HttpInterceptorService _interceptor { get; set; } @@ -45,6 +45,9 @@ public partial class OfficeListCustomerPage : IDisposable // set preferences _preferences = await PreferenceService.GetPreferences(); + + _paging.Country = CountryCode; + _paging.OrderBy = _preferences.CompanySort; _paging.SearchColumn = _preferences.CompanySearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); diff --git a/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor b/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor index fbf02d2d..9af3844d 100644 --- a/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor +++ b/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor @@ -16,7 +16,7 @@ *@ @using Wonky.Client.Components -@page "/office/companies/{CountryCode}/{UserId}" +@page "/office/users/advisors/{CountryCode}/{UserId}/companies"
diff --git a/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor.cs b/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor.cs index 4b15408f..e889da1a 100644 --- a/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor.cs +++ b/Wonky.Client/Pages/OfficeListCustomerSalesRepPage.razor.cs @@ -27,9 +27,9 @@ public partial class OfficeListCustomerSalesRepPage : IDisposable [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public ILogger _logger { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IOfficeCustomerHttpRepository _companyRepo { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); @@ -40,84 +40,87 @@ public partial class OfficeListCustomerSalesRepPage : IDisposable protected override async Task OnParametersSetAsync() { - _interceptor.DisposeEvent(); - _interceptor.RegisterBeforeSendEvent(); - + Interceptor.DisposeEvent(); + Interceptor.RegisterBeforeSendEvent(); + // set preferences _preferences = await PreferenceService.GetPreferences(); + _paging.Country = CountryCode; _paging.OrderBy = _preferences.CompanySort; _paging.SearchColumn = _preferences.CompanySearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); _paging.HasFolded = _includeFolded ? 1 : 0; - + // load saved search _savedSearch = _preferences.CompanyFilterPhrase; _paging.SearchTerm = _savedSearch; - + await GetCompanies(); } - private async Task OnFoldedClick() - { - _includeFolded = !_includeFolded; - _companyList = new List(); - _paging.PageNumber = 1; - _paging.HasFolded = _includeFolded ? 1 : 0; - await GetCompanies(); - } - private async Task SelectedPage(int page) - { - _companyList = new List(); - _paging.PageNumber = page; - await GetCompanies(); - } - - private async Task SetSearchCol(string searchColumn) - { - _companyList = new List(); - _paging.SearchColumn = searchColumn; - _paging.PageNumber = 1; - await GetCompanies(); - } - private async Task SetPageSize(string pageSize) - { - _companyList = new List(); - _paging.PageSize = Convert.ToInt32(pageSize); - _paging.PageNumber = 1; - await GetCompanies(); - } + private async Task OnFoldedClick() + { + _includeFolded = !_includeFolded; + _companyList = new List(); + _paging.PageNumber = 1; + _paging.HasFolded = _includeFolded ? 1 : 0; + await GetCompanies(); + } - private async Task SetSearchPhrase(string searchTerm) - { - // if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.Length < 3) return; - - _companyList = new List(); - _paging.PageNumber = 1; - _paging.SearchTerm = searchTerm; - await GetCompanies(); - if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) - { - _savedSearch = searchTerm; - await PreferenceService.SetCompanyFilterPhrase(searchTerm.Trim()); - } - } + private async Task SelectedPage(int page) + { + _companyList = new List(); + _paging.PageNumber = page; + await GetCompanies(); + } - private async Task SetSortCol(string orderBy) + private async Task SetSearchCol(string searchColumn) + { + _companyList = new List(); + _paging.SearchColumn = searchColumn; + _paging.PageNumber = 1; + await GetCompanies(); + } + + private async Task SetPageSize(string pageSize) + { + _companyList = new List(); + _paging.PageSize = Convert.ToInt32(pageSize); + _paging.PageNumber = 1; + await GetCompanies(); + } + + private async Task SetSearchPhrase(string searchTerm) + { + // if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.Length < 3) return; + + _companyList = new List(); + _paging.PageNumber = 1; + _paging.SearchTerm = searchTerm; + await GetCompanies(); + if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { - _companyList = new List(); - _paging.OrderBy = orderBy; - await GetCompanies(); + _savedSearch = searchTerm; + await PreferenceService.SetCompanyFilterPhrase(searchTerm.Trim()); } - + } + + private async Task SetSortCol(string orderBy) + { + _companyList = new List(); + _paging.OrderBy = orderBy; + await GetCompanies(); + } + private async Task GetCompanies() { - var pagingResponse = await _companyRepo.GetCompaniesPagedSalesRep(UserId, _paging); + var pagingResponse = await CustomerRepo.GetCompaniesPagedSalesRep(UserId, _paging); _companyList = pagingResponse.Items; _metaData = pagingResponse.MetaData; } public void Dispose() { - _interceptor.DisposeEvent(); + Interceptor.DisposeEvent(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/SalesCatalogPage.razor b/Wonky.Client/Pages/SalesCatalogPage.razor index 1ed52282..1878e298 100644 --- a/Wonky.Client/Pages/SalesCatalogPage.razor +++ b/Wonky.Client/Pages/SalesCatalogPage.razor @@ -19,7 +19,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Advisor,Admin")] +@attribute [Authorize(Roles = "Advisor,Admin,Office")]
diff --git a/Wonky.Client/Pages/SalesCatalogPage.razor.cs b/Wonky.Client/Pages/SalesCatalogPage.razor.cs index 2ad99e20..9410ae18 100644 --- a/Wonky.Client/Pages/SalesCatalogPage.razor.cs +++ b/Wonky.Client/Pages/SalesCatalogPage.razor.cs @@ -31,31 +31,33 @@ namespace Wonky.Client.Pages; public partial class SalesCatalogPage : IDisposable { - [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public ILocalStorageService _storage { get; set; } - [Inject] public ICatalogHttpRepository _itemRepo { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public UserPreferenceService _preferenceService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ICatalogHttpRepository ItemRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } private List _items { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CatalogPagingParams _paging = new(); private Preferences _preferences = new(); + private UserInfoView _user { get; set; } = new(); protected override async Task OnInitializedAsync() { - _preferences = await _preferenceService.GetPreferences(); + _preferences = await PreferenceService.GetPreferences(); + _user = await Storage.GetItemAsync("_xu"); + _paging.Country = _user.CountryCode; _paging.OrderBy = _preferences.ItemSort; _paging.SearchColumn = _preferences.ItemSearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); - _interceptor.RegisterEvent(); - _interceptor.RegisterBeforeSendEvent(); + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); await GetSalesItems(); } private async Task GetSalesItems() { - var pagingResponse = await _itemRepo.GetSalesItemsPaged(_paging); + var pagingResponse = await ItemRepo.GetSalesItemsPaged(_paging); _items = pagingResponse.Items!; _metaData = pagingResponse.MetaData; } @@ -106,6 +108,6 @@ public partial class SalesCatalogPage : IDisposable await GetSalesItems(); } - public void Dispose() => _interceptor.DisposeEvent(); + public void Dispose() => Interceptor.DisposeEvent(); } \ No newline at end of file diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs index 081323bd..a4de896c 100644 --- a/Wonky.Client/Shared/AuthStateProvider.cs +++ b/Wonky.Client/Shared/AuthStateProvider.cs @@ -79,6 +79,7 @@ namespace Wonky.Client.Shared { new(ClaimTypes.Name, userInfo.FullName), new(ClaimTypes.Email, userInfo.Email), + new(ClaimTypes.Country, userInfo.CountryCode), new(ClaimTypes.MobilePhone, userInfo.PhoneNumber), new(ClaimTypes.Expiration, exp) }; diff --git a/Wonky.Client/Shared/Confirmation.razor b/Wonky.Client/Shared/Confirmation.razor index 48c02751..50dcfaf6 100644 --- a/Wonky.Client/Shared/Confirmation.razor +++ b/Wonky.Client/Shared/Confirmation.razor @@ -19,11 +19,11 @@
-
Er du sikker?
+
Bekræft Venligst
-

@BodyMessage

+

@BodyMessage

diff --git a/Wonky.Client/Shared/PriceListModal.razor.cs b/Wonky.Client/Shared/PriceListModal.razor.cs index 0e4f23da..482cabaf 100644 --- a/Wonky.Client/Shared/PriceListModal.razor.cs +++ b/Wonky.Client/Shared/PriceListModal.razor.cs @@ -26,25 +26,28 @@ namespace Wonky.Client.Shared; public partial class PriceListModal : IDisposable { + [Parameter] public string CountryCode { get; set; } = "dk"; + [Parameter] public EventCallback OnSelected { get; set; } + [Inject] public ICatalogHttpRepository ItemRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } + private string _modalDisplay = ""; private bool _showBackdrop; private List _items { get; set; } = new(); - [Parameter] public EventCallback OnSelected { get; set; } - [Inject] public ICatalogHttpRepository _itemRepo { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public UserPreferenceService _preferenceService { get; set; } private MetaData? _metaData { get; set; } = new(); private CatalogPagingParams _paging = new(); private Preferences _preferences = new(); protected override async Task OnInitializedAsync() { - _preferences = await _preferenceService.GetPreferences(); + _preferences = await PreferenceService.GetPreferences(); + _paging.Country = CountryCode; _paging.OrderBy = _preferences.ItemSort; _paging.SearchColumn = _preferences.ItemSearch; _paging.PageSize = Convert.ToInt32(_preferences.PageSize); - _interceptor.RegisterEvent(); - _interceptor.RegisterBeforeSendEvent(); + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); await GetSalesItems(); } @@ -64,7 +67,7 @@ public partial class PriceListModal : IDisposable private async Task GetSalesItems() { - var pagingResponse = await _itemRepo.GetSalesItemsPaged(_paging); + var pagingResponse = await ItemRepo.GetSalesItemsPaged(_paging); _items = pagingResponse.Items!; _metaData = pagingResponse.MetaData; } @@ -106,5 +109,5 @@ public partial class PriceListModal : IDisposable StateHasChanged(); } - public void Dispose() => _interceptor.DisposeEvent(); + public void Dispose() => Interceptor.DisposeEvent(); } \ No newline at end of file diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor b/Wonky.Client/Shared/VatLookupDkModal.razor index 13a76f56..defff5ca 100644 --- a/Wonky.Client/Shared/VatLookupDkModal.razor +++ b/Wonky.Client/Shared/VatLookupDkModal.razor @@ -25,8 +25,8 @@
+ - @if (_vInfos.Any()) {
Virksomhedsopslag
Moms/Org Reg.nr.AdresseVirksomhedsopslag
- + + - -
+ +
+ +
diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor.cs b/Wonky.Client/Shared/VatLookupDkModal.razor.cs index c55fb66e..e1794ac6 100644 --- a/Wonky.Client/Shared/VatLookupDkModal.razor.cs +++ b/Wonky.Client/Shared/VatLookupDkModal.razor.cs @@ -78,7 +78,7 @@ public partial class VatLookupDkModal .QueryVirkRegistry(new VirkParams {EntityName = entityName}); if (!_vInfos.Any()) { - _toast.ShowError($"Firma med nav '{entityName}' findes ikke."); + _toast.ShowError($"Firma med navn '{entityName}' findes ikke."); } } diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 4e46af1d..08856460 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 13b45339..4c42f59d 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,9 +1,9 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.20.20", - "rc": false, - "sandBox": false, + "version": "0.22.1", + "rc": true, + "sandBox": true, "image": "grumpy-coder.png" }, "apiConfig": { @@ -13,9 +13,9 @@ "serviceVirk": "api/v2/services/virk", "serviceBrReg": "api/v2/services/brReg", "serviceVies": "api/v2/services/vies", - "Token": "token", - "UserInfo": "api/auth/userinfo", - "Catalog": "api/v2/catalog", + "token": "token", + "userInfo": "api/auth/userinfo", + "catalog": "api/v2/catalog", "crmSales": "api/v2/crm/advisors/sales", "crmReports": "api/v2/crm/advisors/reports", "crmTasks": "api/v2/crm/advisors/tasks", diff --git a/Wonky.Entity/Requests/CatalogPagingParams.cs b/Wonky.Entity/Requests/CatalogPagingParams.cs index 3d57da55..ebad4a27 100644 --- a/Wonky.Entity/Requests/CatalogPagingParams.cs +++ b/Wonky.Entity/Requests/CatalogPagingParams.cs @@ -59,5 +59,10 @@ public class CatalogPagingParams /// /// Set product group filter /// - public string SelectGroup { get; set; } = ""; + public string SelectGroup { get; set; } = ""; + + /// + /// Country code + /// + public string Country { get; set; } = "dk"; } \ No newline at end of file diff --git a/Wonky.Entity/Requests/CompanyPagingParams.cs b/Wonky.Entity/Requests/CompanyPagingParams.cs index aab2283f..473da12e 100644 --- a/Wonky.Entity/Requests/CompanyPagingParams.cs +++ b/Wonky.Entity/Requests/CompanyPagingParams.cs @@ -70,5 +70,7 @@ public class CompanyPagingParams /// Set a flag to include entities which has gone out of business /// public int HasFolded { get; set; } - + + public string Country { get; set; } = "dk"; + } \ No newline at end of file