From af22647320588637e42ad8dcdc86854c75d0de64 Mon Sep 17 00:00:00 2001
From: error500 <nonstopus.sha@gmail.com>
Date: Tue, 7 Sep 2021 12:28:04 +0600
Subject: [PATCH] sqlite + redux +

---
 lib/core/models/entity_data/transaction_data.dart | 8 +++++---
 lib/core/redux/actions/journal_actions.dart       | 4 ++--
 lib/core/services/data_service.dart               | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/core/models/entity_data/transaction_data.dart b/lib/core/models/entity_data/transaction_data.dart
index 66cf76a..9e56f60 100644
--- a/lib/core/models/entity_data/transaction_data.dart
+++ b/lib/core/models/entity_data/transaction_data.dart
@@ -5,9 +5,10 @@ class TransactionData {
   TransactionData();
 
   TransactionData.fromMap(dynamic map) {
-    contragentName = map['contragentName'] as String;
-    card = map['card'] as double;
-    nal = map['nal'] as double;
+    contragentName = cast<String>(map['contragentName']) ?? '';
+    card = cast<double>(map['card']) ?? 0;
+    nal = cast<double>(map['nal']) ?? 0;
+    total = cast<double>(map['total']) ?? 0;
     sellResponse = map['sellResponse'] != null
         ? SellResponse.fromMap(map['sellResponse'])
         : null;
@@ -24,6 +25,7 @@ class TransactionData {
       'contragentName': contragentName,
       'card': card,
       'nal': nal,
+      'total' : total,
       'sellResponse': sellResponse
     };
     return map;
diff --git a/lib/core/redux/actions/journal_actions.dart b/lib/core/redux/actions/journal_actions.dart
index ebe48be..b898171 100644
--- a/lib/core/redux/actions/journal_actions.dart
+++ b/lib/core/redux/actions/journal_actions.dart
@@ -48,10 +48,10 @@ Future<void> loadJournalData(Store<AppState> store) async {
     final List<Map<String, dynamic>> set = await _dbService.queryRowsWithWhere(
         transactionTableName,
         '$transactionColumnAppCompanyId = ?'
-            '  and $transactionColumnStatus = ?'
+            ' and $transactionColumnStatus = ?'
             ' and $transactionColumnType = ?',
         [appCompanyId, transactionStatusFinish, transactionTypeSell],
-        orderBy: '$transactionColumnCreatedAt desc');
+        orderBy: '$transactionColumnCreatedAt asc');
     log.i(set.length);
     final List<TransactionDao> list = [];
 
diff --git a/lib/core/services/data_service.dart b/lib/core/services/data_service.dart
index bd3881a..5e7bf50 100644
--- a/lib/core/services/data_service.dart
+++ b/lib/core/services/data_service.dart
@@ -81,6 +81,7 @@ class DataService extends BaseService {
     data.nal = nal;
     data.total = total;
     transaction.data = jsonEncode(data.toMap());
+    log.i(jsonEncode(data.toMap()));
     await _db.update(transactionTableName, transaction.toMap());
   }