diff --git a/Wonky.Client/Components/ActivityListComponent.razor b/Wonky.Client/Components/ActivityListComponent.razor index 7575c12f..057f913f 100644 --- a/Wonky.Client/Components/ActivityListComponent.razor +++ b/Wonky.Client/Components/ActivityListComponent.razor @@ -66,6 +66,19 @@ } + + + + @(Activities.Sum(x => x.SasAmount)) + @(Activities.Sum(x => x.OrderAmount)) + + + + TOTAL + @(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount)) + + + diff --git a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor index 10610c50..d6e11d6a 100644 --- a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor +++ b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor @@ -16,7 +16,7 @@ @using Wonky.Client.Helpers -@if (ActivityList.Any()) +@if (Activities.Any()) { @@ -43,7 +43,7 @@ - @foreach (var activity in ActivityList) + @foreach (var activity in Activities) { - + } + + + + + + + + + + + + + +
@@ -54,7 +54,7 @@ @activity.Sales @activity.OfficeNote @($"{activity.SasAmount:N2}")@(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}")@(activity.StatusTypeEnum == "Quote" ? "" : $"{activity.OrderAmount:N2}") @if (activity.OurRef.Contains("T:") || activity.OurRef.Contains("TLF:")) { @@ -86,6 +86,20 @@
@(Activities.Sum(x => x.SasAmount))@(Activities.Sum(x => x.OrderAmount))
TOTAL@(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount))
} else diff --git a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor.cs b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor.cs index 18097bec..d0c7b2cc 100644 --- a/Wonky.Client/Components/ReportActivityListOfficeComponent.razor.cs +++ b/Wonky.Client/Components/ReportActivityListOfficeComponent.razor.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.Components; public partial class ReportActivityListOfficeComponent { - [Parameter] public List ActivityList { get; set; } = new(); + [Parameter] public List Activities { get; set; } = new(); [Inject] public NavigationManager Navigator { get; set; } private void ShowOrder(string companyId, string orderId) diff --git a/Wonky.Client/Components/ReportVisitComponent.razor b/Wonky.Client/Components/ReportVisitComponent.razor index 22420aa0..82cdc7c0 100644 --- a/Wonky.Client/Components/ReportVisitComponent.razor +++ b/Wonky.Client/Components/ReportVisitComponent.razor @@ -121,21 +121,34 @@ } + + - - Ordresum + + SAS + @ReportItem.SasAmount + + + + NORMAL @ReportItem.OrderAmount + + + TOTAL + @(ReportItem.SasAmount + ReportItem.OrderAmount) + @if (ReportItem.Express) { -
HASTER
+
HASTER
} - + + @if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) { diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor index 0c8c40d0..c4c3163b 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor @@ -113,14 +113,31 @@ @($"{line.Price:N2}") @($"{line.Discount:N2}") @($"{line.LineSum:N2}") - @if(line.Sas){} + + @if (line.Sas) + { + + } + } + + - Ordresum + SAS + @ReportItem.SasAmount + + + + NORMAL @ReportItem.OrderAmount + + + TOTAL + @(ReportItem.SasAmount + ReportItem.OrderAmount) + @if (ReportItem.Express) { @@ -130,7 +147,7 @@ } - + @* Office Note *@ @if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate()) diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor index 5919ad9b..522a256a 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor @@ -45,6 +45,6 @@ - + \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index b9f9b37b..92831306 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -54,7 +54,7 @@ - + } else diff --git a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs index 4e01c806..65d0969c 100644 --- a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs @@ -107,6 +107,12 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable // Initialize date variable SelectedDate = DateTime.Now; var today = $"{SelectedDate:yyyy-MM-dd}"; + // assign activity properties + Activity.ActivityVisitEnum = "office"; + Activity.ActivityTypeEnum = "phone"; + Activity.ActivityStatusEnum = "order"; + Activity.Express = true; + Activity.OurRef = $"INNOTEC:{UserInfo.FirstName}"; Activity.ActivityDate = today; // initiate a sync to ensure up-to-date product history if (Company.HistorySync != today) @@ -149,12 +155,6 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable Activity.DlvCity = Company.City; Activity.BcId = Company.BcId; Activity.CompanyId = Company.CompanyId; - // assign activity properties - Activity.ActivityVisitEnum = "office"; - Activity.ActivityTypeEnum = "phone"; - Activity.ActivityStatusEnum = "order"; - Activity.Express = true; - Activity.OurRef = $"TLF:{UserInfo.FirstName}"; Working = false; } diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OfficeOrderViewPage.razor index bd96137d..35226a75 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor @@ -134,11 +134,6 @@ } - - - Ordresum - @ReportItem.OrderAmount - @if (ReportItem.Express) { @@ -147,6 +142,23 @@ } + + + SAS + @ReportItem.SasAmount + + + + NORMAL + @ReportItem.OrderAmount + + + + TOTAL + @(ReportItem.OrderAmount + ReportItem.SasAmount) + + + @if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) { diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 159de21b..ddb7161a 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "285.0", + "version": "292.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png",