From eb518b3429de0ff086467d57b1d92f1e72c00147 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 6 Dec 2023 12:53:24 +0100 Subject: [PATCH] misc cosmetic changes office customer list office customer list added isHidden = 1 to custom page filter office create order added salesRep name draft - added property to use for enabling disabling submit button B2B page work --- .../OfficeCountryCustomerListComponent.razor | 10 +- .../Extensions/JsInteropExtenstions.cs | 12 ++ Wonky.Client/Models/Draft.cs | 3 +- Wonky.Client/Models/DraftItem.cs | 8 +- .../CustomerInvoiceViewOverlay.razor | 4 +- .../Pages/AdvisorActivityCreatePage.razor | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 2 +- ...AdvisorCustomerWorkplaceViewEditPage.razor | 8 +- .../Pages/BusinessOrderViewPage.razor | 56 ++++++ .../Pages/BusinessOrderViewPage.razor.cs | 167 +++++++++++++++--- ...fficeAdvisorCustomerPagedListPage.razor.cs | 1 + ...fficeCustomerCountryPagedListPage.razor.cs | 1 + .../Pages/OfficeCustomerOrderCreatePage.razor | 9 +- .../OfficeCustomerOrderCreatePage.razor.cs | 120 +++++-------- Wonky.Client/wwwroot/appsettings.json | 2 +- Wonky.Client/wwwroot/index.html | 3 +- Wonky.Client/wwwroot/scripts/focus-element.js | 5 + Wonky.Entity/DTO/B2BAdvisorInfo.cs | 5 +- Wonky.Entity/DTO/B2BBusinessInfo.cs | 10 +- 19 files changed, 302 insertions(+), 126 deletions(-) create mode 100644 Wonky.Client/Extensions/JsInteropExtenstions.cs create mode 100644 Wonky.Client/wwwroot/scripts/focus-element.js diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index 7c168ef6..d4efa34c 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -44,6 +44,8 @@ }
+ + @@ -64,7 +66,7 @@ - + @@ -86,12 +89,13 @@ +
Konto @company.Account
- Sælgernr. + Sælger Nr. @company.SalesRep @@ -72,9 +74,10 @@
Sidst besøgt + @(Mapper.MapVisitState(company.LastVisit) == "the-draw" ? "?" : company.LastVisit) @(company.IsHidden == 1 ? "Skjult af sælger." : "")
Næste besøg
- +
diff --git a/Wonky.Client/Extensions/JsInteropExtenstions.cs b/Wonky.Client/Extensions/JsInteropExtenstions.cs new file mode 100644 index 00000000..7f6a48a2 --- /dev/null +++ b/Wonky.Client/Extensions/JsInteropExtenstions.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; + +namespace Wonky.Client.Extensions; + +public static class JsInteropExtensions +{ + public static ValueTask SetFocusAsync(this IJSRuntime jsRuntime, ElementReference elementReference) + { + return jsRuntime.InvokeVoidAsync("FormFocusElement", elementReference); + } +} \ No newline at end of file diff --git a/Wonky.Client/Models/Draft.cs b/Wonky.Client/Models/Draft.cs index 843b1938..f72c33eb 100644 --- a/Wonky.Client/Models/Draft.cs +++ b/Wonky.Client/Models/Draft.cs @@ -22,12 +22,13 @@ public class Draft { public string DraftId { get; set; } = ""; public string DraftType { get; set; } = "noSale"; + public bool Invalid => Items.Count == 0; public List Items { get; set; } = new (); public decimal Total { get { - return Items.Sum(item => item.LineTotal); + return Items.Sum(item => item.LineSum); } } public DateTime LastAccessed { get; set; } diff --git a/Wonky.Client/Models/DraftItem.cs b/Wonky.Client/Models/DraftItem.cs index bb7802ab..13f19c39 100644 --- a/Wonky.Client/Models/DraftItem.cs +++ b/Wonky.Client/Models/DraftItem.cs @@ -22,10 +22,10 @@ namespace Wonky.Client.Models; /// public class DraftItem { - public int Quantity { get; set; } - public SalesItemView Item { get; set; } - public decimal Price { get; set; } public decimal Discount { get; set; } + public decimal Price { get; set; } + public int Quantity { get; set; } + public decimal LineSum => (Price - Price * Discount / 100) * Quantity; public bool Sas { get; set; } - public decimal LineTotal => (Price - Price * Discount / 100) * Quantity; + public SalesItemView Item { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor index 4cd7bf78..7a1bd999 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor @@ -19,7 +19,7 @@
-

Faktura @Invoice.DocumentNumber

+

Salgsinfo @Invoice.DocumentNumber

@@ -98,7 +98,7 @@ } else { - Ingen data +
Ingen data
}
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index 7b765bfb..a635ffbe 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -287,7 +287,7 @@ else @cartItem.Quantity @($"{cartItem.Price:N2}") @($"{cartItem.Discount:N2}") - @($"{cartItem.LineTotal:N2}") + @($"{cartItem.LineSum:N2}") diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 83678349..8c186a82 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -474,7 +474,7 @@ public partial class AdvisorActivityCreatePage : IDisposable { Price = item.Price, Discount = item.Discount, - LineAmount = item.LineTotal, + LineAmount = item.LineSum, Qty = item.Quantity, Sku = item.Item.Sku, Text = item.Item.Name, diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor index ff7df122..5ac266fc 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor @@ -123,7 +123,7 @@ Vis QR-koder
- Revision + Tilføj Produkt(er)
@@ -174,7 +174,7 @@ @docView.DocumentDate
- produkt-billede
@@ -182,6 +182,10 @@ } } + else + { +

Ingen dokumenter oprettet.

+ }
diff --git a/Wonky.Client/Pages/BusinessOrderViewPage.razor b/Wonky.Client/Pages/BusinessOrderViewPage.razor index 72937389..bbbcb025 100644 --- a/Wonky.Client/Pages/BusinessOrderViewPage.razor +++ b/Wonky.Client/Pages/BusinessOrderViewPage.razor @@ -16,3 +16,59 @@ @attribute [Authorize(Roles = "EShop")] @page "/b2b/{countryCode}/{companyId}/order/new" @using Microsoft.AspNetCore.Authorization + +
+
+ Bestilling +
+
+
+
+
+ @_businessInfo.Name +
+
+ @_businessInfo.Account +
+
+ @_businessInfo.Phone +
+
+
+
+ @Activity.DlvAddress1, @Activity.DlvAddress2 +
+
+ @CountryCode.ToUpper()-@Activity.DlvZipCode @Activity.DlvCity +
+
+
+
+
+
+ Vare No. +
+
+ Beskrivelse +
+
+ Antal +
+
+ @foreach (var item in DraftProvider.Draft.Items) + { +
+
+ @item.Item.Sku +
+
+ @item.Item.Name +
+
+ @item.Quantity +
+
+ } +
+
+
\ No newline at end of file diff --git a/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs b/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs index 66c8436b..caf20013 100644 --- a/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using System.Text.Json; +using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; using Microsoft.Extensions.Options; @@ -25,6 +26,7 @@ public partial class BusinessOrderViewPage [Inject] public ICountryPriceCatalogRepository PriceCatalog { get; set; } [Inject] public IOptions Config { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } + [Inject] public IToastService Toaster { get; set; } // ############################################################## [CascadingParameter] private DraftStateProvider DraftProvider { get; set; } = new(); @@ -34,12 +36,7 @@ public partial class BusinessOrderViewPage // ############################################################## private UserManagerEditView UserInfo { get; set; } = new(); private B2BBusinessInfo _businessInfo = new(); - private B2BAdvisorInfo _advisorInfo = new(); - private List _productHistory = new(); - private List _productInventory = new(); private ApiConfig _config = new(); - private B2BProductPriceHistoryOverlay PriceHistoryOverlay { get; set; } - private ItemSelect _selectedItem = new(); private ActivityDto Activity { get; set; } = new(); private DateTime SelectedDate { get; set; } private bool Working { get; set; } = true; @@ -52,6 +49,7 @@ public partial class BusinessOrderViewPage // get info for logged in user UserInfo = await UserInfoService.GetUserInfo(); + _businessInfo = await B2BRepo.GetBusinessInfo(CompanyId); SelectedDate = DateTime.Now; var today = $"{SelectedDate:yyyy-MM-dd}"; @@ -62,34 +60,147 @@ public partial class BusinessOrderViewPage Activity.ActivityStatusEnum = "order"; Activity.Express = true; Activity.OurRef = $"WEB:{UserInfo.FirstName}"; - // get sales rep info - // SalesRep = await UserRepo.GetUserInfo(Company.SalesRepId); - // Logger.LogDebug("OfficeOrderCreate => SalesRep => {}", JsonSerializer.Serialize(SalesRep)); // assign salesRep and countryCode to activity - // Activity.SalesRep = _advisorInfo.SalesRep; - // Activity.CountryCode = SalesRep.CountryCode; - // Activity.SalesRepId = Company.SalesRepId; + Activity.SalesRep = _businessInfo.SalesRep; + Activity.CountryCode = _businessInfo.CountryCode; + Activity.SalesRepId = _businessInfo.AdvisorId; // assign customer info into activity properties - // Activity.Account = Company.Account; - // Activity.VatNumber = Company.VatNumber; - // Activity.Email = Company.Email; - // Activity.Phone = Company.Phone; - // Activity.Mobile = Company.Mobile; - // Activity.Name = Company.Name; - // Activity.Address1 = Company.Address1; - // Activity.Address2 = Company.Address2; - // Activity.ZipCode = Company.ZipCode; - // Activity.City = Company.City; - // Activity.DlvName = Company.Name; - // Activity.DlvAddress1 = Company.Address1; - // Activity.DlvAddress2 = Company.Address2; - // Activity.DlvZipCode = Company.ZipCode; - // Activity.DlvCity = Company.City; - // Activity.BcId = Company.BcId; - // Activity.CompanyId = Company.CompanyId; + Activity.Account = _businessInfo.Account; + Activity.VatNumber = _businessInfo.VatNumber; + Activity.Email = _businessInfo.Email; + Activity.Phone = _businessInfo.Phone; + Activity.Mobile = _businessInfo.Mobile; + Activity.Name = _businessInfo.Name; + Activity.Address1 = _businessInfo.Address1; + Activity.Address2 = _businessInfo.Address2; + Activity.ZipCode = _businessInfo.ZipCode; + Activity.City = _businessInfo.City; + Activity.DlvName = _businessInfo.Name; + Activity.DlvAddress1 = _businessInfo.Address1; + Activity.DlvAddress2 = _businessInfo.Address2; + Activity.DlvZipCode = _businessInfo.ZipCode; + Activity.DlvCity = _businessInfo.City; + Activity.BcId = _businessInfo.BcId; + Activity.CompanyId = _businessInfo.CompanyId; // assign activity properties + + // var lineNo = 0; + // foreach (var item in DraftProvider.Draft.Items) + // { + // lineNo += 1; + // Activity.Lines.Add(new ActivityLineDto() + // { + // Discount = item.Discount, + // Price = item.Price, + // Qty = item.Quantity, + // LineAmount = item.LineSum, + // LineNumber = lineNo, + // ShortName = item.Item.ShortName, + // Sku = item.Item.Sku, + // Text = item.Item.Name, + // Location = item.Item.Location, + // Sas = item.Sas + // }); + // } Working = false; + } + + private async Task CreateActivity() + { + // avoid duplication + if (Working) + return; + // validate customer address1 + // - this is a required input + // --- exclude for office orders + // if (string.IsNullOrWhiteSpace(Activity.Address1)) + // { + // Toaster.ShowError("Kunde adresse er ufuldstændig."); + // return; + // } + + // validate org number + // - this is a required input + // - must validate according to country rules. + // --- exclude for office orders + // if (!VatUtils.ValidateFormat(Company.CountryCode, Activity.VatNumber)) + // { + // Toaster.ShowError("Firma registreringsnummer er ikke korrekt."); + // return; + // } + + // // validate input according to status + // switch (Activity.ActivityStatusEnum) + // { + // // don't accept order with no lines + // case "order" when DraftProvider.Draft.Items.Count == 0: + // Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden."); + // return; + // // phone number is required if first time customer + // case "order" when Company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(Activity.Phone): + // Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives."); + // return; + // // verify email address is a valid address + // // --- exclude for office orders + // // case "quote" when !Utils.IsValidEmail(Activity.Email): + // // Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives."); + // // return; + // } + + // raise working flag + Working = true; + + // reset selected item + // SelectedItem = new SalesItemView(); + + // begin assembling activity + Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}"; + if (Activity.Express) + Activity.OurRef = $"E{Activity.OurRef}"; + // begin lines + Activity.Lines = new List(); + var lineNo = 0; + if (DraftProvider.Draft.Items.Count != 0) + { + var lines = DraftProvider.Draft.Items.Select(item => new ActivityLineDto + { + // sales properties + Discount = item.Discount, + Price = item.Price, + Qty = item.Quantity, + LineAmount = item.LineSum, + LineNumber = ++lineNo, + Sas = item.Sas, + // item properties + Location = item.Item.Location, + ShortName = item.Item.ShortName, + Sku = item.Item.Sku, + Text = item.Item.Name, + }) + .ToList(); + Activity.Lines = lines; + } + + // // debug logging + // Logger.LogDebug("CrmNewActivityPage => \n {}", JsonSerializer.Serialize(Activity)); + // // post to api + // var result = await CountryActivityRepo.PostPhoneOrder(Company.CompanyId, Activity); + // // debug logging + // Logger.LogDebug("ApiResponseView => \n {}", JsonSerializer.Serialize(result)); + // // show result message + // if (result.IsSuccess) + // { + // Toaster.ShowSuccess($"{result.Message}"); + // await DeleteDraft(); + // Navigator.NavigateTo($"/office/customers/{CompanyId}/orders/{result.Id}"); + // Working = false; + // return; + // } + // lower working flag + Working = false; + // show error message + // Toaster.ShowError(result.Message); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs index b6e0c1d3..32e4f60a 100644 --- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs @@ -61,6 +61,7 @@ public partial class OfficeAdvisorCustomerPagedListPage : IDisposable Paging.OrderBy = UserPreference.CompanySort; Paging.SearchColumn = UserPreference.CompanySearch; Paging.PageSize = Convert.ToInt32(UserPreference.PageSize); + Paging.IsHidden = 1; Paging.HasFolded = IncludeFolded ? 1 : 0; // load saved search diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs index a0d2807d..1224677d 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs @@ -67,6 +67,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable Paging.OrderBy = Preference.CompanySort; Paging.SearchColumn = Preference.CompanySearch; Paging.PageSize = Convert.ToInt32(Preference.PageSize); + Paging.IsHidden = 1; Paging.HasFolded = ShowFolded ? 1 : 0; // load saved search diff --git a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor index 900ecfec..8ef6b951 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor +++ b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor @@ -20,9 +20,9 @@ @page "/office/customers/{CountryCode}/{CompanyId}/order" -Telefon Ordre - @Company.Name - @Company.Account +@Company.Name - @Company.Account - Telefon Bestilling -
+

@Company.Name - @Company.Account

@@ -36,6 +36,8 @@
+
Sælger
+
@SalesRep.FirstName @SalesRep.LastName
@@ -76,6 +78,7 @@
+
@cartItem.Quantity @($"{cartItem.Price:N2}") @($"{cartItem.Discount:N2}") - @($"{cartItem.LineTotal:N2}") + @($"{cartItem.LineSum:N2}") diff --git a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs index 65d0969c..1dd07c12 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs @@ -19,6 +19,8 @@ using System.Text.Json; using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; +using Microsoft.JSInterop; +using Wonky.Client.Extensions; using Wonky.Client.Helpers; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; @@ -47,6 +49,7 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable [Inject] public ICountryUserInfoRepository UserRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } + [Inject] public IJSRuntime JsRuntime { get; set; } // ############################################################# // parameters @@ -88,56 +91,53 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable private List CompanyInventory { get; set; } = new(); private InvoiceListView CompanyInvoices { get; set; } = new(); private List CompanyActivities { get; set; } = new(); - + private readonly ElementReference _yourRef = new ("yourRef"); + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await JsRuntime.SetFocusAsync(_yourRef); + } + } protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - // get info for logged in user + UserInfo = await UserInfoService.GetUserInfo(); - // setup edit context + ActivityContext = new EditContext(Activity); ActivityContext.OnFieldChanged += HandleFieldChanged; ActivityContext.OnValidationStateChanged += ValidationChanged; - // fetch customer + Company = await CustomerRepo.GetByCustomerId(CountryCode, CompanyId); - Logger.LogDebug("OfficeOrderCreate => Customer => {}", JsonSerializer.Serialize(Company)); - // construct today's workdate - // Initialize date variable + SelectedDate = DateTime.Now; var today = $"{SelectedDate:yyyy-MM-dd}"; - // assign activity properties + Activity.ActivityVisitEnum = "office"; Activity.ActivityTypeEnum = "phone"; Activity.ActivityStatusEnum = "order"; Activity.Express = true; Activity.OurRef = $"INNOTEC:{UserInfo.FirstName}"; Activity.ActivityDate = today; - // initiate a sync to ensure up-to-date product history + if (Company.HistorySync != today) { Company.HistorySync = await HistoryRepo.RequestErpToCrmSync(CompanyId, Company.HistorySync, false); - Logger.LogDebug("OfficeOrderCreate => RequestErpToCrmSync <= {}", Company.HistorySync); } - // fetch invoices CompanyInvoices = await HistoryRepo.GetInvoiceList(CountryCode, CompanyId); - Logger.LogDebug("OfficeOrderCreate => Invoices => {}", JsonSerializer.Serialize(CompanyInvoices)); - // fetch activities CompanyActivities = await CountryActivityRepo.GetActivityList(CompanyId); - Logger.LogDebug("OfficeOrderCreate => Activities => {}", JsonSerializer.Serialize(CompanyActivities)); - // fetch inventory CompanyInventory = await HistoryRepo.GetInventory(CountryCode, CompanyId); CompanyInventory = CompanyInventory.OrderBy(x => x.Description).ToList(); - Logger.LogDebug("OfficeOrderCreate => Inventory => {}", JsonSerializer.Serialize(CompanyInventory)); - // get sales rep info + SalesRep = await UserRepo.GetUserInfo(Company.SalesRepId); - Logger.LogDebug("OfficeOrderCreate => SalesRep => {}", JsonSerializer.Serialize(SalesRep)); - // assign salesRep and countryCode to activity Activity.SalesRep = SalesRep.SalesRep; Activity.CountryCode = SalesRep.CountryCode; Activity.SalesRepId = Company.SalesRepId; - // assign customer info into activity properties + Activity.Account = Company.Account; Activity.VatNumber = Company.VatNumber; Activity.Email = Company.Email; @@ -156,6 +156,9 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable Activity.BcId = Company.BcId; Activity.CompanyId = Company.CompanyId; + DraftProvider.Draft.DraftType = "order"; + PoFormInvalid = DraftProvider.Draft.Invalid; + Working = false; } @@ -163,22 +166,23 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable private async Task DeleteDraft() { await DraftProvider.DeleteDraftAsync(); + PoFormInvalid = DraftProvider.Draft.Invalid; } private async Task RemoveItem(DraftItem item) { - // remove item DraftProvider.Draft.Items.Remove(item); - // save the remaining draft + await DraftProvider.SaveChangesAsync(); + PoFormInvalid = DraftProvider.Draft.Invalid; } private async Task AddItem(SalesItemView salesItem) { ShowItem = false; - // create a new cart item + var item = new DraftItem { Item = salesItem, @@ -187,30 +191,30 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable 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 + + SelectedItem = new SalesItemView(); DraftProvider.Draft.Items.Add(item); - if(Activity.ActivityStatusEnum != "quote") - Activity.ActivityStatusEnum = "order"; - // save the item using the CartStateProvider's save method + PoFormInvalid = DraftProvider.Draft.Invalid; + await DraftProvider.SaveChangesAsync(); + } private async Task PriceListCallback(ItemSelect selectedItem) { - // get selected item + SelectedItem = new SalesItemView(); if (string.IsNullOrWhiteSpace(selectedItem.ItemNo)) return; SelectedItem = await PriceCatalog.GetSalesItemSku(CountryCode, selectedItem.ItemNo); ShowItem = true; Price = selectedItem.Rate; Quantity = selectedItem.Quantity; - StateHasChanged(); } @@ -240,71 +244,40 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable private async Task CreateActivity() { - // avoid duplication if (Working) return; - // validate customer address1 - // - this is a required input - // --- exclude for office orders - // if (string.IsNullOrWhiteSpace(Activity.Address1)) - // { - // Toaster.ShowError("Kunde adresse er ufuldstændig."); - // return; - // } - // validate org number - // - this is a required input - // - must validate according to country rules. - // --- exclude for office orders - // if (!VatUtils.ValidateFormat(Company.CountryCode, Activity.VatNumber)) - // { - // Toaster.ShowError("Firma registreringsnummer er ikke korrekt."); - // return; - // } - - // validate input according to status switch (Activity.ActivityStatusEnum) { - // don't accept order with no lines - case "order" when DraftProvider.Draft.Items.Count == 0: + case "order" when DraftProvider.Draft.Invalid: Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden."); return; - // phone number is required if first time customer + case "order" when Company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(Activity.Phone): Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives."); return; - // verify email address is a valid address - // --- exclude for office orders - // case "quote" when !Utils.IsValidEmail(Activity.Email): - // Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives."); - // return; } - // raise working flag Working = true; - - // reset selected item - SelectedItem = new SalesItemView(); - - // begin assembling activity + Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}"; if (Activity.Express) Activity.OurRef = $"E{Activity.OurRef}"; - // begin lines + Activity.Lines = new List(); var ln = 0; if (DraftProvider.Draft.Items.Count != 0) { var lines = DraftProvider.Draft.Items.Select(item => new ActivityLineDto { - // sales properties + Discount = item.Discount, Price = item.Price, Qty = item.Quantity, - LineAmount = item.LineTotal, + LineAmount = item.LineSum, LineNumber = ++ln, Sas = item.Sas, - // item properties + Location = item.Item.Location, ShortName = item.Item.ShortName, Sku = item.Item.Sku, @@ -314,13 +287,8 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable Activity.Lines = lines; } - // debug logging - Logger.LogDebug("CrmNewActivityPage => \n {}", JsonSerializer.Serialize(Activity)); - // post to api var result = await CountryActivityRepo.PostPhoneOrder(Company.CompanyId, Activity); - // debug logging - Logger.LogDebug("ApiResponseView => \n {}", JsonSerializer.Serialize(result)); - // show result message + if (result.IsSuccess) { Toaster.ShowSuccess($"{result.Message}"); @@ -329,9 +297,9 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable Working = false; return; } - // lower working flag + Working = false; - // show error message + Toaster.ShowError(result.Message); } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 59cc4ba1..a0299a0c 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "315.0", + "version": "316.0", "rc": false, "sandBox": true, "image": "grumpy-coder.png", diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index da8f988d..8654adc5 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -29,7 +29,8 @@
- + + diff --git a/Wonky.Client/wwwroot/scripts/focus-element.js b/Wonky.Client/wwwroot/scripts/focus-element.js new file mode 100644 index 00000000..02708475 --- /dev/null +++ b/Wonky.Client/wwwroot/scripts/focus-element.js @@ -0,0 +1,5 @@ +function FormFocusElement(element) { + if (element instanceof HTMLElement) { + element.focus(); + } +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/B2BAdvisorInfo.cs b/Wonky.Entity/DTO/B2BAdvisorInfo.cs index 589ad775..349ac2ee 100644 --- a/Wonky.Entity/DTO/B2BAdvisorInfo.cs +++ b/Wonky.Entity/DTO/B2BAdvisorInfo.cs @@ -2,7 +2,10 @@ namespace Wonky.Entity.DTO; public class B2BAdvisorInfo { + public string AdvisorId { get; set; } = ""; + public string CountryCode { get; set; } = ""; + public string Email { get; set; } = ""; public string Name { get; set; } = ""; public string Phone { get; set; } = ""; - public string Email { get; set; } = ""; + public string SalesRep { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/DTO/B2BBusinessInfo.cs b/Wonky.Entity/DTO/B2BBusinessInfo.cs index cd851bbe..0fcf1a6a 100644 --- a/Wonky.Entity/DTO/B2BBusinessInfo.cs +++ b/Wonky.Entity/DTO/B2BBusinessInfo.cs @@ -5,10 +5,16 @@ public class B2BBusinessInfo public string Account { get; set; } = ""; public string Address1 { get; set; } = ""; public string Address2 { get; set; } = ""; + public string AdvisorId { get; set; } = ""; + public string BcId { get; set; } = ""; public string City { get; set; } = ""; public string CompanyId { get; set; } = ""; + public string CountryCode { get; set; } = ""; + public string Email { get; set; } = ""; + public string Mobile { get; set; } = ""; public string Name { get; set; } = ""; - public string ZipCode { get; set; } = ""; public string Phone { get; set; } = ""; - public string Email { get; set; } = ""; + public string SalesRep { get; set; } = ""; + public string VatNumber { get; set; } = ""; + public string ZipCode { get; set; } = ""; } \ No newline at end of file