-
@Report.ReportData.Name
+
+ @*
*@
+ @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum))
+ {
+
@Report.ReportData.Name
+
+
+
@Report.ReportData.Name
+
-
-
-
-
+
-
-
-
- }
- else
- {
-
- }
+ }
+ @*
*@
@if (Activities.Any())
{
foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
{
-
+
}
-}
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor
index 92f01909..1a5e86e3 100644
--- a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor
+++ b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor
@@ -88,10 +88,6 @@
diff --git a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs
index 23e38d7b..4e01c806 100644
--- a/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs
+++ b/Wonky.Client/Pages/OfficeCustomerOrderCreatePage.razor.cs
@@ -150,9 +150,10 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable
Activity.BcId = Company.BcId;
Activity.CompanyId = Company.CompanyId;
// assign activity properties
- Activity.ActivityVisitEnum = "none";
+ Activity.ActivityVisitEnum = "office";
Activity.ActivityTypeEnum = "phone";
Activity.ActivityStatusEnum = "order";
+ Activity.Express = true;
Activity.OurRef = $"TLF:{UserInfo.FirstName}";
Working = false;
@@ -244,20 +245,22 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable
return;
// validate customer address1
// - this is a required input
- if (string.IsNullOrWhiteSpace(Activity.Address1))
- {
- Toaster.ShowError("Kunde adresse er ufuldstændig.");
- return;
- }
+ // --- exclude for office orders
+ // if (string.IsNullOrWhiteSpace(Activity.Address1))
+ // {
+ // Toaster.ShowError("Kunde adresse er ufuldstændig.");
+ // return;
+ // }
// validate org number
// - this is a required input
// - must validate according to country rules.
- if (!VatUtils.ValidateFormat(Company.CountryCode, Activity.VatNumber))
- {
- Toaster.ShowError("Firma registreringsnummer er ikke korrekt.");
- return;
- }
+ // --- exclude for office orders
+ // if (!VatUtils.ValidateFormat(Company.CountryCode, Activity.VatNumber))
+ // {
+ // Toaster.ShowError("Firma registreringsnummer er ikke korrekt.");
+ // return;
+ // }
// validate input according to status
switch (Activity.ActivityStatusEnum)
@@ -271,9 +274,10 @@ public partial class OfficeCustomerOrderCreatePage : IDisposable
Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives.");
return;
// verify email address is a valid address
- case "quote" when !Utils.IsValidEmail(Activity.Email):
- Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives.");
- return;
+ // --- exclude for office orders
+ // case "quote" when !Utils.IsValidEmail(Activity.Email):
+ // Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives.");
+ // return;
}
// raise working flag
diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor
index d7168970..f104a8e3 100644
--- a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor
@@ -42,14 +42,14 @@
-
-
+
+
}
else
{
diff --git a/Wonky.Client/Pages/SupervisorDocumentListPage.razor b/Wonky.Client/Pages/SupervisorDocumentListPage.razor
index 0756377e..33f8be13 100644
--- a/Wonky.Client/Pages/SupervisorDocumentListPage.razor
+++ b/Wonky.Client/Pages/SupervisorDocumentListPage.razor
@@ -87,5 +87,5 @@ else
}
-
+
diff --git a/Wonky.Client/Pages/SupervisorDocumentListPage.razor.cs b/Wonky.Client/Pages/SupervisorDocumentListPage.razor.cs
index 48d7ad39..5a20231e 100644
--- a/Wonky.Client/Pages/SupervisorDocumentListPage.razor.cs
+++ b/Wonky.Client/Pages/SupervisorDocumentListPage.razor.cs
@@ -40,7 +40,7 @@ public partial class SupervisorDocumentListPage : IDisposable
private List
Documents { get; set; } = new();
private SupportAdvisorView Advisor { get; set; } = new();
private bool Working { get; set; } = true;
- private ConfirmActionModal _confirmDeleteDocuments = new();
+ private ConfirmationModal _confirmDeleteDocuments = new();
private string _deleteMessage = "";
protected override async Task OnInitializedAsync()
diff --git a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor
index 3758afca..4c332dcd 100644
--- a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor
+++ b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor
@@ -92,6 +92,6 @@
-
+
diff --git a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor.cs b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor.cs
index d5e6348e..222fcd17 100644
--- a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor.cs
@@ -46,7 +46,7 @@ public partial class SupervisorDocumentViewEditPage : IDisposable
private EditContext FormContext { get; set; }
private SupportDocumentEditView Document { get; set; } = new();
private bool Working { get; set; } = true;
- private ConfirmActionModal _confirmDeleteDocument = new();
+ private ConfirmationModal _confirmDeleteDocument = new();
private string _deleteMessage = "";
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj
index d67d15cf..866d78f7 100644
--- a/Wonky.Client/Wonky.Client.csproj
+++ b/Wonky.Client/Wonky.Client.csproj
@@ -3784,6 +3784,12 @@
<_ContentIncludedByDefault Remove="wwwroot\icons\zoom-out.svg" />
<_ContentIncludedByDefault Remove="wwwroot\bootstrap\fonts\bootstrap-icons.woff" />
<_ContentIncludedByDefault Remove="wwwroot\bootstrap\fonts\bootstrap-icons.woff2" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\bootstrap-icons.css" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\bootstrap-icons.json" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\bootstrap-icons.min.css" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\bootstrap-icons.scss" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\fonts\bootstrap-icons.woff" />
+ <_ContentIncludedByDefault Remove="wwwroot\bootstrap\css\fonts\bootstrap-icons.woff2" />
@@ -3800,5 +3806,9 @@
+
+
+
+
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 8ff46123..ffcae8f6 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "259.0",
+ "version": "273.0",
"rc": true,
"sandBox": true,
"image": "grumpy-coder.png",
@@ -23,7 +23,7 @@
"assetUrl": "https://files.innotec.dk",
"baseUrl": "https://dev.innotec.dk",
"countryPriceCatalog": "api/v2/catalog/country",
- "countryPublicCatalog": "api/v2/catalog/public",
+ "countryProductCatalog": "api/v2/catalog/public",
"crmCustomers": "api/v2/crm/companies",
"crmReports": "api/v2/crm/advisors/reports",
"crmActivities": "api/v2/crm/advisors/activities",
diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css
index 8a22e5fd..ff0cf0d5 100644
--- a/Wonky.Client/wwwroot/css/app.css
+++ b/Wonky.Client/wwwroot/css/app.css
@@ -31,6 +31,11 @@
background-color: #a2a2ec;
}
+.table-* {
+ background-color: #030303;
+ color: white;
+}
+
html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html
index fef2e004..6260ccd0 100644
--- a/Wonky.Client/wwwroot/index.html
+++ b/Wonky.Client/wwwroot/index.html
@@ -11,8 +11,10 @@
-
-
+
+
+
+
diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs
index b5a97692..afeccba0 100644
--- a/Wonky.Entity/Configuration/ApiConfig.cs
+++ b/Wonky.Entity/Configuration/ApiConfig.cs
@@ -36,7 +36,7 @@ public class ApiConfig
///
/// Application uri for public product catalog
///
- public string CountryPublicCatalog { get; set; } = "";
+ public string CountryProductCatalog { get; set; } = "";
///
/// Application uri for activity request
diff --git a/Wonky.Entity/DTO/ReportDto.cs b/Wonky.Entity/DTO/ReportDto.cs
index 69d4a425..316e5346 100644
--- a/Wonky.Entity/DTO/ReportDto.cs
+++ b/Wonky.Entity/DTO/ReportDto.cs
@@ -13,54 +13,26 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
-
using System.ComponentModel.DataAnnotations;
+using Wonky.Entity.Views;
namespace Wonky.Entity.DTO;
public class ReportDto
{
- ///
- /// Report name
- ///
- /// System generated
public string Name { get; set; } = "";
-
- ///
- /// Sales day counter
- ///
public int SalesDayNumber { get; set; }
-
- ///
- /// Report description
- ///
- [MaxLength(1000, ErrorMessage = "Du kan højst bruge 1000 tegn")]
+
+ [MaxLength(1000, ErrorMessage = "Du kan højst bruge 1000 tegn")]
public string Description { get; set; } = "";
-
- ///
- /// Supervisor
- ///
- [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
+
+ [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")]
public string SupervisedBy { get; set; } = "";
-
- ///
- /// Day type enum as string
- ///
- [Required(ErrorMessage = "Dagtype skal angives")]
+
+ [Required(ErrorMessage = "Dagtype skal angives")]
public string DayTypeEnum { get; set; } = "";
-
- ///
- /// Report timespan - start date time
- ///
+
public string FromDateTime { get; set; } = "";
-
- ///
- /// Report timespan - end date time
- ///
public string ToDateTime { get; set; } = "";
-
- ///
- /// Report figures
- ///
- public ReportFiguresDto Figures { get; set; } = new();
-}
+ public ReportFiguresView Figures { get; set; } = new();
+}
\ No newline at end of file
diff --git a/Wonky.Entity/DTO/ReportInitDto.cs b/Wonky.Entity/DTO/ReportInitDto.cs
index 59b5f00a..d63b31ae 100644
--- a/Wonky.Entity/DTO/ReportInitDto.cs
+++ b/Wonky.Entity/DTO/ReportInitDto.cs
@@ -21,19 +21,7 @@ namespace Wonky.Entity.DTO;
public class ReportInitDto
{
- ///
- /// Flag to prevent activity to be added to report
- ///
public bool ReportClosed { get; set; }
-
- ///
- /// Report figures
- ///
- public ReportFiguresDto ReportData { get; set; } = new();
-
- ///
- /// List of activities for report
- ///
+ public ReportFiguresView ReportData { get; set; } = new();
public List ReportItems { get; set; } = new();
-
}
\ No newline at end of file
diff --git a/Wonky.Entity/Views/ReportFiguresView.cs b/Wonky.Entity/Views/ReportFiguresView.cs
index bc80bc50..cb8fd2c7 100644
--- a/Wonky.Entity/Views/ReportFiguresView.cs
+++ b/Wonky.Entity/Views/ReportFiguresView.cs
@@ -14,7 +14,8 @@ public class ReportFiguresView
public decimal SasTurnoverMonth { get; set; }
public decimal TotalTurnover { get; set; }
public decimal TotalTurnoverMonth { get; set; }
-
+ public decimal WebTurnover { get; set; }
+ public decimal WebTurnoverMonth { get; set; }
public int Distance { get; set; }
public int DistanceMonth { get; set; }
public int DistancePrivate { get; set; }
@@ -45,5 +46,7 @@ public class ReportFiguresView
public int TotalSaleCount { get; set; }
public int TotalSaleCountMonth { get; set; }
public int TotalVisitCount { get; set; }
- public int TotalVisitCountMonth { get; set; }
+ public int TotalVisitCountMonth { get; set; }
+ public int WebCount { get; set; }
+ public int WebCountMonth { get; set; }
}
\ No newline at end of file
diff --git a/Wonky.Entity/Views/ReportView.cs b/Wonky.Entity/Views/ReportView.cs
index 18da5dec..745dd211 100644
--- a/Wonky.Entity/Views/ReportView.cs
+++ b/Wonky.Entity/Views/ReportView.cs
@@ -19,6 +19,6 @@ namespace Wonky.Entity.Views;
public class ReportView
{
- public ReportData ReportData { get; set; } = new();
+ public ReportDataView ReportData { get; set; } = new();
public List ReportItems { get; set; } = new();
}
\ No newline at end of file