hot fix - date check - add OnDemand to catalog display

This commit is contained in:
FH 2023-08-15 12:19:16 +02:00
parent d70f59628b
commit 96134e804d
4 changed files with 29 additions and 11 deletions

View file

@ -36,7 +36,19 @@
onerror="this.onerror=null;this.src='@(_config.AssetUrl)/images/no-image.png?height=100'" onerror="this.onerror=null;this.src='@(_config.AssetUrl)/images/no-image.png?height=100'"
alt="@salesItem.Name"/> alt="@salesItem.Name"/>
</td> </td>
<td class="align-middle">@salesItem.Name</td> <td class="align-middle">
<div class="position-relative">
@* OnDemand flag 2023-08-15 *@
@salesItem.Name
@if (salesItem.OnDemand)
{
<span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning">
Bestillingsvare
<span class="visually-hidden">Bestillingsvare</span>
</span>
}
</div>
</td>
<td class="align-middle">@salesItem.ShortName</td> <td class="align-middle">@salesItem.ShortName</td>
<td class="align-middle">@salesItem.Sku</td> <td class="align-middle">@salesItem.Sku</td>
<td class="align-middle">@salesItem.BoxSize</td> <td class="align-middle">@salesItem.BoxSize</td>

View file

@ -176,8 +176,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
? DateTime.Now ? DateTime.Now
: DateTime.Parse(_userPref.WorkDate); : DateTime.Parse(_userPref.WorkDate);
// 2023-08-14 - reject orders for past or future dates // 2023-08-14 - reject orders for future dates
if (SelectedDate.Date != DateTime.Now.Date) if (SelectedDate.Date > DateTime.Now.Date)
{ {
Toaster.ShowError($"Aktivitetsdato er ikke dagens dato. Dato ændres til {DateTime.Now.Date}"); Toaster.ShowError($"Aktivitetsdato er ikke dagens dato. Dato ændres til {DateTime.Now.Date}");
SelectedDate = DateTime.Now; SelectedDate = DateTime.Now;

View file

@ -221,12 +221,18 @@ public partial class AdvisorReportCreatePage : IDisposable
if (_working) if (_working)
return; 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) 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?"); Toaster.ShowError("Du har rod i ferie datoer. Prøver du at lave ferierapport før ferien er færdig?");
return; 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 // check day type
if (string.IsNullOrWhiteSpace(Report.DayTypeEnum)) if (string.IsNullOrWhiteSpace(Report.DayTypeEnum))

View file

@ -1,27 +1,27 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "222.0", "version": "223.2",
"rc": true, "rc": true,
"sandBox": true, "sandBox": false,
"image": "grumpy-coder.png", "image": "grumpy-coder.png",
"sdk": "dotnet 7.0" "sdk": "dotnet 7.0"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Debug", "Default": "None",
"System": "Debug", "System": "None",
"Microsoft": "Information" "Microsoft": "None"
}, },
"Debug": { "Debug": {
"LogLevel": { "LogLevel": {
"Default": "" "Default": "None"
} }
} }
}, },
"apiConfig": { "apiConfig": {
"assetUrl": "https://files.innotec.dk", "assetUrl": "https://files.innotec.dk",
"baseUrl": "https://dev.innotec.dk", "baseUrl": "https://zeta.innotec.dk",
"catalog": "api/v2/catalog/country", "catalog": "api/v2/catalog/country",
"crmCustomers": "api/v2/crm/companies", "crmCustomers": "api/v2/crm/companies",
"crmReports": "api/v2/crm/advisors/reports", "crmReports": "api/v2/crm/advisors/reports",