diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor b/Wonky.Client/Components/OfficeActivityTableComponent.razor index 36ce9bbf..04af9c03 100644 --- a/Wonky.Client/Components/OfficeActivityTableComponent.razor +++ b/Wonky.Client/Components/OfficeActivityTableComponent.razor @@ -36,12 +36,12 @@ @foreach (var activity in Activities) { - + @activity.Company.Name @activity.Company.City @activity.Demo @activity.Sales - @activity.OfficeNote + @activity.OfficeNote @($"{activity.SasAmount:N2}") @(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}") @@ -64,12 +64,6 @@ } - - - Total - @Activities.Where(x => x.StatusTypeEnum == "Order").Sum(x => x.OrderAmount) - - } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmActivityNewPage.razor b/Wonky.Client/Pages/CrmActivityNewPage.razor index 63042de1..5ad861c6 100644 --- a/Wonky.Client/Pages/CrmActivityNewPage.razor +++ b/Wonky.Client/Pages/CrmActivityNewPage.razor @@ -26,6 +26,12 @@ +@if (!string.IsNullOrWhiteSpace(Company.Blocked)) +{ +
+

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

+
+}

@Activity.Name - @Activity.Account

diff --git a/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor new file mode 100644 index 00000000..d5729873 --- /dev/null +++ b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor @@ -0,0 +1,6 @@ +@page "/companies/{CompanyId}/invoices" +
+
+

Faktura oversigt

+
+
\ No newline at end of file diff --git a/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs new file mode 100644 index 00000000..14c6bdc3 --- /dev/null +++ b/Wonky.Client/Pages/CrmCompanyInvoiceListPage.razor.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpInterfaces; + +namespace Wonky.Client.Pages; + +public partial class CrmCompanyInvoiceListPage +{ + [Parameter] public string CompanyId { get; set; } = ""; + [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + + +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmCompanyViewPage.razor b/Wonky.Client/Pages/CrmCompanyViewPage.razor index 4fec1671..a6ea3382 100644 --- a/Wonky.Client/Pages/CrmCompanyViewPage.razor +++ b/Wonky.Client/Pages/CrmCompanyViewPage.razor @@ -21,11 +21,17 @@ @attribute [Authorize(Roles = "Advisor")] @page "/companies/{CompanyId}" -@if (!string.IsNullOrWhiteSpace(_company.Name)) +@if (!string.IsNullOrWhiteSpace(Company.Name)) { + @if (!string.IsNullOrWhiteSpace(Company.Blocked)) + { +
+

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

+
+ }
-

@_company.Name

+

@Company.Name

@if (_dk) { @@ -70,16 +76,16 @@ BEMÆRK - - @if (string.IsNullOrWhiteSpace(_company.Note)) + + @if (string.IsNullOrWhiteSpace(Company.Note)) { - + } else { - + } - + @@ -90,16 +96,15 @@ - - + + @* *@ - Telefon + Konto - - - + + @@ -108,15 +113,15 @@ - - + + Attention - - - + + + @@ -125,15 +130,15 @@ - - + + Adresse2 - - - + + + @@ -142,15 +147,15 @@ - - + + Bynavn - - - + + + @@ -159,15 +164,22 @@ - - + + + + + Telefon + + + + Mobil - - + + @@ -184,7 +196,7 @@ Besøgt - + @@ -194,11 +206,11 @@ - - + + - - @if (_company.HasFolded == 1) + + @if (Company.HasFolded == 1) { } @@ -207,28 +219,26 @@
-
-
-
-
- Kundeliste -
-
- Besøg oversigt -
-
- Produktkøb -
-
- -
-
- - -
+
+
+
+ Faktura +
+
+ Besøg +
+
+ Produkter +
+
+ +
+
+ +
diff --git a/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs b/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs index c8a7c667..0bfdbf1a 100644 --- a/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmCompanyViewPage.razor.cs @@ -46,7 +46,7 @@ public partial class CrmCompanyViewPage : IDisposable [Inject] public HttpInterceptorService _interceptor { get; set; } [Inject] public VatInfoLookupService _vatService { get; set; } [Inject] public ILocalStorageService _storage { get; set; } - private CompanyDto _company { get; set; } = new(); + private CompanyDto Company { get; set; } = new(); private EditContext _editContext { get; set; } private List _vInfos { get; set; } = new(); private VirkRegInfo _virkRegInfo { get; set; } = new(); @@ -68,6 +68,7 @@ public partial class CrmCompanyViewPage : IDisposable private bool _dk { get; set; } = true; private int _isDirty { get; set; } private int _vatUpdated { get; set; } + private bool _blocked { get; set; } = true; private VatLookupDkModal _vatLookupModal { get; set; } = new(); @@ -85,32 +86,32 @@ public partial class CrmCompanyViewPage : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - _company = await _companyRepo.GetCompanyById(CompanyId); - _orgVat = _company.VatNumber; - _company.CountryCode = ux.CountryCode.ToLower(); - _enableActivity = _company.ValidVat; + Company = await _companyRepo.GetCompanyById(CompanyId); + _orgVat = Company.VatNumber; + Company.CountryCode = ux.CountryCode.ToLower(); + _enableActivity = Company.ValidVat; // override if canvas which has account property as empty string or "NY" - if (_company.Account == "NY" || string.IsNullOrWhiteSpace(_company.Account)) + if (Company.Account == "NY" || string.IsNullOrWhiteSpace(Company.Account)) _enableActivity = 1; if (_dk) - _vatAddress = PrepareVatAddress(_company); + _vatAddress = PrepareVatAddress(Company); - if (_company.Interval == 0) - _company.Interval = 8; + if (Company.Interval == 0) + Company.Interval = 8; - _lastVisit = DateTime.Parse(_company.LastVisit); - _nextVisit = DateTime.Parse(_company.NextVisit); + _lastVisit = DateTime.Parse(Company.LastVisit); + _nextVisit = DateTime.Parse(Company.NextVisit); if (_lastVisit.Year < 2020) _lastVisit = DateTime.Parse("2020-01-01"); - if (!_company.ValidDateSpan()) - _nextVisit = _lastVisit.AddDays(_company.Interval * 7); + if (!Company.ValidDateSpan()) + _nextVisit = _lastVisit.AddDays(Company.Interval * 7); _visitState = Utils.GetVisitState($"{_nextVisit:yyyy-MM-dd}"); _actionLink = $"/companies/{CompanyId}/activities/new"; // used when drawing visit button - if(_company.HasFolded == 1) + if(Company.HasFolded == 1) { // this is only used if user has selected to show all customers _hasFolded = true; @@ -120,13 +121,13 @@ public partial class CrmCompanyViewPage : IDisposable else { // simple format validation if CRM indicates invalid vatNumber - if (_company.ValidVat == 0 && !string.IsNullOrWhiteSpace(_company.VatNumber)) - _company.ValidVat = VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber) ? 1 : 0; + if (Company.ValidVat == 0 && !string.IsNullOrWhiteSpace(Company.VatNumber)) + Company.ValidVat = VatUtils.ValidateFormat(Company.CountryCode, Company.VatNumber) ? 1 : 0; // flags - _validVat = _company.ValidVat == 1; // flag set if company has a valid vatNumber - _vatState = _company.ValidVat == 1 ? "the-good" : "no-vat"; // assign css class + _validVat = Company.ValidVat == 1; // flag set if company has a valid vatNumber + _vatState = Company.ValidVat == 1 ? "the-good" : "no-vat"; // assign css class } - _editContext = new EditContext(_company); + _editContext = new EditContext(Company); _editContext.OnFieldChanged += HandleFieldChanged; _editContext.OnValidationStateChanged += ValidationChanged; } @@ -137,9 +138,9 @@ public partial class CrmCompanyViewPage : IDisposable } private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - _nextVisit = _lastVisit.AddDays(_company.Interval * 7); + _nextVisit = _lastVisit.AddDays(Company.Interval * 7); // simple validation of VAT format - if (!VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber)) + if (!VatUtils.ValidateFormat(Company.CountryCode, Company.VatNumber)) { _formInvalid = true; } @@ -159,7 +160,7 @@ public partial class CrmCompanyViewPage : IDisposable _editContext.OnFieldChanged -= HandleFieldChanged; _editContext.OnValidationStateChanged -= ValidationChanged; - _editContext = new EditContext(_company); + _editContext = new EditContext(Company); _formInvalid = _editContext.Validate(); @@ -169,8 +170,9 @@ public partial class CrmCompanyViewPage : IDisposable private async Task SubmitUpdate() { + _working = true; // simple format validation if CRM indicates invalid vatNumber - if (!VatUtils.ValidateFormat(_company.CountryCode, _company.VatNumber)) + if (!VatUtils.ValidateFormat(Company.CountryCode, Company.VatNumber)) { _toast.ShowError($"CVR/VAT/ORG nummer mangler eller er ugyldig."); StateHasChanged(); @@ -178,27 +180,27 @@ public partial class CrmCompanyViewPage : IDisposable } _toast.ShowInfo("Vent venligst ...."); //_hideButtons = true; - _company.LastVisit = $"{_lastVisit:yyyy-MM-dd}"; - _company.NextVisit = $"{_nextVisit:yyyy-MM-dd}"; - _company.IsHidden = 0; + 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; + Company.UpdateErpVat = _vatUpdated; // flag base info has changed - _company.IsDirty = _isDirty; + Company.IsDirty = _isDirty; - var success = await _companyRepo.UpdateCompany(CompanyId, _company ); + var success = await _companyRepo.UpdateCompany(CompanyId, Company ); _toast.ShowSuccess("Opdatering er afsendt. Der går nogle minutter inden data er opdateret."); - _company = await _companyRepo.GetCompanyById(_company.CompanyId); - _company.ValidVat = 1; + Company = await _companyRepo.GetCompanyById(Company.CompanyId); + Company.ValidVat = 1; _enableActivity = 1; if (_virkRegInfo.States[0].State.ToLower() != "normal") { - _company.HasFolded = 1; + Company.HasFolded = 1; } StateHasChanged(); - //_hideButtons = false; + _working = false; } private async Task GetInfoFromAddress(VatAddress address) @@ -253,23 +255,23 @@ public partial class CrmCompanyViewPage : IDisposable private void OnSelectedCompany(VirkRegInfo regInfo) { _validVat = regInfo.States[0].State.ToLower() == "normal"; - _company.HasFolded = _validVat ? 1 : 0; + Company.HasFolded = _validVat ? 1 : 0; _enableActivity = _validVat ? 1 : 0; _vatState = regInfo.States[0].State.ToLower() == "normal" ? "the-good" : "the-dead"; if (regInfo.SyncAll) { - _company.VatNumber = _virkRegInfo.VatNumber; - _company.Name = _virkRegInfo.Name; - _company.Address1 = _virkRegInfo.Address; - _company.Address2 = _virkRegInfo.CoName; - _company.ZipCode = _virkRegInfo.ZipCode; - _company.City = _virkRegInfo.City; + Company.VatNumber = _virkRegInfo.VatNumber; + Company.Name = _virkRegInfo.Name; + Company.Address1 = _virkRegInfo.Address; + Company.Address2 = _virkRegInfo.CoName; + Company.ZipCode = _virkRegInfo.ZipCode; + Company.City = _virkRegInfo.City; _isDirty = 1; } else { - _company.VatNumber = _virkRegInfo.VatNumber; + Company.VatNumber = _virkRegInfo.VatNumber; _vatUpdated = 1; } StateHasChanged(); @@ -279,23 +281,23 @@ public partial class CrmCompanyViewPage : IDisposable { _virkRegInfo = (from x in _vInfos where x.VatNumber == vatNumber select x).First(); _validVat = _virkRegInfo.States[0].State.ToLower() == "normal"; - _company.HasFolded = _validVat ? 1 : 0; + Company.HasFolded = _validVat ? 1 : 0; _enableActivity = _validVat ? 1 : 0; _vatState = _virkRegInfo.States[0].State.ToLower() == "normal" ? "the-good" : "the-dead"; if (syncAll) { - _company.VatNumber = _virkRegInfo.VatNumber; - _company.Name = _virkRegInfo.Name; - _company.Address1 = _virkRegInfo.Address; - _company.Address2 = _virkRegInfo.CoName; - _company.ZipCode = _virkRegInfo.ZipCode; - _company.City = _virkRegInfo.City; + Company.VatNumber = _virkRegInfo.VatNumber; + Company.Name = _virkRegInfo.Name; + Company.Address1 = _virkRegInfo.Address; + Company.Address2 = _virkRegInfo.CoName; + Company.ZipCode = _virkRegInfo.ZipCode; + Company.City = _virkRegInfo.City; _isDirty = 1; } else { - _company.VatNumber = _virkRegInfo.VatNumber; + Company.VatNumber = _virkRegInfo.VatNumber; _vatUpdated = 1; } // empty list diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/CrmReportNewPage.razor index aac7032d..b797b9bc 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor +++ b/Wonky.Client/Pages/CrmReportNewPage.razor @@ -86,10 +86,12 @@ - + @*
*@ + + @*
*@ diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs index 571c4834..ad9c376e 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs @@ -98,21 +98,24 @@ public partial class CrmReportNewPage : IDisposable private async Task ReportSaveConfirmed() { + // attempt to eliminate doubled click on submit button + if (_working) + return; _working = true; var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", _report); // reset km and date confirmation await PrefsService.SetKmMorning(0); await PrefsService.SetDateConfirmed(false); - - _toast.ShowInfo($"Rapport oprettet {_workDate}"); - _working = false; - _navigator.NavigateTo("/home"); - + _navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); } private void SubmitReport() { + // attempt to eliminate doubled click on submit button + if (_working) + return; + if (string.IsNullOrWhiteSpace(_report.DayTypeEnum)) { _toast.ShowError("Dagtype skal vælges"); @@ -152,7 +155,6 @@ public partial class CrmReportNewPage : IDisposable _prompt = $"Rapport for {_workDate.ToLongDateString()}?"; _confirmReport.Show(); - } private void OnTimeChanged() @@ -187,11 +189,11 @@ public partial class CrmReportNewPage : IDisposable var data = await CrmReportRepo.InitializeReportData($"{_workDate:yyyy-MM-dd}"); if(data.ReportClosed) _navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); - _noFigures = false; _report.Figures = data.ReportData; _init = data.ReportData; _activities = data.ReportItems; _report.Figures.KmMorning = _prefs.KmMorning; + _noFigures = false; _working = false; } diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor b/Wonky.Client/Pages/CrmTaskItemListPage.razor index 0765deea..6bfea92e 100644 --- a/Wonky.Client/Pages/CrmTaskItemListPage.razor +++ b/Wonky.Client/Pages/CrmTaskItemListPage.razor @@ -35,6 +35,6 @@
- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs index 8e5d5ca9..b100f79a 100644 --- a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs +++ b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs @@ -23,40 +23,40 @@ using Wonky.Client.Services; using Wonky.Entity.DTO; using Wonky.Entity.Views; -namespace Wonky.Client.Pages; +namespace Wonky.Client.Pages; public partial class CrmTaskItemListPage : IDisposable { - [Inject] public PreferenceService Prefs { get; set; } + [Inject] public PreferenceService PreferenceService { get; set; } [Inject] public ILogger Logger { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public NavigationManager _navigator { get; set; } - [Inject] public ICrmTaskItemHttpRepository CrmTaskItemRepo { get; set; } - [Inject] public IToastService _toast { get; set; } - private Preferences _prefs { get; set; } = new(); - private string _workDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; - private bool _reportExist = false; - private List? _taskItems { get; set; } = new(); + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ICrmTaskItemHttpRepository TaskItemRepo { get; set; } + [Inject] public IToastService Toaster { get; set; } + private Preferences Prefs { get; set; } = new(); + private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; + private bool ReportExist = false; + private List TaskItems { get; set; } = new(); protected override async Task OnInitializedAsync() { - _prefs = await Prefs.GetPreferences(); - if(!string.IsNullOrWhiteSpace(_prefs.WorkDate)) - _workDate = _prefs.WorkDate; + Prefs = await PreferenceService.GetPreferences(); + if(!string.IsNullOrWhiteSpace(Prefs.WorkDate)) + WorkDate = Prefs.WorkDate; - _interceptor.RegisterEvent(); - _interceptor.RegisterBeforeSendEvent(); - await GetTaskItems(_workDate); + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + await GetTaskItems(WorkDate); } private async Task GetTaskItems(string workDate) { - _toast.ShowInfo("Vent nogle sekunder for data"); - _taskItems = await CrmTaskItemRepo.GetTaskList(workDate); + Toaster.ShowInfo("Vent nogle sekunder for data"); + TaskItems = await TaskItemRepo.GetTaskList(workDate); } public void Dispose() { - _interceptor.DisposeEvent(); + Interceptor.DisposeEvent(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmTaskItemViewPage.razor b/Wonky.Client/Pages/CrmTaskItemViewPage.razor index a366482f..ec763ce9 100644 --- a/Wonky.Client/Pages/CrmTaskItemViewPage.razor +++ b/Wonky.Client/Pages/CrmTaskItemViewPage.razor @@ -19,8 +19,6 @@ @attribute [Authorize(Roles = "Advisor")] @page "/tasks/{TaskItemId}" -@* {"TaskItemId":"","ErpUserId":"","ReferenceId":"","Name":"","Description":"","DueTimestamp":"","TaskTypeEnum":"","Interval":0,"IsCompleted":false,"OverDue":false,"Recurring":false} *@ -

Opgave

diff --git a/Wonky.Client/Shared/ConfirmationModal.razor.cs b/Wonky.Client/Shared/ConfirmationModal.razor.cs index 253e82db..b52ff841 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor.cs +++ b/Wonky.Client/Shared/ConfirmationModal.razor.cs @@ -23,8 +23,6 @@ public partial class ConfirmationModal private bool _showBackdrop; [Parameter] public string BodyMessage { get; set; } = ""; [Parameter] public EventCallback OnOkClicked { get; set; } - - public void Show() { diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index f4dd6419..2211fbde 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.30.3", - "rc": false, + "version": "0.36.1", + "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://app.innotec.dk", + "innoBaseUrl": "https://zeta.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", diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyDto.cs index f6a29139..dc12956c 100644 --- a/Wonky.Entity/DTO/CompanyDto.cs +++ b/Wonky.Entity/DTO/CompanyDto.cs @@ -115,6 +115,12 @@ public class CompanyDto [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] public string Attention { get; set; } = ""; + /// + /// ERP block state + /// + /// Empty string - Customer not blocked + public string Blocked { get; set; } = ""; + /// /// Country code ISO ///