diff --git a/MemoGenerator/MainWindow.xaml b/MemoGenerator/MainWindow.xaml
index 756f174..d48414f 100644
--- a/MemoGenerator/MainWindow.xaml
+++ b/MemoGenerator/MainWindow.xaml
@@ -44,7 +44,6 @@
-
+ SelectionChanged="updateMemoTextBlock">
계산서
카드
@@ -76,27 +75,27 @@
IsEnabled="{Binding EnableInvoice}"
PlaceholderForeground="LightGray" PlaceholderText="0619"
Text="{Binding InvoiceInfo.Date, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
- TextChanged="updatePaymentProofMethodComponent" />
-
+
-
+ SelectionChanged="updateMemoTextBlock">
세금계산서
면세계산서
-
@@ -106,7 +105,7 @@
+ SelectionChanged="updateMemoTextBlock">
미지정
일이삼사
대미기프트
@@ -115,7 +114,7 @@
-
@@ -125,7 +124,7 @@
IsEnabled="{Binding EnableCard}"
MaxColumns="1"
SelectedIndex="{Binding CardInfo.SelectedCardTypeIndex, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
- SelectionChanged="updatePaymentProofMethodComponent">
+ SelectionChanged="updateMemoTextBlock">
비씨카드 결제
나이스페이 카드 결제
@@ -141,21 +140,21 @@
-
-
-
+
-
-
-
diff --git a/MemoGenerator/MainWindow.xaml.cs b/MemoGenerator/MainWindow.xaml.cs
index 38918ec..1803f0c 100644
--- a/MemoGenerator/MainWindow.xaml.cs
+++ b/MemoGenerator/MainWindow.xaml.cs
@@ -36,8 +36,6 @@ public sealed partial class MainWindow : Window
StackPanel[] panels;
private string identifyingComponent = "";
- private string paymentProofMethodComponent = "";
- private string documentsDeliveryRouteComponent = "";
private TaxCalculatingModel taxCalculatingModel = new TaxCalculatingModel();
private PaymentProofModel paymentProofModel = new PaymentProofModel();
@@ -108,13 +106,13 @@ private void updateMemoTextBlock(object sender, RoutedEventArgs e)
{
components.Add($"{componentPrefix}{identifyingComponent}{componentSuffix}");
}
- if (!String.IsNullOrEmpty(paymentProofMethodComponent))
+ if (!String.IsNullOrEmpty(paymentProofModel.memoComponent))
{
- components.Add($"{componentPrefix}{paymentProofMethodComponent}{componentSuffix}");
+ components.Add($"{componentPrefix}{paymentProofModel.memoComponent}{componentSuffix}");
}
- if (!String.IsNullOrEmpty(documentsDeliveryRouteComponent))
+ if (!String.IsNullOrEmpty(proofDocumentModel.memoComponent))
{
- components.Add($"{componentPrefix}{documentsDeliveryRouteComponent}{componentSuffix}");
+ components.Add($"{componentPrefix}{proofDocumentModel.memoComponent}{componentSuffix}");
}
string text = String.Join("-", components);
@@ -162,21 +160,6 @@ private void updateIdentifyingComponent(object sender, TextChangedEventArgs e)
updateMemoTextBlock(null, null);
}
- private void updatePaymentProofMethodComponent(object sender, RoutedEventArgs e)
- {
- // 함께사는 세상 옵션 추가
- // 분할 발행 기능
-
- paymentProofMethodComponent = paymentProofModel.memoComponent;
- updateMemoTextBlock(null, null);
- }
-
- private void updateDocumentsDeliveryRouteComponent(object sender, RoutedEventArgs e)
- {
- documentsDeliveryRouteComponent = proofDocumentModel.memoComponent;
- updateMemoTextBlock(null, null);
- }
-
private void resetButton_Click(object sender, RoutedEventArgs e)
{
taxCalculatingModel.initializeItemInfos();
@@ -194,8 +177,6 @@ private void memoResetButton_Click(object sender, RoutedEventArgs e)
proofDocumentModel.propertyChanged(null);
recipientModel.initializeRecipientModel();
recipientModel.propertyChanged(null);
- updatePaymentProofMethodComponent(null, null);
- updateDocumentsDeliveryRouteComponent(null, null);
}
private void deductionCheckBox_Click(object sender, RoutedEventArgs e)
diff --git a/MemoGenerator/Model/MemoGenerating/PaymentProofModel.cs b/MemoGenerator/Model/MemoGenerating/PaymentProofModel.cs
index f450761..3203699 100644
--- a/MemoGenerator/Model/MemoGenerating/PaymentProofModel.cs
+++ b/MemoGenerator/Model/MemoGenerating/PaymentProofModel.cs
@@ -176,6 +176,8 @@ public int SelectedCardTypeIndex
}
}
+ // 함께사는 세상 옵션 추가
+ // 분할 발행 기능
sealed class PaymentProofModel : BaseINotifyPropertyChanged
{
private PaymentProofType paymentProofType;