diff --git a/Wonky.Client.sln.DotSettings b/Wonky.Client.sln.DotSettings
index 22a99637..95725125 100644
--- a/Wonky.Client.sln.DotSettings
+++ b/Wonky.Client.sln.DotSettings
@@ -2,9 +2,12 @@
Kunde | -Bynavn | -Demo | -Salg | -Note | -sas | -Beløb | -- | - | - | - |
---|---|---|---|---|---|---|---|---|---|---|
@activity.Company.Name | -@activity.Company.City | -@activity.Demo | -@activity.Sales | -@activity.OfficeNote | -@($"{activity.SasAmount:N2}") | -@(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}") | -- @if (activity.OurRef.Contains("T:")) - {} - | -- @if (activity.Express) - {} - | -- @if (activity.StatusTypeEnum == "Quote") - {} - | -
- @if (activity.Lines.Any() && activity.StatusTypeEnum == "Order")
- {
- |
-
- | Total | -@ActivityList.Where(x => x.StatusTypeEnum == "Order").Sum(x => x.OrderAmount) | -- |
Kunde | -Bynavn | -Demo | -Salg | -Note | -sas | -Beløb | -- - | -- - | -- - | -- - | -||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@activity.Company.Name | -@activity.Company.City | -@activity.Demo | -@activity.Sales | -@activity.OfficeNote | -@($"{activity.SasAmount:N2}") | -@(activity.StatusTypeEnum.Contains("Quote") ? $"{0:N2}" : $"{activity.OrderAmount:N2}") | -- @if (activity.OurRef.Contains("T:")) - { - - } - | -- @if (activity.Express) - { - - } - | -- @if (activity.StatusTypeEnum == "Quote") - { - - } - | -
- |
+@if (ActivityList.Any())
+{
+
Kunde | +Bynavn | +Demo | +Salg | +Note | +sas | +Beløb | ++ | + | + | |
---|---|---|---|---|---|---|---|---|---|---|
- | Total | -@Activities.Where(x => x.StatusTypeEnum != "Quote").Sum(x => x.OrderAmount) | -- |
Kunde | +Bynavn | +Demo | +Salg | +Note | +sas | +Beløb | ++ + | ++ + | ++ + | ++ + | +
---|---|---|---|---|---|---|---|---|---|---|
@activity.Company.Name | +@activity.Company.City | +@activity.Demo | +@activity.Sales | +@activity.OfficeNote | +@($"{activity.SasAmount:N2}") | +@(activity.StatusTypeEnum.Contains("Quote") ? $"{0:N2}" : $"{activity.OrderAmount:N2}") | ++ @if (activity.OurRef.Contains("T:")) + { + + } + | ++ @if (activity.Express) + { + + } + | ++ @if (activity.StatusTypeEnum == "Quote") + { + + } + | +
+ |
+
+ | Total | +@Activities.Where(x => x.StatusTypeEnum != "Quote").Sum(x => x.OrderAmount) | ++ |
@ErrorDescription
+ | Ordrekladde Global kladde (udløber efter @(DraftProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) | @@ -163,14 +152,14 @@ else |
-
+
|
- + | @SelectedItem.Sku |
@@ -229,10 +218,11 @@ else
-
-
-
-
-
+
+
+
+
+
+
-}
+
-
-
-
diff --git a/Wonky.Client/Pages/CountryLandingPage.razor.cs b/Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs
similarity index 80%
rename from Wonky.Client/Pages/CountryLandingPage.razor.cs
rename to Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs
index 393bc45c..8b736cfa 100644
--- a/Wonky.Client/Pages/CountryLandingPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs
@@ -4,7 +4,7 @@ using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-public partial class CountryLandingPage
+public partial class OfficeCountryLandingPage
{
[Parameter] public string CountryCode { get; set; } = "";
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/CountryPrintCatalogPage.razor b/Wonky.Client/Pages/OfficeCountryPrintCatalogPage.razor
similarity index 83%
rename from Wonky.Client/Pages/CountryPrintCatalogPage.razor
rename to Wonky.Client/Pages/OfficeCountryPrintCatalogPage.razor
index 3210d3d4..cd6f4e93 100644
--- a/Wonky.Client/Pages/CountryPrintCatalogPage.razor
+++ b/Wonky.Client/Pages/OfficeCountryPrintCatalogPage.razor
@@ -17,10 +17,12 @@
@using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization
-@attribute [Authorize(Roles = "Admin,Warehouse")]
+@attribute [Authorize(Roles = "Admin,Office,Warehouse")]
@page "/print/catalog/{CountryCode}"
-
-
+
+}
+
+
+@if (Working)
+{
+ @_reportItem.OfficeNote+Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName
@@ -53,7 +53,7 @@
Sælgere
-
-
-
@@ -44,6 +44,6 @@
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor b/Wonky.Client/Pages/WarehouseOrderListPage.razor
index 8a2b7315..cba15e46 100644
--- a/Wonky.Client/Pages/WarehouseOrderListPage.razor
+++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor
@@ -17,7 +17,7 @@
@using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization
-@attribute [Authorize(Roles = "Admin,Warehouse")]
+@attribute [Authorize(Roles = "Admin,Office,Warehouse")]
@page "/warehouse/orders/{Status}"
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor
index 3d8f45e3..42dd5c0b 100644
--- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor
+++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor
@@ -17,7 +17,7 @@
@using Microsoft.AspNetCore.Authorization
@using Wonky.Client.Components
-@attribute [Authorize(Roles = "Admin,Warehouse")]
+@attribute [Authorize(Roles = "Admin,Office,Warehouse")]
@page "/warehouse/orders/process/{OrderId}"
@if (!string.IsNullOrWhiteSpace(Order.OrderDate))
diff --git a/Wonky.Client/Shared/ConfirmWorkDateModal.razor b/Wonky.Client/Shared/ConfirmWorkDateModal.razor
index 39a85bda..2875f478 100644
--- a/Wonky.Client/Shared/ConfirmWorkDateModal.razor
+++ b/Wonky.Client/Shared/ConfirmWorkDateModal.razor
@@ -16,7 +16,7 @@
*@
-
+ |
---|