From 341e254071c6591eee66952f171baa1b432de67c Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 20 Nov 2022 15:16:58 +0100 Subject: [PATCH] adding http repos for endpoint splitting --- Wonky.Client/Helpers/VatUtils.cs | 33 +- .../ICrmCompanyHttpRepository.cs | 3 + .../CrmCompanyHttpRepository.cs | 47 +- Wonky.Client/Pages/CrmCompanyViewPage.razor | 410 +++++++++--------- .../Pages/CrmCompanyViewPage.razor.cs | 111 +++-- Wonky.Client/Shared/ContactModal.razor | 15 +- Wonky.Client/wwwroot/appsettings.json | 4 +- 7 files changed, 362 insertions(+), 261 deletions(-) diff --git a/Wonky.Client/Helpers/VatUtils.cs b/Wonky.Client/Helpers/VatUtils.cs index 2f9c6b5f..83f77e9b 100644 --- a/Wonky.Client/Helpers/VatUtils.cs +++ b/Wonky.Client/Helpers/VatUtils.cs @@ -13,6 +13,8 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Globalization; + namespace Wonky.Client.Helpers; public class VatUtils @@ -22,18 +24,24 @@ public class VatUtils public static bool ValidateFormat(string countryCode, string vatNumber) { - if (string.IsNullOrWhiteSpace(vatNumber) || string.IsNullOrWhiteSpace(countryCode)) + if (string.IsNullOrWhiteSpace(vatNumber) || string.IsNullOrWhiteSpace(countryCode) || !IsDigitsOnly(vatNumber)) return false; + var sanitisedVat = SanitizeVatNumber(vatNumber); + return countryCode.ToUpperInvariant() switch { - "DK" => ValidateFormatDk(vatNumber), - "NO" => ValidateFormatNo(vatNumber), - "SE" => ValidateFormatSe(vatNumber), + "DK" => ValidateFormatDk(sanitisedVat), + "NO" => ValidateFormatNo(sanitisedVat), + "SE" => ValidateFormatSe(sanitisedVat), _ => false }; } + private static bool IsDigitsOnly(string check) + { + return check.All(c => c is >= '0' and <= '9'); + } private static bool ValidateFormatDk(string vatNumber) { // https://wiki.scn.sap.com/wiki/display/CRM/Denmark @@ -42,12 +50,11 @@ public class VatUtils // C8 check-digit MOD11 // C1 > 0 // R = (2*C1 + 7*C2 + 6*C3 + 5*C4 + 4*C5 + 3*C6 + 2*C7 + C8) - var vatToCheck = SanitizeVatNumber(vatNumber); - if (vatToCheck.Length != 8) + if (vatNumber.Length != 8) return false; - if ((int)char.GetNumericValue(vatToCheck[0]) < 1 || vatToCheck.Length > 8) + if ((int)char.GetNumericValue(vatNumber[0]) < 1 || vatNumber.Length > 8) return false; - return ValidateMod11(vatToCheck); + return ValidateMod11(vatNumber); } private static bool ValidateFormatNo(string vatNumber) @@ -57,10 +64,9 @@ public class VatUtils // C1..C8 random 0 to 9 // C9 check-digit MOD11 // C10 C11 C12 chars == MVA - var vatToCheck = SanitizeVatNumber(vatNumber); - if (vatToCheck.Length != 9) + if (vatNumber.Length != 9) return false; - return long.Parse(vatToCheck) != 0 && ValidateMod11(vatNumber); + return long.Parse(vatNumber) != 0 && ValidateMod11(vatNumber); } private static bool ValidateFormatSe(string vatNumber) @@ -72,7 +78,7 @@ public class VatUtils // Si = int(Ci/5) + (Ci*2)MOD10) // https://www.skatteverket.se/skatter/mervardesskattmoms/momsregistreringsnummer.4.18e1b10334ebe8bc80002649.html // C11 C12 == 01 (De två sista siffrorna är alltid 01) - var vatToCheck = SanitizeVatNumber(vatNumber); + var vatToCheck = vatNumber; if (vatToCheck.Length < 10 || long.Parse(vatToCheck) == 0) return false; @@ -104,8 +110,7 @@ public class VatUtils private static string SanitizeVatNumber(string vatNumber) { - vatNumber = vatNumber.ToUpperInvariant(); - return vatNumber + return vatNumber.ToUpperInvariant() .Replace(" ", "") .Replace("-", "") .Replace("DK", "") diff --git a/Wonky.Client/HttpInterfaces/ICrmCompanyHttpRepository.cs b/Wonky.Client/HttpInterfaces/ICrmCompanyHttpRepository.cs index 23b6dfb9..4292d62e 100644 --- a/Wonky.Client/HttpInterfaces/ICrmCompanyHttpRepository.cs +++ b/Wonky.Client/HttpInterfaces/ICrmCompanyHttpRepository.cs @@ -26,4 +26,7 @@ public interface ICrmCompanyHttpRepository Task CreateCompany(CompanyDto model); Task UpdateCompany(string companyId, CompanyDto model); Task DeleteCompany(string companyId); + Task UpdateCrmData(string companyId, CompanyDto model); + Task UpdateErpData(string companyId, CompanyDto model); + Task UpdateCompanyVat(string companyId, string vatNumber); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/CrmCompanyHttpRepository.cs b/Wonky.Client/HttpRepository/CrmCompanyHttpRepository.cs index bdd10556..53699839 100644 --- a/Wonky.Client/HttpRepository/CrmCompanyHttpRepository.cs +++ b/Wonky.Client/HttpRepository/CrmCompanyHttpRepository.cs @@ -115,10 +115,9 @@ public class CrmCompanyHttpRepository : ICrmCompanyHttpRepository { var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}", model); var content = await response.Content.ReadAsStringAsync(); - Console.WriteLine(content); return response.IsSuccessStatusCode; } - + /// /// Delete company /// @@ -129,4 +128,48 @@ public class CrmCompanyHttpRepository : ICrmCompanyHttpRepository var response = await _client.DeleteAsync($"{_conf.CrmCustomers}/{companyId}"); return response.IsSuccessStatusCode; } + + /// + /// Update Company CRM properties + /// + /// + /// + /// + public async Task UpdateCrmData(string companyId, CompanyDto model) + { + var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/crmData", model, _options); + var content = await response.Content.ReadAsStringAsync(); + return string.IsNullOrWhiteSpace(content) ? new CompanyDto() : JsonSerializer.Deserialize(content); + } + + /// + /// Update Company ERP properties + /// + /// + /// + /// + public async Task UpdateErpData(string companyId, CompanyDto model) + { + var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/erpData", model, _options); + var content = await response.Content.ReadAsStringAsync(); + return string.IsNullOrWhiteSpace(content) ? new CompanyDto() : JsonSerializer.Deserialize(content); + } + + /// + /// Update company VAT number + /// + /// + /// + /// + public async Task UpdateCompanyVat(string companyId, string vatNumber) + { + var model = new Dictionary + { + { "VatNumber", vatNumber } + }; + var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/vat", model, _options); + var content = await response.Content.ReadAsStringAsync(); + return string.IsNullOrWhiteSpace(content) ? new CompanyDto() : JsonSerializer.Deserialize(content); + } + } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmCompanyViewPage.razor b/Wonky.Client/Pages/CrmCompanyViewPage.razor index f54ce594..046a10e0 100644 --- a/Wonky.Client/Pages/CrmCompanyViewPage.razor +++ b/Wonky.Client/Pages/CrmCompanyViewPage.razor @@ -29,230 +29,236 @@

Ring til kontoret. Denne konto er spærret med kode '@Company.Blocked'

} -
-
+

@Company.Name

- @if (Dk) - { -
- - @if (VatInfos.Any()) - { - - - - - - - - - - - - @foreach (var info in VatInfos) - { - - - - - - - - } - -
CVR ORGNavnStatus
@info.VatNumber@info.Name@info.States[^1].State - - - -
- } -
- } - + -
-
- -
- @if (string.IsNullOrWhiteSpace(Company.Note)) - { - - } - else - { - - } - -
+
+ +
+ +
+ +
+ + +
+
-
- -
-
- - - - - -
-
- -
- -
+
+ +
+ +
+ +
+ + +
+
-
- -
- - -
- -
- - -
+
+ +
+ +
- -
- -
- - -
- -
- - -
-
- -
- -
- - -
- -
- - -
+ +
+ +
+
-
- -
- - -
- -
- - -
+
+ +
+ +
- -
- -
- - -
+ +
+ +
-
-
- -
-
- - - - -
-
- -
- -
- -
- - -
-
- -
- -
-
-
-
-
Stilling
-
Navn
-
Direkte
-
- -
-
-
- @if (Contacts.Any()) - { - @foreach (var contact in Contacts) - { -
-
-
@contact.JobTitle
-
@contact.FirstName @contact.LastName
-
@contact.PhoneDirect
-
- -
-
-
- } - } -
-
- -
- -
+
+ +
+ +
+ +
-
-
-
- Faktura + + +
+ + @* vat context *@ + +
+ +
+
+ + + + +
-
- Besøg +
+ +
+ +
+
+ + @* erp context *@ + +
+ +
+ @if (string.IsNullOrWhiteSpace(Company.Note)) + { + + } + else + { + + } + +
+
+ +
+ +
+
+ + + +
-
- Produkter -
-
- - @if (Company.HasFolded == 1) +
+ +
+ +
+ +
+ + +
+
+ +
+ +
+
+
+
+
Stilling
+
Navn
+
Direkte
+
+ +
+
+
+ @if (Contacts.Any()) { - + @foreach (var contact in Contacts) + { +
+
+
@contact.JobTitle
+
@contact.FirstName @contact.LastName
+
@contact.PhoneDirect
+
+ +
+
+
+ } }
-
- - -
+
+ +
+ +
+
+ +
+
+ Faktura +
+
+ Besøg +
+
+ Produkter +
+
+ + @if (Company.HasFolded == 1) + { + + } +
+
+ +
-
+ + @if (Dk) + { +
+

CVR adresse kontrol

+
+ + @if (VatInfos.Any()) + { + + + + + + + + + + + + @foreach (var info in VatInfos) + { + + + + + + + + } + +
CVR ORGNavnStatus
@info.VatNumber@info.Name@info.States[^1].State + + + +
+ } +
+
+ } } else { @@ -260,4 +266,4 @@ else } - \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs b/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs index e4ce0e31..633c8aa2 100644 --- a/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs @@ -50,7 +50,8 @@ public partial class CrmCompanyViewPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } private readonly JsonSerializerOptions _options = new () { PropertyNameCaseInsensitive = true }; private CompanyDto Company { get; set; } = new(); - private EditContext CompanyContext { get; set; } + private EditContext ErpContext { get; set; } + private EditContext CrmContext { get; set; } private List VatInfos { get; set; } = new(); private VirkRegInfo CompanyRegInfo { get; set; } = new(); private DateTime LastVisit { get; set; } @@ -129,9 +130,10 @@ public partial class CrmCompanyViewPage : IDisposable ValidVat = Company.ValidVat == 1; // flag set if company has a valid vatNumber VatState = Company.ValidVat == 1 ? "the-good" : "no-vat"; // assign css class } - CompanyContext = new EditContext(Company); - CompanyContext.OnFieldChanged += HandleFieldChanged; - CompanyContext.OnValidationStateChanged += ValidationChanged; + ErpContext = new EditContext(Company); + ErpContext.OnFieldChanged += HandleFieldChanged; + ErpContext.OnValidationStateChanged += ValidationChanged; + await SyncCompanyHistory(); Contacts = await ContactRepo.GetContacts(CompanyId); @@ -185,10 +187,13 @@ public partial class CrmCompanyViewPage : IDisposable if (!VatUtils.ValidateFormat(Company.CountryCode, Company.VatNumber)) { FormInvalid = true; + ValidVat = false; } else { - FormInvalid = !CompanyContext.Validate(); + FormInvalid = !ErpContext.Validate(); + ValidVat = true; + EnableActivity = 1; } if(VatUpdated == 0 && e.FieldIdentifier.FieldName != "Note" && e.FieldIdentifier.FieldName != "CrmNotes") IsDirty = 1; @@ -199,48 +204,75 @@ public partial class CrmCompanyViewPage : IDisposable private void ValidationChanged(object sender, ValidationStateChangedEventArgs e) { FormInvalid = false; - CompanyContext.OnFieldChanged -= HandleFieldChanged; - CompanyContext.OnValidationStateChanged -= ValidationChanged; + ErpContext.OnFieldChanged -= HandleFieldChanged; + ErpContext.OnValidationStateChanged -= ValidationChanged; - CompanyContext = new EditContext(Company); + ErpContext = new EditContext(Company); - FormInvalid = CompanyContext.Validate(); + FormInvalid = ErpContext.Validate(); - CompanyContext.OnFieldChanged += HandleFieldChanged; - CompanyContext.OnValidationStateChanged += ValidationChanged; + ErpContext.OnFieldChanged += HandleFieldChanged; + ErpContext.OnValidationStateChanged += ValidationChanged; } - - private async Task SubmitUpdate() + + private async Task UpdateCrmData() + { + Toaster.ShowInfo("Vent venligst ...", "Opdaterer CRM data"); + + Working = true; + + Company.LastVisit = $"{LastVisit:yyyy-MM-dd}"; + Company.NextVisit = $"{NextVisit:yyyy-MM-dd}"; + Company.IsHidden = 0; + + Company = await CompanyRepo.UpdateCompanyVat(CompanyId, Company.VatNumber); + StateHasChanged(); + return true; + } + + private async Task UpdateErpData() { Working = true; + + Toaster.ShowInfo("Vent venligst ...", "Opdaterer Erp data"); + Company = await CompanyRepo.UpdateCompanyVat(CompanyId, Company.VatNumber); + StateHasChanged(); + + Working = false; + return true; + } + + private async Task UpdateVatNumber() + { // simple format validation if CRM indicates invalid vatNumber if (!VatUtils.ValidateFormat(Company.CountryCode, Company.VatNumber)) { Toaster.ShowError($"CVR/VAT/ORG nummer mangler eller er ugyldig."); StateHasChanged(); + return false; + } + Working = true; + + Toaster.ShowInfo("Vent venligst ...", "Opdaterer Moms Nr"); + Company = await CompanyRepo.UpdateCompanyVat(CompanyId, Company.VatNumber); + StateHasChanged(); + + Working = false; + return true; + } + + private async Task SubmitUpdate() + { + if (!await UpdateCrmData()) + { + Toaster.ShowError("CRM data opdatering fejlede."); return; } - Toaster.ShowInfo("Vent venligst ...."); - //_hideButtons = true; - Company.LastVisit = $"{LastVisit:yyyy-MM-dd}"; - Company.NextVisit = $"{NextVisit:yyyy-MM-dd}"; - Company.IsHidden = 0; - - // flag if backend should update ERP system - Company.UpdateErpVat = VatUpdated; - - // flag base info has changed - Company.IsDirty = IsDirty; - - var success = await CompanyRepo.UpdateCompany(CompanyId, Company ); - - Toaster.ShowSuccess("Opdatering er afsendt. Der går nogle minutter inden data er opdateret."); - Company = await CompanyRepo.GetCompanyById(Company.CompanyId); - Company.ValidVat = 1; - EnableActivity = 1; - Working = false; - Toaster.ClearAll(); - StateHasChanged(); + + if (!await UpdateErpData()) + { + Toaster.ShowError("ERP data opdatering fejlede."); + } } private async Task GetInfoFromAddress(VatAddress address) @@ -291,7 +323,8 @@ public partial class CrmCompanyViewPage : IDisposable private void CallVatLookupModal() { VatLookupPopup.Show(); - } + } + private void OnSelectedCompany(VirkRegInfo regInfo) { ValidVat = regInfo.States[0].State.ToLower() == "normal"; @@ -312,7 +345,7 @@ public partial class CrmCompanyViewPage : IDisposable else { Company.VatNumber = CompanyRegInfo.VatNumber; - VatUpdated = 1; + Company = CompanyRepo.UpdateCompanyVat(CompanyId, Company.VatNumber).Result; } StateHasChanged(); } @@ -338,7 +371,7 @@ public partial class CrmCompanyViewPage : IDisposable else { Company.VatNumber = CompanyRegInfo.VatNumber; - VatUpdated = 1; + Company = CompanyRepo.UpdateCompanyVat(CompanyId, Company.VatNumber).Result; } // empty list VatInfos = new List(); @@ -348,7 +381,7 @@ public partial class CrmCompanyViewPage : IDisposable public void Dispose() { Interceptor.DisposeEvent(); - CompanyContext.OnFieldChanged -= HandleFieldChanged; - CompanyContext.OnValidationStateChanged -= ValidationChanged; + ErpContext.OnFieldChanged -= HandleFieldChanged; + ErpContext.OnValidationStateChanged -= ValidationChanged; } } \ No newline at end of file diff --git a/Wonky.Client/Shared/ContactModal.razor b/Wonky.Client/Shared/ContactModal.razor index 20a66cc3..b3659629 100644 --- a/Wonky.Client/Shared/ContactModal.razor +++ b/Wonky.Client/Shared/ContactModal.razor @@ -29,7 +29,7 @@ -
+
@@ -50,6 +50,18 @@
+
+ + + +
+
+ + + +
+
+
@if (string.IsNullOrWhiteSpace(Contact.ContactId)) { @@ -59,7 +71,6 @@ { } -
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 93d74fb8..40cd4017 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.45.1", + "version": "0.46.1", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://zeta.innotec.dk", + "innoBaseUrl": "https://dev.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",