Merge branch 'master' of tzw/fcs into master

lib/pages/main/home_page.dart

@@ -361,8 +361,8 @@ class _HomePageState extends State<HomePage> {
       // 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.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);

lib/pages/profile/profile_page.dart

@@ -112,13 +112,13 @@ class _ProfileState extends State<Profile> {
               labelTextKey: "profile.phone",
               iconData: Icons.phone),
         ),
-        IconButton(
-            icon: Icon(Icons.edit, color: Colors.grey),
-            onPressed: () {
-              Navigator.of(context, rootNavigator: true).push(
-                  CupertinoPageRoute(
-                      builder: (context) => ChangePhoneNumber(user: user)));
-            })
+        // IconButton(
+        //     icon: Icon(Icons.edit, color: Colors.grey),
+        //     onPressed: () {
+        //       Navigator.of(context, rootNavigator: true).push(
+        //           CupertinoPageRoute(
+        //               builder: (context) => ChangePhoneNumber(user: user)));
+        //     })
       ],
     );
 
@@ -213,7 +213,7 @@ class _ProfileState extends State<Profile> {
               fcsIDBox,
               usaShippingAddressBox,
               currencyBox,
-              emailBox,
+              // emailBox,
               DefaultDeliveryAddress(
                 labelKey: "profile.default.delivery.address",
                 deliveryAddress: deliveryAddressModel.defalutAddress,