diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor.cs b/Wonky.Client/Components/SearchPhraseComponent.razor.cs index 22ca22ca..7154744d 100644 --- a/Wonky.Client/Components/SearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/SearchPhraseComponent.razor.cs @@ -25,13 +25,16 @@ namespace Wonky.Client.Components private string _searchTerm { get; set; } = ""; [Parameter] public EventCallback OnChanged { get; set; } [Parameter] public string SavedSearch { get; set; } = string.Empty; - + + protected override void OnParametersSet() + { + _searchTerm = SavedSearch; + } + protected override void OnInitialized() { - if (string.IsNullOrWhiteSpace(SavedSearch)) + if (string.IsNullOrWhiteSpace(_searchTerm)) return; - - _searchTerm = SavedSearch; OnSearchChanged(); } diff --git a/Wonky.Client/HttpRepository/IUserHttpRepository.cs b/Wonky.Client/HttpRepository/IUserHttpRepository.cs index 09e4f751..24efd3b5 100644 --- a/Wonky.Client/HttpRepository/IUserHttpRepository.cs +++ b/Wonky.Client/HttpRepository/IUserHttpRepository.cs @@ -21,10 +21,10 @@ namespace Wonky.Client.HttpRepository; public interface IUserHttpRepository { Task> GetAdvisors(); - Task GetAdvisorInfo(string userId); + Task GetAdvisorInfo(string userId); Task UpdateAdvisor(string userId, UserUpdateDto model); Task> GetAdminUsers(); - Task GetAdminUserInfo(string userId); + Task GetAdminUserInfo(string userId); Task UpdateAdminUser(string userId, UserUpdateDto model); Task ResetUserPassword(string userId, string newPasswd, string confirmPasswd); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/UserHttpRepository.cs b/Wonky.Client/HttpRepository/UserHttpRepository.cs index 7415df98..6f1b4b1a 100644 --- a/Wonky.Client/HttpRepository/UserHttpRepository.cs +++ b/Wonky.Client/HttpRepository/UserHttpRepository.cs @@ -52,9 +52,9 @@ public class UserHttpRepository : IUserHttpRepository return await _client.GetFromJsonAsync>(_api.AdminUser); } - public async Task GetAdvisorInfo(string userId) + public async Task GetAdvisorInfo(string userId) { - return await _client.GetFromJsonAsync($"{_api.AdminUser}/{userId}"); + return await _client.GetFromJsonAsync($"{_api.AdminUser}/{userId}"); } public async Task UpdateAdvisor(string userId, UserUpdateDto model) @@ -67,9 +67,9 @@ public class UserHttpRepository : IUserHttpRepository return await _client.GetFromJsonAsync>(_api.AdminOffice); } - public async Task GetAdminUserInfo(string userId) + public async Task GetAdminUserInfo(string userId) { - return await _client.GetFromJsonAsync($"{_api.AdminOffice}/{userId}"); + return await _client.GetFromJsonAsync($"{_api.AdminOffice}/{userId}"); } public async Task UpdateAdminUser(string userId, UserUpdateDto model) diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor index bc757ea9..06e813ae 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor @@ -20,6 +20,7 @@ @attribute [Authorize(Roles = "Advisor")] @using Wonky.Client.Components +
@@ -121,238 +122,171 @@
-@* Order lines *@ -
-

- -

-
-
-
-
- @* Order draft lines *@ - - - - - - - - - - - - - - - - - - @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) - { - @foreach (var cItem in DraftStateProvider.Draft.Items) - { - - - - - - - - - - } - } - - - - - - - - - -
- Ordrekladde Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) - - -
NavnVarenrAntalEnhedsprisLinjesumSAS
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal - - - -
Total@DraftStateProvider.Draft.Total
-
-
-
-
- @* draft line *@ - @if (_selectedItem != null && ShowItem) - { - + @* Order lines *@ +
+

+ +

+
+
+
+
+ @* Order draft lines *@ +
- + + - - - - - - + + + + + + + + @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) + { + @foreach (var cartItem in DraftStateProvider.Draft.Items) + { + + + + + + + + + + } + } - - - - - - + + + +
Kladdelinje + Ordrekladde Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) + + +
AntalPrisRabatSASVarenr.
NavnVarenrAntalEnhedsprisLinjesumSAS
@cartItem.Item.Name@cartItem.Item.Sku@cartItem.Quantity@cartItem.Price@cartItem.LineTotal + + + +
- - - - - - - - @_selectedItem.Sku - + Total@DraftStateProvider.Draft.Total +
- } -
-
-
-
- @* catalog *@ -
-
- @*
*@ - @* *@ - @*
*@ -
- -
-
- -
-
- -
-
- -
-
- @*
*@ - @*
*@ - @* *@ - @*
*@ - @*
*@
- @if (_catalog.Any()) - { - - - - - - - - - - - @foreach (var item in _catalog) - { + +
+
+ @* draft line *@ + @if (_selectedItem != null && ShowItem) + { +
NavnVarenrForkStk / Pris
+ + + + - - - - + + + + + + + + + + + + + + + - } - -
Kladdelinje
@item.Name@item.Sku@item.ShortName -
    - @foreach (var rate in item.Rates) - { -
  • -
    @rate.Quantity
    -
    @rate.Rate
    - - Vælg - -
    • - } -
+ 		AntalPrisRabatSASVarenr.
+ + + + + + + + @_selectedItem.Sku +
- } - else - { -
Der er ingen data
- } + + + } +
-
-@* Delivery address *@ -
-

- -

-
-
-
- -
- + @* Delivery address *@ +
+

+ +

+
+
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
@if (HideButtons) { - + } else { diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs index 47d303ed..5a134e85 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs @@ -17,7 +17,6 @@ using System.Globalization; using System.Text.Json; using Blazored.LocalStorage; using Blazored.Toast.Services; -using Wonky.Client.Helpers; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Client.Models; @@ -26,7 +25,6 @@ using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.Services; using Wonky.Client.Shared; using Wonky.Entity.DTO; -using Wonky.Entity.Requests; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -48,14 +46,12 @@ public partial class ActivityNewVisitPage : IDisposable [Inject] private IActivityHttpRepository _activityRepo { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } // variables + private PriceListModal _priceList { get; set; } private readonly JsonSerializerOptions? _options = new JsonSerializerOptions{PropertyNameCaseInsensitive = true}; private SalesItemView _selectedItem { get; set; } = new(); - private List _catalog { get; set; } = new(); - private MetaData _metaData { get; set; } = new(); private Preferences _prefs { get; set; } = new(); private ActivityDto _draft { get; set; } = new(); private CompanyDto _company = new(); - private CatalogPagingParams _paging = new(); private EditContext _editContext { get; set; } private bool _poFormInvalid { get; set; } = true; private bool ShowItem { get; set; } @@ -100,11 +96,6 @@ public partial class ActivityNewVisitPage : IDisposable _draft.ActivityDate = $"{_workDate:yyyy-MM-dd}" ; - _paging.SearchColumn = string.IsNullOrWhiteSpace(_prefs.ItemSearch) ? "name" : _prefs.ItemSearch; - _paging.PageSize = Convert.ToInt32(_prefs.PageSize); - - await GetSalesItems(); - _ux = await _storage.GetItemAsync("_xu"); _company = await _companyRepo.GetCompanyById(CompanyId); @@ -146,7 +137,18 @@ public partial class ActivityNewVisitPage : IDisposable _draft.DlvCity = _company.City; } - + private void CallPriceListModal() + { + _priceList.Show(); + } + private async Task SelectSku(SelectedSku sku) + { + ShowItem = true; + Console.WriteLine($"XTextPriceList => sku: {JsonSerializer.Serialize(sku)}"); + _selectedItem = await _itemRepo.GetSalesItem(sku.ItemId); + Price = sku.Rate; + Quantity = sku.Quantity; + } private void SetWorkDate(string workDate) { _selectedDate = workDate; @@ -220,14 +222,6 @@ public partial class ActivityNewVisitPage : IDisposable await DraftStateProvider.DeleteDraftAsync(); } - private void SelectItem(string itemId, string quantity, string price) - { - ShowItem = true; - _selectedItem = (from x in _catalog where x.ItemId == itemId select x).First(); - Price = price; - Quantity = quantity; - } - private async Task AddItem(SalesItemView salesItem) { ShowItem = false; @@ -257,55 +251,6 @@ public partial class ActivityNewVisitPage : IDisposable // save the remaining draft await DraftStateProvider.SaveChangesAsync(); } - private async Task SetItemGroup(string groupFilter) - { - _catalog = new List(); - _paging.PageNumber = 1; - _paging.SelectGroup = groupFilter; - await GetSalesItems(); - } - private async Task SetSearchCol(string columnName) - { - _catalog = new List(); - _paging.PageNumber = 1; - _paging.SearchTerm = ""; - _paging.SearchColumn = columnName; - await GetSalesItems(); - } - private async Task SetSortCol(string orderBy) - { - _catalog = new List(); - _paging.OrderBy = orderBy; - await GetSalesItems(); - } - private async Task SetSearchPhrase(string searchTerm) - { - _catalog = new List(); - _paging.PageNumber = 1; - _paging.SearchTerm = searchTerm; - await GetSalesItems(); - } - private async Task SelectedPage(int page) - { - _catalog = new List(); - _paging.PageNumber = page; - await GetSalesItems(); - } - - private async Task SetPageSize(string pageSize) - { - _catalog = new List(); - _paging.PageSize = Convert.ToInt32(pageSize); - _paging.PageNumber = 1; - await GetSalesItems(); - } - - private async Task GetSalesItems() - { - var response = await _itemRepo.GetSalesItemsPaged(_paging); - _catalog = response.Items!; - _metaData = response.MetaData; - } private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { diff --git a/Wonky.Client/Pages/AllCustomersListPage.razor b/Wonky.Client/Pages/AllCustomersListPage.razor index e06b7c62..cc0cb50a 100644 --- a/Wonky.Client/Pages/AllCustomersListPage.razor +++ b/Wonky.Client/Pages/AllCustomersListPage.razor @@ -21,7 +21,7 @@
-

@AdminUserInfo.FirstName @AdminUserInfo.LastName Kunder

+

@UserInfoDto.FirstName @UserInfoDto.LastName Kunder

diff --git a/Wonky.Client/Pages/AllCustomersListPage.razor.cs b/Wonky.Client/Pages/AllCustomersListPage.razor.cs index df191c4d..70e51c7a 100644 --- a/Wonky.Client/Pages/AllCustomersListPage.razor.cs +++ b/Wonky.Client/Pages/AllCustomersListPage.razor.cs @@ -35,7 +35,7 @@ public partial class AllCustomersListPage : IDisposable private CompanyPagingParams _paging = new(); private Preferences _preferences { get; set; } = new(); private string _savedSearch { get; set; } = ""; - private AdminUserInfoDto AdminUserInfo { get; set; } = new(); + private UserInfoDto UserInfoDto { get; set; } = new(); private List _companyList { get; set; } = new(); protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/CrmUserViewPage.razor b/Wonky.Client/Pages/CrmUserViewPage.razor index 18df57dd..26e91336 100644 --- a/Wonky.Client/Pages/CrmUserViewPage.razor +++ b/Wonky.Client/Pages/CrmUserViewPage.razor @@ -25,7 +25,7 @@

Bruger info

- @if (AdminUserInfo != null) + @if (UserInfoDto != null) { @@ -70,7 +70,7 @@ Sælgernr. - @AdminUserInfo.Advisor + @UserInfoDto.Advisor Landekode diff --git a/Wonky.Client/Pages/CrmUserViewPage.razor.cs b/Wonky.Client/Pages/CrmUserViewPage.razor.cs index 6da3bd96..198ac4dd 100644 --- a/Wonky.Client/Pages/CrmUserViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmUserViewPage.razor.cs @@ -33,7 +33,7 @@ public partial class CrmUserViewPage : IDisposable [Inject] private ILogger _logger { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private IToastService _toast { get; set; } - private AdminUserInfoDto AdminUserInfo { get; set; } = new(); + private UserInfoDto UserInfoDto { get; set; } = new(); private EditContext _editContext { get; set; } private UserUpdateDto _updateInfo { get; set; } = new(); private AdminResetPasswordDto _passwords { get; set; } = new(); @@ -53,14 +53,14 @@ public partial class CrmUserViewPage : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - AdminUserInfo = await _userRepo.GetAdvisorInfo(UserId); + UserInfoDto = await _userRepo.GetAdvisorInfo(UserId); - _updateInfo.Email = AdminUserInfo.Email; - _updateInfo.CountryCode = AdminUserInfo.CountryCode; - _updateInfo.FirstName = AdminUserInfo.FirstName; - _updateInfo.LastName = AdminUserInfo.LastName; - _updateInfo.PhoneNumber = AdminUserInfo.PhoneNumber; - _updateInfo.LockoutEnabled = AdminUserInfo.LockoutEnabled; + _updateInfo.Email = UserInfoDto.Email; + _updateInfo.CountryCode = UserInfoDto.CountryCode; + _updateInfo.FirstName = UserInfoDto.FirstName; + _updateInfo.LastName = UserInfoDto.LastName; + _updateInfo.PhoneNumber = UserInfoDto.PhoneNumber; + _updateInfo.LockoutEnabled = UserInfoDto.LockoutEnabled; _passwdContext.OnFieldChanged += PwHandleFieldChanged; _passwdContext.OnValidationStateChanged += PwValidationChanged; diff --git a/Wonky.Client/Pages/CustomerViewPage.razor b/Wonky.Client/Pages/CustomerViewPage.razor index 5522a1eb..032ef684 100644 --- a/Wonky.Client/Pages/CustomerViewPage.razor +++ b/Wonky.Client/Pages/CustomerViewPage.razor @@ -27,7 +27,7 @@

@_company.Account - @_company.Name

- @if (_dk && !_validVat) + @if (_dk) {
@@ -196,19 +196,19 @@
- Oversigt + Oversigt
- Produktkøb + Produktkøb
- Varelinjer + Varelinjer
- Kemi + Kemi
- +
- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/AdminCompanyListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/AdminCompanyListPage.razor.cs rename to Wonky.Client/Pages/OfficeCustomerListPage.razor.cs index 77dabb8e..281fc336 100644 --- a/Wonky.Client/Pages/AdminCompanyListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs @@ -20,7 +20,7 @@ using Wonky.Entity.DTO; namespace Wonky.Client.Pages; -public partial class AdminCompanyListPage +public partial class OfficeCustomerListPage { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/OfficeNewOrderPage.razor b/Wonky.Client/Pages/OfficeNewOrderPage.razor new file mode 100644 index 00000000..f6a7c650 --- /dev/null +++ b/Wonky.Client/Pages/OfficeNewOrderPage.razor @@ -0,0 +1,182 @@ +@using Microsoft.AspNetCore.Authorization +@using Wonky.Client.Components +@attribute [Authorize(Roles = "Office,Warehouse")] +@page "/office/customers/{CompanyId}/orders/new" + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ + +
+ + +
+ + +
+
+ +
+ +
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) + { + @foreach (var cartItem in DraftStateProvider.Draft.Items) + { + + + + + + + + + + } + } + + + + + + + + +
+ Ordrekladde Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) + + +
NavnVarenrAntalEnhedsprisLinjesumSAS
@cartItem.Item.Name@cartItem.Item.Sku@cartItem.Quantity@cartItem.Price@cartItem.LineTotal + + + +
Total@DraftStateProvider.Draft.Total + +
+
+
+
+
+ @* draft line *@ + @if (_selectedItem != null && ShowItem) + { + + + + + + + + + + + + + + + + + + + + + + + + +
Kladdelinje
AntalPrisRabatSASVarenr.
+ + + + + + + + @_selectedItem.Sku + +
+ } +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + + +
+ @if (HideButton) + { + + } + else + { +
+
+ +
+
+ } +
\ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeNewOrderPage.razor.cs b/Wonky.Client/Pages/OfficeNewOrderPage.razor.cs new file mode 100644 index 00000000..f779ce07 --- /dev/null +++ b/Wonky.Client/Pages/OfficeNewOrderPage.razor.cs @@ -0,0 +1,177 @@ +using System.Globalization; +using System.Text.Json; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Client.Models; +using Wonky.Client.Shared; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.Pages; + +public partial class OfficeNewOrderPage : IDisposable +{ + [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; } + [Parameter] public string CompanyId { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private ICompanyHttpRepository _companyRepo { get; set; } + [Inject] private IUserHttpRepository _userRepo { get; set; } + [Inject] private ISalesItemHttpRepository _itemRepo { get; set; } + [Inject] private IActivityHttpRepository _activityRepo { get; set; } + private PriceListModal _priceList { get; set; } = new(); + private CompanyDto _company { get; set; } = new(); + private EditContext _editContext { get; set; } + private ActivityDto _draft { get; set; } = new(); + private UserInfoDto _userInfo { get; set; } = new(); + private SalesItemView _selectedItem { get; set; } = new(); + private string Rate { get; set; } = "0"; + private string Quantity { get; set; } = "1"; + private string Price { get; set; } = "0"; + private string Discount { get; set; } = "0"; + private bool ShowItem { get; set; } + private bool Sas { get; set; } + private bool FormInvalid { get; set; } = true; + private bool HideButton { get; set; } + + protected override async Task OnParametersSetAsync() + { + _interceptor.RegisterEvent(); + _interceptor.RegisterBeforeSendEvent(); + _company = await _companyRepo.GetCompanyById(CompanyId); + _userInfo = await _userRepo.GetAdvisorInfo(_company.SalesRepId); + } + + protected override async Task OnInitializedAsync() + { + _editContext = new EditContext(_draft); + _editContext.OnFieldChanged += HandleFieldChanged; + _editContext.OnValidationStateChanged += ValidationChanged; + + _interceptor.RegisterEvent(); + _interceptor.RegisterBeforeSendEvent(); + + _draft.ActivityDate = $"{DateTime.Now:yyyy-MM-dd}" ; + + // variable to validate if customer needs phone number update + // _phone = _company.Phone; + if (string.IsNullOrWhiteSpace(_company.Phone) + && !string.IsNullOrWhiteSpace(_company.Account) + && _company.Account != "NY" && _company.Account.Length > 7) + { + _company.Phone = _company.Account[..8]; + } + + _draft.ActivityStatusEnum = "order"; + _draft.ActivityTypeEnum = "phone"; + + // set up identification + _draft.CompanyId = _company.CompanyId; + _draft.BcId = _company.BcId; + _draft.SalesRepId = _userInfo.UserId; + + _draft.ActivityStatusEnum = "noSale"; + _draft.VisitTypeEnum = _company.Account is "" or "NY" ? "new" : "recall"; + + // permanent identifications + _draft.SalesRep = _userInfo.Advisor; + _draft.Account = _company.Account; + _draft.VatNumber = _company.VatNumber; + _draft.Email = _company.Email; + _draft.Phone = _company.Phone; + _draft.Mobile = _company.Mobile; + + _draft.Name = _company.Name; + _draft.Address1 = _company.Address1; + _draft.Address2 = _company.Address2; + _draft.ZipCode = _company.ZipCode; + _draft.City = _company.City; + + _draft.DlvName = _company.Name; + _draft.DlvAddress1 = _company.Address1; + _draft.DlvAddress2 = _company.Address2; + _draft.DlvZipCode = _company.ZipCode; + _draft.DlvCity = _company.City; + + } + private void CallPriceListModal() + { + _priceList.Show(); + } + private async Task SelectSku(SelectedSku sku) + { + ShowItem = true; + _selectedItem = await _itemRepo.GetSalesItem(sku.ItemId); + Price = sku.Rate; + Quantity = sku.Quantity; + } + + private async Task DeleteDraft() + { + await DraftStateProvider.DeleteDraftAsync(); + } + + private async Task CreateOrder() + { + await _activityRepo.CreateActivity(_draft); + } + private async Task AddItem(SalesItemView salesItem) + { + ShowItem = false; + // create a new cart item + var item = new DraftItem + { + Item = salesItem, + Quantity = Convert.ToInt32(Quantity), + Price = Convert.ToDecimal(Price, CultureInfo.InvariantCulture), + Discount = Convert.ToDecimal(Discount, CultureInfo.InvariantCulture), + Sas = Sas + }; + // reset internals to initial state + Sas = false; + Quantity = "1"; + Price = "0"; + Discount = "0"; + // add it to the cart + DraftStateProvider.Draft.Items.Add(item); + // save the item using the CartStateProvider's save method + await DraftStateProvider.SaveChangesAsync(); + } + private async Task RemoveItem(DraftItem item) + { + // remove item + DraftStateProvider.Draft.Items.Remove(item); + // save the remaining draft + await DraftStateProvider.SaveChangesAsync(); + } + + private void HandleFieldChanged(object sender, FieldChangedEventArgs e) + { + if (DraftStateProvider.Draft.Items.Count == 0) + { + FormInvalid = true; + return; + } + + FormInvalid = !_editContext.Validate(); + StateHasChanged(); + } + private void ValidationChanged(object sender, ValidationStateChangedEventArgs e) + { + FormInvalid = false; + + _editContext.OnFieldChanged -= HandleFieldChanged; + _editContext.OnValidationStateChanged -= ValidationChanged; + _editContext = new EditContext(_draft); + _editContext.OnFieldChanged += HandleFieldChanged; + _editContext.OnValidationStateChanged += ValidationChanged; + } + + public void Dispose() + { + _interceptor.DisposeEvent(); + _editContext.OnFieldChanged -= HandleFieldChanged; + _editContext.OnValidationStateChanged -= ValidationChanged; + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/ReportNewPageAdvisor.razor b/Wonky.Client/Pages/ReportNewPageAdvisor.razor index 64a8fe95..6883d64d 100644 --- a/Wonky.Client/Pages/ReportNewPageAdvisor.razor +++ b/Wonky.Client/Pages/ReportNewPageAdvisor.razor @@ -33,7 +33,7 @@
@if (_working) { - + }
diff --git a/Wonky.Client/Pages/XTestPriceListPopupPage.razor b/Wonky.Client/Pages/XTestPriceListPopupPage.razor index 122be60a..78cf4464 100644 --- a/Wonky.Client/Pages/XTestPriceListPopupPage.razor +++ b/Wonky.Client/Pages/XTestPriceListPopupPage.razor @@ -115,5 +115,4 @@ }
-
- \ No newline at end of file +
\ No newline at end of file diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 88920104..ab19947f 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -49,7 +49,7 @@
- Ordrer + Forsendelse
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index d535e87a..637b2123 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.10.16", - "rc": false, + "version": "0.10.27", + "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://dev.innotec.dk", + "innoBaseUrl": "https://production.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "serviceVirk": "api/v2/services/virk", diff --git a/Wonky.Entity/DTO/AdminUserInfoDto.cs b/Wonky.Entity/DTO/UserInfoDto.cs similarity index 98% rename from Wonky.Entity/DTO/AdminUserInfoDto.cs rename to Wonky.Entity/DTO/UserInfoDto.cs index 79988b22..22bf08b3 100644 --- a/Wonky.Entity/DTO/AdminUserInfoDto.cs +++ b/Wonky.Entity/DTO/UserInfoDto.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class AdminUserInfoDto +public class UserInfoDto { /// /// First name