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

public v0.2.44-beta

Browse source
This commit is contained in:
Frede Hundewadt 2022-05-29 13:40:06 +02:00
parent e7f5948b96
commit d210d3ba33
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wonky.Client/Components/AppVersion.razor
View file

@ -17,7 +17,7 @@
<span class="version">@Name</span> <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>} <span class="version">@Name</span> <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>}
@code @code
{ {
private const string Version = "0.2.43"; private const string Version = "0.2.44";
private const string Name = "wwo"; private const string Name = "wwo";
private const bool IsBeta = true; private const bool IsBeta = true;
} }

6
Wonky.Client/Models/VatAddress.cs
View file

@ -4,7 +4,7 @@ namespace Wonky.Client.Models;
public class VatAddress public class VatAddress
{ {
[Required] public string? StreetName { get; set; } [Required] public string StreetName { get; set; } = "";
[Required] public string? HouseNumber { get; set; } [Required] public string HouseNumber { get; set; } = "";
[Required] public string? ZipCode { get; set; } [Required] public string ZipCode { get; set; } = "";
} }

7
Wonky.Client/Pages/CompanyUpdate.razor.cs
View file

@ -15,6 +15,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using Blazored.LocalStorage; using Blazored.LocalStorage;
using Blazored.Toast.Services; using Blazored.Toast.Services;
using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterceptors;
@ -91,7 +92,7 @@ public partial class CompanyUpdate : IDisposable
{ {
ZipCode = DtoNgCompany.ZipCode, ZipCode = DtoNgCompany.ZipCode,
StreetName = DtoNgCompany.Address1[..pos1], StreetName = DtoNgCompany.Address1[..pos1],
HouseNumber = DtoNgCompany.Address1[pos1..] HouseNumber = Regex.Replace(DtoNgCompany.Address1[pos1..], "[^0-9]", "")
}; };
} }
var pos2 = DtoNgCompany.Address2.IndexOfAny(digits); var pos2 = DtoNgCompany.Address2.IndexOfAny(digits);
@ -101,7 +102,7 @@ public partial class CompanyUpdate : IDisposable
{ {
ZipCode = DtoNgCompany.ZipCode, ZipCode = DtoNgCompany.ZipCode,
StreetName = DtoNgCompany.Address2[..pos2], StreetName = DtoNgCompany.Address2[..pos2],
HouseNumber = DtoNgCompany.Address2[pos2..] HouseNumber = Regex.Replace(DtoNgCompany.Address2[pos2..], "[^0-9]", "")
}; };
} }
return vatAddress; return vatAddress;
@ -135,7 +136,7 @@ public partial class CompanyUpdate : IDisposable
.QueryVirkRegistry( .QueryVirkRegistry(
new VirkParams new VirkParams
{ {
VatNumber = vatNumber VatNumber = vatNumber.Trim()
}); });
if (string.IsNullOrWhiteSpace(VInfos[0].VatNumber)) if (string.IsNullOrWhiteSpace(VInfos[0].VatNumber))
{ {

9
Wonky.Client/Services/VatInfoLookupService.cs
View file

@ -13,6 +13,7 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
// //
using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -43,10 +44,10 @@ public class VatInfoLookupService
} }
var queryString = new Dictionary<string, string> var queryString = new Dictionary<string, string>
{ {
["vatNumber"] = query.VatNumber, ["vatNumber"] = $"{query.VatNumber}",
["streetName"] = query.StreetName, ["streetName"] = $"{query.StreetName}",
["houseNumber"] = query.HouseNumber, ["houseNumber"] = $"{query.HouseNumber}",
["zipCode"] = query.ZipCode ["zipCode"] = $"{query.ZipCode}"
}; };
var endpoint = QueryHelpers.AddQueryString(_apiConfig.Value.CvrLookup, queryString); var endpoint = QueryHelpers.AddQueryString(_apiConfig.Value.CvrLookup, queryString);
var response = await _client.GetAsync(endpoint); var response = await _client.GetAsync(endpoint);

2
Wonky.Client/wwwroot/appsettings.json
View file

@ -7,7 +7,7 @@
} }
}, },
"apiConfig": { "apiConfig": {
"baseAddress": "https://app.innotec.dk", "baseAddress": "https://staging.innotec.dk",
"tokenPath": "token", "tokenPath": "token",
"userInfo": "api/auth/userinfo", "userInfo": "api/auth/userinfo",
"customerEndpoint": "api/v2/crm/companies", "customerEndpoint": "api/v2/crm/companies",