[WIP] certs

Elwig/Documents/BusinessDocument.cs

@@ -68,7 +68,7 @@ namespace Elwig.Documents {
                 .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
                 .AddCell(NewAsideCell("Mitglied", 2))
                 .AddCell(NewAsideCell("Mitglieds-Nr.:", isName: true)).AddCell(NewAsideCell($"{Member.MgNr}"))
-                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? ""))
+                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell((Member.LfbisNr ?? "-") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : "")))
                 .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
         }
 

Elwig/Documents/DeliveryConfirmation.cs

@@ -30,7 +30,7 @@ namespace Elwig.Documents {
             _year = year;
             ShowDateAndLocation = true;
             UseBillingAddress = true;
-            DocumentId = $"Anl.-Best. {_year}/{m.MgNr}";
+            DocumentId = $"Anlfrg.-Bstng. {_year}/{m.MgNr}";
             Data = data;
         }
 

Elwig/Documents/MemberDataSheet.cs

@@ -161,7 +161,7 @@ namespace Elwig.Documents {
                 .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
                     .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
-                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(Member.IsOrganic ? "Ja" : "Nein", colspan: 2))
+                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd((Member.IsOrganic ? "Ja" : "Nein") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : ""), colspan: 2))
                 .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
                 .AddCell(NewDataTh("Status:")).AddCell(NewTd(new KernedParagraph(Member.IsActive ? "Aktiv " : "Nicht aktiv ", 10)
                     .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))

Elwig/Elwig.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="154.0.8021" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="154.0.8035" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="itext" Version="9.7.0" />
     <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
@@ -31,7 +31,7 @@
     <PackageReference Include="MailKit" Version="4.17.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4191.47" />
     <PackageReference Include="NJsonSchema" Version="11.6.1" />
     <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 41;
+        public static readonly int RequiredSchemaVersion = 42;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Export/ElwigData.cs

@@ -638,6 +638,7 @@ namespace Elwig.Helpers.Export {
                 ["zwstid"] = m.ZwstId,
                 ["lfbis_nr"] = m.LfbisNr,
                 ["ustid_nr"] = m.UstIdNr,
+                ["org_auth_code"] = m.OrganicAuthorityCode,
                 ["juridical_pers"] = m.IsJuridicalPerson,
                 ["volllieferant"] = m.IsVollLieferant,
                 ["buchführend"] = m.IsBuchführend,
@@ -710,6 +711,7 @@ namespace Elwig.Helpers.Export {
                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
                 UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                OrganicAuthorityCode = json["org_auth_code"]?.AsValue().GetValue<string>(),
                 IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
                 IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
                 IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,

Elwig/Helpers/Validator.cs

@@ -631,15 +631,18 @@ namespace Elwig.Helpers {
                 if (v < 2 && char.IsAsciiLetter(ch)) {
                     v++;
                     text += ch;
-                } else if ((v == 2 || v == 6) && ch == '-') {
-                    v++;
+                } else if ((v == 2 || v == 5) && ch == '-' && text[^1] != '-') {
                     text += ch;
-                } else if (v >= 2 && char.IsLetterOrDigit(ch)) {
+                } else if (v >= 2 && v <= 4 && char.IsLetter(ch)) {
+                    if (v == 2 && text[^1] != '-')
+                        text += "-";
                     if (text.StartsWith("AT")) {
-                        if (v == 3 && ch == 'B' || v == 4 && ch == 'I' || v == 5 && ch == 'O') {
+                        if (v == 2 && ch == 'B' || v == 3 && ch == 'I' || v == 4 && ch == 'O') {
                             v++;
                             text += ch;
-                        } else if (v > 6 && char.IsAsciiDigit(ch)) {
+                        }
+                    } else if (text.StartsWith("DE")) {
+                        if (v == 2 && ch == 'Ö' || v == 3 && ch == 'K' || v == 4 && ch == 'O') {
                             v++;
                             text += ch;
                         }
@@ -647,11 +650,16 @@ namespace Elwig.Helpers {
                         v++;
                         text += ch;
                     }
+                } else if (v >= 5 && v <= 7 && char.IsAsciiDigit(ch)) {
+                    if (v == 5 && text[^1] != '-')
+                        text += "-";
+                    v++;
+                    text += ch;
                 }
 
                 if (i == input.CaretIndex - 1) {
                     pos = text.Length;
-                } else if (text.StartsWith("AT") && v >= 10) {
+                } else if ((text.StartsWith("AT") || text.StartsWith("DE")) && v >= 10) {
                     break;
                 }
             }
@@ -662,7 +670,7 @@ namespace Elwig.Helpers {
             if (text.Length == 0)
                 return required ? new(false, "Bio-Kontrollstellen-Code ist nicht optional") : new(true, null);
 
-            if (text.StartsWith("AT")) {
+            if (text.StartsWith("AT") || text.StartsWith("DE")) {
                 if (text.Length != 10) {
                     return new(false, "Bio-Kontrollstellen-Code ist ungültig");
                 }

Elwig/Models/Entities/Member.cs

@@ -96,6 +96,12 @@ namespace Elwig.Models.Entities {
         [Column("ustid_nr")]
         public string? UstIdNr { get; set; }
 
+        [Column("org_op_id")]
+        public string? OrganicOperatorId { get; set; }
+
+        [Column("org_auth_code")]
+        public string? OrganicAuthorityCode { get; set; }
+
         [Column("juridical_pers")]
         public bool IsJuridicalPerson { get; set; }
 

Elwig/Resources/Sql/41-42.sql

@@ -0,0 +1,4 @@
+-- schema version 41 to 42
+
+ALTER TABLE member ADD COLUMN org_op_id        TEXT             CHECK (org_op_id     REGEXP '^[0-9]{3}-[0-9]{7}$') DEFAULT NULL;
+ALTER TABLE member ADD COLUMN org_auth_code    TEXT             CHECK (org_auth_code REGEXP '^[A-Z]{2}-[A-ZÖØ]{3}-[0-9]{2,3}(-[A-Z]{2})?$') DEFAULT NULL;

Elwig/Services/MemberService.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Media;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -106,6 +107,7 @@ namespace Elwig.Services {
 
             vm.UstIdNr = m.UstIdNr;
             vm.LfbisNr = m.LfbisNr;
+            vm.OrganicAuthorityCode = m.OrganicAuthorityCode;
             vm.IsBuchführend = m.IsBuchführend;
             vm.IsOrganic = m.IsOrganic;
 
@@ -187,10 +189,9 @@ namespace Elwig.Services {
                     .GroupBy(d => d.Year)
                     .ToDictionaryAsync(g => g.Key, g => g.Any());
 
-                if (m.MgNr != vm.MgNr)
-                    return;
-
                 await App.MainDispatcher.BeginInvoke(() => {
+                    if (m.MgNr != vm.MgNr)
+                        return;
                     var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
                     var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
                     var grid = AreaComService.GenerateToolTip(gridData);
@@ -207,6 +208,58 @@ namespace Elwig.Services {
                 });
             });
 
+            vm.OrganicTest1 = null;
+            vm.OrganicTest2 = "...";
+            vm.OrganicTest3 = Brushes.Black;
+            vm.OrganicTest4 = null;
+            Utils.RunBackground("Bio-Zertifikatsdaten laden", async () => {
+                if (App.MainDispatcher == null)
+                    return;
+
+                var certs = await OrganicService.FetchTracesCertificatesOfMember(m);
+
+                // TODO button for TRACES search url
+                // TODO button for authority search url
+
+                await App.MainDispatcher.BeginInvoke(() => {
+                    if (m.MgNr != vm.MgNr)
+                        return;
+                    vm.OrganicTest2 = null;
+                    if (certs.Length == 0) {
+                        vm.OrganicTest1 = "Nicht gefunden";
+                        vm.OrganicTest3 = Brushes.DarkRed;
+                    } else {
+                        var cert = certs[0];
+                        vm.OrganicTest4 = $"Zertifikat-Nr.: {cert.Id}\nBio-KSt.: {cert.AuthorityCode}\nEU Operator-ID: {cert.OperatorId}\nOperator: {cert.OperatorName}";
+                        if (cert.IsValidForWineProduction) {
+                            vm.OrganicTest1 = "Gültig";
+                            vm.OrganicTest2 = $" (bis {cert.ExpiresOn:dd.MM.yyyy})";
+                            vm.OrganicTest3 = Brushes.DarkGreen;
+                        } else if (cert.IsValid) {
+                            vm.OrganicTest1 = "Teilw. gültig";
+                            vm.OrganicTest2 = $" (bis {cert.ExpiresOn:dd.MM.yyyy})";
+                            vm.OrganicTest3 = Brushes.OrangeRed;
+                        } else {
+                            vm.OrganicTest3 = Brushes.DarkRed;
+                            switch (cert.Status) {
+                                case OrganicService.TracesStatus.ISSUED:
+                                    vm.OrganicTest1 = "Ausgestellt";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.SUSPENDED:
+                                    vm.OrganicTest1 = "Gesperrt";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.EXPIRED:
+                                    vm.OrganicTest1 = "Ausgelaufen";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.WITHDRAWN:
+                                    vm.OrganicTest1 = "Widerrufen";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                            }
+                        }
+                    }
+                });
+            });
+
             vm.MemberHasEmail = m.EmailAddresses.Count > 0;
             vm.MemberCanSendEmail = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
             vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => false).ToList();
@@ -555,6 +608,7 @@ namespace Elwig.Services {
 
                 UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
                 LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                OrganicAuthorityCode = string.IsNullOrWhiteSpace(vm.OrganicAuthorityCode) ? null : vm.OrganicAuthorityCode,
                 IsBuchführend = vm.IsBuchführend,
                 IsOrganic = vm.IsOrganic,
 

Elwig/Services/OrganicService.cs

@@ -0,0 +1,132 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace Elwig.Services {
+    public static class OrganicService {
+
+        public const string TRACES_API_URL = "https://webgate.ec.europa.eu/tracesnt/directory/publication/organic-operator/for/query";
+        public const string TRACES_PDF_URL_PREFIX = "https://webgate.ec.europa.eu/tracesnt/directory/publication/organic-operator/digitally-signed/";
+
+        public enum TracesStatus {
+            ISSUED, SUSPENDED, WITHDRAWN, EXPIRED
+        }
+
+        public enum TracesActivity {
+            PREPARATION, EXPORT, IMPORT, STORING, PRODUCTION, DISTRIBUTION, DISTRIBUTION_PLACING_ON_THE_MARKET
+        }
+
+        public enum TracesCategoryOfProduct {
+            UNPROCESSED_PLANT_PRODUCTS_INCLUDING_SEEDS, LIVESTOCK_AND_UNPROCESSED_LIVESTOCK_PRODUCTS, ALGAE_AND_UNPROCESSED_AQUACULTURE_PRODUCTS,
+            PROCESSED_AGRICULTURAL_PRODUCTS_INCLUDING_AQUACULTURE_FOR_USE_AS_FOOD, FEED, WINE, OTHER_PRODUCTS_NOT_COVERED_BY_PREVIOUS_CATEGORIES
+        }
+
+        public record TracesCertificate {
+            public required string Id { get; init; }
+            public required string AuthorityCode { get; init; }
+            public required string OperatorId { get; init; }
+            public required string OperatorName { get; init; }
+            public required TracesActivity[] Activities { get; init; }
+            public required TracesCategoryOfProduct[] CategoriesOfProduct { get; init; }
+            public required DateOnly IssuedOn { get; init; }
+            public required DateOnly ExpiresOn { get; init; }
+            public required DateOnly LastStatusUpdateOn { get; init; }
+            public required TracesStatus Status { get; init; }
+
+            public string PdfUrl => TRACES_PDF_URL_PREFIX + Id + ".pdf";
+            public bool IsValid => Status == TracesStatus.ISSUED && IssuedOn.ToDateTime(new()) <= DateTime.Today && ExpiresOn.ToDateTime(new()) >= DateTime.Today;
+            public bool IsValidForWineProduction => IsValid && Activities.Contains(TracesActivity.PRODUCTION) &&
+                (CategoriesOfProduct.Contains(TracesCategoryOfProduct.UNPROCESSED_PLANT_PRODUCTS_INCLUDING_SEEDS) || CategoriesOfProduct.Contains(TracesCategoryOfProduct.WINE));
+        }
+
+        private async static Task<JsonArray> TryFetchTracesCertificates(Dictionary<string, string> query) {
+            var q = HttpUtility.ParseQueryString("");
+            q.Add("sort", "-issuedOn");
+            q.Add("countryCode", "AT");
+            foreach (var (k, v) in query) {
+                q.Add(k, v);
+            }
+
+            using var client = Utils.GetHttpClient();
+            using var res = await client.GetAsync($"{TRACES_API_URL}?{q}");
+            res.EnsureSuccessStatusCode();
+            var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
+            var certs = resJson?.AsArray() ?? throw new Exception();
+            if (certs.Count == 0)
+                throw new Exception();
+            return certs;
+        }
+
+        public async static Task<TracesCertificate[]> FetchTracesCertificatesOfMember(Member m, bool? tryNameAndAddress = null) {
+            bool searchedByName = false;
+
+            JsonArray? jsonCerts = null;
+            if (m.OrganicOperatorId != null) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorIdentifierType", "ooc_identifier" },
+                        { "operatorIdentifierSearchOperator", "STRICT" },
+                        { "operatorIdentifier", m.OrganicOperatorId },
+                    });
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+            
+            if (jsonCerts == null && m.LfbisNr != null) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorIdentifierType", "comp_reg" },
+                        { "operatorIdentifierSearchOperator", "STRICT" },
+                        { "operatorIdentifier", m.LfbisNr.TrimStart('0') },
+                    });
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+                
+            if (jsonCerts == null && (tryNameAndAddress ?? m.IsOrganic)) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorPostalCode", $"{(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}" },
+                        { "query", m.BillingAddress is BillingAddr a ? $"{a.FullName} {a.Address}" : $"{m.FullName} {m.Address}" },
+                    });
+                    searchedByName = true;
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+
+            if (jsonCerts == null)
+                return [];
+
+            TracesCertificate[] certs = [];
+            try {
+                certs = [.. jsonCerts.Select(j => new TracesCertificate {
+                    Id = j!["reference"]?.GetValue<string>() ?? throw new Exception(),
+                    AuthorityCode = j["issuingBody"]?["code"]?.GetValue<string>() ?? throw new Exception(),
+                    OperatorId = j["operatorIdentifier"]?.GetValue<string>() ?? throw new Exception(),
+                    OperatorName = j["operator"]?["name"]?.GetValue<string>() ?? throw new Exception(),
+                    Activities = [.. j["activities"]?.AsArray().Select(a => Enum.Parse<TracesActivity>(a?["id"]?.GetValue<string>().ToUpper().Replace("_IMPORT", "IMPORT") ?? throw new Exception())) ?? []],
+                    CategoriesOfProduct = [.. j["categoriesOfProduct"]?.AsArray().Select(c => Enum.Parse<TracesCategoryOfProduct>(c?["id"]?.GetValue<string>() ?? throw new Exception())) ?? []],
+                    IssuedOn = DateOnly.FromDateTime(DateTime.ParseExact(j["issuedOn"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-ddTHH:mm:ss.fffK", CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                    ExpiresOn = DateOnly.ParseExact(j["expiresOn"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-dd"),
+                    LastStatusUpdateOn = DateOnly.FromDateTime(DateTime.ParseExact(j["lastStatusUpdateDateTime"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-ddTHH:mm:ss.fffK", CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                    Status = Enum.Parse<TracesStatus>(j["status"]?["id"]?.GetValue<string>() ?? throw new Exception()),
+                })];
+            } catch {
+                return [];
+            }
+
+            return (!searchedByName || certs.Where(c => c.Status == TracesStatus.ISSUED).Select(c => c.OperatorId).ToHashSet().Count == 1) ? certs : [];
+        }
+
+
+    }
+}

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -6,6 +6,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
@@ -118,10 +119,21 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _lfbisNr;
         [ObservableProperty]
+        private string? _organicAuthorityCode;
+        [ObservableProperty]
         private bool _isBuchführend;
         [ObservableProperty]
         private bool _isOrganic;
 
+        [ObservableProperty]
+        private string? _organicTest1;
+        [ObservableProperty]
+        private string? _organicTest2;
+        [ObservableProperty]
+        private Brush? _organicTest3;
+        [ObservableProperty]
+        private string? _organicTest4;
+
         [ObservableProperty]
         private string? _entryDate;
         [ObservableProperty]

Elwig/Windows/MemberAdminWindow.xaml

@@ -548,34 +548,42 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="90"/>
-                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition Width="110"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="Umsatzsteuer-ID"/>
                     <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
                              TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
 
                     <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="LfbisNrInput" Text="{Binding LfbisNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
-
                     <CheckBox x:Name="OrganicInput" Content="Bio" IsChecked="{Binding IsOrganic, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top"/>
-                    <Button x:Name="OrganicButton" Content="easy-cert.com" IsEnabled="{Binding IsMemberSelected}"
-                            Height="25" FontSize="12"
-                            Click="OrganicButton_Click"
-                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
+                    <Label Content="Bio-Zert.:" Margin="10,10,150,0" Grid.Column="2" HorizontalAlignment="Right"/>
+                    <TextBlock FontSize="14" Margin="10,12,10,0" Grid.Column="2" HorizontalAlignment="Right" ToolTip="{Binding OrganicTest4}">
+                        <Run Text="{Binding OrganicTest1}" FontWeight="Bold" Foreground="{Binding OrganicTest3}"/><Run FontSize="12" Text="{Binding OrganicTest2}"/>
+                    </TextBlock>
+                    <Label Content="Bio-KSt.:" Margin="10,40,95,0" Grid.Column="2" HorizontalAlignment="Right" ToolTip="Bio-Kontrollstelle"/>
+                    <TextBox x:Name="OrganicAuthorityCodeInput" Text="{Binding OrganicAuthorityCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,0" Grid.Column="2" Width="82" HorizontalAlignment="Right"
+                             TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
                 </Grid>
             </GroupBox>
-            <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+            <GroupBox Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+                <GroupBox.Header>
+                    <TextBlock>
+                        Rechnungsadresse (optional) <Run FontSize="10">für Lieferschein, Anlfrg.-Bstng., Tr.-Gutschr.</Run>
+                    </TextBlock>
+                </GroupBox.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="65"/>
@@ -619,7 +627,7 @@
                              Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0" ToolTip="Buchhaltungskonto"/>
                     <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Margin="0,70,10,0" Width="63" Grid.Column="1" HorizontalAlignment="Left"
                              TextChanged="TextBox_TextChanged"/>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -7,7 +7,6 @@ using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -966,17 +965,6 @@ namespace Elwig.Windows {
             }
         }
 
-        private void OrganicButton_Click(object sender, RoutedEventArgs evt) {
-            if (ViewModel.SelectedMember is not Member m) return;
-            var url = "https://www.easy-cert.com/htm/suchergebnis.htm?" +
-                //$"CustomerNumber={m.LfbisNr}&" +
-                $"Name={(m.BillingAddress?.FullName ?? m.FullName).Replace(' ', '+')}&" +
-                $"PostalCode={(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}";
-            Process.Start(new ProcessStartInfo(url) {
-                UseShellExecute = true,
-            });
-        }
-
         private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
             if (ViewModel.SelectedMember is not Member m || m.PredecessorMgNr == null) return;
             FocusMember((int)m.PredecessorMgNr);

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=41" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=42" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"