From 79081639b015f3ee18cdac7dcc2e94b906b12a0a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 5 Jun 2023 08:20:46 +0200
Subject: [PATCH] Fix migration + viemodel data

---
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 .../DbModels/OrderStatusViewModel.cs          |  11 +
 ...13_AddDeliveryDiscountToOrders.Designer.cs | 998 ++++++++++++++++++
 ...30605061113_AddDeliveryDiscountToOrders.cs |  38 +
 .../WDCData/WDCDataContextModelSnapshot.cs    |   6 +
 .../Components/DoorMan/DoorList.razor.cs      |   9 -
 .../Components/Order/OrderList.razor          |   9 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |   2 +-
 10 files changed, 1063 insertions(+), 16 deletions(-)
 create mode 100644 WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.Designer.cs
 create mode 100644 WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.cs
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 18ce7f0..91ddf9c 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2306.0119</h4>
+    <h4>Version: 0.9.2306.0508</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d0682cc..fa6f17d 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2306.0119
+0.9.2306.0508
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 803c3b1..6fa2427 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2306.0119</version>
+  <version>0.9.2306.0508</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs b/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
index 1108cec..7c3fd85 100644
--- a/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
+++ b/WebDoorCreator.Data/DbModels/OrderStatusViewModel.cs
@@ -70,5 +70,16 @@ namespace WebDoorCreator.Data.DbModels
         /// TotCost represent the total cost of the order
         /// </summary>
         public decimal TotCost { get; set; } = 0;
+
+
+        /// <summary>
+        /// Data promessa di consegna
+        /// </summary>
+        public DateTime DateDelivery { get; set; } = DateTime.Now.AddDays(60);
+
+        /// <summary>
+        /// Eventuale sconto globale
+        /// </summary>
+        public double Discount { get; set; } = 0;
     }
 }
diff --git a/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.Designer.cs b/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.Designer.cs
new file mode 100644
index 0000000..690fef6
--- /dev/null
+++ b/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.Designer.cs
@@ -0,0 +1,998 @@
+﻿// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using WebDoorCreator.Data;
+
+#nullable disable
+
+namespace WebDoorCreator.Data.Migrations.WDCData
+{
+    [DbContext(typeof(WDCDataContext))]
+    [Migration("20230605061113_AddDeliveryDiscountToOrders")]
+    partial class AddDeliveryDiscountToOrders
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .UseCollation("Latin1_General_CI_AS")
+                .HasAnnotation("ProductVersion", "6.0.14")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.AspNetRoles", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AspNetRoles", null, t => t.ExcludeFromMigrations());
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.AspNetUserRoles", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", null, t => t.ExcludeFromMigrations());
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.AspNetUsers", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AspNetUsers", null, t => t.ExcludeFromMigrations());
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.CompanyModel", b =>
+                {
+                    b.Property<int>("CompanyId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("CompanyId"), 1L, 1);
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("CompanyExtCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("CompanyToken")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("PrivateNote")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("VAT")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("ZipCode")
+                        .HasColumnType("int");
+
+                    b.HasKey("CompanyId");
+
+                    b.ToTable("Company");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.ConfigModel", b =>
+                {
+                    b.Property<string>("chiave")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("note")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("valore")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("valoreStd")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("chiave");
+
+                    b.ToTable("Config");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorModel", b =>
+                {
+                    b.Property<int>("DoorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DoorId"), 1L, 1);
+
+                    b.Property<DateTime>("DateIns")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateLockExpiry")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateMod")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DoorDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DoorExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MeasureUnit")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("UnitCost")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("UserIdIns")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdLock")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdMod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("DoorId");
+
+                    b.HasIndex("OrderId");
+
+                    b.ToTable("Door");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorOpModel", b =>
+                {
+                    b.Property<int>("DoorOpId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DoorOpId"), 1L, 1);
+
+                    b.Property<DateTime>("DateIns")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateMod")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("DoorId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DtConfirm")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("JsoncActVal")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("JsoncConfigVal")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ObjectId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdIns")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdMod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("userConfirm")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("DoorOpId");
+
+                    b.HasIndex("DoorId");
+
+                    b.ToTable("DoorOp");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorOpTypeModel", b =>
+                {
+                    b.Property<int>("DoorOpTypId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DoorOpTypId"), 1L, 1);
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DisplayUrl")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<HierarchyId>("DoorOpIdPathFromPatriarch")
+                        .HasColumnType("hierarchyid");
+
+                    b.Property<string>("ExtDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ExtOpCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("FPath")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("HasHw")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("HwCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HwDescription")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsConcrete")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("JsoncConfig")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("MaxAllowed")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OpCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ParentDoorOpId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Rev")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("ValidFrom")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("ValidUntil")
+                        .HasColumnType("datetime2");
+
+                    b.HasKey("DoorOpTypId");
+
+                    b.ToTable("DoorOpType");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorTypeModel", b =>
+                {
+                    b.Property<int>("TypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TypeCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("TypeId");
+
+                    b.ToTable("DoorType");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.GraphicParamsModel", b =>
+                {
+                    b.Property<int>("GraphicParamId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("GraphicParamId"), 1L, 1);
+
+                    b.Property<int>("compoId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("graphicParamAlias")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("graphicParamDefaultVal")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("graphicParamKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("graphicParamName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("graphicParamType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("graphicParamsN")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("GraphicParamId");
+
+                    b.ToTable("GraphicParams");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.HardwareModel", b =>
+                {
+                    b.Property<int>("HardwareId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("HardwareId"), 1L, 1);
+
+                    b.Property<string>("compoAlias")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("compoLayerName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("compoName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("compoTemplateIsActive")
+                        .HasColumnType("bit");
+
+                    b.HasKey("HardwareId");
+
+                    b.ToTable("Hardware");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.LanguageModel", b =>
+                {
+                    b.Property<string>("CodLingua")
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("DescrizioneLingua")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("CodLingua");
+
+                    b.ToTable("Languages");
+
+                    b.HasData(
+                        new
+                        {
+                            CodLingua = "EN",
+                            DescrizioneLingua = "English"
+                        },
+                        new
+                        {
+                            CodLingua = "IT",
+                            DescrizioneLingua = "Italiano"
+                        });
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.ListValuesModel", b =>
+                {
+                    b.Property<string>("TableName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("FieldName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("DefaultVal")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("InputType")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Label")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("Ordinal")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("isSerializable")
+                        .HasMaxLength(5)
+                        .HasColumnType("bit");
+
+                    b.HasKey("TableName", "FieldName", "Value");
+
+                    b.ToTable("ListValues");
+
+                    b.HasData(
+                        new
+                        {
+                            TableName = "Opening",
+                            FieldName = "Swing",
+                            Value = "LH",
+                            Label = "Left Handed",
+                            Ordinal = 1,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Opening",
+                            FieldName = "Swing",
+                            Value = "RH",
+                            Label = "Right Handed",
+                            Ordinal = 2,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Opening",
+                            FieldName = "Swing",
+                            Value = "LHR",
+                            Label = "Left Handed Reverse",
+                            Ordinal = 3,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Opening",
+                            FieldName = "Swing",
+                            Value = "RHR",
+                            Label = "Right Handed Reverse",
+                            Ordinal = 4,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Edges",
+                            FieldName = "EdgeType",
+                            Value = "BV",
+                            Label = "Bevel",
+                            Ordinal = 1,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Edges",
+                            FieldName = "EdgeType",
+                            Value = "SQ",
+                            Label = "Squared",
+                            Ordinal = 2,
+                            isSerializable = false
+                        },
+                        new
+                        {
+                            TableName = "Edges",
+                            FieldName = "EdgeType",
+                            Value = "1B",
+                            Label = "Bull Nose 1",
+                            Ordinal = 3,
+                            isSerializable = false
+                        });
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.ListValuesTempModel", b =>
+                {
+                    b.Property<string>("TableName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("FieldName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("DefaultVal")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("InputType")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Label")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("Ordinal")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("isSerializable")
+                        .HasMaxLength(5)
+                        .HasColumnType("bit");
+
+                    b.HasKey("TableName", "FieldName", "Value");
+
+                    b.ToTable("ListValuesTemp");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.OrderModel", b =>
+                {
+                    b.Property<int>("OrderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("OrderId"), 1L, 1);
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateIns")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateMod")
+                        .HasColumnType("datetime2");
+
+                    b.Property<double>("Discount")
+                        .HasColumnType("float");
+
+                    b.Property<string>("OrderDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserIdIns")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdMod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("OrderId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("Order");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.OrderStatusViewModel", b =>
+                {
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("OrderId"), 1L, 1);
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateIns")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("NumDoors")
+                        .HasColumnType("int");
+
+                    b.Property<int>("NumType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OrderDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("OrderStatus")
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("TotCost")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("UserIdIns")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdMod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("OrderId");
+
+                    b.ToView("v_OrderStatus");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.PrtRepOrderModel", b =>
+                {
+                    b.Property<int>("OrderId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("DoorId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ObjectKey")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CompanyExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateIns")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateMod")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DoorDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DoorExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MeasureUnit")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ObjectQty")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ObjectType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ObjectVal")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderDescript")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderExtCode")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("int");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TypeId")
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("UnitCost")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("UserIdIns")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserIdMod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("VAT")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ZipCode")
+                        .HasColumnType("int");
+
+                    b.HasKey("OrderId", "DoorId", "ObjectKey");
+
+                    b.ToTable("DbSetPrtRepOrder");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.SerializedDoorsModel", b =>
+                {
+                    b.Property<int>("DoorTmpId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DoorTmpId"), 1L, 1);
+
+                    b.Property<string>("DoorSerVal")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("Lock")
+                        .HasColumnType("bit");
+
+                    b.HasKey("DoorTmpId");
+
+                    b.ToTable("SerializedDoors");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.UsersViewModel", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("ClaimId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "RoleId", "ClaimId");
+
+                    b.ToView("v_UserRolesClaims");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.VocabularyModel", b =>
+                {
+                    b.Property<string>("Lingua")
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("Lemma")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Traduzione")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.HasKey("Lingua", "Lemma");
+
+                    b.ToTable("Vocabulary");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.VocabularyTempModel", b =>
+                {
+                    b.Property<string>("Lingua")
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("Lemma")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Traduzione")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.HasKey("Lingua", "Lemma");
+
+                    b.ToTable("VocabularyTemp");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.AspNetUserRoles", b =>
+                {
+                    b.HasOne("WebDoorCreator.Data.DbModels.AspNetRoles", "RolesNav")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("WebDoorCreator.Data.DbModels.AspNetUsers", "UsersNav")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RolesNav");
+
+                    b.Navigation("UsersNav");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorModel", b =>
+                {
+                    b.HasOne("WebDoorCreator.Data.DbModels.OrderModel", "OrderNav")
+                        .WithMany()
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OrderNav");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.DoorOpModel", b =>
+                {
+                    b.HasOne("WebDoorCreator.Data.DbModels.DoorModel", "DoorNav")
+                        .WithMany()
+                        .HasForeignKey("DoorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DoorNav");
+                });
+
+            modelBuilder.Entity("WebDoorCreator.Data.DbModels.OrderModel", b =>
+                {
+                    b.HasOne("WebDoorCreator.Data.DbModels.CompanyModel", "CompanyNav")
+                        .WithMany()
+                        .HasForeignKey("CompanyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CompanyNav");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.cs b/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.cs
new file mode 100644
index 0000000..2252600
--- /dev/null
+++ b/WebDoorCreator.Data/Migrations/WDCData/20230605061113_AddDeliveryDiscountToOrders.cs
@@ -0,0 +1,38 @@
+﻿using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace WebDoorCreator.Data.Migrations.WDCData
+{
+    public partial class AddDeliveryDiscountToOrders : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateDelivery",
+                table: "Order",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<double>(
+                name: "Discount",
+                table: "Order",
+                type: "float",
+                nullable: false,
+                defaultValue: 0.0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DateDelivery",
+                table: "Order");
+
+            migrationBuilder.DropColumn(
+                name: "Discount",
+                table: "Order");
+        }
+    }
+}
diff --git a/WebDoorCreator.Data/Migrations/WDCData/WDCDataContextModelSnapshot.cs b/WebDoorCreator.Data/Migrations/WDCData/WDCDataContextModelSnapshot.cs
index c426734..2fba887 100644
--- a/WebDoorCreator.Data/Migrations/WDCData/WDCDataContextModelSnapshot.cs
+++ b/WebDoorCreator.Data/Migrations/WDCData/WDCDataContextModelSnapshot.cs
@@ -657,12 +657,18 @@ namespace WebDoorCreator.Data.Migrations.WDCData
                     b.Property<int>("CompanyId")
                         .HasColumnType("int");
 
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
                     b.Property<DateTime>("DateIns")
                         .HasColumnType("datetime2");
 
                     b.Property<DateTime>("DateMod")
                         .HasColumnType("datetime2");
 
+                    b.Property<double>("Discount")
+                        .HasColumnType("float");
+
                     b.Property<string>("OrderDescript")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
index 4746bc0..6880b9c 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
@@ -237,15 +237,6 @@ namespace WebDoorCreator.UI.Components.DoorMan
 
         protected async Task ReloadData()
         {
-            // 2023.05.26 - report inserito come servizio nell'app
-#if false
-            var confData = await WDService.ConfigGetKey("prt_ReportServerUrl");
-            if (confData != null)
-            {
-                reportBaseUrl = confData.valore;
-            }
-#endif
-
             if (!AddDoorDict.ContainsKey("ADD NEW DOOR"))
             {
                 AddDoorDict.Add("ADD NEW DOOR", "");
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor
index 69228de..cd74cd7 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor
@@ -15,7 +15,7 @@ else
                 <th class="text-end">Qty</th>
                 <th class="text-end">Models#</th>
                 <th class="text-end">Order Status</th>
-                <th class="text-end">TOTAL COST</th>
+                <th class="text-end">TOTAL PRICE</th>
                 <th class="text-end"></th>
             </tr>
         </thead>
@@ -33,12 +33,15 @@ else
                         <div class="small">@item.OrderDescript</div>
                     </td>
                     <td class="small">@item.DateIns</td>
-                    <td class="small">@item.DateIns</td>
+                    <td class="small">@item.DateDelivery</td>
                     <td class="small">@(GetCompany(item.CompanyId))</td>
                     <td class="text-end">@item.NumDoors</td>
                     <td class="text-end">@item.NumType</td>
                     <td class="text-end">@getOrderStatusLabel(item.OrderStatus)</td>
-                    <td class="text-end fw-bold">@($"{item.TotCost:C2}")</td>
+                    <td class="text-end">
+                        <b>@($"{item.TotCost:C2}")</b>
+                        <div class="small">@($"{item.Discount:P2}")</div>
+                        </td>
                     <td class="text-end">
                         @if (item.OrderStatus <= 10)
                         {
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 5df5303..a6b330a 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2306.0119</Version>
+        <Version>0.9.2306.0508</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
