revert size of vat number input for activity creation
add company lookup to update page
This commit is contained in:
parent
6625983376
commit
d6041def76
3 changed files with 53 additions and 11 deletions
|
@ -26,9 +26,44 @@
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="h2">@_company.Account - @_company.Name</div>
|
<div class="h2">@_company.Account - @_company.Name</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<VatNumberInputComponent OnValidSubmit="GetInfoFromVat"/>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<VatAddressInputComponent OnValidSubmit="GetInfoFromAddress"/>
|
||||||
|
</div>
|
||||||
|
@if (VInfos.Any())
|
||||||
|
{
|
||||||
|
<div class="card-body">
|
||||||
|
@foreach (var info in VInfos)
|
||||||
|
{
|
||||||
|
<div class="row mb-2">
|
||||||
|
<div class="col">
|
||||||
|
@info.VatNumber
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
@info.Name
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
@info.States[^1].State
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
<button class="btn btn-primary" @onclick="@(() => SelectCompany(info.VatNumber))">OVERFØR</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<EditForm EditContext="_editContext" OnValidSubmit="Update">
|
<EditForm EditContext="_editContext" OnValidSubmit="Update">
|
||||||
<DataAnnotationsValidator/>
|
<DataAnnotationsValidator/>
|
||||||
|
<div class="form-group row mb-2">
|
||||||
|
<label for="vatNumber" class="col-md-2 col-form-label">CVR/ORG</label>
|
||||||
|
<div class="col-md-10">
|
||||||
|
<InputText id="vatNumber" class="form-control" @bind-Value="_company.VatNumber"/>
|
||||||
|
<ValidationMessage For="@(() => _company.VatNumber)"></ValidationMessage>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="form-group row mb-2">
|
<div class="form-group row mb-2">
|
||||||
<label for="name" class="col-md-2 col-form-label">Firmanavn</label>
|
<label for="name" class="col-md-2 col-form-label">Firmanavn</label>
|
||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
|
@ -62,13 +97,6 @@
|
||||||
<ValidationMessage For="@(() => _company.City)"></ValidationMessage>
|
<ValidationMessage For="@(() => _company.City)"></ValidationMessage>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group row mb-2">
|
|
||||||
<label for="vatNumber" class="col-md-2 col-form-label">CVR/ORG</label>
|
|
||||||
<div class="col-md-10">
|
|
||||||
<InputText id="vatNumber" class="form-control" @bind-Value="_company.VatNumber"/>
|
|
||||||
<ValidationMessage For="@(() => _company.VatNumber)"></ValidationMessage>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group row mb-2">
|
<div class="form-group row mb-2">
|
||||||
<label for="phone" class="col-md-2 col-form-label">Telefon nummer</label>
|
<label for="phone" class="col-md-2 col-form-label">Telefon nummer</label>
|
||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
|
|
|
@ -87,9 +87,9 @@ public partial class CompanyUpdate : IDisposable
|
||||||
}
|
}
|
||||||
private async Task GetInfoFromVat(string vatNumber)
|
private async Task GetInfoFromVat(string vatNumber)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(vatNumber))
|
if (string.IsNullOrWhiteSpace(vatNumber) || !VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber))
|
||||||
{
|
{
|
||||||
ToastService.ShowError($"CVR nummer mangler.");
|
ToastService.ShowError($"CVR er ugyldigt eller mangler");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
VInfos = await VatOwnerLookupService
|
VInfos = await VatOwnerLookupService
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Blazored.Toast.Services;
|
||||||
using Wonky.Client.HttpInterceptors;
|
using Wonky.Client.HttpInterceptors;
|
||||||
using Wonky.Client.HttpRepository;
|
using Wonky.Client.HttpRepository;
|
||||||
using Microsoft.AspNetCore.Components;
|
using Microsoft.AspNetCore.Components;
|
||||||
|
@ -31,6 +32,7 @@ public partial class CompanyView : IDisposable
|
||||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||||
[Inject] public VatOwnerLookupService VatOwnerLookup { get; set; }
|
[Inject] public VatOwnerLookupService VatOwnerLookup { get; set; }
|
||||||
[Inject] public ILogger<CompanyView> Logger { get; set; }
|
[Inject] public ILogger<CompanyView> Logger { get; set; }
|
||||||
|
[Inject] public IToastService ToastService { get; set; }
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string CompanyId { get; set; } = "";
|
||||||
private CompanyDto _company { get; set; } = new ();
|
private CompanyDto _company { get; set; } = new ();
|
||||||
private string _vatState { get; set; } = "the-dead";
|
private string _vatState { get; set; } = "the-dead";
|
||||||
|
@ -49,6 +51,18 @@ public partial class CompanyView : IDisposable
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_vatState = VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber) ? "the-good" : "the-draw";
|
_vatState = VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber) ? "the-good" : "the-draw";
|
||||||
|
if (string.IsNullOrWhiteSpace(_company.VatNumber))
|
||||||
|
{
|
||||||
|
ToastService.ShowInfo("CVR / ORG nummer mangler.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(_vatState == "the-draw")
|
||||||
|
ToastService.ShowInfo("CVR / ORG nummer er ugyldigt.");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue