add packages, receiving & processing

2020-10-12 03:34:05 +06:30
parent 32e6be2abd
commit b13dc69161
36 changed files with 1110 additions and 668 deletions
--- a/lib/pages/box/box_list.dart
+++ b/lib/pages/box/box_list.dart
@@ -4,6 +4,7 @@ import 'package:fcs/pages/box/model/box_model.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

@@ -38,7 +39,7 @@ class _BoxListState extends State<BoxList> {
            appBar: AppBar(
              centerTitle: true,
              leading: new IconButton(
-                icon: new Icon(Icons.close),
+                icon: new Icon(CupertinoIcons.back),
                onPressed: () => Navigator.of(context).pop(),
              ),
              backgroundColor: primaryColor,
--- a/lib/pages/chat/message_detail.dart
+++ b/lib/pages/chat/message_detail.dart
@@ -12,6 +12,7 @@ import 'package:fcs/pages/package/package_info.dart';
 import 'package:fcs/pages/profile/profile_page.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

@@ -45,6 +46,10 @@ class MessageDetail extends StatelessWidget {

    return Scaffold(
      appBar: AppBar(
+        leading: new IconButton(
+          icon: new Icon(CupertinoIcons.back),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
        backgroundColor: primaryColor,
        elevation: .9,
        title: Text(
@@ -170,6 +175,7 @@ class MessageDetail extends StatelessWidget {
      PackageModel packageModel =
          Provider.of<PackageModel>(context, listen: false);
      Package p = await packageModel.getPackage(message.messageID);
+      if (p == null) return;
      Navigator.push<bool>(context, BottomUpPageRoute(PackageInfo(package: p)));
    }
    if (message.messageType == message_type_profile &&
--- a/lib/pages/delivery/delivery_list.dart
+++ b/lib/pages/delivery/delivery_list.dart
@@ -2,6 +2,7 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/box/model/box_model.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

@@ -35,7 +36,7 @@ class _DeliverListState extends State<DeliverList> {
            appBar: AppBar(
              centerTitle: true,
              leading: new IconButton(
-                icon: new Icon(Icons.close),
+                icon: new Icon(CupertinoIcons.back),
                onPressed: () => Navigator.of(context).pop(),
              ),
              backgroundColor: primaryColor,
--- a/lib/pages/delivery_address/model/delivery_address_model.dart
+++ b/lib/pages/delivery_address/model/delivery_address_model.dart
@@ -21,6 +21,12 @@ class DeliveryAddressModel extends BaseModel {
    _loadDeliveryAddresses();
  }

+  @override
+  logout() async {
+    if (listener != null) await listener.cancel();
+    deliveryAddresses = [];
+  }
+
  Future<void> _loadDeliveryAddresses() async {
    if (user == null) return;
    String path = "$delivery_address_collection/";
--- a/lib/pages/discount/discount_list.dart
+++ b/lib/pages/discount/discount_list.dart
@@ -4,6 +4,7 @@ import 'package:fcs/pages/discount/model/discount_model.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

@@ -29,7 +30,7 @@ class _DiscountListState extends State<DiscountList> {
            AppTranslations.of(context).text("discount.title"),
          ),
          leading: new IconButton(
-            icon: new Icon(Icons.close),
+            icon: new Icon(CupertinoIcons.back),
            onPressed: () => Navigator.of(context).pop(),
          ),
          backgroundColor: primaryColor,
--- a/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
+++ b/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
@@ -20,7 +20,7 @@ class FcsShipmentModel extends BaseModel {
  }

  Future<void> _loadFcsShipments() async {
-    if (user == null) return;
+    if (user == null || !user.hasFcsShipments()) return;
    String path = "/$fcs_shipment_collection/";
    if (listener != null) listener.cancel();
    fcsShipments = [];
@@ -49,6 +49,7 @@ class FcsShipmentModel extends BaseModel {

  @override
  logout() async {
+    if (listener != null) await listener.cancel();
    fcsShipments = [];
  }

--- a/lib/pages/invoice/invoce_list.dart
+++ b/lib/pages/invoice/invoce_list.dart
@@ -8,6 +8,7 @@ import 'package:fcs/pages/user_search/user_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';

 import 'package:flutter/material.dart';
@@ -45,7 +46,7 @@ class _InvoiceListState extends State<InvoiceList> {
            appBar: AppBar(
              centerTitle: true,
              leading: new IconButton(
-                icon: new Icon(Icons.close),
+                icon: new Icon(CupertinoIcons.back),
                onPressed: () => Navigator.of(context).pop(),
              ),
              backgroundColor: primaryColor,
--- a/lib/pages/main/home_page.dart
+++ b/lib/pages/main/home_page.dart
@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:io';

 import 'package:fcs/data/services/services.dart';
+import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/domain/entities/user.dart';
+import 'package:fcs/helpers/shared_pref.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/transalation.dart';
 import 'package:fcs/pages/box/box_list.dart';
@@ -17,23 +19,27 @@ import 'package:fcs/pages/fcs_shipment/fcs_shipment_list.dart';
 import 'package:fcs/pages/invoice/invoce_list.dart';
 import 'package:fcs/pages/main/model/language_model.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
+import 'package:fcs/pages/main/util.dart';
+import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/package/package_info.dart';
 import 'package:fcs/pages/package/package_list.dart';
 import 'package:fcs/pages/processing/processing_list.dart';
 import 'package:fcs/pages/rates/shipment_rates.dart';
 import 'package:fcs/pages/receiving/receiving_list.dart';
 import 'package:fcs/pages/shipment/shipment_list.dart';
 import 'package:fcs/pages/staff/staff_list.dart';
-import 'package:fcs/pages/widgets/task_button.dart';
 import 'package:fcs/pages/widgets/badge.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/bottom_widgets.dart';
+import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pages/widgets/right_left_page_rout.dart';
+import 'package:fcs/pages/widgets/task_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';

@@ -52,10 +58,12 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage> {
  final log = Logger('_HomePageState');
  bool login = false;
-  bool customer = true;
+  bool _isLoading = false;
  List<bool> isSelected = [true, false];
  static FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin =
      FlutterLocalNotificationsPlugin();
+  TextEditingController _searchCtl = TextEditingController();
+  List<bool> isFcs = [false];

  @override
  void initState() {
@@ -73,6 +81,18 @@ class _HomePageState extends State<HomePage> {
          mainModel.setMessaginToken = token;
        });
    _initLocalNotifications();
+    _loadStaffMode(mainModel.isCustomer());
+  }
+
+  _loadStaffMode(bool isCustomer) async {
+    bool staffMode = await SharedPref.getStaffMode();
+    setState(() {
+      if (isCustomer) {
+        isFcs[0] = false;
+      } else {
+        isFcs[0] = staffMode;
+      }
+    });
  }

  String notiUserID, notiUserName;
@@ -189,7 +209,6 @@ class _HomePageState extends State<HomePage> {
    if (user == null) {
      return Container();
    }
-    customer = Provider.of<MainModel>(context).isCustomer();

    login = Provider.of<MainModel>(context).isLogin();
    LanguageModel languageModel = Provider.of<LanguageModel>(context);
@@ -204,6 +223,12 @@ class _HomePageState extends State<HomePage> {
        icon: Octicons.package,
        btnCallback: () => Navigator.of(context).push<void>(
            CupertinoPageRoute(builder: (context) => PackageList())));
+    final packagesBtnFcs = TaskButton("package.btn.name",
+        icon: Octicons.package,
+        btnCallback: () => Navigator.of(context).push<void>(CupertinoPageRoute(
+            builder: (context) => PackageList(
+                  onlyFcs: true,
+                ))));

    final receivingBtn = TaskButton("receiving.title",
        icon: MaterialCommunityIcons.inbox_arrow_down,
@@ -214,15 +239,20 @@ class _HomePageState extends State<HomePage> {
        icon: FontAwesome.dropbox,
        btnCallback: () => Navigator.of(context).push<void>(
            CupertinoPageRoute(builder: (context) => ProcessingList())));
-    final boxesBtn = TaskButton("boxes.name",
+    final cartonBtn = TaskButton("boxes.name",
        icon: MaterialCommunityIcons.package,
-        btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(BoxList())));
+        btnCallback: () => Navigator.of(context)
+            .push<void>(CupertinoPageRoute(builder: (context) => BoxList())));

-    final pickUpBtn = TaskButton("shipment",
+    final shipmentBtn = TaskButton("shipment",
        icon: SimpleLineIcons.direction,
-        btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(ShipmentList())));
+        btnCallback: () => Navigator.of(context)
+            .push(CupertinoPageRoute(builder: (context) => ShipmentList())));
+
+    final shipmentBtnFcs = TaskButton("shipment",
+        icon: SimpleLineIcons.direction,
+        btnCallback: () => Navigator.of(context)
+            .push(CupertinoPageRoute(builder: (context) => ShipmentList())));

    final shipmentCostBtn = TaskButton("rate",
        icon: FontAwesomeIcons.calculator,
@@ -231,21 +261,19 @@ class _HomePageState extends State<HomePage> {

    final fcsShipmentBtn = TaskButton("FCSshipment.title",
        icon: Ionicons.ios_airplane,
-        btnCallback: () => Navigator.of(context).push<void>(CupertinoPageRoute(
+        btnCallback: () => Navigator.of(context).push(CupertinoPageRoute(
              builder: (context) => FcsShipmentList(),
            )));
-
    final notiBtnOrg =
        TaskButton("message.btn", icon: Icons.message, btnCallback: () {
      MessageModel messageModel =
          Provider.of<MessageModel>(context, listen: false);
      messageModel.initQuery(user.id);
-      Navigator.push(
-        context,
-        BottomUpPageRoute(MessageDetail(
-          messageModel: messageModel,
-        )),
-      ).then((value) {
+      Navigator.of(context)
+          .push(CupertinoPageRoute(
+        builder: (context) => MessageDetail(messageModel: messageModel),
+      ))
+          .then((value) {
        if (user.userUnseenCount > 0) {
          messageModel.seenMessages(user.id, true);
        }
@@ -272,128 +300,204 @@ class _HomePageState extends State<HomePage> {

    final invoicesBtn = TaskButton("invoices.btn",
        icon: FontAwesomeIcons.fileInvoice,
-        btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(InvoiceList())));
+        btnCallback: () => Navigator.of(context).push<void>(
+            CupertinoPageRoute(builder: (context) => InvoiceList())));
+    final invoicesBtnFcs = TaskButton("invoices.btn",
+        icon: FontAwesomeIcons.fileInvoice,
+        btnCallback: () => Navigator.of(context).push<void>(
+            CupertinoPageRoute(builder: (context) => InvoiceList())));

    final discountBtn = TaskButton("discount.btn",
        icon: Entypo.price_ribbon,
-        btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(DiscountList())));
+        btnCallback: () => Navigator.of(context).push<void>(
+            CupertinoPageRoute(builder: (context) => DiscountList())));

    final deliveryBtn = TaskButton("delivery.title",
        icon: MaterialCommunityIcons.truck_fast,
-        btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(DeliverList())));
+        btnCallback: () => Navigator.of(context).push<void>(
+            CupertinoPageRoute(builder: (context) => DeliverList())));

    List<Widget> widgets = [];
-    if (user != null) {
-      true ? widgets.add(pickUpBtn) : "";
-      !customer ? widgets.add(fcsShipmentBtn) : "";
-      customer ? widgets.add(notiBtn) : "";
-      user.hasStaffs() ? widgets.add(staffBtn) : "";
-      widgets.add(shipmentCostBtn);
-      user.hasPackages() ? widgets.add(packagesBtn) : "";
-      user.hasPackages() ? widgets.add(receivingBtn) : "";
-      user.hasPackages() ? widgets.add(processingBtn) : "";
-      true ? widgets.add(boxesBtn) : "";
-      true ? widgets.add(deliveryBtn) : "";
-      user.hasCustomers() ? widgets.add(customersBtn) : "";
-      true ? widgets.add(invoicesBtn) : "";
-      // true ? widgets.add(discountBtn) : "";
-    }
+    widgets.add(notiBtn);
+    widgets.add(packagesBtn);
+    widgets.add(shipmentBtn);
+    widgets.add(invoicesBtn);
    widgets.add(faqBtn);
-    return OfflineRedirect(
-      child: FlavorBanner(
-        child: Scaffold(
-            appBar: AppBar(
-                elevation: 0,
-                backgroundColor: primaryColor,
-                title: ClipRRect(
-                  child: Image.asset("assets/logo.jpg", height: 40),
-                  borderRadius: new BorderRadius.circular(30.0),
-                ),
-                actions: login
-                    ? <Widget>[
-                        ToggleButtons(
-                          children: <Widget>[
-                            Image.asset(
-                              'icons/flags/png/us.png',
-                              package: 'country_icons',
-                              fit: BoxFit.fitWidth,
-                              width: 25,
-                            ),
-                            Image.asset(
-                              'icons/flags/png/mm.png',
-                              package: 'country_icons',
-                              fit: BoxFit.fitWidth,
-                              width: 25,
-                            )
-                          ],
-                          onPressed: _langChange,
-                          isSelected: languageModel.currentState,
-                          selectedBorderColor: Colors.white24,
-                        ),
-                        IconButton(
-                          onPressed: () {
-                            Navigator.of(context)
-                                .push(RightLeftPageRoute(Profile()));
-                          },
-                          iconSize: 30,
-                          icon: Icon(Icons.account_circle),
-                        ),
-                      ]
-                    : <Widget>[
-                        ToggleButtons(
-                          children: <Widget>[
-                            Image.asset(
-                              'icons/flags/png/us.png',
-                              package: 'country_icons',
-                              fit: BoxFit.fitWidth,
-                              width: 25,
-                            ),
-                            Image.asset(
-                              'icons/flags/png/mm.png',
-                              package: 'country_icons',
-                              fit: BoxFit.fitWidth,
-                              width: 25,
-                            )
-                          ],
-                          onPressed: _langChange,
-                          isSelected: languageModel.currentState,
-                        ),
-                        FlatButton(
-                          onPressed: () {
-                            Navigator.of(context)
-                                .push(BottomUpPageRoute(SigninPage()));
-                          },
-                          child: Text(
-                            "Sign In",
-                            style: siginButtonStyle,
-                          ),
+    widgets.add(shipmentCostBtn);
+
+    List<Widget> widgetsFcs = [];
+    if (user.hasPackages()) widgetsFcs.add(packagesBtnFcs);
+    if (user.hasShipment()) widgetsFcs.add(shipmentBtnFcs);
+    if (user.hasInvoices()) widgetsFcs.add(invoicesBtnFcs);
+
+    if (user.hasFcsShipments()) widgetsFcs.add(fcsShipmentBtn);
+    if (user.hasReceiving()) widgetsFcs.add(receivingBtn);
+    if (user.hasProcessing()) widgetsFcs.add(processingBtn);
+    if (user.hasCarton()) widgetsFcs.add(cartonBtn);
+    if (user.hasDeliveries()) widgetsFcs.add(deliveryBtn);
+    if (user.hasCustomers()) widgetsFcs.add(customersBtn);
+    if (user.hasAdmin()) widgetsFcs.add(discountBtn);
+    if (user.hasStaffs()) widgetsFcs.add(staffBtn);
+
+    final fcsToggle = ToggleButtons(
+      selectedColor: Colors.white,
+      children: <Widget>[
+        Icon(MaterialCommunityIcons.worker),
+      ],
+      onPressed: (i) => this.setState(() {
+        isFcs[0] = !isFcs[0];
+        SharedPref.saveStaffMode(isFcs[0]);
+      }),
+      isSelected: isFcs,
+      selectedBorderColor: Colors.white24,
+    );
+    final langToggle = ToggleButtons(
+      children: <Widget>[
+        Image.asset(
+          'icons/flags/png/us.png',
+          package: 'country_icons',
+          fit: BoxFit.fitWidth,
+          width: 25,
+        ),
+        Image.asset(
+          'icons/flags/png/mm.png',
+          package: 'country_icons',
+          fit: BoxFit.fitWidth,
+          width: 25,
+        )
+      ],
+      onPressed: _langChange,
+      isSelected: languageModel.currentState,
+      selectedBorderColor: Colors.white24,
+    );
+    final signinBtn = FlatButton(
+      onPressed: () {
+        Navigator.of(context).push(BottomUpPageRoute(SigninPage()));
+      },
+      child: Text(
+        "Sign In",
+        style: siginButtonStyle,
+      ),
+    );
+    final profileBtn = IconButton(
+      onPressed: () {
+        Navigator.of(context).push(RightLeftPageRoute(Profile()));
+      },
+      iconSize: 30,
+      icon: Icon(Icons.account_circle),
+    );
+
+    var searchInput = Row(children: [
+      Expanded(
+        child: Padding(
+          padding: const EdgeInsets.only(bottom: 3, left: 5, right: 5, top: 3),
+          child: Theme(
+            data: new ThemeData(
+              primaryColor: primaryColor,
+              primaryColorDark: primaryColor,
+            ),
+            child: TextField(
+              style: TextStyle(color: Colors.white),
+              controller: _searchCtl,
+              scrollPadding: EdgeInsets.all(0),
+              decoration: new InputDecoration(
+                  enabledBorder: const OutlineInputBorder(
+                    borderRadius: BorderRadius.all(Radius.circular(30)),
+                    borderSide:
+                        const BorderSide(color: Colors.white, width: 1.5),
+                  ),
+                  focusedBorder: const OutlineInputBorder(
+                    borderRadius: BorderRadius.all(Radius.circular(30)),
+                    borderSide:
+                        const BorderSide(color: Colors.white, width: 1.5),
+                  ),
+                  contentPadding: EdgeInsets.only(top: 1, bottom: 1),
+                  isDense: true,
+                  hintText: getLocalString(context, "home.search"),
+                  hintStyle: languageModel.isEng
+                      ? newLabelStyle(color: Colors.white60)
+                      : newLabelStyleMM(color: Colors.white60),
+                  prefixIcon: const Icon(
+                    Icons.search,
+                    color: Colors.grey,
+                  ),
+                  suffixIcon: InkWell(
+                    onTap: () => {_searchCtl.clear()},
+                    child: const Icon(
+                      Icons.close,
+                      color: Colors.grey,
+                    ),
+                  ),
+                  suffixStyle: const TextStyle(color: primaryColor)),
+            ),
+          ),
+        ),
+      ),
+      InkWell(
+        child: Padding(
+          padding: const EdgeInsets.all(10.0),
+          child: LocalText(
+            context,
+            "home.search.btn",
+            color: Colors.white,
+          ),
+        ),
+        onTap: _lookup,
+      )
+    ]);
+    widgets.insert(0, searchInput);
+
+    return LocalProgress(
+      inAsyncCall: _isLoading,
+      child: OfflineRedirect(
+        child: FlavorBanner(
+          child: Scaffold(
+              appBar: AppBar(
+                  elevation: 0,
+                  backgroundColor: primaryColor,
+                  title: ClipRRect(
+                    child: Image.asset("assets/logo.jpg", height: 40),
+                    borderRadius: new BorderRadius.circular(30.0),
+                  ),
+                  actions: login
+                      ? user.isCustomer()
+                          ? <Widget>[
+                              langToggle,
+                              profileBtn,
+                            ]
+                          : <Widget>[
+                              fcsToggle,
+                              langToggle,
+                              profileBtn,
+                            ]
+                      : <Widget>[
+                          langToggle,
+                          signinBtn,
+                        ]),
+              body: Container(
+                  decoration: BoxDecoration(
+                    gradient: LinearGradient(
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
+                      colors: [
+                        Color(0xd0272262),
+                        Color(0xfa272262),
+                      ],
+                    ),
+                  ),
+                  child: ListView(
+                    children: <Widget>[
+                      Column(children: [
+                        Wrap(
+                          alignment: WrapAlignment.center,
+                          children: isFcs[0] ? widgetsFcs : widgets,
                        ),
                      ]),
-            body: Container(
-                decoration: BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: [
-                      Color(0xd0272262),
-                      Color(0xfa272262),
+                      SizedBox(height: 50),
+                      BottomWidgets(),
                    ],
-                  ),
-                ),
-                child: ListView(
-                  children: <Widget>[
-                    Column(children: [
-                      Wrap(
-                        alignment: WrapAlignment.center,
-                        children: widgets,
-                      ),
-                    ]),
-                    BottomWidgets(),
-                  ],
-                ))),
+                  ))),
+        ),
      ),
    );
  }
@@ -408,4 +512,34 @@ class _HomePageState extends State<HomePage> {
      isSelected[index] = !isSelected[index];
    });
  }
+
+  _lookup() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      String term = _searchCtl.text;
+      if (term == null || term.trim() == "") return;
+      var packageModel = Provider.of<PackageModel>(context, listen: false);
+      Package package = await packageModel.lookupPackage(term);
+      if (package == null) {
+        showMsgDialog(context, "Not found", "Tracking ID - '$term' not found!");
+        return;
+      }
+      Navigator.push(
+        context,
+        BottomUpPageRoute(PackageInfo(
+          package: package,
+          isSearchResult: true,
+        )),
+      );
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
 }
--- a/lib/pages/package/model/package_model.dart
+++ b/lib/pages/package/model/package_model.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:fcs/data/services/services.dart';
+import 'package:fcs/domain/vo/message.dart';
+import 'package:fcs/helpers/pagination.dart';
 import 'package:path/path.dart' as Path;

 import 'package:cloud_firestore/cloud_firestore.dart';
@@ -15,37 +17,97 @@ class PackageModel extends BaseModel {
  final log = Logger('PackageModel');

  StreamSubscription<QuerySnapshot> listener;
+  StreamSubscription<QuerySnapshot> customerPackageListener;
+  Pagination pagination;
+
  List<Package> packages = [];
+  List<Package> customerPackages = [];
+  List<Package> deliveredPackages = [];
+
+  bool endOfDeliveredPackages = false;
+  bool isLoading = false;

  @override
  void privilegeChanged() {
    super.privilegeChanged();
    _loadPackages();
+    _loadCustomerPackages();
  }

  @override
  logout() async {
    if (listener != null) await listener.cancel();
+    if (customerPackageListener != null) await customerPackageListener.cancel();
+    if (pagination != null) pagination.close();
    packages = [];
+    customerPackages = [];
+    deliveredPackages = [];
+  }
+
+  Future<void> initDeliveredPackages() {
+    if (pagination != null) pagination.close();
+    deliveredPackages = [];
+    endOfDeliveredPackages = false;
+    isLoading = false;
+
+    var pageQuery = Firestore.instance
+        .collection("/$packages_collection")
+        // .collection(
+        //     "/users/8OTfsbVvsUOn1SLxy1OrKk7Y_yNKkVoGalPcIlcHnAY/messages")
+        // .orderBy("date", descending: true);
+        .where("is_delivered", isEqualTo: true)
+        .where("is_deleted", isEqualTo: false);
+    if (user.isCustomer()) {
+      pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
+    }
+    pageQuery = pageQuery.orderBy("current_status_date", descending: true);
+    pagination = new Pagination(pageQuery, rowPerLoad: 20);
+    pagination.stream.listen((doc) {
+      if (doc == null) {
+        endOfDeliveredPackages = true;
+      } else {
+        deliveredPackages.add(Package.fromMap(doc.data, doc.documentID));
+        // var m = Message.fromMap(doc.data, doc.documentID);
+        // deliveredPackages.add(Package(
+        //     id: m.id,
+        //     status: package_delivered_status,
+        //     currentStatus: package_delivered_status,
+        //     currentStatusDate: m.date,
+        //     trackingID: (count++).toString(),
+        //     market: m.message));
+      }
+    });
+    return null;
+  }
+
+  Future<bool> loadMoreDeliveredPackages() {
+    if (pagination != null && !isLoading && !endOfDeliveredPackages) {
+      isLoading = true;
+      notifyListeners();
+      pagination.load().then((value) {
+        isLoading = false;
+        notifyListeners();
+      });
+    }
+    return null;
  }

  Future<void> _loadPackages() async {
-    if (user == null) return;
-    String path = "";
-    if (user.isCustomer()) {
-      path = "/$user_collection/${user.id}/$packages_collection";
-    } else {
-      path = "/$packages_collection";
-    }
+    if (user == null ||
+        !user.hasPackages() ||
+        !user.hasReceiving() ||
+        !user.hasProcessing()) return;
+    String path = "/$packages_collection";
    if (listener != null) listener.cancel();
    packages = [];

    try {
-      listener = Firestore.instance
+      var q = Firestore.instance
          .collection("$path")
          .where("is_delivered", isEqualTo: false)
-          .snapshots()
-          .listen((QuerySnapshot snapshot) {
+          .where("is_deleted", isEqualTo: false);
+
+      listener = q.snapshots().listen((QuerySnapshot snapshot) {
        packages.clear();
        packages = snapshot.documents.map((documentSnapshot) {
          var package = Package.fromMap(
@@ -59,14 +121,36 @@ class PackageModel extends BaseModel {
    }
  }

+  Future<void> _loadCustomerPackages() async {
+    if (user == null) return;
+    String path = "/$packages_collection";
+    if (customerPackageListener != null) customerPackageListener.cancel();
+    customerPackages = [];
+
+    try {
+      var q = Firestore.instance
+          .collection("$path")
+          .where("is_delivered", isEqualTo: false)
+          .where("is_deleted", isEqualTo: false)
+          .where("user_id", isEqualTo: user.id);
+
+      customerPackageListener = q.snapshots().listen((QuerySnapshot snapshot) {
+        customerPackages.clear();
+        customerPackages = snapshot.documents.map((documentSnapshot) {
+          var package = Package.fromMap(
+              documentSnapshot.data, documentSnapshot.documentID);
+          return package;
+        }).toList();
+        notifyListeners();
+      });
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+  }
+
  Future<Package> getPackage(String id) async {
    if (user == null) return null;
-    String path = "";
-    if (user.isCustomer()) {
-      path = "/$user_collection/${user.id}/$packages_collection";
-    } else {
-      path = "/$packages_collection";
-    }
+    String path = "/$packages_collection";
    try {
      DocumentSnapshot snap =
          await Firestore.instance.collection("$path").document(id).get();
@@ -80,6 +164,42 @@ class PackageModel extends BaseModel {
    return null;
  }

+  Future<Package> lookupPackage(String trackingID) async {
+    if (user == null) return null;
+    String path = "/$packages_collection";
+
+    try {
+      var qsnap = await Firestore.instance
+          .collection("$path")
+          .where("tracking_id", isEqualTo: trackingID)
+          .where("has_user_id", isEqualTo: false)
+          .getDocuments(source: Source.server);
+      if (qsnap.documents.length > 0) {
+        var snap = qsnap.documents[0];
+        if (snap.exists) {
+          var package = Package.fromMap(snap.data, snap.documentID);
+          return package;
+        }
+      }
+
+      qsnap = await Firestore.instance
+          .collection("$path")
+          .where("tracking_id", isEqualTo: trackingID)
+          .where("user_id", isEqualTo: user.id)
+          .getDocuments(source: Source.server);
+      if (qsnap.documents.length > 0) {
+        var snap = qsnap.documents[0];
+        if (snap.exists) {
+          var package = Package.fromMap(snap.data, snap.documentID);
+          return package;
+        }
+      }
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+    return null;
+  }
+
  Future<List<User>> searchUser(String term) {
    return Services.instance.userService.searchUser(term);
  }
@@ -93,8 +213,8 @@ class PackageModel extends BaseModel {
        .createPackages(packages, user.fcsID);
  }

-  Future<void> createPackage(User user, Package package, List<File> files,
-      List<String> deletedUrls) async {
+  Future<void> createReceiving(
+      User user, Package package, List<File> files) async {
    if (user != null) {
      package.fcsID = user.fcsID;
    }
@@ -106,28 +226,61 @@ class PackageModel extends BaseModel {
        String url = await uploadStorage(path, f);
        package.photoUrls.add(url);
      }
-      package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
    }
-    return Services.instance.packageService.createPackage(package);
+    return Services.instance.packageService.createReceiving(package);
  }

-  Future<void> completeProcessing(
-      Package package, List<File> files, List<String> deletedUrls) async {
+  Future<void> updateReceiving(User user, Package package, List<File> files,
+      List<String> deletedUrls) async {
+    if (user != null) {
+      package.fcsID = user.fcsID;
+    }
+    if (deletedUrls != null) {
+      for (String url in deletedUrls) {
+        package.photoUrls.remove(url);
+      }
+      await deleteStorageFromUrls(deletedUrls);
+    }
+
    if (files != null) {
      if (files.length > 5) throw Exception("Exceed number of file upload");
      package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
      for (File f in files) {
-        String path = Path.join(pkg_files_path, package.userID, package.id);
+        String path = Path.join(pkg_files_path);
+        String url = await uploadStorage(path, f);
+        package.photoUrls.add(url);
+      }
+    }
+    await Services.instance.packageService.updateReceiving(package);
+  }
+
+  Future<void> deleteReceiving(Package package) {
+    return Services.instance.packageService.deleteReceiving(package);
+  }
+
+  Future<void> updateProcessing(
+      Package package, List<File> files, List<String> deletedUrls) async {
+    if (deletedUrls != null) {
+      for (String url in deletedUrls) {
+        package.photoUrls.remove(url);
+      }
+      await deleteStorageFromUrls(deletedUrls);
+    }
+
+    if (files != null) {
+      if (files.length > 5) throw Exception("Exceed number of file upload");
+      package.photoUrls = package.photoUrls == null ? [] : package.photoUrls;
+      for (File f in files) {
+        String path = Path.join(pkg_files_path);
        String url = await uploadStorage(path, f);
        package.photoUrls.add(url);
      }
      package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
    }
-    await request("/package", "PUT",
-        payload: package.toJson(), token: await getToken());
+    await Services.instance.packageService.updateProcessing(package);
  }

-  Future<void> deletePackage(Package package) {
-    return Services.instance.packageService.deletePackage(package);
+  Future<void> deleteProcessing(Package package) {
+    return Services.instance.packageService.deleteProcessing(package);
  }
 }
--- a/lib/pages/package/package_editor.dart
+++ b/lib/pages/package/package_editor.dart
@@ -228,8 +228,8 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
      _package.desc = _descCtl.text;
      _package.remark = _remarkCtl.text;
      _package.market = selectedMarket;
-      await packageModel.completeProcessing(_package,
-          multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+      // await packageModel.completeProcessing(_package,
+      //     multiImgController.getAddedFile, multiImgController.getDeletedUrl);
      Navigator.pop(context);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
@@ -251,7 +251,7 @@ class _PackageEditorPageState extends State<PackageEditorPage> {
    PackageModel packageModel =
        Provider.of<PackageModel>(context, listen: false);
    try {
-      await packageModel.deletePackage(_package);
+      // await packageModel.deletePackage(_package);
      Navigator.pop<bool>(context, true);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
--- a/lib/pages/package/package_info.dart
+++ b/lib/pages/package/package_info.dart
@@ -1,28 +1,24 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
-import 'package:fcs/pages/package/package_editor.dart';
-import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pages/widgets/status_tree.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:timeline_list/timeline.dart';
 import 'package:timeline_list/timeline_model.dart';

-import 'model/package_model.dart';
-
 final DateFormat dateFormat = DateFormat("d MMM yyyy");

 class PackageInfo extends StatefulWidget {
+  final isSearchResult;
  final Package package;
-  PackageInfo({this.package});
+  PackageInfo({this.package, this.isSearchResult = false});

  @override
  _PackageInfoState createState() => _PackageInfoState();
@@ -54,8 +50,6 @@ class _PackageInfoState extends State<PackageInfo> {

  @override
  Widget build(BuildContext context) {
-    bool isCustomer = Provider.of<MainModel>(context).isCustomer();
-
    final trackingIdBox = DisplayText(
      text: _package.trackingID,
      labelTextKey: "package.tracking.id",
@@ -109,14 +103,6 @@ class _PackageInfoState extends State<PackageInfo> {
            fontSize: 20,
            color: primaryColor,
          ),
-          actions: <Widget>[
-            isCustomer
-                ? Container()
-                : IconButton(
-                    icon: Icon(Icons.edit, color: primaryColor),
-                    onPressed: _gotoEditor,
-                  )
-          ],
        ),
        body: Card(
          child: Column(
@@ -126,29 +112,15 @@ class _PackageInfoState extends State<PackageInfo> {
                padding: const EdgeInsets.all(10.0),
                child: ListView(children: <Widget>[
                  trackingIdBox,
-                  customerNameBox,
-                  marketBox,
+                  widget.isSearchResult ? Container() : customerNameBox,
+                  widget.isSearchResult ? Container() : marketBox,
                  statusBox,
                  _package.photoUrls.length == 0 ? Container() : img,
-                  descBox,
+                  widget.isSearchResult ? Container() : descBox,
                  remarkBox,
-                  ExpansionTile(
-                    initiallyExpanded: true,
-                    title: Text(
-                      'Status',
-                      style: TextStyle(
-                          color: primaryColor, fontWeight: FontWeight.bold),
-                    ),
-                    children: <Widget>[
-                      Container(
-                        padding: EdgeInsets.only(left: 20),
-                        height: 400,
-                        child: Timeline(
-                            children: _models(),
-                            position: TimelinePosition.Left),
-                      ),
-                    ],
-                  ),
+                  StatusTree(
+                      shipmentHistory: _package.shipmentHistory,
+                      currentStatus: _package.currentStatus),
                  SizedBox(
                    height: 20,
                  )
@@ -194,20 +166,4 @@ class _PackageInfoState extends State<PackageInfo> {
            )))
        .toList();
  }
-
-  _gotoEditor() async {
-    bool deleted = await Navigator.push<bool>(
-        context,
-        BottomUpPageRoute(PackageEditorPage(
-          package: widget.package,
-        )));
-    if (deleted ?? false) {
-      Navigator.pop(context);
-    } else {
-      PackageModel packageModel =
-          Provider.of<PackageModel>(context, listen: false);
-      Package p = await packageModel.getPackage(_package.id);
-      initPackage(p);
-    }
-  }
 }
--- a/lib/pages/package/package_list.dart
+++ b/lib/pages/package/package_list.dart
@@ -1,14 +1,12 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/app_translations.dart';
-import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/package_info.dart';
 import 'package:fcs/pages/package/package_list_row.dart';
-import 'package:fcs/pages/package/package_new.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
-import 'package:fcs/pages/user_search/user_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:fcs/pages/widgets/local_popup_menu_button.dart';
+import 'package:fcs/pages/widgets/local_popupmenu.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
@@ -16,16 +14,29 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 class PackageList extends StatefulWidget {
+  final bool onlyFcs;
+
+  const PackageList({Key key, this.onlyFcs = false}) : super(key: key);
  @override
  _PackageListState createState() => _PackageListState();
 }

 class _PackageListState extends State<PackageList> {
  bool _isLoading = false;
+  bool _showDelivered = false;
+  var _controller = ScrollController();

  @override
  void initState() {
    super.initState();
+    Provider.of<PackageModel>(context, listen: false).initDeliveredPackages();
+    _controller.addListener(() {
+      if (_showDelivered &&
+          _controller.position.pixels == _controller.position.maxScrollExtent) {
+        Provider.of<PackageModel>(context, listen: false)
+            .loadMoreDeliveredPackages();
+      }
+    });
  }

  @override
@@ -36,7 +47,20 @@ class _PackageListState extends State<PackageList> {
  @override
  Widget build(BuildContext context) {
    var packageModel = Provider.of<PackageModel>(context);
-    bool isCustomer = context.select((MainModel m) => m.isCustomer());
+    bool onlyFcs = widget.onlyFcs;
+    var packages = _showDelivered
+        ? packageModel.deliveredPackages
+        : onlyFcs ? packageModel.packages : packageModel.customerPackages;
+    final popupMenu = LocalPopupMenuButton(
+      popmenus: [
+        LocalPopupMenu(
+            id: 1, textKey: "package.popupmenu.active", selected: true),
+        LocalPopupMenu(id: 2, textKey: "package.popupmenu.delivered")
+      ],
+      popupMenuCallback: (p) => this.setState(() {
+        _showDelivered = p.id == 2;
+      }),
+    );

    return LocalProgress(
      inAsyncCall: _isLoading,
@@ -55,9 +79,8 @@ class _PackageListState extends State<PackageList> {
              color: Colors.white,
            ),
            actions: <Widget>[
-              isCustomer
-                  ? Container()
-                  : IconButton(
+              onlyFcs
+                  ? IconButton(
                      icon: Icon(
                        Icons.search,
                        color: Colors.white,
@@ -65,41 +88,45 @@ class _PackageListState extends State<PackageList> {
                      iconSize: 30,
                      onPressed: () => searchPackage(context,
                          callbackPackageSelect: _searchCallback),
-                    ),
+                    )
+                  : Container(),
+              popupMenu
            ],
          ),
-          floatingActionButton: isCustomer
-              ? Container()
-              : FloatingActionButton.extended(
-                  onPressed: () {
-                    _newPackage();
-                  },
-                  icon: Icon(Icons.add),
-                  label: Text(
-                      AppTranslations.of(context).text("package.create.title")),
-                  backgroundColor: primaryColor,
-                ),
-          body: new ListView.separated(
-              separatorBuilder: (context, index) => Divider(
-                    color: Colors.black,
-                  ),
-              scrollDirection: Axis.vertical,
-              padding: EdgeInsets.only(top: 15),
-              shrinkWrap: true,
-              itemCount: packageModel.packages.length,
-              itemBuilder: (BuildContext context, int index) {
-                return PackageListRow(
-                  key: ValueKey(packageModel.packages[index].id),
-                  package: packageModel.packages[index],
-                );
-              })),
-    );
-  }
-
-  _newPackage() {
-    Navigator.push(
-      context,
-      BottomUpPageRoute(PackageNew()),
+          body: Column(
+            children: [
+              Expanded(
+                child: ListView.separated(
+                    controller: _controller,
+                    separatorBuilder: (context, index) => Divider(
+                          color: Colors.black,
+                        ),
+                    scrollDirection: Axis.vertical,
+                    padding: EdgeInsets.only(top: 15),
+                    shrinkWrap: true,
+                    itemCount: packages.length,
+                    itemBuilder: (BuildContext context, int index) {
+                      return PackageListRow(
+                        key: ValueKey(packages[index].id),
+                        package: packages[index],
+                      );
+                    }),
+              ),
+              packageModel.isLoading
+                  ? Container(
+                      padding: EdgeInsets.all(8),
+                      color: primaryColor,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Text("Loading...",
+                              style: TextStyle(color: Colors.white)),
+                        ],
+                      ),
+                    )
+                  : Container(),
+            ],
+          )),
    );
  }

--- a/lib/pages/processing/processing_editor.dart
+++ b/lib/pages/processing/processing_editor.dart
@@ -1,13 +1,16 @@
 import 'package:fcs/domain/entities/market.dart';
 import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/market/market_editor.dart';
 import 'package:fcs/pages/market/model/market_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/tracking_id_page.dart';
 import 'package:fcs/pages/main/util.dart';
+import 'package:fcs/pages/user_search/user_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
+import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
@@ -31,6 +34,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
  TextEditingController _descCtl = new TextEditingController();

  Package _package;
+  User _user;
  bool _isLoading = false;

  @override
@@ -41,6 +45,10 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
    _descCtl.text = _package.desc;
    _remarkCtl.text = _package.remark;
    multiImgController.setImageUrls = _package.photoUrls;
+    _user = User(
+        fcsID: _package.fcsID ?? "",
+        name: _package.userName ?? "",
+        phoneNumber: _package.phoneNumber ?? "");
  }

  final DateFormat dateFormat = DateFormat("d MMM yyyy");
@@ -50,21 +58,39 @@ class _ProcessingEditorState extends State<ProcessingEditor> {

  @override
  Widget build(BuildContext context) {
+    var fcsIDBox = Row(
+      children: <Widget>[
+        Expanded(
+            child: DisplayText(
+          text: _user.fcsID,
+          labelTextKey: "processing.fcs.id",
+          icon: FcsIDIcon(),
+        )),
+        IconButton(
+            icon: Icon(Icons.search, color: primaryColor),
+            onPressed: () => searchUser(context, callbackUserSelect: (u) {
+                  setState(() {
+                    this._user = u;
+                  });
+                })),
+      ],
+    );
+    final namebox = DisplayText(
+      text: _user.name,
+      labelTextKey: "processing.name",
+      iconData: Icons.person,
+    );
+    final phoneNumberBox = DisplayText(
+      text: _user.phoneNumber,
+      labelTextKey: "processing.phone",
+      iconData: Icons.phone,
+    );
+
    final trackingIdBox = DisplayText(
      text: _package.trackingID,
      labelTextKey: "processing.tracking.id",
      iconData: MaterialCommunityIcons.barcode_scan,
    );
-    final statusBox = DisplayText(
-      text: _package.currentStatus,
-      labelTextKey: "processing.status",
-      iconData: AntDesign.exclamationcircleo,
-    );
-    final customerNameBox = DisplayText(
-      text: _package.userName,
-      labelTextKey: "processing.name",
-      iconData: Icons.perm_identity,
-    );
    final completeProcessingBtn = fcsButton(
      context,
      getLocalString(context, 'processing.edit.complete.btn'),
@@ -101,44 +127,19 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
            fontSize: 20,
            color: primaryColor,
          ),
-          actions: [
-            IconButton(
-              icon: Icon(Icons.delete, color: primaryColor),
-              onPressed: _delete,
-            )
-          ],
        ),
        body: Padding(
          padding: const EdgeInsets.all(8.0),
          child: ListView(
            children: [
              trackingIdBox,
-              customerNameBox,
-              statusBox,
-              Divider(),
-              Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: LocalText(
-                    context,
-                    "processing.edit.sub_title",
-                    color: primaryColor,
-                    fontSize: 16,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.only(left: 18.0, right: 10),
-                child: Column(
-                  children: [
-                    marketDropdown(),
-                    descBox,
-                    remarkBox,
-                    img,
-                  ],
-                ),
-              ),
+              fcsIDBox,
+              namebox,
+              phoneNumberBox,
+              marketDropdown(),
+              descBox,
+              remarkBox,
+              img,
              completeProcessingBtn,
              SizedBox(
                height: 20,
@@ -159,51 +160,54 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
      markets.insert(0, selectedMarket);
    }

-    return Row(
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(right: 18.0),
-          child: LocalText(
-            context,
-            "processing.market",
-            color: primaryColor,
-            fontSize: 16,
-          ),
-        ),
-        Container(
-          width: 150,
-          child: DropdownButton<String>(
-            value: selectedMarket,
-            style: TextStyle(color: Colors.black, fontSize: 14),
-            underline: Container(
-              height: 1,
-              color: Colors.grey,
+    return Padding(
+      padding: const EdgeInsets.only(left: 8.0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(right: 18.0),
+            child: LocalText(
+              context,
+              "processing.market",
+              color: primaryColor,
+              fontSize: 16,
            ),
-            onChanged: (String newValue) {
-              setState(() {
-                if (newValue == MANAGE_MARKET) {
-                  selectedMarket = null;
-                  _manageMarket();
-                  return;
-                }
-                selectedMarket = newValue;
-              });
-            },
-            isExpanded: true,
-            items: markets.map<DropdownMenuItem<String>>((String value) {
-              return DropdownMenuItem<String>(
-                value: value,
-                child: Text(value ?? "",
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                        color: value == MANAGE_MARKET
-                            ? secondaryColor
-                            : primaryColor)),
-              );
-            }).toList(),
          ),
-        ),
-      ],
+          Container(
+            width: 150,
+            child: DropdownButton<String>(
+              value: selectedMarket,
+              style: TextStyle(color: Colors.black, fontSize: 14),
+              underline: Container(
+                height: 1,
+                color: Colors.grey,
+              ),
+              onChanged: (String newValue) {
+                setState(() {
+                  if (newValue == MANAGE_MARKET) {
+                    selectedMarket = null;
+                    _manageMarket();
+                    return;
+                  }
+                  selectedMarket = newValue;
+                });
+              },
+              isExpanded: true,
+              items: markets.map<DropdownMenuItem<String>>((String value) {
+                return DropdownMenuItem<String>(
+                  value: value,
+                  child: Text(value ?? "",
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                          color: value == MANAGE_MARKET
+                              ? secondaryColor
+                              : primaryColor)),
+                );
+              }).toList(),
+            ),
+          ),
+        ],
+      ),
    );
  }

@@ -219,16 +223,21 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
      showMsgDialog(context, "Error", "Expected some description");
      return;
    }
+    if (_user.fcsID == null || _user.fcsID == "") {
+      showMsgDialog(context, "Error", "Expected FCS-ID");
+      return;
+    }
    setState(() {
      _isLoading = true;
    });
    PackageModel packageModel =
        Provider.of<PackageModel>(context, listen: false);
    try {
+      _package.fcsID = _user.fcsID;
      _package.desc = _descCtl.text;
      _package.remark = _remarkCtl.text;
      _package.market = selectedMarket;
-      await packageModel.completeProcessing(_package,
+      await packageModel.updateProcessing(_package,
          multiImgController.getAddedFile, multiImgController.getDeletedUrl);
      Navigator.pop(context);
    } catch (e) {
@@ -239,26 +248,4 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
      });
    }
  }
-
-  _delete() {
-    showConfirmDialog(context, "processing.delete.confirm", _deletePackage);
-  }
-
-  _deletePackage() async {
-    setState(() {
-      _isLoading = true;
-    });
-    PackageModel packageModel =
-        Provider.of<PackageModel>(context, listen: false);
-    try {
-      await packageModel.deletePackage(_package);
-      Navigator.pop<bool>(context, true);
-    } catch (e) {
-      showMsgDialog(context, "Error", e.toString());
-    } finally {
-      setState(() {
-        _isLoading = false;
-      });
-    }
-  }
 }
--- a/lib/pages/processing/processing_info.dart
+++ b/lib/pages/processing/processing_info.dart
@@ -1,6 +1,7 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
+import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
@@ -8,6 +9,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:fcs/pages/widgets/status_tree.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
@@ -53,8 +55,6 @@ class _ProcessingInfoState extends State<ProcessingInfo> {

  @override
  Widget build(BuildContext context) {
-    bool isCustomer = Provider.of<MainModel>(context).isCustomer();
-
    final trackingIdBox = DisplayText(
      text: _package.trackingID,
      labelTextKey: "processing.tracking.id",
@@ -65,11 +65,6 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
      labelTextKey: "processing.name",
      iconData: Icons.perm_identity,
    );
-    final statusBox = DisplayText(
-      text: _package.currentStatus,
-      labelTextKey: "processing.status",
-      iconData: AntDesign.exclamationcircleo,
-    );
    final marketBox = DisplayText(
      text: _package.market ?? "-",
      labelTextKey: "processing.market",
@@ -109,12 +104,14 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
            color: primaryColor,
          ),
          actions: <Widget>[
-            isCustomer
-                ? Container()
-                : IconButton(
-                    icon: Icon(Icons.edit, color: primaryColor),
-                    onPressed: _gotoEditor,
-                  )
+            IconButton(
+              icon: Icon(Icons.delete, color: primaryColor),
+              onPressed: _delete,
+            ),
+            IconButton(
+              icon: Icon(Icons.edit, color: primaryColor),
+              onPressed: _gotoEditor,
+            ),
          ],
        ),
        body: Card(
@@ -127,27 +124,12 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
                  trackingIdBox,
                  customerNameBox,
                  marketBox,
-                  statusBox,
                  _package.photoUrls.length == 0 ? Container() : img,
                  descBox,
                  remarkBox,
-                  ExpansionTile(
-                    initiallyExpanded: true,
-                    title: Text(
-                      'Status',
-                      style: TextStyle(
-                          color: primaryColor, fontWeight: FontWeight.bold),
-                    ),
-                    children: <Widget>[
-                      Container(
-                        padding: EdgeInsets.only(left: 20),
-                        height: 400,
-                        child: Timeline(
-                            children: _models(),
-                            position: TimelinePosition.Left),
-                      ),
-                    ],
-                  ),
+                  StatusTree(
+                      shipmentHistory: _package.shipmentHistory,
+                      currentStatus: _package.currentStatus),
                  SizedBox(
                    height: 20,
                  )
@@ -160,36 +142,26 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
    );
  }

-  List<TimelineModel> _models() {
-    if (_package.shipmentHistory == null) return [];
-    return _package.shipmentHistory
-        .map((e) => TimelineModel(
-            Padding(
-              padding: const EdgeInsets.all(18.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(e.status,
-                      style: TextStyle(
-                          color: e.done ? primaryColor : Colors.grey,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold)),
-                  Text(dateFormat.format(e.date)),
-                ],
-              ),
-            ),
-            iconBackground: e.done ? primaryColor : Colors.grey,
-            icon: Icon(
-              e.status == "shipped"
-                  ? Ionicons.ios_airplane
-                  : e.status == "delivered"
-                      ? MaterialCommunityIcons.truck_fast
-                      : e.status == "processed"
-                          ? MaterialIcons.check
-                          : Octicons.package,
-              color: Colors.white,
-            )))
-        .toList();
+  _delete() {
+    showConfirmDialog(context, "processing.delete.confirm", _deletePackage);
+  }
+
+  _deletePackage() async {
+    setState(() {
+      _isLoading = true;
+    });
+    PackageModel packageModel =
+        Provider.of<PackageModel>(context, listen: false);
+    try {
+      await packageModel.deleteProcessing(_package);
+      Navigator.pop<bool>(context, true);
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    } finally {
+      setState(() {
+        _isLoading = false;
+      });
+    }
  }

  _gotoEditor() async {
--- a/lib/pages/processing/processing_list.dart
+++ b/lib/pages/processing/processing_list.dart
@@ -1,10 +1,8 @@
 import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/package_info.dart';
-import 'package:fcs/pages/package/package_new.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
@@ -13,6 +11,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

+import 'processing_info.dart';
 import 'processing_list_row.dart';

 class ProcessingList extends StatefulWidget {
@@ -91,7 +90,7 @@ class _ProcessingListState extends State<ProcessingList> {
    if (_package == null) return;
    Navigator.push(
      context,
-      BottomUpPageRoute(PackageInfo(package: _package)),
+      BottomUpPageRoute(ProcessingInfo(package: _package)),
    );
  }
 }
--- a/lib/pages/receiving/receiving_editor.dart
+++ b/lib/pages/receiving/receiving_editor.dart
@@ -20,22 +20,38 @@ import 'package:provider/provider.dart';

 typedef void FindCallBack();

-class ReceivingNew extends StatefulWidget {
-  const ReceivingNew();
+class ReceivingEditor extends StatefulWidget {
+  final Package package;
+  const ReceivingEditor({this.package});
  @override
-  _ReceivingNewState createState() => _ReceivingNewState();
+  _ReceivingEditorState createState() => _ReceivingEditorState();
 }

-class _ReceivingNewState extends State<ReceivingNew> {
+class _ReceivingEditorState extends State<ReceivingEditor> {
+  Package package = Package();
  bool _isLoading = false;
+  bool _isNew;
  User user;
-  TextEditingController _transcationIDCtl = new TextEditingController();
+  TextEditingController _trackingIDCtl = new TextEditingController();
  TextEditingController _remarkCtl = new TextEditingController();
  MultiImgController _multiImgController = MultiImgController();

  @override
  void initState() {
    super.initState();
+    _isNew = widget.package == null;
+    if (!_isNew) {
+      package = widget.package;
+      _trackingIDCtl.text = package.trackingID;
+      _remarkCtl.text = package.remark;
+      _multiImgController.setImageUrls = package.photoUrls;
+      user = User(
+          fcsID: package.fcsID,
+          name: package.userName,
+          phoneNumber: package.phoneNumber);
+    } else {
+      package = new Package();
+    }
  }

  @override
@@ -66,7 +82,7 @@ class _ReceivingNewState extends State<ReceivingNew> {
            Expanded(
                child: InputText(
              labelTextKey: "receiving.tracking.id",
-              controller: _transcationIDCtl,
+              controller: _trackingIDCtl,
            )),
            IconButton(
              icon: Icon(MaterialCommunityIcons.barcode_scan,
@@ -99,7 +115,13 @@ class _ReceivingNewState extends State<ReceivingNew> {
    final createButton = fcsButton(
      context,
      getLocalString(context, 'receiving.create_btn'),
-      callack: _create,
+      callack: _save,
+    );
+
+    final updateButton = fcsButton(
+      context,
+      getLocalString(context, 'receiving.update_btn'),
+      callack: _save,
    );

    return LocalProgress(
@@ -115,7 +137,7 @@ class _ReceivingNewState extends State<ReceivingNew> {
            backgroundColor: Colors.white,
            title: LocalText(
              context,
-              "receiving.new",
+              _isNew ? "receiving.new" : "receiving.update",
              fontSize: 20,
              color: primaryColor,
            ),
@@ -139,7 +161,7 @@ class _ReceivingNewState extends State<ReceivingNew> {
                SizedBox(
                  height: 20,
                ),
-                createButton,
+                _isNew ? createButton : updateButton,
                SizedBox(
                  height: 10,
                ),
@@ -166,7 +188,7 @@ class _ReceivingNewState extends State<ReceivingNew> {
      String barcode = await scanBarcode();
      if (barcode != null) {
        setState(() {
-          _transcationIDCtl.text = barcode;
+          _trackingIDCtl.text = barcode;
        });
      }
    } catch (e) {
@@ -174,9 +196,8 @@ class _ReceivingNewState extends State<ReceivingNew> {
    }
  }

-  _create() async {
-    Package package = Package();
-    package.trackingID = _transcationIDCtl.text;
+  _save() async {
+    package.trackingID = _trackingIDCtl.text;
    package.remark = _remarkCtl.text;

    if (package.trackingID == null || package.trackingID == "") {
@@ -189,8 +210,17 @@ class _ReceivingNewState extends State<ReceivingNew> {
    PackageModel packageModel =
        Provider.of<PackageModel>(context, listen: false);
    try {
-      await packageModel.createPackage(user, package,
-          _multiImgController.getAddedFile, _multiImgController.getDeletedUrl);
+      if (_isNew) {
+        await packageModel.createReceiving(
+            user, package, _multiImgController.getAddedFile);
+      } else {
+        package.id = widget.package.id;
+        await packageModel.updateReceiving(
+            user,
+            package,
+            _multiImgController.getAddedFile,
+            _multiImgController.getDeletedUrl);
+      }
      Navigator.pop(context);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
--- a/lib/pages/receiving/receiving_info.dart
+++ b/lib/pages/receiving/receiving_info.dart
@@ -18,6 +18,8 @@ import 'package:provider/provider.dart';
 import 'package:timeline_list/timeline.dart';
 import 'package:timeline_list/timeline_model.dart';

+import 'receiving_editor.dart';
+
 final DateFormat dateFormat = DateFormat("d MMM yyyy");

 class ReceivingInfo extends StatefulWidget {
@@ -40,9 +42,9 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
  }

  initPackage(Package package) {
+    multiImgController.setImageUrls = package.photoUrls;
    setState(() {
      _package = package;
-      multiImgController.setImageUrls = package.photoUrls;
    });
  }

@@ -89,18 +91,22 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
          backgroundColor: Colors.white,
          title: LocalText(
            context,
-            "package.info.title",
+            "receiving.info",
            fontSize: 20,
            color: primaryColor,
          ),
-          actions: <Widget>[
-            isCustomer
-                ? Container()
-                : IconButton(
+          actions: isCustomer
+              ? null
+              : <Widget>[
+                  IconButton(
                    icon: Icon(Icons.delete, color: primaryColor),
                    onPressed: _delete,
+                  ),
+                  IconButton(
+                    icon: Icon(Icons.edit, color: primaryColor),
+                    onPressed: _edit,
                  )
-          ],
+                ],
        ),
        body: Card(
          child: Column(
@@ -113,19 +119,9 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
                  _package.userID != null ? customerNameBox : Container(),
                  _package.photoUrls.length == 0 ? Container() : img,
                  remarkBox,
-                  ExpansionTile(
-                    initiallyExpanded: true,
-                    title: Text(
-                      'Status',
-                      style: TextStyle(
-                          color: primaryColor, fontWeight: FontWeight.bold),
-                    ),
-                    children: <Widget>[
-                      StatusTree(
-                          shipmentHistory: _package.shipmentHistory,
-                          currentStatus: _package.currentStatus),
-                    ],
-                  ),
+                  StatusTree(
+                      shipmentHistory: _package.shipmentHistory,
+                      currentStatus: _package.currentStatus),
                  SizedBox(
                    height: 20,
                  )
@@ -138,6 +134,19 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
    );
  }

+  _edit() async {
+    await Navigator.push(
+      context,
+      BottomUpPageRoute(ReceivingEditor(
+        package: widget.package,
+      )),
+    );
+    PackageModel packageModel =
+        Provider.of<PackageModel>(context, listen: false);
+    var pkg = await packageModel.getPackage(widget.package.id);
+    initPackage(pkg);
+  }
+
  _delete() {
    showConfirmDialog(context, "receiving.delete.confirm", _deleteReceiving);
  }
@@ -149,7 +158,7 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
    try {
      PackageModel packageModel =
          Provider.of<PackageModel>(context, listen: false);
-      await packageModel.deletePackage(_package);
+      await packageModel.deleteReceiving(_package);
      Navigator.pop(context);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
--- a/lib/pages/receiving/receiving_list.dart
+++ b/lib/pages/receiving/receiving_list.dart
@@ -12,7 +12,7 @@ import 'package:provider/provider.dart';

 import 'receiving_info.dart';
 import 'receiving_list_row.dart';
-import 'receiving_new.dart';
+import 'receiving_editor.dart';

 class ReceivingList extends StatefulWidget {
  @override
@@ -98,7 +98,7 @@ class _ReceivingListState extends State<ReceivingList> {
  _newReceiving() {
    Navigator.push(
      context,
-      BottomUpPageRoute(ReceivingNew()),
+      BottomUpPageRoute(ReceivingEditor()),
    );
  }

--- a/lib/pages/shipment/shipment_list.dart
+++ b/lib/pages/shipment/shipment_list.dart
@@ -4,6 +4,7 @@ import 'package:fcs/pages/shipment/model/shipment_model.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';

 import 'package:flutter/material.dart';
@@ -40,7 +41,7 @@ class _ShipmentListState extends State<ShipmentList> {
          appBar: AppBar(
            centerTitle: true,
            leading: new IconButton(
-              icon: new Icon(Icons.close),
+              icon: new Icon(CupertinoIcons.back),
              onPressed: () => Navigator.of(context).pop(),
            ),
            backgroundColor: primaryColor,
@@ -72,7 +73,7 @@ class _ShipmentListState extends State<ShipmentList> {
              _newPickup();
            },
            icon: Icon(Icons.add),
-            label: Text(AppTranslations.of(context).text("shipment.new")),
+            label: LocalText(context, "shipment.new", color: Colors.white),
            backgroundColor: primaryColor,
          ),
          body: new ListView.separated(
--- a/lib/pages/widgets/badge.dart
+++ b/lib/pages/widgets/badge.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 Widget badgeCounter(Widget child, int counter) {
  return Container(
    width: 120,
-    height: 140,
    child: new Stack(
      children: <Widget>[
        child,
--- a/lib/pages/widgets/local_popup_menu_button.dart
+++ b/lib/pages/widgets/local_popup_menu_button.dart
@@ -0,0 +1,120 @@
+import 'package:fcs/helpers/theme.dart';
+import 'package:fcs/pages/widgets/local_text.dart';
+import 'package:flutter/material.dart';
+
+import 'local_popupmenu.dart';
+
+typedef PopupMenuCallback = Function(LocalPopupMenu popupMenu);
+
+class LocalPopupMenuButton extends StatefulWidget {
+  final PopupMenuCallback popupMenuCallback;
+  final List<LocalPopupMenu> popmenus;
+  final bool multiSelect;
+
+  const LocalPopupMenuButton(
+      {Key key,
+      this.popupMenuCallback,
+      this.popmenus,
+      this.multiSelect = false})
+      : super(key: key);
+
+  @override
+  _LocalPopupMenuButtonState createState() => _LocalPopupMenuButtonState();
+}
+
+class _LocalPopupMenuButtonState extends State<LocalPopupMenuButton> {
+  List<LocalPopupMenu> popmenus;
+
+  @override
+  void initState() {
+    popmenus = widget.popmenus;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    bool hightlight = _needHighlight();
+    return PopupMenuButton<LocalPopupMenu>(
+        elevation: 3.2,
+        onSelected: (selected) {
+          if (!widget.multiSelect) {
+            setState(() {
+              popmenus.forEach((e) {
+                if (e.id != selected.id)
+                  e.selected = false;
+                else
+                  e.selected = true;
+              });
+            });
+            selected.selected = true;
+          } else {
+            setState(() {
+              popmenus.forEach((e) {
+                if (e.id == selected.id) e.selected = !e.selected;
+              });
+            });
+            selected.selected = !selected.selected;
+          }
+          if (widget.popupMenuCallback != null)
+            widget.popupMenuCallback(selected);
+        },
+        icon: Container(
+            width: 30,
+            height: 30,
+            decoration: new BoxDecoration(
+              shape: BoxShape.circle,
+              color: Colors.white,
+            ),
+            child: Stack(
+              fit: StackFit.expand,
+              children: <Widget>[
+                Icon(
+                  Icons.filter_list,
+                  color: primaryColor,
+                ),
+                hightlight
+                    ? Positioned(
+                        bottom: 0,
+                        right: 0,
+                        child: Container(
+                          width: 10,
+                          height: 10,
+                          decoration: new BoxDecoration(
+                            shape: BoxShape.circle,
+                            color: secondaryColor,
+                          ),
+                        ),
+                      )
+                    : Container()
+              ],
+            )),
+        itemBuilder: (BuildContext context) {
+          return popmenus.map((LocalPopupMenu choice) {
+            return PopupMenuItem<LocalPopupMenu>(
+              value: choice,
+              child: Row(
+                children: <Widget>[
+                  LocalText(context, choice.textKey, color: primaryColor),
+                  SizedBox(
+                    width: 10,
+                  ),
+                  choice.selected
+                      ? Icon(
+                          Icons.check,
+                          color: Colors.grey,
+                        )
+                      : Container(),
+                ],
+              ),
+            );
+          }).toList();
+        });
+  }
+
+  bool _needHighlight() {
+    popmenus.forEach((e) {
+      if (e.selected && e.highlight) return true;
+    });
+    return false;
+  }
+}
--- a/lib/pages/widgets/local_popupmenu.dart
+++ b/lib/pages/widgets/local_popupmenu.dart
@@ -0,0 +1,8 @@
+class LocalPopupMenu {
+  int id;
+  String textKey;
+  bool selected;
+  bool highlight;
+  LocalPopupMenu(
+      {this.id, this.textKey, this.selected = false, this.highlight = false});
+}
--- a/lib/pages/widgets/popupmenu.dart
+++ b/lib/pages/widgets/popupmenu.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/material.dart';
-
 class PopupMenu {
  int id;
  String status;
--- a/lib/pages/widgets/status_tree.dart
+++ b/lib/pages/widgets/status_tree.dart
@@ -19,10 +19,19 @@ class StatusTree extends StatelessWidget {
      : super(key: key);
  @override
  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.only(left: 20),
-      height: 400,
-      child: Timeline(children: _models(), position: TimelinePosition.Left),
+    return ExpansionTile(
+      initiallyExpanded: true,
+      title: Text(
+        'Status',
+        style: TextStyle(color: primaryColor, fontWeight: FontWeight.bold),
+      ),
+      children: <Widget>[
+        Container(
+          padding: EdgeInsets.only(left: 20),
+          height: 400,
+          child: Timeline(children: _models(), position: TimelinePosition.Left),
+        )
+      ],
    );
  }

--- a/lib/pages/widgets/task_button.dart
+++ b/lib/pages/widgets/task_button.dart
@@ -1,3 +1,4 @@
+import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/model/language_model.dart';
 import 'package:flutter/material.dart';
@@ -22,7 +23,7 @@ class TaskButton extends StatelessWidget {
      onTap: btnCallback != null ? btnCallback : () => {},
      child: Container(
        width: 120,
-        height: 170,
+        height: 155,
        padding: EdgeInsets.only(top: 0.0, left: 5, right: 5),
        decoration: new BoxDecoration(
            color: Colors.transparent,
@@ -42,7 +43,7 @@ class TaskButton extends StatelessWidget {
              ),
            ),
            Container(
-              height: 60,
+              height: 45,
              alignment: Alignment.topCenter,
              child: Text(AppTranslations.of(context).text(titleKey),
                  textAlign: TextAlign.center,