winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Change UstId to UstIdNr

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-08-17 16:45:31 +02:00
parent 3ab2b8a8dc
commit 58235e3b02
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Documents/BusinessDocument.cshtml.cs
View File

@ -12,7 +12,7 @@ namespace Elwig.Documents {
Member = m;
Location = App.BranchName;
IncludeSender = includeSender;
var uid = (m.UstId ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
Aside = $"<table><colgroup><col span='1' style='width: 2.25cm;'/><col span='1' style='width: 100%;'/></colgroup>" +
$"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
$"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +

2
Elwig/Documents/Document.cshtml.cs
View File

@ -17,7 +17,7 @@ namespace Elwig.Documents {
Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
.Item(c.NameFull).NextLine()
.Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
.Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstId).NextLine()
.Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
.Item("BIC", c.Bic).Item("IBAN", c.Iban)
.ToString();
Date = DateTime.Today;

4
Elwig/Helpers/ClientParameters.cs
View File

@ -30,7 +30,7 @@ namespace Elwig.Helpers {
public string? Iban;
public string? Bic;
public string? UstId;
public string? UstIdNr;
public string? LfbisNr;
public string? PhoneNr;
@ -66,7 +66,7 @@ namespace Elwig.Helpers {
EmailAddress = parameters.GetValueOrDefault("CLIENT_EMAIL");
Website = parameters.GetValueOrDefault("CLIENT_WEBSITE");
LfbisNr = parameters.GetValueOrDefault("CLIENT_LFBISNR");
UstId = parameters.GetValueOrDefault("CLIENT_USTIDNR");
UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
Bic = parameters.GetValueOrDefault("CLIENT_BIC");
Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";

2
Elwig/Helpers/Validator.cs
View File

@ -332,7 +332,7 @@ namespace Elwig.Helpers {
return new(true, null);
}
public static ValidationResult CheckUstId(TextBox input, bool required) {
public static ValidationResult CheckUstIdNr(TextBox input, bool required) {
string text = "";
int pos = input.CaretIndex;
for (int i = 0, v = 0; i < input.Text.Length; i++) {

4
Elwig/Models/Member.cs
View File

@ -95,8 +95,8 @@ namespace Elwig.Models {
[Column("lfbis_nr")]
public string? LfbisNr { get; set; }
[Column("ustid")]
public string? UstId { get; set; }
[Column("ustid_nr")]
public string? UstIdNr { get; set; }
[Column("volllieferant")]
public bool IsVollLieferant { get; set; }

8
Elwig/Windows/AdministrationWindow.cs
View File

@ -422,12 +422,12 @@ namespace Elwig.Windows {
InputLostFocus((TextBox)sender, Validator.CheckBic);
}
protected void UstIdInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckUstId);
protected void UstIdNrInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckUstIdNr);
}
protected void UstIdInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, Validator.CheckUstId);
protected void UstIdNrInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, Validator.CheckUstIdNr);
}
protected void LfbisNrInput_TextChanged(object sender, RoutedEventArgs evt) {

4
Elwig/Windows/MemberAdminWindow.xaml
View File

@ -258,8 +258,8 @@
</Grid.ColumnDefinitions>
<Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="UstIdInput" Margin="0,10,10,0" Grid.Column="1" Width="120" HorizontalAlignment="Left"
TextChanged="UstIdInput_TextChanged" LostFocus="UstIdInput_LostFocus"/>
<TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="120" HorizontalAlignment="Left"
TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
<Label Content="BetriebsNr.:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"

4
Elwig/Windows/MemberAdminWindow.xaml.cs
View File

@ -346,7 +346,7 @@ namespace Elwig.Windows {
m.Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", "");
m.Bic = (BicInput.Text == "") ? null : BicInput.Text;
m.UstId = (UstIdInput.Text == "") ? null : UstIdInput.Text;
m.UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text;
m.LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text;
m.IsBuchführend = BuchführendInput.IsChecked ?? false;
@ -476,7 +476,7 @@ namespace Elwig.Windows {
IbanInput.Text = m.Iban;
BicInput.Text = m.Bic;
UstIdInput.Text = m.UstId;
UstIdNrInput.Text = m.UstIdNr;
LfbisNrInput.Text = m.LfbisNr;
BuchführendInput.IsChecked = m.IsBuchführend;