From df8c47f0b819bb5074cbceab41bc22bd4d339987 Mon Sep 17 00:00:00 2001
From: Andre Beging <a.beging@eas-solutions.de>
Date: Thu, 12 Dec 2024 09:52:38 +0100
Subject: [PATCH] Remove seller address from invoice model, always use settings
 seller

---
 Server/Components/Pages/CreatePage.razor.cs  |  1 -
 Server/Components/Pages/InvoicePage.razor.cs |  1 -
 Server/Model/InvoiceDocument.cs              | 20 ++++++++++----------
 Server/Model/InvoiceModel.cs                 |  1 -
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Server/Components/Pages/CreatePage.razor.cs b/Server/Components/Pages/CreatePage.razor.cs
index 31de80e..d2b3190 100644
--- a/Server/Components/Pages/CreatePage.razor.cs
+++ b/Server/Components/Pages/CreatePage.razor.cs
@@ -58,7 +58,6 @@ namespace Server.Components.Pages
                 InvoiceId = InvoiceId,
                 Comment = SettingsData.Instance.Comment,
                 PaymentData = SettingsData.Instance.PaymentData,
-                Seller = SettingsData.Instance.SellerAddress
             };
 
             await InvoiceData.SaveAsync(invoice);
diff --git a/Server/Components/Pages/InvoicePage.razor.cs b/Server/Components/Pages/InvoicePage.razor.cs
index 1268239..396b478 100644
--- a/Server/Components/Pages/InvoicePage.razor.cs
+++ b/Server/Components/Pages/InvoicePage.razor.cs
@@ -98,7 +98,6 @@ namespace Server.Components.Pages
             var doc = new InvoiceDocument(new()
             {
                 InvoiceId = "3129",
-                Seller = SettingsData.Instance.SellerAddress,
                 PaymentData = SettingsData.Instance.PaymentData,
                 Comment = SettingsData.Instance.Comment,
                 Customer = new()
diff --git a/Server/Model/InvoiceDocument.cs b/Server/Model/InvoiceDocument.cs
index 26d1a29..ef22f28 100644
--- a/Server/Model/InvoiceDocument.cs
+++ b/Server/Model/InvoiceDocument.cs
@@ -281,16 +281,16 @@ namespace Server.Model
                 {
                     row.RelativeItem().Column(column =>
                     {
-                        column.Item().TextSmall(Model.Seller?.Name, true);
-                        column.Item().TextSmall(Model.Seller?.Street);
-                        column.Item().TextSmall($"{Model.Seller?.Zip} {Model.Seller?.City}");
+                        column.Item().TextSmall(SettingsData.Instance.SellerAddress.Name, true);
+                        column.Item().TextSmall(SettingsData.Instance.SellerAddress.Street);
+                        column.Item().TextSmall($"{SettingsData.Instance.SellerAddress.Zip} {SettingsData.Instance.SellerAddress.City}");
                     });
                 
                     row.RelativeItem().Column(column =>
                     {
-                        if(!string.IsNullOrWhiteSpace(Model.Seller?.Phone)) column.Item().TextSmall($"Tel.: {Model.Seller?.Phone}");
-                        if(!string.IsNullOrWhiteSpace(Model.Seller?.Email)) column.Item().TextSmall($"E-Mail: {Model.Seller?.Email}");
-                        if(!string.IsNullOrWhiteSpace(Model.Seller?.Web)) column.Item().TextSmall($"Web: {Model.Seller?.Web}");
+                        if(!string.IsNullOrWhiteSpace(SettingsData.Instance.SellerAddress.Phone)) column.Item().TextSmall($"Tel.: {SettingsData.Instance.SellerAddress.Phone}");
+                        if(!string.IsNullOrWhiteSpace(SettingsData.Instance.SellerAddress.Email)) column.Item().TextSmall($"E-Mail: {SettingsData.Instance.SellerAddress.Email}");
+                        if(!string.IsNullOrWhiteSpace(SettingsData.Instance.SellerAddress.Web)) column.Item().TextSmall($"Web: {SettingsData.Instance.SellerAddress.Web}");
                     });
                 
                     row.RelativeItem().Column(column =>
@@ -336,7 +336,7 @@ namespace Server.Model
                 {
                     row.AutoItem().Column(column =>
                     {
-                        column.Item().PaddingBottom(5).TextSmall(Model.Seller?.ToString(), true);
+                        column.Item().PaddingBottom(5).TextSmall(SettingsData.Instance.SellerAddress.ToString(), true);
                         if(!string.IsNullOrWhiteSpace(Model.Customer?.Name)) column.Item().Text(Model.Customer?.Name);
                         if(!string.IsNullOrWhiteSpace(Model.Customer?.Name2)) column.Item().Text(Model.Customer?.Name2);
                         column.Item().Text(Model.Customer?.Street);
@@ -352,11 +352,11 @@ namespace Server.Model
                             table.ColumnsDefinition(c =>
                             {
                                 c.ConstantColumn(50);
-                                c.ConstantColumn(50);
+                                c.ConstantColumn(65);
                             });
-                        
+                            
                             table.Cell().TextSmall("Steuer-Nr:", true);
-                            table.Cell().TextSmall(Model.Seller?.TaxId);
+                            table.Cell().TextSmall(SettingsData.Instance.SellerAddress.TaxId);
                             
                             table.Cell().TextSmall("Datum:", true);
                             table.Cell().TextSmall(Model.IssueDate.ToShortDateString());
diff --git a/Server/Model/InvoiceModel.cs b/Server/Model/InvoiceModel.cs
index b6566b4..8b0a2a0 100644
--- a/Server/Model/InvoiceModel.cs
+++ b/Server/Model/InvoiceModel.cs
@@ -7,7 +7,6 @@
         public string? InvoiceId { get; set; }
         public DateTime IssueDate { get; set; } = DateTime.Today;
 
-        public Address? Seller { get; set; }
         public Address? Customer { get; set; }
 
         public List<OrderItem> Items { get; set; } = new();