Merge branch 'master' into error-handling

Brixel · Aug 18, 2022 · c0495ca · c0495ca
2 parents f755878 + d477229
commit c0495ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Types/TransactionType.cs b/Types/TransactionType.cs
@@ -19,5 +19,9 @@ public enum TransactionType
     [Description("Fixed costs")]
     CreditFixedCosts,
     [Description("Internal bank transfer")]
-    InternalBank
+    InternalBank,
+    [Description("Sale of consumables")]
+    DebitSaleConsumables,
+    [Description("Sale of goods and services")]
+    DebitSaleGoodsAndServices
 }
diff --git a/Web/Models/TransactionForm.cs b/Web/Models/TransactionForm.cs
@@ -14,7 +14,7 @@ public TransactionForm()
         Counterparty = new AutocompleteCounterparty(string.Empty, null);
         TransactionTypeAmounts = new List<TransactionTypeAmountForm>()
         {
-            new(TransactionType.DebitWorkshopFee, 0)
+            new(TransactionType.DebitMemberFee, 0)
         };
         TransactionAttachments = new List<TransactionAttachment>();
     }

diff --git a/Web/Pages/Transactions/NewTransaction.razor b/Web/Pages/Transactions/NewTransaction.razor
@@ -36,7 +36,7 @@
 @code {
     private readonly Models.TransactionForm _newTransaction = new();
 
-    private TransactionTypeGroup _selectedTransactionTypeGroup = TransactionTypeGroup.Credit;
+    private TransactionTypeGroup _selectedTransactionTypeGroup = TransactionTypeGroup.Debit;
 
     private async Task AddTransaction()
     {

diff --git a/Web/Pages/Transactions/TransactionForm.razor b/Web/Pages/Transactions/TransactionForm.razor
@@ -163,15 +163,15 @@
             {
                 <MudItem xs="6">
                     <MudNumericField @bind-Value="transactionType.Amount"
-                                     Label="Bedrag (€)"
+                                     Label="Amount (€)"
                                      Min="0"
                                      T="decimal">
                     </MudNumericField>
                 </MudItem>
 
                 <MudItem xs="6">
                     <MudSelect @bind-Value="transactionType.TransactionType"
-                               Label="Selecteer transactie type"
+                               Label="Select transaction type"
                                Variant="Variant.Outlined">
                         @foreach (var item in _transactionTypes)
                         {
@@ -277,7 +277,9 @@
                 TransactionType.DebitWorkshopFee,
                 TransactionType.DebitDonation,
                 TransactionType.DebitMemberFee,
-                TransactionType.InternalBank
+                TransactionType.InternalBank,
+                TransactionType.DebitSaleConsumables,
+                TransactionType.DebitSaleGoodsAndServices
             }.OrderBy(x => x.GetDescription()).ToList();
         }
         return new List<TransactionType>