diff --git a/Wonky.Client/Components/ActivityHeaderComponent.razor b/Wonky.Client/Components/ActivityHeaderComponent.razor index 06bd6b22..577a59eb 100644 --- a/Wonky.Client/Components/ActivityHeaderComponent.razor +++ b/Wonky.Client/Components/ActivityHeaderComponent.razor @@ -27,18 +27,18 @@ Dato @ReportItem.OrderDate - Konto - @ReportItem.Company.Account + Vores Ref + @ReportItem.OurRef - Telefon - @ReportItem.Company.Phone + Konto + @ReportItem.Company.Account Køber @ReportItem.YourRef - CVR/VAT - @ReportItem.Company.VatNumber + Telefon + @ReportItem.Company.Phone Rekvisition @ReportItem.ReferenceNumber @@ -68,11 +68,13 @@ Email - @ReportItem.Company.Email + @ReportItem.Company.Email + Sælger + @SalesRep - Vores Ref - @ReportItem.OurRef + CVR/VAT + @ReportItem.Company.VatNumber Oprettet af @ReportItem.CreatedBy @@ -80,10 +82,3 @@ - -@code { - - [Parameter] - public ReportItemView ReportItem { get; set; } = new(); - -} \ No newline at end of file diff --git a/Wonky.Client/Components/ActivityHeaderComponent.razor.cs b/Wonky.Client/Components/ActivityHeaderComponent.razor.cs new file mode 100644 index 00000000..4897b349 --- /dev/null +++ b/Wonky.Client/Components/ActivityHeaderComponent.razor.cs @@ -0,0 +1,10 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Entity.Views; + +namespace Wonky.Client.Components; + +public partial class ActivityHeaderComponent +{ + [Parameter] public ReportItemView ReportItem { get; set; } = new(); + [Parameter] public string SalesRep { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index 1db21666..7c168ef6 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -23,83 +23,89 @@
@foreach (var company in CompanyList) { -
+
+ @* +
+ +
- @if (string.IsNullOrWhiteSpace(company.Blocked)) - { -
- @company.Name @(company.HasFolded == 1 ? "(OPHØRT)" : "") -
- } - else - { -
- @company.Name (spærret med kode '@company.Blocked') -
- } -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Konto@company.AccountOrg Nr.@(string.IsNullOrWhiteSpace(company.VatNumber) ? "mangler" : company.VatNumber)
Telefon@company.Phone
Adresse@company.Address1 @(string.IsNullOrWhiteSpace(company.Address2) ? "" : ",") @company.Address2
Post By@company.CountryCode.ToUpper()-@company.ZipCode @company.City
- Sælgernr. - - @company.SalesRep -
Sidst besøgt - @(Mapper.MapVisitState(company.LastVisit) == "the-draw" ? "?" : company.LastVisit) -
Næste besøg - @(Mapper.MapVisitState(company.LastVisit) == "the-draw" ? "?" : company.NextVisit) -
+ *@ + @if (string.IsNullOrWhiteSpace(company.Blocked)) + { +
+ @company.Name @(company.HasFolded == 1 ? "(OPHØRT)" : "")
-
-
-
- -
-
- -
-
- -
-
- Bestilling -
-
- -
+ } + else + { +
+ @company.Name (spærret med kode '@company.Blocked') +
+ } +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Konto@company.AccountOrg Nr.@(string.IsNullOrWhiteSpace(company.VatNumber) ? "mangler" : company.VatNumber)
Telefon@company.Phone
Adresse@company.Address1 @(string.IsNullOrWhiteSpace(company.Address2) ? "" : ",") @company.Address2
Post By@company.CountryCode.ToUpper()-@company.ZipCode @company.City
+ Sælgernr. + + @company.SalesRep +
Sidst besøgt + @(Mapper.MapVisitState(company.LastVisit) == "the-draw" ? "?" : company.LastVisit) +
Næste besøg + @(Mapper.MapVisitState(company.LastVisit) == "the-draw" ? "?" : company.NextVisit) + + +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ Bestilling
+ //
}
@@ -109,4 +115,4 @@ else {
Ingen data
-} +} \ No newline at end of file diff --git a/Wonky.Client/Components/ActivityListComponent.razor b/Wonky.Client/Components/ReportActivityListComponent.razor similarity index 97% rename from Wonky.Client/Components/ActivityListComponent.razor rename to Wonky.Client/Components/ReportActivityListComponent.razor index dd99f7b0..d034c6d5 100644 --- a/Wonky.Client/Components/ActivityListComponent.razor +++ b/Wonky.Client/Components/ReportActivityListComponent.razor @@ -73,13 +73,13 @@ - + @(Activities.Sum(x => x.SasAmount)) @(Activities.Sum(x => x.OrderAmount)) - TOTAL + TOTAL @(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount)) diff --git a/Wonky.Client/Components/ActivityListComponent.razor.cs b/Wonky.Client/Components/ReportActivityListComponent.razor.cs similarity index 97% rename from Wonky.Client/Components/ActivityListComponent.razor.cs rename to Wonky.Client/Components/ReportActivityListComponent.razor.cs index 2e260a49..d9a99c6b 100644 --- a/Wonky.Client/Components/ActivityListComponent.razor.cs +++ b/Wonky.Client/Components/ReportActivityListComponent.razor.cs @@ -19,7 +19,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class ActivityListComponent +public partial class ReportActivityListComponent { [Inject] public NavigationManager Navigator { get; set; } [Parameter] public List Activities { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportActivityListShowDocumentCallbackComponent.razor b/Wonky.Client/Components/ReportActivityListShowDocumentCallbackComponent.razor index 26fb1ed5..c53c174a 100644 --- a/Wonky.Client/Components/ReportActivityListShowDocumentCallbackComponent.razor +++ b/Wonky.Client/Components/ReportActivityListShowDocumentCallbackComponent.razor @@ -15,8 +15,9 @@ @using Wonky.Client.Helpers - -ReportActivityListShowDocumentCallbackComponent.razor +@* +called via supervisor -> advisor -> activity button +*@ @if (Activities.Any()) { diff --git a/Wonky.Client/Components/ReportDescriptionComponent.razor b/Wonky.Client/Components/ReportLedgerDescriptionComponent.razor similarity index 100% rename from Wonky.Client/Components/ReportDescriptionComponent.razor rename to Wonky.Client/Components/ReportLedgerDescriptionComponent.razor diff --git a/Wonky.Client/Components/ReportDescriptionComponent.razor.cs b/Wonky.Client/Components/ReportLedgerDescriptionComponent.razor.cs similarity index 94% rename from Wonky.Client/Components/ReportDescriptionComponent.razor.cs rename to Wonky.Client/Components/ReportLedgerDescriptionComponent.razor.cs index 191eed0e..e1958db9 100644 --- a/Wonky.Client/Components/ReportDescriptionComponent.razor.cs +++ b/Wonky.Client/Components/ReportLedgerDescriptionComponent.razor.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Components; -public partial class ReportDescriptionComponent +public partial class ReportLedgerDescriptionComponent { [Parameter] public ReportDataView ReportDataView { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportLedgerActivityComponent.razor b/Wonky.Client/Components/ReportLedgerSummaryComponent.razor similarity index 85% rename from Wonky.Client/Components/ReportLedgerActivityComponent.razor rename to Wonky.Client/Components/ReportLedgerSummaryComponent.razor index 7549da09..baa81814 100644 --- a/Wonky.Client/Components/ReportLedgerActivityComponent.razor +++ b/Wonky.Client/Components/ReportLedgerSummaryComponent.razor @@ -27,7 +27,7 @@ - + @@ -65,62 +65,62 @@ @* PHONE row *@ - - - + + + - - + + @* WEB row *@ - - + + - - + + @* SUMMARY row *@ - - - - + + + + - - - + + + @* SAS row *@ - - + + - - + + @* TOTAL summarry row *@ - - - - + + + + - - - + + + diff --git a/Wonky.Client/HttpRepository/CountryPriceCatalogRepository.cs b/Wonky.Client/HttpRepository/CountryPriceCatalogRepository.cs index 241fb6a2..96d98144 100644 --- a/Wonky.Client/HttpRepository/CountryPriceCatalogRepository.cs +++ b/Wonky.Client/HttpRepository/CountryPriceCatalogRepository.cs @@ -124,7 +124,7 @@ public class CountryPriceCatalogRepository : ICountryPriceCatalogRepository public async Task GetProductDetailView(string salesItemId) { var detailView = await _client - .GetFromJsonAsync($"{_api.CountryPriceCatalog}/{salesItemId}"); + .GetFromJsonAsync($"{_api.CountryPriceCatalog}/item/{salesItemId}"); return detailView ?? new ProductDetailView(); } diff --git a/Wonky.Client/HttpRepository/CountryProductCatalogRepository.cs b/Wonky.Client/HttpRepository/CountryProductCatalogRepository.cs index ab0bd221..abf9fed7 100644 --- a/Wonky.Client/HttpRepository/CountryProductCatalogRepository.cs +++ b/Wonky.Client/HttpRepository/CountryProductCatalogRepository.cs @@ -124,7 +124,7 @@ public class CountryProductCatalogRepository : ICountryProductCatalogRepository public async Task GetProductDetailView(string salesItemId) { var detailView = await _client - .GetFromJsonAsync($"{_api.CountryProductCatalog}/{salesItemId}"); + .GetFromJsonAsync($"{_api.CountryProductCatalog}/item/{salesItemId}"); return detailView ?? new ProductDetailView(); } diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor index d759b325..2301d3ab 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor @@ -19,7 +19,7 @@
-

Salgsfaktura @(Invoice.DocumentNumber.Split("-")[1])

+

Info fra @(Invoice.DocumentNumber.Split("-")[1])

@@ -79,7 +79,6 @@
- @@ -92,32 +91,12 @@ - } - @* - - - - - - - - - - - - - - - - - *@ - - + diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor index fb656edd..ccb02456 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor @@ -39,7 +39,7 @@ @if (ReportStatusView.ReportItems.Any()) { - + } @if (Working) { diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor index 092f09bc..c22f610b 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor @@ -185,13 +185,13 @@ @if (_activities.Any()) {
- +
} }
@* ledger summaries calculated *@ - +
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index d0c7c700..ebbdb15c 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -45,14 +45,14 @@
- +
- - + + } else { diff --git a/Wonky.Client/Pages/BusinessCustomerLandingPage.razor b/Wonky.Client/Pages/BusinessCustomerLandingPage.razor index a7979973..25d56506 100644 --- a/Wonky.Client/Pages/BusinessCustomerLandingPage.razor +++ b/Wonky.Client/Pages/BusinessCustomerLandingPage.razor @@ -23,10 +23,11 @@
- @_businessInfo.Name + Firmainfo

- @_businessInfo.Account
+ @_businessInfo.Name
+ @_businessInfo.Account
@_businessInfo.Phone
@_businessInfo.Email

@@ -38,18 +39,19 @@ Leveringsadresse

- @_businessInfo.Address1
- @_businessInfo.Address2
- @_businessInfo.ZipCode @_businessInfo.City
+ @_businessInfo.Address1
+ @_businessInfo.Address2
+ @_businessInfo.ZipCode @_businessInfo.City

- @_advisorInfo.Name + Innotec Konsulent

+ @_advisorInfo.Name
@_advisorInfo.Phone
@_advisorInfo.Email

@@ -73,17 +75,17 @@ @foreach (var line in DraftProvider.Draft.Items) {
- - - + + + } + - - +
Måneds Resultat
SALGAKTIVITET Besøg Demo Salg
TELEFONTLF @ReportData.PhoneCount @ReportData.PhoneTurnover @ReportData.PhoneCountMonth @ReportData.PhoneTurnoverMonth
WEB @ReportData.WebCount @ReportData.WebTurnover @ReportData.WebCountMonth @ReportData.WebTurnoverMonth
NORMAL SALGSALG@ReportData.TotalVisitCount@ReportData.TotalDemoCount@ReportData.TotalSaleCount @(ReportData.NormalTurnover)@ReportData.TotalVisitCountMonth@ReportData.TotalDemoCountMonth@ReportData.TotalSaleCountMonth @(ReportData.NormalTurnoverMonth)
SAS @ReportData.SasCount @ReportData.SasTurnover @ReportData.SasCountMonth @ReportData.SasTurnoverMonth
TOTAL SALG@ReportData.TotalVisitCount@ReportData.TotalDemoCount@ReportData.TotalSaleCountSUM @ReportData.TotalTurnover@ReportData.TotalVisitCountMonth@ReportData.TotalDemoCountMonth@ReportData.TotalSaleCountMonth @ReportData.TotalTurnoverMonth
Pris Rabat BeløbSAS
@line.Price @line.Discount @line.LineAmount
Salg@NormalAmount
Heraf SAS@SasAmount
Rabat@DiscountAmount
Faktura beløbBeløb @Invoice.InvoiceAmount
@line.Item.Sku@line.Item.Name@line.Quantity@line.Item.Sku@line.Item.Name@line.Quantity
kladde udløber efter @(DraftProvider.Draft.TimeToLiveInSeconds/60)m Vis Bestilling
diff --git a/Wonky.Client/Pages/BusinessCustomerLandingPage.razor.cs b/Wonky.Client/Pages/BusinessCustomerLandingPage.razor.cs index eaf48d51..ea69017a 100644 --- a/Wonky.Client/Pages/BusinessCustomerLandingPage.razor.cs +++ b/Wonky.Client/Pages/BusinessCustomerLandingPage.razor.cs @@ -34,11 +34,11 @@ public partial class BusinessCustomerLandingPage : IDisposable private List _productInventory = new(); private ApiConfig _config = new(); private B2BProductPriceHistoryOverlay PriceHistoryOverlay { get; set; } - private string _price = "0"; - private string _quantity = "1"; + // private string _price = "0"; + // private string _quantity = "1"; private string _productName = ""; private ItemSelect _selectedItem = new(); - private string _sku = ""; + // private string _sku = ""; private B2BGetOrderQuantityOverlay GetQuantity { get; set; } @@ -78,7 +78,7 @@ public partial class BusinessCustomerLandingPage : IDisposable { ItemNo = sku, Quantity = $"{_productHistory[0].Quantity}", - Rate = $"{_productHistory[0].Price}", + Rate = "0", }; GetQuantity.Show(); } diff --git a/Wonky.Client/Pages/BusinessOrderViewPage.razor b/Wonky.Client/Pages/BusinessOrderViewPage.razor index 296c9f31..72937389 100644 --- a/Wonky.Client/Pages/BusinessOrderViewPage.razor +++ b/Wonky.Client/Pages/BusinessOrderViewPage.razor @@ -1 +1,18 @@ +@* Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +*@ + +@attribute [Authorize(Roles = "EShop")] @page "/b2b/{countryCode}/{companyId}/order/new" +@using Microsoft.AspNetCore.Authorization diff --git a/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs b/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs index e51fd040..66c8436b 100644 --- a/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/BusinessOrderViewPage.razor.cs @@ -43,6 +43,7 @@ public partial class BusinessOrderViewPage private ActivityDto Activity { get; set; } = new(); private DateTime SelectedDate { get; set; } private bool Working { get; set; } = true; + protected override async Task OnInitializedAsync() { @@ -52,40 +53,15 @@ public partial class BusinessOrderViewPage // get info for logged in user UserInfo = await UserInfoService.GetUserInfo(); + SelectedDate = DateTime.Now; + var today = $"{SelectedDate:yyyy-MM-dd}"; + + Activity.ActivityDate = today; Activity.ActivityVisitEnum = "web"; Activity.ActivityTypeEnum = "phone"; Activity.ActivityStatusEnum = "order"; Activity.Express = true; - Activity.OurRef = $"TLF:{UserInfo.FirstName}"; - - // setup edit context - // ActivityContext = new EditContext(Activity); - // ActivityContext.OnFieldChanged += HandleFieldChanged; - // ActivityContext.OnValidationStateChanged += ValidationChanged; - // // fetch customer - // Company = await CustomerRepo.GetByCustomerId(CountryCode, CompanyId); - // Logger.LogDebug("OfficeOrderCreate => Customer => {}", JsonSerializer.Serialize(Company)); - // construct today's workdate - // Initialize date variable - SelectedDate = DateTime.Now; - var today = $"{SelectedDate:yyyy-MM-dd}"; - Activity.ActivityDate = today; - // initiate a sync to ensure up-to-date product history - // if (Company.HistorySync != today) - // { - // Company.HistorySync = await HistoryRepo.RequestErpToCrmSync(CompanyId, Company.HistorySync, false); - // Logger.LogDebug("OfficeOrderCreate => RequestErpToCrmSync <= {}", Company.HistorySync); - // } - // fetch invoices - // CompanyInvoices = await HistoryRepo.GetInvoiceList(CountryCode, CompanyId); - // Logger.LogDebug("OfficeOrderCreate => Invoices => {}", JsonSerializer.Serialize(CompanyInvoices)); - // fetch activities - // CompanyActivities = await CountryActivityRepo.GetActivityList(CompanyId); - // Logger.LogDebug("OfficeOrderCreate => Activities => {}", JsonSerializer.Serialize(CompanyActivities)); - // fetch inventory - // CompanyInventory = await HistoryRepo.GetInventory(CountryCode, CompanyId); - // CompanyInventory = CompanyInventory.OrderBy(x => x.Description).ToList(); - // Logger.LogDebug("OfficeOrderCreate => Inventory => {}", JsonSerializer.Serialize(CompanyInventory)); + Activity.OurRef = $"WEB:{UserInfo.FirstName}"; // get sales rep info // SalesRep = await UserRepo.GetUserInfo(Company.SalesRepId); // Logger.LogDebug("OfficeOrderCreate => SalesRep => {}", JsonSerializer.Serialize(SalesRep)); diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 2fec246c..e7eb69f8 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -48,15 +48,15 @@
- +
@* *@ - - + + } else { diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OfficeOrderViewPage.razor index f24cd86c..06e62beb 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor @@ -47,7 +47,7 @@
- + @if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index 71665fa1..b9396310 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -40,7 +40,7 @@ public partial class OfficeOrderViewPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICountryUserInfoRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } - [Inject] public IToastService Toast { get; set; } + [Inject] public IToastService Toaster { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } [Inject] public IJSRuntime JsRuntime { get; set; } [Inject] public IOrderProcessRepository ProcessRepo { get; set; } @@ -55,6 +55,9 @@ public partial class OfficeOrderViewPage : IDisposable private bool IsNotified { get; set; } private bool Working { get; set; } = true; private IJSObjectReference JsModule { get; set; } + private UserInfoAdvisorView _salesRep = new(); + private UserManagerEditView _user = new(); + private readonly JsonSerializerOptions _options = new JsonSerializerOptions @@ -66,9 +69,13 @@ public partial class OfficeOrderViewPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - // fetch order from backend + ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); - Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem, _options)); + + _user = await UserInfoService.GetUserInfo(); + + _salesRep = await UserRepo.GetUserInfo(ReportItem.SalesRepId); + Working = false; } @@ -87,32 +94,33 @@ public partial class OfficeOrderViewPage : IDisposable if (Working) return; Working = true; - // send request to backend + var responseView = await AdvisorActivityRepo.GetExpressState(ReportItem.ActivityId); - // get user info from storage - var user = await UserInfoService.GetUserInfo(); - // fetch sales rep from response - var salesRep = await UserRepo.GetUserInfo(responseView.Id); - // create email notification body + if (!responseView.IsSuccess) + { + Toaster.ShowError("Noget gik galt med forbindelsen. Ordrestatus er ikke ændret og kvittering kan ikke sendes"); + Working = false; + return; + } var body = new StringBuilder(); body.AppendLine($"Kvittering for modtagelse af hasteordre {ReportItem.ESalesNumber}"); body.AppendLine($"Konto : {ReportItem.Company.Account}"); body.AppendLine($"Navn : {ReportItem.Company.Name}"); - body.AppendLine($"Post By : {salesRep.CountryCode.ToUpper()}-{ReportItem.Company.ZipCode} {ReportItem.Company.City}"); + body.AppendLine($"Post By : {_salesRep.CountryCode.ToUpper()}-{ReportItem.Company.ZipCode} {ReportItem.Company.City}"); body.AppendLine(); body.AppendLine("Med venlig hilsen"); - body.AppendLine($"{user.FirstName} {user.LastName}"); - body.AppendLine($"{user.PhoneNumber}"); - // create a list of mail addresses + body.AppendLine($"{_user.FirstName} {_user.LastName}"); + body.AppendLine($"{_user.PhoneNumber}"); + var sendTo = new List { new() { - Email = salesRep.Email, - Name = $"{salesRep.FirstName} {salesRep.LastName}" + Email = _salesRep.Email, + Name = $"{_salesRep.FirstName} {_salesRep.LastName}" } }; - // create an email + var msg = new EmailMessage { Body = body.ToString(), @@ -120,20 +128,18 @@ public partial class OfficeOrderViewPage : IDisposable To = sendTo, IsBodyHtml = false }; - Logger.LogDebug("SetExpressState Notification => \n {}", JsonSerializer.Serialize(msg)); - // send a system generated email + var sendMail = await MailService.SendMail("System", msg); - // result notification if (sendMail.IsSuccess) { - Toast.ShowSuccess($"Status er opdateret og notifikation sendt til {salesRep.FirstName}."); + Toaster.ShowSuccess($"Status er opdateret og notifikation sendt til {_salesRep.FirstName}."); } else { - Toast.ShowWarning($"Notifikation til {salesRep.FirstName} kunne ikke sendes. {sendMail.Message}"); + Toaster.ShowWarning($"Notifikation til {_salesRep.FirstName} kunne ikke sendes. {sendMail.Message}"); } - // disable further notifications + IsNotified = true; Working = false; } diff --git a/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor index 49b79c3e..122fdfd9 100644 --- a/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor +++ b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor @@ -39,13 +39,13 @@
- +
@* *@ - - + +
\ No newline at end of file diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor index 4202e7fe..4d7504ea 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor @@ -42,14 +42,14 @@
- +
- + } else { diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 2ff300eb..96138ca3 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "310.0", + "version": "313.0", "rc": false, "sandBox": true, "image": "grumpy-coder.png", diff --git a/Wonky.Client/wwwroot/css/print.css b/Wonky.Client/wwwroot/css/print.css index 69174948..7b9ca79f 100644 --- a/Wonky.Client/wwwroot/css/print.css +++ b/Wonky.Client/wwwroot/css/print.css @@ -10,8 +10,8 @@ html, body { height: 290mm; width: 210mm; - -webkit-print-color-adjust: exact; - color-adjust: exact; + /*-webkit-print-color-adjust: exact;*/ + /*color-adjust: exact;*/ } .report-main { /*page-break-before: always;*/ @@ -26,8 +26,8 @@ font-size: 11px; margin: auto; width: initial; - -webkit-print-color-adjust: exact; - color-adjust: exact; + /*-webkit-print-color-adjust: exact;*/ + /*color-adjust: exact;*/ } .report-visit { /*page-break-before: always;*/ @@ -43,8 +43,8 @@ min-height: 250mm; margin: 0; width: initial; - -webkit-print-color-adjust: exact; - color-adjust: exact; + /*-webkit-print-color-adjust: exact;*/ + /*color-adjust: exact;*/ } .report-visit td { font-size: 11px; diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs index 430f2b48..9b712482 100644 --- a/Wonky.Entity/Views/ReportItemView.cs +++ b/Wonky.Entity/Views/ReportItemView.cs @@ -42,6 +42,7 @@ public class ReportItemView public string ReferenceNumber { get; set; } = ""; public string Sales { get; set; } = ""; public string SalesRepId { get; set; } = ""; + public string SalesRep { get; set; } = ""; public decimal SasAmount { get; set; } public string StatusTypeEnum { get; set; } = ""; public string VisitTypeEnum { get; set; } = "";