add package

lib/model_fcs/message_model.dart

@@ -17,20 +17,34 @@ class MessageModel extends BaseModel {
       receiverName: "Online Buyer",
       date: DateTime(2020, 6, 1, 1, 1, 1),
       message:
-          "Hi Online Buyer, we received your goods. Please see in 'A202-3 #1'",
+          "Hi Online Buyer, we received your goods. Please see the following link",
+    ),
+    Message(
+      senderName: "FCS System",
+      receiverName: "Online Buyer",
+      date: DateTime(2020, 6, 1, 1, 1, 1),
+      message:
+          "'A202-3 #1'",
     ),
     Message(
         senderName: "FCS System",
         receiverName: "Online Buyer",
         date: DateTime(2020, 6, 1, 1, 5, 1),
-        message: "Thank you. Will see the photos and check.",
+        message: "Thank you. Will check the photos.",
         isMe: false),
     Message(
       senderName: "FCS System",
       receiverName: "Online Buyer",
       date: DateTime(2020, 6, 1, 2, 1, 1),
       message:
-          "Hi Online Buyer, we successfully processed your goods and ready for payment. Please see in 'INV202005010387'",
+          "Hi Online Buyer, we successfully processed your goods and ready for payment. Please see in the following link.",
+    ),
+    Message(
+      senderName: "FCS System",
+      receiverName: "Online Buyer",
+      date: DateTime(2020, 6, 1, 2, 1, 1),
+      message:
+          "'INV202005010387'",
     ),
     Message(
       senderName: "FCS System",
@@ -44,14 +58,28 @@ class MessageModel extends BaseModel {
       receiverName: "Shipper",
       date: DateTime(2020, 6, 1, 1, 1, 1),
       message:
-          "Hi Online Buyer, we received your goods. Please see in 'A202-3 #1'",
+          "Hi Online Buyer, we received your goods. Please see in the following link.",
+    ),
+    Message(
+      senderName: "FCS System",
+      receiverName: "Shipper",
+      date: DateTime(2020, 6, 1, 1, 1, 1),
+      message:
+          "'A202-3 #1'",
     ),
     Message(
       senderName: "FCS System",
       receiverName: "Shipper",
       date: DateTime(2020, 6, 1, 2, 1, 1),
       message:
-          "Hi Online Buyer, we successfully processed your goods and ready for payment. Please see in 'INV202005010387'",
+          "Hi Online Buyer, we successfully processed your goods and ready for payment. Please see in the following link.",
+    ),
+    Message(
+      senderName: "FCS System",
+      receiverName: "Shipper",
+      date: DateTime(2020, 6, 1, 2, 1, 1),
+      message:
+          "'INV202005010387'",
     ),
     Message(
       senderName: "FCS System",
@@ -63,7 +91,7 @@ class MessageModel extends BaseModel {
   ];
 
   List<Message> get lastMessage {
-    return [messages[2], messages[5]];
+    return [messages[2], messages[6]];
   }
 
   List<Message> getMessage(String receiver) {

lib/model_fcs/package_model.dart

@@ -39,7 +39,7 @@ class PackageModel extends BaseModel {
         rate: 7,
         packageType: "General",
         weight: 15,
-        status: "Received",
+        status: "Waiting for payment",
         arrivedDate: DateTime(2020, 6, 1),
         receiverAddress: '1 Bo Yar Nyunt St.\nDagon Tsp, Yangon'),
     Package(

lib/pages/home_page.dart

@@ -306,8 +306,8 @@ class _HomePageState extends State<HomePage> {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: <Widget>[
-                        _buildSmallButton(
+                        // _buildSmallButton(
-                            "Policies", FontAwesomeIcons.fileContract),
+                        //     "Policies", FontAwesomeIcons.fileContract),
                         _buildSmallButton("Support", SimpleLineIcons.support),
                       ],
                     )

lib/pages_fcs/package_editor.dart

@@ -1,5 +1,6 @@
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/pickup_model.dart';
+import 'package:fcs/pages/util.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
@@ -39,6 +40,8 @@ class _PackageEditorState extends State<PackageEditor> {
       // _toTimeEditingController.text = _pickUp.toTime;
       // _noOfPackageEditingController.text = _pickUp.numberOfPackage.toString();
       // _weightEditingController.text = _pickUp.weight.toString();
+    } else {
+      _package = Package(rate: 0, weight: 0);
     }
   }
 
@@ -65,22 +68,37 @@ class _PackageEditorState extends State<PackageEditor> {
           child: Column(
             children: <Widget>[
               Expanded(
-                  child: Padding(
+                child: ListView(
-                padding: const EdgeInsets.all(10.0),
+                  children: [
-                child: ListView(children: <Widget>[
+                    widget.package == null
-                  DropdownButtonFormField(
+                        ? Center(
+                            child: Container(
+                                padding: EdgeInsets.all(8),
+                                child: Text("New Package")))
+                        : Center(child: nameWidget(_package.packageNumber)),
+                    ExpansionTile(
+                      title: Text('Package Information'),
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: DropdownButtonFormField(
+                            value: _package.shipmentNumber,
                             decoration: InputDecoration(
                                 fillColor: Colors.white,
                                 labelText: 'Shipment Number',
                                 icon: Icon(Icons.pages)
                                 // prefixIcon: Icon(Icons.play_arrow)
                                 ),
-                    items: ["A102", "A103"]
+                            items: ["A102", "A103", "A201", "A202"]
-                        .map((e) => DropdownMenuItem(child: Text(e), value: e))
+                                .map((e) =>
+                                    DropdownMenuItem(child: Text(e), value: e))
                                 .toList(),
                             onChanged: (map) => {},
                           ),
-                  TextFormField(
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: TextFormField(
                             initialValue: "FCS383-283-1",
                             decoration: InputDecoration(
                                 fillColor: Colors.white,
@@ -91,9 +109,14 @@ class _PackageEditorState extends State<PackageEditor> {
                                   Icons.account_box,
                                 ),
                                 suffixIcon: IconButton(
-                            icon: Icon(Icons.search), onPressed: () {})),
+                                    icon: Icon(Icons.search),
+                                    onPressed: () {})),
                           ),
-                  DropdownButtonFormField(
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: DropdownButtonFormField(
+                            value: _package.packageType,
                             decoration: InputDecoration(
                                 fillColor: Colors.white,
                                 labelText: 'Cargo Type',
@@ -101,12 +124,16 @@ class _PackageEditorState extends State<PackageEditor> {
                                 // prefixIcon: Icon(Icons.play_arrow)
                                 ),
                             items: ["General", "Medicine", "Dangerous"]
-                        .map((e) => DropdownMenuItem(child: Text(e), value: e))
+                                .map((e) =>
+                                    DropdownMenuItem(child: Text(e), value: e))
                                 .toList(),
                             onChanged: (map) => {},
                           ),
-                  TextFormField(
+                        ),
-                      initialValue: "0",
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: TextFormField(
+                              initialValue: _package.weight.toString(),
                               textAlign: TextAlign.end,
                               decoration: InputDecoration(
                                 fillColor: Colors.white,
@@ -116,8 +143,11 @@ class _PackageEditorState extends State<PackageEditor> {
                                   FontAwesomeIcons.weightHanging,
                                 ),
                               )),
-                  TextFormField(
+                        ),
-                      initialValue: "0",
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: TextFormField(
+                              initialValue: _package.rate.toString(),
                               textAlign: TextAlign.end,
                               decoration: InputDecoration(
                                 fillColor: Colors.white,
@@ -127,8 +157,11 @@ class _PackageEditorState extends State<PackageEditor> {
                                   FontAwesomeIcons.tag,
                                 ),
                               )),
-                  TextFormField(
+                        ),
-                      initialValue: "0",
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: TextFormField(
+                              initialValue: _package.amount.toString(),
                               textAlign: TextAlign.end,
                               decoration: InputDecoration(
                                 fillColor: Colors.white,
@@ -138,7 +171,10 @@ class _PackageEditorState extends State<PackageEditor> {
                                   FontAwesomeIcons.moneyBill,
                                 ),
                               )),
-                  TextFormField(
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(left: 20.0),
+                          child: TextFormField(
                             initialValue: "P0203",
                             decoration: InputDecoration(
                                 fillColor: Colors.white,
@@ -148,10 +184,46 @@ class _PackageEditorState extends State<PackageEditor> {
                                   Icons.account_box,
                                 ),
                                 suffixIcon: IconButton(
-                            icon: Icon(Icons.search), onPressed: () {})),
+                                    icon: Icon(Icons.search),
+                                    onPressed: () {})),
+                          ),
+                        ),
+                      ],
+                    ),
+                    ExpansionTile(
+                      title: Text('Photos'),
+                      children: <Widget>[
+                        Container(
+                          height: 130,
+                          width: 500,
+                          child: ListView(
+                            // scrollDirection: Axis.horizontal,
+                            children: <Widget>[
+                              Padding(
+                                padding: const EdgeInsets.only(left: 20.0),
+                                child: DropdownButtonFormField(
+                                  value: _package.shipmentNumber,
+                                  decoration: InputDecoration(
+                                      fillColor: Colors.white,
+                                      labelText: 'Shipment Number',
+                                      icon: Icon(Icons.pages)
+                                      // prefixIcon: Icon(Icons.play_arrow)
+                                      ),
+                                  items: ["A102", "A103", "A201", "A202"]
+                                      .map((e) => DropdownMenuItem(
+                                          child: Text(e), value: e))
+                                      .toList(),
+                                  onChanged: (map) => {},
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    )
+                  ],
+                ),
               ),
-                ]),
-              )),
               widget.package == null
                   ? Align(
                       alignment: Alignment.bottomCenter,

lib/vo/package.dart

@@ -12,13 +12,14 @@ class Package {
 
   int rate;
   int weight;
-  int amount;
   String packageType;
   String pickUpID;
   List<String> photos;
   String remark;
   DateTime arrivedDate;
 
+  int get amount => rate != null && weight != null ? rate * weight : 0;
+
   String get packageNumber =>
       shipmentNumber + "-" + receiverNumber + " #" + boxNumber;
   double get price => rate.toDouble() * weight;
@@ -35,7 +36,6 @@ class Package {
       this.boxNumber,
       this.rate,
       this.weight,
-      this.amount,
       this.packageType,
       this.pickUpID,
       this.remark,