diff --git a/Wonky.Client/Components/ProductPriceListComponent.razor b/Wonky.Client/Components/ProductPriceListComponent.razor
index 5ea09682..dc6bc8b8 100644
--- a/Wonky.Client/Components/ProductPriceListComponent.razor
+++ b/Wonky.Client/Components/ProductPriceListComponent.razor
@@ -36,7 +36,19 @@
onerror="this.onerror=null;this.src='@(_config.AssetUrl)/images/no-image.png?height=100'"
alt="@salesItem.Name"/>
-
@salesItem.Name |
+
+
+ @* OnDemand flag 2023-08-15 *@
+ @salesItem.Name
+ @if (salesItem.OnDemand)
+ {
+
+ Bestillingsvare
+ Bestillingsvare
+
+ }
+
+ |
@salesItem.ShortName |
@salesItem.Sku |
@salesItem.BoxSize |
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
index 7075420a..bd464376 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
@@ -176,8 +176,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
? DateTime.Now
: DateTime.Parse(_userPref.WorkDate);
- // 2023-08-14 - reject orders for past or future dates
- if (SelectedDate.Date != DateTime.Now.Date)
+ // 2023-08-14 - reject orders for future dates
+ if (SelectedDate.Date > DateTime.Now.Date)
{
Toaster.ShowError($"Aktivitetsdato er ikke dagens dato. Dato ændres til {DateTime.Now.Date}");
SelectedDate = DateTime.Now;
diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
index 9560e29d..3edaecad 100644
--- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs
@@ -221,12 +221,18 @@ public partial class AdvisorReportCreatePage : IDisposable
if (_working)
return;
- // 2023-08-14 - reject report for a future date
+ // 2023-08-14 - reject vacation report for a future date
if (_endLeave.Date > DateTime.Now.Date)
{
Toaster.ShowError("Du har rod i ferie datoer. Prøver du at lave ferierapport før ferien er færdig?");
return;
}
+ // 2023-08-15 - reject sales report for a future date
+ if (_thisWorkDate.Date > DateTime.Now.Date)
+ {
+ Toaster.ShowError("Du kan ikke lave rapport for en fremtidig dato.");
+ return;
+ }
// check day type
if (string.IsNullOrWhiteSpace(Report.DayTypeEnum))
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 204e57bc..5cdcae6a 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,27 +1,27 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "222.0",
+ "version": "223.2",
"rc": true,
- "sandBox": true,
+ "sandBox": false,
"image": "grumpy-coder.png",
"sdk": "dotnet 7.0"
},
"Logging": {
"LogLevel": {
- "Default": "Debug",
- "System": "Debug",
- "Microsoft": "Information"
+ "Default": "None",
+ "System": "None",
+ "Microsoft": "None"
},
"Debug": {
"LogLevel": {
- "Default": ""
+ "Default": "None"
}
}
},
"apiConfig": {
"assetUrl": "https://files.innotec.dk",
- "baseUrl": "https://dev.innotec.dk",
+ "baseUrl": "https://zeta.innotec.dk",
"catalog": "api/v2/catalog/country",
"crmCustomers": "api/v2/crm/companies",
"crmReports": "api/v2/crm/advisors/reports",