root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix ActivityVisitEnum - incorrectly assigned recall to new

Browse source
This commit is contained in:
Frede Hundewadt 2023-05-04 06:04:46 +02:00
parent c3f39d1b94
commit 07403c34de
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
View file

@ -132,17 +132,17 @@ public partial class AdvisorActivityCreatePage : IDisposable
Activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt."; Activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt.";
} }
// //
if (Company.CountryCode.ToLower() == "dk" // if (Company.CountryCode.ToLower() == "dk"
&& string.IsNullOrWhiteSpace(Company.Phone) // && string.IsNullOrWhiteSpace(Company.Phone)
&& !string.IsNullOrWhiteSpace(Company.Account) // && !string.IsNullOrWhiteSpace(Company.Account)
&& !Company.Account.StartsWith("NY") // && !Company.Account.StartsWith("NY")
&& Company.Account.Length > 7) // && Company.Account.Length > 7)
{ // {
Company.Phone = Company.Account[..8]; // Company.Phone = Company.Account[..8];
} // }
Activity.ActivityStatusEnum = "noSale"; Activity.ActivityStatusEnum = "noSale";
Activity.ActivityVisitEnum = string.IsNullOrWhiteSpace(Company.Account) // decide if new or recall
|| Company.Account.StartsWith("NY") Activity.ActivityVisitEnum = Company.Account.StartsWith("NY")
? "new" : "recall"; ? "new" : "recall";
} }
@ -243,7 +243,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
{ {
// check if new account // check if new account
if (string.IsNullOrWhiteSpace(Company.Account) if (string.IsNullOrWhiteSpace(Company.Account)
|| Company.Account.ToLower() == "ny" || Company.Account.StartsWith("NY")
|| Activity.ActivityStatusEnum.ToLower() == "quote" || Activity.ActivityStatusEnum.ToLower() == "quote"
|| Activity.ActivityStatusEnum.ToLower() == "canvas") || Activity.ActivityStatusEnum.ToLower() == "canvas")
{ {
@ -274,7 +274,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
Toaster.ShowInfo("Vent mens data synkroniseres ..."); Toaster.ShowInfo("Vent mens data synkroniseres ...");
var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync);
while (string.IsNullOrWhiteSpace(ts)) while (string.IsNullOrWhiteSpace(ts))
await Task.Delay(500); await Task.Delay(250);
// save pDate // save pDate
await Storage.SetItemAsync($"{CompanyId}-pDate", ts); await Storage.SetItemAsync($"{CompanyId}-pDate", ts);
// request products from backend // request products from backend
@ -444,7 +444,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden."); Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden.");
return; return;
// phone number is required if first time customer // phone number is required if first time customer
case "order" when Company.Account.StartsWith("NY") || Company.Account.StartsWith("KANVAS") || string.IsNullOrWhiteSpace(Company.Account) && string.IsNullOrWhiteSpace(Activity.Phone): case "order" when Company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(Activity.Phone):
Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives."); Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives.");
return; return;
// verify email address is a valid address // verify email address is a valid address

4
Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
View file

@ -20,9 +20,9 @@
@page "/advisor/customers/{CompanyId}/h/i" @page "/advisor/customers/{CompanyId}/h/i"
@attribute [Authorize(Roles = "Advisor")] @attribute [Authorize(Roles = "Advisor")]
<PageTitle>Produkt oversigt for @Company.Name</PageTitle> <PageTitle>Produkt oversigt for @Company.Name</PageTitle>
<div class="row pt-2 pb-1 rounded-2 bg-dark text-white"> <div class="row ps-3 pt-2 pb-1 rounded-2 bg-dark text-white">
<div class="col-sm-6"> <div class="col-sm-6">
<h4 class="pt-1">@Company.Name</h4> <h4 class="pt-1">Produkt oversigt @Company.Name</h4>
</div> </div>
<div class="col-sm-3 align-content-end d-print-none"> <div class="col-sm-3 align-content-end d-print-none">
<a class="btn btn-primary d-block" href="/advisor/customers/@CompanyId"><i class="bi-arrow-right"></i> Kundekort</a> <a class="btn btn-primary d-block" href="/advisor/customers/@CompanyId"><i class="bi-arrow-right"></i> Kundekort</a>

2
Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
View file

@ -107,7 +107,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
// internal flag // internal flag
EnableActivity = Company.ValidVat; EnableActivity = Company.ValidVat;
// override if canvas which has account property as empty string or "NY" // override if canvas which has account property as empty string or "NY"
if (Company.Account == "NY" || Company.Account.StartsWith("KANVAS") || string.IsNullOrWhiteSpace(Company.Account)) if (Company.Account.StartsWith("NY") || Company.Account.StartsWith("KANVAS") || string.IsNullOrWhiteSpace(Company.Account))
EnableActivity = 1; EnableActivity = 1;
if (Company.Account.StartsWith("KANVAS")) if (Company.Account.StartsWith("KANVAS"))

2
Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
View file

@ -259,7 +259,7 @@ public partial class OfficeOrderCreatePage : IDisposable
Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden."); Toaster.ShowError("Ved bestilling skal der være en eller flere linjer i kladden.");
return; return;
// phone number is required if first time customer // phone number is required if first time customer
case "order" when Company.Account is "NY" or "" && string.IsNullOrWhiteSpace(Activity.Phone): case "order" when Company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(Activity.Phone):
Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives."); Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives.");
return; return;
// verify email address is a valid address // verify email address is a valid address