diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
index bd464376..8d0fc95b 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
@@ -101,15 +101,11 @@ public partial class AdvisorActivityCreatePage : IDisposable
_formContext = new EditContext(_activity);
_formContext.OnFieldChanged += ContextHandleFieldChanged!;
_formContext.OnValidationStateChanged += ContextValidationChanged!;
-
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
-
_userPref = await PreferenceService.GetPreference();
_salesRep = await UserInfo.GetUserInfo();
-
_company = await CompanyRepo.GetCompanyById(CompanyId);
-
if (_company.Account.StartsWith("KANVAS"))
{
_kanvas = true;
@@ -125,20 +121,17 @@ public partial class AdvisorActivityCreatePage : IDisposable
// _company has shut down
_activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt.";
}
-
_activity.ActivityStatusEnum = "noSale";
// decide if new or recall
_activity.ActivityVisitEnum = _company.Account.StartsWith("NY")
? "new"
: "recall";
-
// if (string.IsNullOrWhiteSpace(_company.Segment) && _salesRep.CountryCode.ToLower() == "dk")
// {
// Toaster.ShowError("Der mangler information om Segment. Ret kunde segment, gem erp data og prøv igen.");
// // Navigator.NavigateTo($"/advisor/customers/{CompanyId}");
// }
}
-
// Populate base activity information
_activity.Account = _company.Account;
_activity.Address1 = _company.Address1;
@@ -162,7 +155,6 @@ public partial class AdvisorActivityCreatePage : IDisposable
_activity.SalesRepId = _salesRep.UserId;
_activity.Segment = _company.Segment;
_activity.ZipCode = _company.ZipCode;
-
/*
* debug logging
*/
@@ -175,7 +167,6 @@ public partial class AdvisorActivityCreatePage : IDisposable
SelectedDate = string.IsNullOrWhiteSpace(_userPref.WorkDate)
? DateTime.Now
: DateTime.Parse(_userPref.WorkDate);
-
// 2023-08-14 - reject orders for future dates
if (SelectedDate.Date > DateTime.Now.Date)
{
@@ -183,10 +174,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
SelectedDate = DateTime.Now;
await PreferenceService.SetWorkDate(SelectedDate);
}
-
// raise flag if report is closed
ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}");
-
// Lines may already have been added from the company inventory page
if (DraftProvider.Draft.DraftType == "order")
{
@@ -195,18 +184,14 @@ public partial class AdvisorActivityCreatePage : IDisposable
{
_activity.ActivityTypeEnum = "onSite";
}
-
_activity.ActivityStatusEnum = "order";
_formInvalid = false;
}
-
if (_salesRep.CountryCode.ToLower() == "se")
{
await TestOrgNumber();
}
-
Working = false;
-
// Ask for confirmation of date
Logger.LogDebug("Preferences.DateConfirmed => {}", _userPref.DateConfirmed);
if (!_userPref.DateConfirmed)
@@ -221,7 +206,9 @@ public partial class AdvisorActivityCreatePage : IDisposable
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (_kanvas)
+ {
return;
+ }
if (firstRender)
{
if (!_company.Account.StartsWith("NY"))
@@ -244,7 +231,6 @@ public partial class AdvisorActivityCreatePage : IDisposable
{
Toaster.ShowInfo("Afventer svar fra tjenester ...");
}
-
_disableButtons = true;
var newSync = await HistoryRepo.RequestErpSync(CompanyId, _company.HistorySync, force);
await Task.Delay(500);
@@ -260,7 +246,6 @@ public partial class AdvisorActivityCreatePage : IDisposable
{
Toaster.ShowSuccess("Alle tjenester har svaret.");
}
-
_disableButtons = false;
}
@@ -268,43 +253,37 @@ public partial class AdvisorActivityCreatePage : IDisposable
private async Task TestOrgNumber()
{
var result = await OrgService.GetPersonalOrgNumber(_activity.Name);
+ await Task.Delay(100);
if (!string.IsNullOrWhiteSpace(result.PersonalId))
{
- // Toaster.ShowSuccess($"PersonId for {result.CompanyName} er fundet til at være {result.PersonalId}");
- _activity.VatNumber = result.PersonalId;
+ if (result.PersonalId[..6] == _activity.VatNumber)
+ {
+ Logger.LogDebug("search result for {}, {} is {}", _activity.Name, _activity.VatNumber, result.PersonalId);
+ Toaster.ShowSuccess($"PersonId for {result.CompanyName} er fundet til at være {result.PersonalId}");
+ _activity.VatNumber = result.PersonalId;
+ }
}
}
- ///