-
-
-
-
-
- @ReportItem.Company.Name
- @if (ReportItem.Express)
- {
- HASTER
- }
- @if (ReportItem.VisitTypeEnum == "Phone" || ReportItem.OurRef.Contains("T:"))
- {
- TELEFONORDRE
- }
- @if (ReportItem.StatusTypeEnum is "Quote")
- {
- TILBUD
- }
-
- |
-
-
-
-
- Vores Ref. |
- @ReportItem.OurRef |
- EOrdre |
- @ReportItem.ESalesNumber |
-
-
- Dato |
- @ReportItem.OrderDate |
- Konto |
- @ReportItem.Company.Account |
-
-
- Telefon |
- @ReportItem.Company.Phone |
- Køber |
- @ReportItem.YourRef |
-
-
- CVR/VAT |
- @ReportItem.Company.VatNumber |
- Rekvisition |
- @ReportItem.ReferenceNumber |
-
-
- Navn |
- @ReportItem.Company.Name |
- Lev.Navn |
- @ReportItem.DlvName |
-
-
- Adresse |
- @ReportItem.Company.Address1 |
- Lev.Adresse |
- @ReportItem.DlvAddress1 |
-
-
- Adresse |
- @ReportItem.Company.Address2 |
- Lev.Adresse |
- @ReportItem.DlvAddress2 |
-
-
- Postnr By |
- @ReportItem.Company.ZipCode @ReportItem.Company.City |
- Lev.Postnr By |
- @ReportItem.DlvZipCity |
-
-
- Email |
- @ReportItem.Company.Email |
-
-
- Vores Ref |
- @ReportItem.OurRef |
- Oprettet af |
- @ReportItem.CreatedBy |
-
-
-
-
-
-
- Placering |
- Antal |
- Varnr |
- Beskrivelse |
- Pris |
- R% |
- Beløb |
- SAS |
-
-
-
- @foreach (var line in ReportItem.Lines)
- {
-
- @line.Location |
- @line.Quantity |
- @line.Sku |
- @line.Description |
- @($"{line.Price:N2}") |
- @($"{line.Discount:N2}") |
- @($"{line.LineSum:N2}") |
-
-
- |
-
- }
-
-
-
- |
- SAS |
- @ReportItem.SasAmount |
- |
-
-
- |
- NORMAL |
- @ReportItem.OrderAmount |
- |
-
-
- |
- TOTAL |
- @(ReportItem.SasAmount + ReportItem.OrderAmount) |
- |
-
- @if (ReportItem.Express)
- {
-
- |
-
- HASTER
- |
-
- }
-
+
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote))
{
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
index dc544878..ad1c7198 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
@@ -130,7 +130,8 @@ else
-
+
@@ -155,7 +156,8 @@ else
-
+
@@ -167,13 +169,15 @@ else
-
+
-
+
@@ -184,7 +188,8 @@ else
-
+
diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor
index 737ac3e3..5e067c55 100644
--- a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor
@@ -25,150 +25,6 @@
-@*
-
-
-
-
-
- @ReportItem.Company.Name
- @ReportItem.ESalesNumber
- @if (ReportItem.StatusTypeEnum.ToLower() is "quote")
- {
- TILBUD
- }
- @if (ReportItem.VisitTypeEnum.ToLower() == "phone" ||
- ReportItem.OurRef.Contains("T:") ||
- ReportItem.OurRef.Contains("TLF:"))
- {
- TELEFONORDRE
- }
- @if (ReportItem.Express)
- {
- HASTER
- }
-
- |
-
-
-
-
- Dato |
- @ReportItem.OrderDate |
- Konto |
- @ReportItem.Company.Account |
-
-
- Telefon |
- @ReportItem.Company.Phone |
- Køber |
- @ReportItem.YourRef |
-
-
- CVR/VAT |
- @ReportItem.Company.VatNumber |
- Rekvisition |
- @ReportItem.ReferenceNumber |
-
-
- Navn |
- @ReportItem.Company.Name |
- Lev.Navn |
- @ReportItem.DlvName |
-
-
- Adresse |
- @ReportItem.Company.Address1 |
- Lev.Adresse |
- @ReportItem.DlvAddress1 |
-
-
- Adresse |
- @ReportItem.Company.Address2 |
- Lev.Adresse |
- @ReportItem.DlvAddress2 |
-
-
- Postnr By |
- @ReportItem.Company.ZipCode @ReportItem.Company.City |
- Lev.Postnr By |
- @ReportItem.DlvZipCity |
-
-
- Email |
- @ReportItem.Company.Email |
-
-
- Vores Ref |
- @ReportItem.OurRef |
- Oprettet af |
- @ReportItem.CreatedBy |
-
-
-
-
-*@
-
-@*
-
-
-
- Antal |
- Varnr |
- Beskrivelse |
- Pris |
- R% |
- Beløb |
- SAS |
-
-
-
- @foreach (var line in ReportItem.Lines)
- {
-
- @line.Quantity |
- @line.Sku |
- @line.Description |
- @($"{line.Price:N2}") |
- @($"{line.Discount:N2}") |
- @($"{line.LineSum:N2}") |
-
- @if (line.Sas)
- {
-
- }
- |
-
- }
-
-
-
- |
- SAS |
- @ReportItem.SasAmount |
-
-
- |
- NORMAL |
- @ReportItem.OrderAmount |
-
-
- |
- TOTAL |
- @(ReportItem.SasAmount + ReportItem.OrderAmount) |
-
- @if (ReportItem.Express)
- {
-
- |
-
- HASTER
- |
-
- }
-
-
-*@
@* Office Note *@
@if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate())
diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
index 4b900784..d8436681 100644
--- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
@@ -85,7 +85,7 @@ public partial class AdvisorQuoteListPage : IDisposable
// store quotes in local storage
await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name));
// filter quotes - if any - based on active filter
- if(QuoteList.Any())
+ if(QuoteList.Count != 0)
await FilterQuotes(QuoteFilter);
Working = false;
// signal page state changed
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor
index 5f520115..d0c7c700 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor
@@ -45,7 +45,7 @@
-
+
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
index 766e07bf..2fec246c 100644
--- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
@@ -48,13 +48,14 @@
-
+ @*
*@
+
}
else
diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor b/Wonky.Client/Pages/PrintReportOrderPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CommonReportPrintOrderPage.razor
rename to Wonky.Client/Pages/PrintReportOrderPage.razor
diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/PrintReportOrderPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs
rename to Wonky.Client/Pages/PrintReportOrderPage.razor.cs
index b21c1e48..840e5b26 100644
--- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs
+++ b/Wonky.Client/Pages/PrintReportOrderPage.razor.cs
@@ -28,7 +28,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class CommonReportPrintOrderPage
+public partial class PrintReportOrderPage
{
[Parameter] public string CountryCode { get; set; } = "";
[Parameter] public string UserId { get; set; } = "";
@@ -37,7 +37,7 @@ public partial class CommonReportPrintOrderPage
[Inject] public NavigationManager Navigator { get; set; }
[Inject] public IOrderProcessRepository ProcessRepo { get; set; }
[Inject] public IJSRuntime JsRuntime { get; set; }
- [Inject] public ILogger
Logger { get; set; }
+ [Inject] public ILogger Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
private ReportView Report { get; set; } = new();
private List Items { get; set; } = new();
diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor
similarity index 89%
rename from Wonky.Client/Pages/CommonReportPrintSummaryPage.razor
rename to Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor
index ede4e7fc..49b79c3e 100644
--- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor
+++ b/Wonky.Client/Pages/PrintReportSummaryLedgerPage.razor
@@ -39,12 +39,13 @@