Merge branch 'master' of phyothandar/fcs into master

assets/local/localization_en.json

@@ -552,7 +552,7 @@
 
     "contact": "CONTACTS",
 
-    "fcs.profile": "FCS PROFILE",
+    "fcs.profile": "PROFILE",
 
     "contact.usa.phone": "USA Phone",
     "contact.mm.phone": "Myanmar Phone"

assets/local/localization_mu.json

@@ -558,6 +558,9 @@
 
     "rate":"အဆင့်သတ်မှတ်ချက်များ",
     "rate.title":"အဆင့်သတ်မှတ်ချက်များ",
+    "rate.edit.title":"အဆင့်သတ်မှတ်ချက်များပြုပြင်ရန်",
+
+    "rate.cal.title":"အဆင့်သတ်မှတ်ချက်များတွက်ချက်ရန်",
 
     "message.btn":"မက်ဆေ့ခ်ျများ",
     "message.title":"မက်ဆေ့ခ်ျများ",
@@ -580,7 +583,7 @@
 
     "contact": "ဆက်သွယ်ရန်",
 
-    "fcs.profile": "FCS ပရိုဖိုင်",
+    "fcs.profile": "ပရိုဖိုင်",
 
     "contact.usa.phone": "ယူအက်စ်အေ ဖုန်းနံပါတ်",
     "contact.mm.phone": "မြန်မာ ဖုန်းနံပါတ်"

lib/pages/shipment_rates.dart

@@ -2,6 +2,7 @@ import 'package:fcs/model/pickup_model.dart';
 import 'package:fcs/model/shipment_rate_model.dart';
 import 'package:fcs/pages/shipment_rates_calculate.dart';
 import 'package:fcs/pages/shipment_rates_edit.dart';
+import 'package:fcs/pages/term.dart';
 import 'package:fcs/vo/pickup.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:provider/provider.dart';
@@ -32,14 +33,6 @@ class _ShipmentRatesState extends State<ShipmentRates> {
 
   PickUp _pickUp;
   bool _isLoading = false;
-  List<String> texts = [
-    "Minimum shipping weight is 1lbs.",
-    "Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on specifications. Please contact us for pricing.",
-    "Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.",
-    "Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.",
-    "Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.",
-    "Payments made in Myanmar will incur 2% tranfer fee"
-  ];
 
   @override
   void initState() {
@@ -63,13 +56,6 @@ class _ShipmentRatesState extends State<ShipmentRates> {
   Widget build(BuildContext context) {
     var shipmentRateModel = Provider.of<ShipmentRateModel>(context);
 
-    var textList = texts
-        .map(
-          (e) => TextSpan(
-              text: "\n  *   " + e + "\n",
-              style: TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
-        )
-        .toList();
     final usaAddress = Container(
         child: TextFormField(
       maxLines: null,
@@ -119,16 +105,10 @@ class _ShipmentRatesState extends State<ShipmentRates> {
               _row("Free delivery within Yangon \nfor shipments over", "10",
                   "pounds"),
               _row("Delivery fees", "\$ 5", "below 10 pounds"),
-              // Padding(
+              fcsButton(context, "Terms & Conditions", callack: () {
-              //   padding: const EdgeInsets.only(left: 18.0, right: 18),
+                Navigator.of(context)
-              //   child: RichText(
+                    .push(MaterialPageRoute(builder: (_) => Term()));
-              //     // overflow: TextOverflow.fade,
+              }),
-              //     text: TextSpan(
-              //       style: TextStyle(color: primaryColor),
-              //       children: textList,
-              //     ),
-              //   ),
-              // ),
               fcsButton(context, "Calculate", callack: () {
                 Navigator.of(context)
                     .push(BottomUpPageRoute(ShipmentRatesCal()));

lib/pages/shipment_rates_calculate.dart

@@ -58,8 +58,14 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
       child: Scaffold(
         appBar: AppBar(
           centerTitle: true,
+          leading: new IconButton(
+            icon: new Icon(
+              Icons.close,
+            ),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
           backgroundColor: primaryColor,
-          title: Text(AppTranslations.of(context).text("rate.title")),
+          title: Text(AppTranslations.of(context).text("rate.cal.title")),
         ),
         body: Padding(
           padding: const EdgeInsets.all(8.0),
@@ -77,13 +83,22 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
                               shipmentRateModel.rates[index].price.toString() +
                               " per pound",
                           '',
-                          "",input: true);
+                          "",
+                          input: true);
                     }),
               ),
               SizedBox(height: 50),
-              Center(child: Text("Delivery fee:\$ 5",style: TextStyle(color:primaryColor,fontSize:16),)),
+              Center(
+                  child: Text(
+                "Delivery fee:\$ 5",
+                style: TextStyle(color: primaryColor, fontSize: 16),
+              )),
               SizedBox(height: 20),
-              Center(child: Text("Total estimated amount:\$ 38",style: TextStyle(color:primaryColor,fontSize:20),))
+              Center(
+                  child: Text(
+                "Total estimated amount:\$ 38",
+                style: TextStyle(color: primaryColor, fontSize: 20),
+              ))
             ],
           ),
         ),
@@ -91,7 +106,7 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
     );
   }
 
-  _row(String desc, String price, String unit,{bool input}) {
+  _row(String desc, String price, String unit, {bool input}) {
     return Container(
         padding: EdgeInsets.only(left: 25, top: 5, bottom: 5),
         child: Row(
@@ -119,8 +134,10 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
               width: 50,
             ),
             Container(
-              width: 70,
+                width: 70,
-              child: TextField(textAlign: TextAlign.end,)),
+                child: TextField(
+                  textAlign: TextAlign.end,
+                )),
           ],
         ));
   }

lib/pages/shipment_rates_edit.dart

@@ -30,14 +30,6 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
 
   PickUp _pickUp;
   bool _isLoading = false;
-  List<String> texts = [
-    "Minimum shipping weight is 1lbs.",
-    "Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on specifications. Please contact us for pricing.",
-    "Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.",
-    "Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.",
-    "Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.",
-    "Payments made in Myanmar will incur 2% tranfer fee"
-  ];
 
   @override
   void initState() {
@@ -61,14 +53,6 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
   Widget build(BuildContext context) {
     var shipmentRateModel = Provider.of<ShipmentRateModel>(context);
 
-    var textList = texts
-        .map(
-          (e) => TextSpan(
-              text: "\n  *   " + e + "\n",
-              style: TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
-        )
-        .toList();
-
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
@@ -88,7 +72,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
           child: ListView(
             children: <Widget>[
               Container(
-                height: 145,
+                height: 190,
                 child: ListView.builder(
                     itemCount: shipmentRateModel.rates.length,
                     itemBuilder: (context, index) {
@@ -103,16 +87,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
                   FontAwesomeIcons.weightHanging,
                   value: "10"),
               fcsInput("Delivery fees", Icons.attach_money, value: "5"),
-              Padding(
+              SizedBox(height: 10),
-                padding: const EdgeInsets.only(left: 8.0, right: 8),
-                child: RichText(
-                  // overflow: TextOverflow.fade,
-                  text: TextSpan(
-                    style: TextStyle(color: primaryColor),
-                    children: textList,
-                  ),
-                ),
-              ),
               fcsButton(context, "Save", callack: () {}),
               SizedBox(height: 10)
             ],