diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor b/Wonky.Client/Components/OfficeLandingComponent.razor
index ac7bfd3d..1ae65f3c 100644
--- a/Wonky.Client/Components/OfficeLandingComponent.razor
+++ b/Wonky.Client/Components/OfficeLandingComponent.razor
@@ -33,8 +33,8 @@
Produkt Prisliste
-
- Ubehandlede Bestillinger
+
+ Ikke udskrevet
@@ -57,8 +57,8 @@
Produkt Prisliste
-
- Ubehandlede Bestillinger
+
+ Ikke udskrevet
@@ -81,8 +81,8 @@
Produkt Prisliste
-
- Ubehandlede Bestillinger
+
+ Ikke udskrevet
diff --git a/Wonky.Client/Pages/OfficeOrderListPage.razor b/Wonky.Client/Pages/OfficeOrderListPage.razor
index a4090f08..a7df1563 100644
--- a/Wonky.Client/Pages/OfficeOrderListPage.razor
+++ b/Wonky.Client/Pages/OfficeOrderListPage.razor
@@ -5,10 +5,34 @@
@attribute [Authorize(Roles = "Admin,Office,Supervisor,Warehouse")]
@page "/sales/orderlist/{CountryCode}"
-Ubehandlede Bestillinger @CountryCode
-
Ubehandlede Bestillinger @CountryCode
-@if (OrderLIst.Any())
+Ordre udskrivning @CountryCode.ToUpper()
+Ordre udskrivning @CountryCode.ToUpper()
+@if (OrderList.Any())
{
+
+
+
+ Kunde |
+ Konto |
+ Dato |
+ Sælger |
+ Oprettet af |
+
+
+
+ @foreach (var order in OrderList)
+ {
+ OpenOrder(order.CompanyId, order.SalesHeadId)">
+ @order.CompanyName |
+ @order.Account |
+ @order.OrderDate |
+ @order.SalesRep |
+ @order.CreatedBy |
+
+ }
+
+
+ @*
- @foreach (var order in OrderLIst)
+ @foreach (var order in OrderList)
{
@@ -30,13 +54,14 @@
}
+*@
}
else
{
- Afventer svar fra service ... Vent venligst.
+ Ingen data
}
-
@if (Working)
{
+ Afventer svar fra service ... Vent venligst.
-}
\ No newline at end of file
+}
diff --git a/Wonky.Client/Pages/OfficeOrderListPage.razor.cs b/Wonky.Client/Pages/OfficeOrderListPage.razor.cs
index 215f60d4..71a6498c 100644
--- a/Wonky.Client/Pages/OfficeOrderListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeOrderListPage.razor.cs
@@ -21,18 +21,22 @@ public partial class OfficeOrderListPage : IDisposable
// #############################################################
private bool Working { get; set; } = true;
- private List OrderLIst { get; set; } = new();
+ private List OrderList { get; set; } = new();
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
Logger.LogInformation("---- CountryCode is '{}'", CountryCode);
- OrderLIst = await OrderListRepo.GetOrdersProcessStatusNone(CountryCode);
+ OrderList = await OrderListRepo.GetOrdersProcessStatusNone(CountryCode);
Working = false;
}
+ private void OpenOrder(string companyId, string orderId)
+ {
+ Navigator.NavigateTo($"/office/customers/{companyId}/orders/{orderId}");
+ }
public void Dispose()
{
Interceptor.DisposeEvent();
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index ffcae8f6..e5001460 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "273.0",
+ "version": "279.0",
"rc": true,
"sandBox": true,
"image": "grumpy-coder.png",
@@ -11,7 +11,7 @@
"LogLevel": {
"Default": "Debug",
"System": "Debug",
- "Microsoft": "Debug"
+ "Microsoft": "None"
},
"Debug": {
"LogLevel": {
diff --git a/Wonky.Entity/Views/OfficeOrderListView.cs b/Wonky.Entity/Views/OfficeOrderListView.cs
index 1036709a..b7b8c425 100644
--- a/Wonky.Entity/Views/OfficeOrderListView.cs
+++ b/Wonky.Entity/Views/OfficeOrderListView.cs
@@ -9,4 +9,6 @@ public class OfficeOrderListView
public string OrderDate { get; set; } = "";
public string SalesRep { get; set; } = "";
public string CountryCode { get; set; } = "";
+ public string ESalesNumber { get; set; } = "";
+ public string CreatedBy { get; set; } = "";
}
\ No newline at end of file
diff --git a/alfa-build.sh b/alfa-build.sh
index d54557a0..9f361b0b 100755
--- a/alfa-build.sh
+++ b/alfa-build.sh
@@ -14,7 +14,8 @@ sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}"
sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}"
-sed -i 's|\"Microsoft\": \"None\",|\"Microsoft\": \"Information\",|g' "${FILE}"
+sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}"
+sed -i 's|\"Microsoft\": \"Debug\",|\"Microsoft\": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
diff --git a/edu-build.sh b/edu-build.sh
index 1fc1e3a6..da882001 100755
--- a/edu-build.sh
+++ b/edu-build.sh
@@ -15,6 +15,7 @@ sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}"
sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}"
sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}"
sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}"
+sed -i 's|\"Microsoft\": \"Debug\",|\"Microsoft\": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"
diff --git a/next-build.sh b/next-build.sh
index 207341d0..e8313b71 100755
--- a/next-build.sh
+++ b/next-build.sh
@@ -15,6 +15,7 @@ sed -i 's|\"sandBox\":.*|\"sandBox\": false,|g' "${FILE}"
sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}"
sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}"
sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}"
+sed -i 's|\"Microsoft\": \"Debug\",|\"Microsoft\": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}"
diff --git a/prod-build.sh b/prod-build.sh
index b6099e3c..eae5c8e7 100755
--- a/prod-build.sh
+++ b/prod-build.sh
@@ -15,6 +15,7 @@ sed -i 's|\"sandBox\":.*|\"sandBox\": false,|g' "${FILE}"
sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}"
sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}"
sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}"
+sed -i 's|\"Microsoft\": \"Debug\",|\"Microsoft\": \"None\",|g' "${FILE}"
sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}"