From f670db3b66c668aeba26f37629e59c4a963aa635 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 19 Sep 2022 11:11:55 +0300
Subject: [PATCH] Transactions

---
 lib/data/models/transaction_model.dart        |  4 +--
 lib/ui/transaction/edit/transaction_edit.dart | 32 +++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/lib/data/models/transaction_model.dart b/lib/data/models/transaction_model.dart
index 7d9277ee7..aedb067d4 100644
--- a/lib/data/models/transaction_model.dart
+++ b/lib/data/models/transaction_model.dart
@@ -78,11 +78,11 @@ abstract class TransactionEntity extends Object
       bankAccountId: '',
       category: '',
       currencyId: '',
-      date: '',
+      date: convertDateTimeToSqlDate(),
       description: '',
       expenseId: '',
       invoiceId: '',
-      baseType: '',
+      baseType: TYPE_DEPOSIT,
     );
   }
 
diff --git a/lib/ui/transaction/edit/transaction_edit.dart b/lib/ui/transaction/edit/transaction_edit.dart
index 77c3b9c51..3650d6960 100644
--- a/lib/ui/transaction/edit/transaction_edit.dart
+++ b/lib/ui/transaction/edit/transaction_edit.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
+import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/transaction/edit/transaction_edit_vm.dart';
@@ -104,12 +106,23 @@ class _TransactionEditState extends State<TransactionEdit> {
               children: <Widget>[
                 FormCard(
                   children: <Widget>[
-                    DecoratedFormField(
-                      label: localization.amount,
-                      keyboardType:
-                          TextInputType.numberWithOptions(decimal: true),
-                      controller: _amountController,
-                    ),
+                    AppDropdownButton<String>(
+                        labelText: localization.type,
+                        value: transaction.baseType,
+                        onChanged: (dynamic value) {
+                          viewModel.onChanged(
+                              transaction.rebuild((b) => b..baseType = value));
+                        },
+                        items: [
+                          DropdownMenuItem(
+                            child: Text(localization.deposit),
+                            value: TransactionEntity.TYPE_DEPOSIT,
+                          ),
+                          DropdownMenuItem(
+                            child: Text(localization.withdrawal),
+                            value: TransactionEntity.TYPE_WITHDRAWL,
+                          ),
+                        ]),
                     DatePicker(
                         labelText: localization.date,
                         onSelected: (date, _) {
@@ -117,6 +130,13 @@ class _TransactionEditState extends State<TransactionEdit> {
                               transaction.rebuild((b) => b..date = date));
                         },
                         selectedDate: transaction.date),
+                    DecoratedFormField(
+                      autofocus: transaction.isNew,
+                      label: localization.amount,
+                      keyboardType:
+                          TextInputType.numberWithOptions(decimal: true),
+                      controller: _amountController,
+                    ),
                     DecoratedFormField(
                       label: localization.description,
                       keyboardType: TextInputType.multiline,