@Model.Text
+ } +diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml index 243ee82..8131765 100644 --- a/Elwig/Documents/DeliveryConfirmation.cshtml +++ b/Elwig/Documents/DeliveryConfirmation.cshtml @@ -29,7 +29,7 @@
@Model.Text
+ } +@Model.Text
} diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs index 9a200ea..b68a1b0 100644 --- a/Elwig/Helpers/ClientParameters.cs +++ b/Elwig/Helpers/ClientParameters.cs @@ -58,6 +58,7 @@ namespace Elwig.Helpers { public int ModeDeliveryNoteStats; public string? TextDeliveryNote; + public string? TextDeliveryConfirmation; public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { } @@ -100,6 +101,9 @@ namespace Elwig.Helpers { Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? ""; TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE"); + if (TextDeliveryNote == "") TextDeliveryNote = null; + TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION"); + if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null; } catch { throw new KeyNotFoundException(); } @@ -138,6 +142,7 @@ namespace Elwig.Helpers { ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats), ("DOCUMENT_SENDER", Sender2), ("TEXT_DELIVERYNOTE", TextDeliveryNote), + ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation), }; } diff --git a/Elwig/Windows/BaseDataWindow.xaml b/Elwig/Windows/BaseDataWindow.xaml index 8eeccf1..690782e 100644 --- a/Elwig/Windows/BaseDataWindow.xaml +++ b/Elwig/Windows/BaseDataWindow.xaml @@ -241,6 +241,17 @@ +