From bdd3caa15ca680d0116bcb5f9ed9dd37bccb2c90 Mon Sep 17 00:00:00 2001
From: tzw <thinzar.win@mokkon.com>
Date: Tue, 12 Oct 2021 10:22:57 +0630
Subject: [PATCH] update term

---
 lib/data/provider/rate_data_provider.dart        |  1 +
 .../delivery_address_editor.dart                 | 16 +++++++++-------
 .../fcs_shipment/model/fcs_shipment_model.dart   |  2 +-
 lib/pages/staff/model/staff_model.dart           |  2 +-
 lib/pages/term/term_edit.dart                    |  8 +++++++-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/data/provider/rate_data_provider.dart b/lib/data/provider/rate_data_provider.dart
index 0ffc089..e766044 100644
--- a/lib/data/provider/rate_data_provider.dart
+++ b/lib/data/provider/rate_data_provider.dart
@@ -25,6 +25,7 @@ class RateDataProvider {
         .doc(rate_doc_id)
         .snapshots();
     await for (var snap in snapshot) {
+      print(snap.data());
       Rate rate = Rate.fromMap(snap.data() as Map<String, dynamic>);
       yield rate;
     }
diff --git a/lib/pages/delivery_address/delivery_address_editor.dart b/lib/pages/delivery_address/delivery_address_editor.dart
index aa84ba2..4f84619 100644
--- a/lib/pages/delivery_address/delivery_address_editor.dart
+++ b/lib/pages/delivery_address/delivery_address_editor.dart
@@ -44,7 +44,7 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
       _address2Controller.text = _deliveryAddress.addressLine2 ?? "";
       _cityController.text = _deliveryAddress.city ?? "";
       _stateController.text = _deliveryAddress.state ?? "";
-      _phoneController.text = _deliveryAddress.phoneNumber?? "";
+      _phoneController.text = _deliveryAddress.phoneNumber ?? "";
     } else {
       _cityController.text = "Yangon";
       _stateController.text = "Yangon";
@@ -123,12 +123,14 @@ class _DeliveryAddressEditorState extends State<DeliveryAddressEditor> {
             title: LocalText(context, 'delivery_address',
                 color: primaryColor, fontSize: 18),
             actions: [
-              IconButton(
-                  icon: Icon(
-                    Icons.delete,
-                    color: primaryColor,
-                  ),
-                  onPressed: _delete)
+              _isNew
+                  ? Container()
+                  : IconButton(
+                      icon: Icon(
+                        Icons.delete,
+                        color: primaryColor,
+                      ),
+                      onPressed: _delete)
             ],
           ),
           body: Padding(
diff --git a/lib/pages/fcs_shipment/model/fcs_shipment_model.dart b/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
index 762aa0b..8e0d983 100644
--- a/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
+++ b/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
@@ -43,7 +43,7 @@ class FcsShipmentModel extends BaseModel {
   }
 
   Future<void> _loadFcsShipments() async {
-    if (user == null || !user!.hasFcsShipments()) throw "No Privilege";
+    if (user == null || !user!.hasFcsShipments()) return;
     String path = "/$fcs_shipment_collection/";
     if (listener != null) listener!.cancel();
     _fcsShipments = [];
diff --git a/lib/pages/staff/model/staff_model.dart b/lib/pages/staff/model/staff_model.dart
index 152a775..e4a0b7a 100644
--- a/lib/pages/staff/model/staff_model.dart
+++ b/lib/pages/staff/model/staff_model.dart
@@ -33,7 +33,7 @@ class StaffModel extends BaseModel {
   }
 
   Future<void> _loadEmployees() async {
-    if (user == null || !user!.hasStaffs()) throw "No Privilege";
+    if (user == null || !user!.hasStaffs()) return;
 
     try {
       if (listener != null) listener!.cancel();
diff --git a/lib/pages/term/term_edit.dart b/lib/pages/term/term_edit.dart
index 6bc0e69..1bb0b15 100644
--- a/lib/pages/term/term_edit.dart
+++ b/lib/pages/term/term_edit.dart
@@ -90,7 +90,13 @@ class _TermEditState extends State<TermEdit> {
             ],
             bottom: TabBar(
               onTap: (index) {
-                // Tab index when user select it, it start from zero
+                if (index == 0) {
+                  _focusNodeEng = new FocusNode();
+                  FocusScope.of(context).requestFocus(_focusNodeEng);
+                } else {
+                  _focusNodeMm = new FocusNode();
+                  FocusScope.of(context).requestFocus(_focusNodeMm);
+                }
               },
               tabs: [
                 Tab(