add signin function

lib/app.dart

@@ -1,22 +1,22 @@
-import 'package:fcs/model/discount_model.dart';
+import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart';
-import 'package:fcs/model/shipment_model.dart';
-import 'package:fcs/model_fcs/message_model.dart';
-import 'package:fcs/model_fcs/package_model.dart';
-import 'package:fcs/vo/message.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
 import 'package:fcs/model/delivery_model.dart';
+import 'package:fcs/model/discount_model.dart';
 import 'package:fcs/model/manual_model.dart';
 import 'package:fcs/model/notification_model.dart';
 import 'package:fcs/model/pd_model.dart';
 import 'package:fcs/model/reg_model.dart';
 import 'package:fcs/model/report_model.dart';
+import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model/storage_model.dart';
 import 'package:fcs/model/test_model.dart';
+import 'package:fcs/model_fcs/message_model.dart';
+import 'package:fcs/model_fcs/package_model.dart';
 import 'package:fcs/pages/email_page.dart';
 import 'package:fcs/pages/login_page.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:provider/provider.dart';
 
 import 'model/announcement_model.dart';
 import 'model/chart_model.dart';
@@ -35,11 +35,10 @@ import 'model/report_user_model.dart';
 import 'model/shipment_rate_model.dart';
 import 'model/user_model.dart';
 import 'model_fcs/box_model.dart';
-import 'pages/home_page.dart';
+import 'fcs/common/pages/home_page.dart';
-import 'pages/home_page_welcome.dart';
+import 'fcs/common/pages/welcome_page.dart';
-import 'pages/splash.dart';
+import 'fcs/common/pages/splash_page.dart';
 import 'pages/term.dart';
-import 'pages/welcome_page.dart';
 import 'widget/localization/app_translations_delegate.dart';
 import 'widget/localization/transalation.dart';
 
@@ -131,9 +130,8 @@ class _AppState extends State<App> {
   Map<String, WidgetBuilder> route(BuildContext context) {
     final routes = <String, WidgetBuilder>{
       '/': (_) => SplashScreen(),
-      '/home': (_) => HomePageWelcome(),
+      '/welcome': (_) => WelcomePage(),
-      '/homeLogin': (_) => HomePage(),
+      '/home': (_) => HomePage(),
-      '/welcome': (context) => WelcomePage(),
       '/term': (context) => Term(
             agreePage: true,
           ),
@@ -147,38 +145,37 @@ class _AppState extends State<App> {
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
-        ChangeNotifierProvider(builder: (context) => mainModel),
+        ChangeNotifierProvider.value(value: mainModel),
-        ChangeNotifierProvider(builder: (context) => userModel),
+        ChangeNotifierProvider.value(value: userModel),
-        ChangeNotifierProvider(builder: (context) => productModel),
+        ChangeNotifierProvider.value(value: productModel),
-        ChangeNotifierProvider(builder: (context) => employeeModel),
+        ChangeNotifierProvider.value(value: employeeModel),
-        ChangeNotifierProvider(builder: (context) => poSubmissionModel),
+        ChangeNotifierProvider.value(value: poSubmissionModel),
-        ChangeNotifierProvider(builder: (context) => doModel),
+        ChangeNotifierProvider.value(value: doModel),
-        ChangeNotifierProvider(builder: (context) => storageModel),
+        ChangeNotifierProvider.value(value: storageModel),
-        ChangeNotifierProvider(builder: (context) => pdModel),
+        ChangeNotifierProvider.value(value: pdModel),
-        ChangeNotifierProvider(builder: (context) => lanuguageModel),
+        ChangeNotifierProvider.value(value: lanuguageModel),
-        ChangeNotifierProvider(builder: (context) => regModel),
+        ChangeNotifierProvider.value(value: regModel),
-        ChangeNotifierProvider(builder: (context) => buyerModel),
+        ChangeNotifierProvider.value(value: buyerModel),
-        ChangeNotifierProvider(builder: (context) => notificationModel),
+        ChangeNotifierProvider.value(value: notificationModel),
-        ChangeNotifierProvider(builder: (context) => chartModel),
+        ChangeNotifierProvider.value(value: chartModel),
-        ChangeNotifierProvider(builder: (context) => deliveryModel),
+        ChangeNotifierProvider.value(value: deliveryModel),
-        ChangeNotifierProvider(builder: (context) => manualModel),
+        ChangeNotifierProvider.value(value: logModel),
-        ChangeNotifierProvider(builder: (context) => logModel),
+        ChangeNotifierProvider.value(value: phoneDeviceModel),
-        ChangeNotifierProvider(builder: (context) => deliveryModel),
+        ChangeNotifierProvider.value(value: reportModel),
-        ChangeNotifierProvider(builder: (context) => phoneDeviceModel),
+        ChangeNotifierProvider.value(value: announcementModel),
-        ChangeNotifierProvider(builder: (context) => reportModel),
+        ChangeNotifierProvider.value(value: reportUserModel),
-        ChangeNotifierProvider(builder: (context) => announcementModel),
+        ChangeNotifierProvider.value(value: pickUpModel),
-        ChangeNotifierProvider(builder: (context) => reportUserModel),
+        ChangeNotifierProvider.value(value: shipmentRateModel),
-        ChangeNotifierProvider(builder: (context) => pickUpModel),
+        ChangeNotifierProvider.value(value: shipmentModel),
-        ChangeNotifierProvider(builder: (context) => shipmentRateModel),
+        ChangeNotifierProvider.value(value: packageModel),
-        ChangeNotifierProvider(builder: (context) => shipmentModel),
+        ChangeNotifierProvider.value(value: boxModel),
-        ChangeNotifierProvider(builder: (context) => packageModel),
+        ChangeNotifierProvider.value(value: messageModel),
-        ChangeNotifierProvider(builder: (context) => boxModel),
+        ChangeNotifierProvider.value(value: invoiceModel),
-        ChangeNotifierProvider(builder: (context) => messageModel),
+        ChangeNotifierProvider.value(value: customerModel),
-        ChangeNotifierProvider(builder: (context) => invoiceModel),
+        ChangeNotifierProvider.value(value: discountModel),
-        ChangeNotifierProvider(builder: (context) => customerModel),
+        ChangeNotifierProvider.value(value: testModel),
-        ChangeNotifierProvider(builder: (context) => discountModel),
         ChangeNotifierProvider(
-          builder: (context) => testModel,
+          create: (_) => SigninModel(),
         ),
       ],
       child: Consumer<LanguageModel>(

lib/charts/bar_chart.dart

@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/charts/qtyby_customer_table.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 
@@ -41,7 +41,8 @@ class _BarChartState extends State<BarChart> {
         });
       });
 
-      this.chartSummary
+      this
+          .chartSummary
           .sort((s1, s2) => s1.displayOrder.compareTo(s2.displayOrder));
     }
     List<charts.Series<POChartData, String>> series = [

lib/charts/delivery_do_line.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 
@@ -45,7 +45,8 @@ class _DODeliveryLineChartState extends State<DODeliveryLineChart> {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: <Widget>[
-              LocalText(context, "delivery.do.title", color: primaryColor, fontSize: 16),
+              LocalText(context, "delivery.do.title",
+                  color: primaryColor, fontSize: 16),
               InkWell(
                 child: LocalText(
                   context,
@@ -54,8 +55,8 @@ class _DODeliveryLineChartState extends State<DODeliveryLineChart> {
                   fontSize: 14,
                 ),
                 onTap: () {
-                  Navigator.of(context)
+                  Navigator.of(context).push(MaterialPageRoute(
-                      .push(MaterialPageRoute(builder: (_) => DODeliveryLineDetail()));
+                      builder: (_) => DODeliveryLineDetail()));
                 },
               ),
             ],

lib/charts/delivery_do_line_detail.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/charts/delivery_do_summary.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/delivery_do_summary_details.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/charts/delivery_line.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/delivery_line_data.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';
@@ -56,7 +56,8 @@ class _DeliveryBarDataState extends State<DeliveryBarData> {
                 columnSpacing: 100,
                 columns: [
                   MyDataColumn(label: LocalText(context, "delivery.date")),
-                  MyDataColumn(label: LocalText(context, "delivery.qty"),numeric: true),
+                  MyDataColumn(
+                      label: LocalText(context, "delivery.qty"), numeric: true),
                 ],
                 rows: getProductRow(chartModel.revenue.getDelivery()),
               ),
@@ -80,9 +81,7 @@ class _DeliveryBarDataState extends State<DeliveryBarData> {
           MyDataCell(
             new Text(dateFormatter.format(d.date), style: textStyle),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(d.amount)),
-            NumberCell(d.amount)
-          ),
         ],
       );
 

lib/charts/delivery_line_detail.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/do_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';
@@ -61,7 +61,8 @@ class _DeliveryBarDetailState extends State<DeliveryBarDetail> {
                 columns: [
                   MyDataColumn(label: LocalText(context, "do.name")),
                   MyDataColumn(label: LocalText(context, "do.do_num")),
-                  MyDataColumn(label: LocalText(context, "do.quantity"),numeric: true),
+                  MyDataColumn(
+                      label: LocalText(context, "do.quantity"), numeric: true),
                 ],
                 rows: getProductRow(),
               ),
@@ -82,9 +83,7 @@ class _DeliveryBarDetailState extends State<DeliveryBarDetail> {
           MyDataCell(
             new Text(d.doNumber, style: textStyle),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(d.totalQty)),
-            NumberCell(d.totalQty)
-          ),
         ],
       );
 

lib/charts/delivery_summary.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'delivery_summary_detail.dart';

lib/charts/delivery_summary_detail.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/charts/do_line.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po_do_count.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/do_line_detail.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po_do_count.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/charts/po_balance_chart.dart

@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/charts/po_balance_table.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/po_balance_table.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/charts/po_balanceby_buyer.dart

@@ -3,15 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 
 class POBalanceChart_ extends StatefulWidget {
   @override
   _POBalanceChartState createState() => _POBalanceChartState();
-
-
 }
 
 class _POBalanceChartState extends State<POBalanceChart_> {

lib/charts/po_line.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/charts/po_line_detail.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po_do_count.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/po_line_detail.dart

@@ -4,7 +4,7 @@ import 'package:http/http.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po_do_count.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/charts/qtyby_customer_table.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/charts/revenue_line.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/charts/revenue_line_data.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/chart_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/revenue.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';
@@ -56,7 +56,9 @@ class _RevenueLineDataState extends State<RevenueLineData> {
                 columnSpacing: 100,
                 columns: [
                   MyDataColumn(label: LocalText(context, "revenue.date")),
-                  MyDataColumn(label: LocalText(context, "revenue.amount"),numeric: true),
+                  MyDataColumn(
+                      label: LocalText(context, "revenue.amount"),
+                      numeric: true),
                 ],
                 rows: getProductRow(chartModel.revenue.getData()),
               ),
@@ -70,7 +72,7 @@ class _RevenueLineDataState extends State<RevenueLineData> {
   List<MyDataRow> getProductRow(List<Data> revs) {
     return revs.map((p) {
       var r = MyDataRow(
-         onSelectChanged: (bool selected) async {
+        onSelectChanged: (bool selected) async {
           Navigator.push(
             context,
             MaterialPageRoute(builder: (context) => RevenueLineDetail(p.date)),
@@ -80,9 +82,7 @@ class _RevenueLineDataState extends State<RevenueLineData> {
           MyDataCell(
             new Text(dateFormatter.format(p.date), style: textStyle),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(p.amount)),
-            NumberCell(p.amount)
-          ),
         ],
       );
 

lib/charts/revenue_line_detail.dart

@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';

lib/fcs/common/api_helper.dart

@@ -6,7 +6,7 @@ import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';
 import 'package:fcs/vo/status.dart';
 
-import '../config.dart';
+import '../../config.dart';
 
 final log = Logger('requestAPI');
 

lib/fcs/common/data/providers/auth_fb.dart

@@ -4,21 +4,29 @@ import 'package:fcs/fcs/common/domain/entities/auth.dart';
 import 'package:fcs/fcs/common/domain/entities/auth_status.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 
+import '../../api_helper.dart';
+
 class AuthFb {
   static final AuthFb instance = AuthFb._();
   AuthFb._();
 
-  final FirebaseAuth _fb = FirebaseAuth.instance;
+  static final FirebaseAuth _fb = FirebaseAuth.instance;
+  static FirebaseUser firebaseUser;
   static String _verificationId;
 
   Future<Auth> sendSmsCodeToPhoneNumber(String phoneNumber) {
     Completer<Auth> completer = Completer();
 
     final PhoneVerificationCompleted verificationCompleted =
-        (AuthCredential user) {
+        (AuthCredential authCredential) async {
-      completer.complete(Auth(authStatus: AuthStatus.AUTH_VERIFIED));
+      firebaseUser = await _signIn(authCredential);
+      Auth auth = Auth(authStatus: AuthStatus.AUTH_VERIFIED);
+      auth.uid = firebaseUser.uid;
+      auth.name = await _getName(firebaseUser);
+      auth.phoneNumber = firebaseUser.phoneNumber;
+      completer.complete(auth);
       print(
-          'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: $user');
+          'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: $firebaseUser');
     };
 
     final PhoneVerificationFailed verificationFailed =
@@ -28,8 +36,7 @@ class AuthFb {
       completer.complete(Auth(
           authStatus: AuthStatus.ERROR,
           authErrorCode: authException.code,
-          authErrorMsg: authException.message));
+          authErrorMsg: "Phone number verification failed"));
-      throw authException;
     };
 
     final PhoneCodeSent codeSent =
@@ -63,11 +70,10 @@ class AuthFb {
         smsCode: smsCode,
       );
 
-      var firebaseUser = await _fb.signInWithCredential(credential);
+      firebaseUser = await _signIn(credential);
-      final FirebaseUser currentUser = await _fb.currentUser();
-      assert(firebaseUser.user.uid == currentUser.uid);
 
-      auth.uid = firebaseUser.user.uid;
+      auth.uid = firebaseUser.uid;
+      auth.name = await _getName(firebaseUser);
       auth.authStatus = AuthStatus.AUTH_VERIFIED;
     } on Exception catch (e) {
       auth.authStatus = AuthStatus.ERROR;
@@ -76,7 +82,46 @@ class AuthFb {
     return Future.value(auth);
   }
 
-  Future<void> logout() {
+  Future<void> signout() {
+    firebaseUser = null;
     return _fb.signOut();
   }
+
+  Future<FirebaseUser> _signIn(AuthCredential credential) async {
+    AuthResult _authResult = await _fb.signInWithCredential(credential);
+    FirebaseUser _fusr = _authResult.user;
+    final FirebaseUser firebaseUser = await _fb.currentUser();
+    assert(_fusr.uid == firebaseUser.uid);
+
+    var idToken = await firebaseUser.getIdToken();
+    print("Claims:${idToken.claims}");
+
+    return firebaseUser;
+  }
+
+  Future<String> _getName(FirebaseUser firebaseUser) async {
+    IdTokenResult idToken = await firebaseUser.getIdToken();
+    return idToken.claims["name"];
+  }
+
+  Future<bool> hasSignup() async {
+    IdTokenResult idToken = await firebaseUser.getIdToken();
+    return idToken.claims.containsKey("signup") && idToken.claims["signup"];
+  }
+
+  Future<void> signup(String name) async {
+    await requestAPI("/signup", "POST",
+        payload: {
+          'name': name,
+        },
+        token: await getToken());
+    // refresh token once signup
+    await firebaseUser.getIdToken(refresh: true);
+  }
+
+  static Future<String> getToken() async {
+    FirebaseUser firebaseUser = await _fb.currentUser();
+    IdTokenResult token = await firebaseUser.getIdToken();
+    return token.token;
+  }
 }

lib/fcs/common/domain/entities/auth.dart

@@ -6,6 +6,8 @@ class Auth {
   String authErrorMsg;
 
   String uid;
+  String name;
+  String phoneNumber;
 
   Auth({this.authStatus, this.authErrorCode, this.authErrorMsg});
 }

lib/fcs/common/domain/entities/auth_status.dart

@@ -1 +1 @@
-enum AuthStatus { SMS_SENT, AUTH_VERIFIED, ERROR }
+enum AuthStatus { SMS_SENT, AUTH_VERIFIED, ERROR, SIGN_OUT }

lib/fcs/common/pages/home_page.dart

@@ -1,74 +1,38 @@
-import 'package:country_code_picker/country_code.dart';
+import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
+import 'package:fcs/pages/contact.dart';
 import 'package:fcs/pages/discount_list.dart';
+import 'package:fcs/pages/notification_list.dart';
 import 'package:fcs/pages/payment_method_page.dart';
 import 'package:fcs/pages/shipment_list.dart';
+import 'package:fcs/pages/term.dart';
 import 'package:fcs/pages_fcs/box_list.dart';
 import 'package:fcs/pages_fcs/delivery_list.dart';
 import 'package:fcs/pages_fcs/package_list.dart';
-import 'package:fcs/widget/bottom_up_page_route.dart';
-import 'package:fcs/widget/localization/transalation.dart';
-import 'package:fcs/widget/right_left_page_route%20copy.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.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';
-import 'dart:math' as math;
-import 'package:fcs/charts/bar_chart.dart';
-import 'package:fcs/charts/delivery_do_line.dart';
-import 'package:fcs/charts/delivery_do_summary.dart';
-import 'package:fcs/charts/delivery_line.dart';
-import 'package:fcs/charts/delivery_summary.dart';
-import 'package:fcs/charts/do_line.dart';
-import 'package:fcs/charts/po_balance_chart.dart';
-import 'package:fcs/charts/po_line.dart';
-import 'package:fcs/charts/revenue_line.dart';
-import 'package:fcs/model/language_model.dart';
-import 'package:fcs/model/product_model.dart';
-import 'package:fcs/pages/banks/banks.dart';
-import 'package:fcs/pages/buyer_list.dart';
-import 'package:fcs/pages/contact.dart';
-import 'package:fcs/pages/delivery/delivery_list.dart';
-import 'package:fcs/pages/manual/manual_page.dart';
-import 'package:fcs/pages/notification_list.dart';
-import 'package:fcs/pages/term.dart';
-import 'package:fcs/reports/report_list.dart';
 import 'package:fcs/widget/banner.dart';
-import 'package:fcs/widget/local_text.dart';
+import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
+import 'package:fcs/widget/localization/transalation.dart';
 import 'package:fcs/widget/offline_redirect.dart';
+import 'package:fcs/widget/right_left_page_route%20copy.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+import 'package:flutter_icons/flutter_icons.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';
 
-import '../theme/theme.dart';
+import '../../../pages/buying_online.dart';
-import 'announcement_list.dart';
+import '../../../pages/customer_list.dart';
-import 'buying_online.dart';
+import '../../../pages/fcs_profile_page.dart';
-import 'customer_list.dart';
+import '../../../pages/invoice/invoce_list.dart';
-import 'do/do_list.dart';
+import '../../../pages/pickup_list.dart';
-import 'invoice/invoce_list.dart';
+import '../../../pages/shipment_rates.dart';
-import 'my_registeration.dart';
+import '../../../pages/staff_list.dart';
-import 'pd/pd_list.dart';
+import '../theme.dart';
-import 'products_list.dart';
 import 'profile_page.dart';
-import '../fcs/common/pages/signin/signin_page.dart';
+import 'signin/signin_page.dart';
-import 'staff_list.dart';
-
-import 'fcs_profile_page.dart';
-import 'pd/pd_list.dart';
-import 'pickup_list.dart';
-import 'products_list.dart';
-import 'profile_page.dart';
-import 'shipment_rates.dart';
-import 'storage/storage_list.dart';
-import 'user_list.dart';
 
 final msgLog = Logger('backgroundMessageHandler');
 

lib/fcs/common/pages/profile_page.dart

@@ -1,26 +1,21 @@
-import 'package:fcs/model/shipment_model.dart';
+import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart';
-import 'package:fcs/pages_fcs/shipping_address_row.dart';
-import 'package:fcs/vo/shipping_address.dart';
-import 'package:fcs/widget/bottom_up_page_route.dart';
-import 'package:fcs/widget/local_text.dart';
-import 'package:fcs/widget/my_data_table.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
-import 'package:package_info/package_info.dart';
-import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
+import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/pages/profile_edit.dart';
 import 'package:fcs/pages/util.dart';
+import 'package:fcs/pages_fcs/shipping_address_row.dart';
 import 'package:fcs/vo/role.dart';
+import 'package:fcs/vo/shipping_address.dart';
+import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/localization/transalation.dart';
 import 'package:fcs/widget/progress.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
-import '../theme/theme.dart';
+import '../../../pages/shipping_address_editor.dart';
-import 'profile_setting.dart';
+import '../theme.dart';
-import 'shipping_address_editor.dart';
 
 typedef void ProfileCallback();
 
@@ -235,8 +230,9 @@ class _ProfileState extends State<Profile> {
                           _isLoading = true;
                         });
                         await mainModel.logout();
+                        await context.read<SigninModel>().signout();
                         Navigator.of(context).pushNamedAndRemoveUntil(
-                            "/home", ModalRoute.withName('/home'));
+                            "/welcome", ModalRoute.withName('/welcome'));
                         Future.delayed(Duration(seconds: 1), () {
                           if (mounted) {
                             setState(() {

lib/fcs/common/pages/signin/code_page.dart

@@ -1,17 +1,19 @@
 import 'dart:async';
 
+import 'package:fcs/fcs/common/domain/entities/auth.dart';
+import 'package:fcs/fcs/common/domain/entities/auth_status.dart';
+import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/model/shared_pref.dart';
+import 'package:fcs/pages/util.dart';
-import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/material.dart';
 import 'package:pin_input_text_field/pin_input_text_field.dart';
 import 'package:provider/provider.dart';
 
-import '../../../../theme/theme.dart';
+import 'signup_page.dart';
+import '../../theme.dart';
 import '../../../../widget/local_text.dart';
 import '../../../../widget/progress.dart';
-import '../../../../pages/user_edit.dart';
 
 const resend_count_sec = 5;
 
@@ -191,9 +193,21 @@ class _CodePageState extends State<CodePage> {
   _resend() async {}
 
   _verify() async {
-    Provider.of<MainModel>(context).saveUser(pin, widget.phoneNumber);
+    try {
-    await Navigator.of(context).push(BottomUpPageRoute(UserEditPage()));
+      Auth auth = await context.read<SigninModel>().signin(this.pin);
-    Navigator.pop(context);
+      if (auth.authStatus == AuthStatus.AUTH_VERIFIED) {
+        bool hasSignup = await context.read<SigninModel>().hasSignup();
+        if (!hasSignup) {
+          await Navigator.of(context).push(BottomUpPageRoute(SignupPage()));
+        } else {
+          Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false);
+        }
+        Provider.of<MainModel>(context, listen: false)
+            .saveUser(pin, widget.phoneNumber);
+      }
+    } catch (e) {
+      showMsgDialog(context, "Error", e.toString());
+    }
   }
 
   _completeResend() {

lib/fcs/common/pages/signin/model/signin_model.dart

@@ -1,8 +1,25 @@
 import 'package:fcs/fcs/common/data/providers/auth_fb.dart';
+import 'package:fcs/fcs/common/domain/entities/auth.dart';
 import 'package:flutter/foundation.dart';
 
 class SigninModel extends ChangeNotifier {
-  setPhoneNumber(String phoneNumber) async {
+  Future<Auth> sendSms(String phoneNumber) {
-    await AuthFb.instance.sendSmsCodeToPhoneNumber(phoneNumber);
+    return AuthFb.instance.sendSmsCodeToPhoneNumber(phoneNumber);
+  }
+
+  Future<Auth> signin(String smsCode) {
+    return AuthFb.instance.signInWithPhoneNumber(smsCode);
+  }
+
+  Future<void> signout() {
+    return AuthFb.instance.signout();
+  }
+
+  Future<bool> hasSignup() {
+    return AuthFb.instance.hasSignup();
+  }
+
+  Future<void> signup(String name) {
+    return AuthFb.instance.signup(name);
   }
 }

lib/fcs/common/pages/signin/signin_page.dart

@@ -1,10 +1,14 @@
 import 'package:country_code_picker/country_code_picker.dart';
+import 'package:fcs/fcs/common/domain/entities/auth.dart';
+import 'package:fcs/fcs/common/domain/entities/auth_status.dart';
+import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
 
-import '../../../../theme/theme.dart';
+import '../../theme.dart';
 import '../../../../widget/local_text.dart';
 import '../../../../widget/progress.dart';
 import 'code_page.dart';
@@ -157,19 +161,33 @@ class _SigninPageState extends State<SigninPage> {
       return;
     }
 
+    setState(() {
+      _isLoading = true;
+    });
+
     try {
       Exception exp;
       phoneNumber = phoneNumber[0] == "0"
           ? phoneNumber.replaceFirst("0", "")
           : phoneNumber;
       phoneNumber = dialCode + phoneNumber;
-      await Navigator.of(context)
+
-          .push(BottomUpPageRoute(CodePage(phoneNumber: phoneNumber)));
+      Auth auth = await context.read<SigninModel>().sendSms(phoneNumber);
-      Navigator.pop(context);
+      if (auth.authStatus == AuthStatus.SMS_SENT) {
+        await Navigator.of(context)
+            .push(BottomUpPageRoute(CodePage(phoneNumber: phoneNumber)));
+        Navigator.pop(context);
+      }
+      if (auth.authStatus == AuthStatus.ERROR) {
+        showMsgDialog(context, "Error", auth.authErrorMsg);
+      }
 
       if (exp != null) throw exp;
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
     }
+    setState(() {
+      _isLoading = false;
+    });
   }
 }

lib/fcs/common/pages/signin/signup_page.dart

@@ -1,21 +1,19 @@
-import 'package:fcs/model/shared_pref.dart';
+import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart';
-import 'package:fcs/widget/bottom_up_page_route.dart';
-import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
-import '../theme/theme.dart';
+import '../../../../widget/local_text.dart';
-import '../widget/local_text.dart';
+import '../../../../widget/progress.dart';
-import '../widget/progress.dart';
+import '../../theme.dart';
-import 'home_page.dart';
+import 'package:provider/provider.dart';
 
-class UserEditPage extends StatefulWidget {
+class SignupPage extends StatefulWidget {
   @override
-  _UserEditPageState createState() => _UserEditPageState();
+  _SignupPageState createState() => _SignupPageState();
 }
 
-class _UserEditPageState extends State<UserEditPage> {
+class _SignupPageState extends State<SignupPage> {
   bool _isLoading = false;
   TextEditingController nameCtl;
 
@@ -110,6 +108,7 @@ class _UserEditPageState extends State<UserEditPage> {
   }
 
   _submit() async {
-    Navigator.pushNamedAndRemoveUntil(context, "/homeLogin", (r) => false);
+    await context.read<SigninModel>().signup(nameCtl.text);
+    Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false);
   }
 }

lib/fcs/common/pages/splash_page.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
@@ -51,9 +51,9 @@ class _SplashScreenState extends State<SplashScreen> {
     if (_loaded) {
       timer.cancel();
       if (this._isLogin) {
-        Navigator.of(context).pushReplacementNamed('/homeLogin');
-      } else {
         Navigator.of(context).pushReplacementNamed('/home');
+      } else {
+        Navigator.of(context).pushReplacementNamed('/welcome');
       }
 
       // if (_isSupport) {

lib/fcs/common/pages/welcome_page.dart

@@ -13,21 +13,21 @@ import 'package:intl/intl.dart' as intl;
 import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';
 
-import '../theme/theme.dart';
+import '../theme.dart';
 import 'profile_page.dart';
-import '../fcs/common/pages/signin/signin_page.dart';
+import 'signin/signin_page.dart';
-import 'term.dart';
+import '../../../pages/term.dart';
 
 final msgLog = Logger('backgroundMessageHandler');
 
-class HomePageWelcome extends StatefulWidget {
+class WelcomePage extends StatefulWidget {
   @override
-  _HomePageWelcomeState createState() => _HomePageWelcomeState();
+  _WelcomePageState createState() => _WelcomePageState();
 }
 
 typedef BtnCallback();
 
-class _HomePageWelcomeState extends State<HomePageWelcome> {
+class _WelcomePageState extends State<WelcomePage> {
   final log = Logger('_HomePageWelcomeState');
   bool login = false;
   bool customer = true;
@@ -137,56 +137,54 @@ class _HomePageWelcomeState extends State<HomePageWelcome> {
                     Color(0xfa272262),
                   ], // whitish to gray
                 )),
-                child: Column(
+                child: ListView(
                   children: <Widget>[
-                    Expanded(
+                    Column(
-                      child: Column(
+                      children: <Widget>[
-                        children: <Widget>[
+                        Padding(
-                          Padding(
+                          padding: const EdgeInsets.all(80.0),
-                            padding: const EdgeInsets.all(80.0),
+                          child: Text(
-                            child: Text(
+                            "Welcome!",
-                              "Welcome!",
+                            textAlign: TextAlign.center,
-                              textAlign: TextAlign.center,
+                            style: TextStyle(
-                              style: TextStyle(
+                                color: Colors.white,
-                                  color: Colors.white,
+                                fontSize: 28,
-                                  fontSize: 28,
+                                fontFamily: "Roboto"),
-                                  fontFamily: "Roboto"),
-                            ),
                           ),
-                          Padding(
+                        ),
-                            padding: const EdgeInsets.only(top: 0.0),
+                        Padding(
-                            child: Text(
+                          padding: const EdgeInsets.only(top: 0.0),
-                              "Cargo Services",
+                          child: Text(
-                              textAlign: TextAlign.center,
+                            "Cargo Services",
-                              style: TextStyle(
+                            textAlign: TextAlign.center,
-                                  color: Colors.white,
+                            style: TextStyle(
-                                  fontSize: 28,
+                                color: Colors.white,
-                                  fontFamily: "Roboto"),
+                                fontSize: 28,
-                            ),
+                                fontFamily: "Roboto"),
                           ),
-                          Padding(
+                        ),
-                            padding: const EdgeInsets.all(10.0),
+                        Padding(
-                            child: Text(
+                          padding: const EdgeInsets.all(10.0),
-                              "by FCS Trading",
+                          child: Text(
-                              textAlign: TextAlign.center,
+                            "by FCS Trading",
-                              style: TextStyle(
+                            textAlign: TextAlign.center,
-                                  color: Colors.white,
+                            style: TextStyle(
-                                  fontSize: 18,
+                                color: Colors.white,
-                                  fontFamily: "Roboto"),
+                                fontSize: 18,
-                            ),
+                                fontFamily: "Roboto"),
                           ),
-                          Container(
+                        ),
-                            padding: EdgeInsets.only(top: 10, bottom: 10),
+                        Container(
-                            child: CircleAvatar(
+                          padding: EdgeInsets.only(top: 10, bottom: 10),
-                                radius: (50),
+                          child: CircleAvatar(
-                                backgroundColor: Colors.white,
+                              radius: (50),
-                                child: ClipRRect(
+                              backgroundColor: Colors.white,
-                                  borderRadius: BorderRadius.circular(50),
+                              child: ClipRRect(
-                                  child: Image.asset("assets/logo.jpg"),
+                                borderRadius: BorderRadius.circular(50),
-                                )),
+                                child: Image.asset("assets/logo.jpg"),
-                          ),
+                              )),
-                        ],
+                        ),
-                      ),
+                      ],
                     ),
                     // Row(
                     //   children: <Widget>[
@@ -241,28 +239,29 @@ class _HomePageWelcomeState extends State<HomePageWelcome> {
                     //     ),
                     //   ],
                     // ),
-                    Row(
+                    Padding(
-                      mainAxisAlignment: MainAxisAlignment.center,
+                      padding: const EdgeInsets.only(top: 28.0),
-                      children: <Widget>[
+                      child: Row(
-                        // _buildSmallButton(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                        //     "Policies", FontAwesomeIcons.fileContract),
+                        children: <Widget>[
-                        InkWell(
+                          InkWell(
-                          onTap: () {
+                            onTap: () {
-                            Navigator.of(context).push(
+                              Navigator.of(context).push(
-                                MaterialPageRoute(builder: (_) => Contact()));
+                                  MaterialPageRoute(builder: (_) => Contact()));
-                          },
+                            },
-                          child: _buildSmallButton(
+                            child: _buildSmallButton(
-                              "Contact Us", SimpleLineIcons.support),
+                                "Contact Us", SimpleLineIcons.support),
-                        ),
+                          ),
-                        InkWell(
+                          InkWell(
-                          onTap: () {
+                            onTap: () {
-                            Navigator.of(context).push(
+                              Navigator.of(context).push(
-                                MaterialPageRoute(builder: (_) => Term()));
+                                  MaterialPageRoute(builder: (_) => Term()));
-                          },
+                            },
-                          child: _buildSmallButton(
+                            child: _buildSmallButton(
-                              "Terms of service", Icons.info_outline),
+                                "Terms of service", Icons.info_outline),
-                        ),
+                          ),
-                      ],
+                        ],
+                      ),
                     )
                   ],
                 ))),
@@ -285,20 +284,12 @@ class _HomePageWelcomeState extends State<HomePageWelcome> {
     return Padding(
       padding: const EdgeInsets.all(18.0),
       child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          IconButton(
+          Padding(
-              icon: Icon(iconData, color: Colors.white70),
+            padding: const EdgeInsets.only(right: 5),
-              color: Colors.white70,
+            child: Icon(iconData, color: Colors.white70, size: 18),
-              onPressed: null),
+          ),
-          // RaisedButton(onPressed: ()=>{},child: Row(
-          //   children: <Widget>[
-          //     IconButton(
-          //     icon: Icon(iconData, ),
-          //     onPressed: null),
-          //     Text(text),
-          //   ],
-          // ),color: Colors.transparent,
-          // focusColor: Colors.transparent,),
           Text(
             text,
             style: subMenuStyle,

lib/fcs/common/services/auth_imp.dart

@@ -31,7 +31,7 @@ class AuthImp implements AuthInterface {
   }
 
   @override
-  Future<Auth> logout() {
+  Future<Auth> signout() {
-    return authFb.logout();
+    return authFb.signout();
   }
 }

lib/fcs/common/services/auth_interface.dart

@@ -3,5 +3,5 @@ import 'package:fcs/fcs/common/domain/entities/auth.dart';
 abstract class AuthInterface {
   Future<Auth> sendSmsCodeToPhoneNumber(String phoneNumber);
   Future<Auth> signInWithSmsCode(String smsCode);
-  Future<Auth> logout();
+  Future<Auth> signout();
 }

lib/fcs/common/theme.dart

@@ -18,7 +18,7 @@ const TextStyle welcomeLabelStyle =
 const TextStyle welcomeSubLabelStyle =
     TextStyle(fontSize: 18, color: primaryColor, fontWeight: FontWeight.w500);
 const TextStyle subMenuStyle =
-    TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500);
+    TextStyle(fontSize: 11, color: Colors.white, fontWeight: FontWeight.w500);
 const TextStyle siginButtonStyle =
     TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.w500);
 

lib/main-dev.dart

@@ -1,7 +1,6 @@
+import 'package:fcs/config.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
-import 'package:fcs/config.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 import 'app.dart';
 
@@ -9,8 +8,7 @@ void main() {
   Config(
       flavor: Flavor.DEV,
       color: Colors.blue,
-      apiURL:
+      apiURL: "http://192.168.100.11:7777",
-          "https://asia-northeast1-mokkon-wholesale-dev.cloudfunctions.net/APIOK",
       reportURL: "http://petrok-dev.mokkon.com:8080",
       reportProjectID: "dev",
       level: Level.ALL);

lib/model/base_model.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:fcs/model/api_helper.dart';
+import 'package:fcs/fcs/common/api_helper.dart';
 
 import '../vo/setting.dart';
 import '../vo/user.dart';

lib/model/buyer_model.dart

@@ -4,7 +4,7 @@ import 'dart:convert' show HtmlEscape, base64, utf8;
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:logging/logging.dart';
 import 'package:fcs/config.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/vo/popup_menu.dart';
 

lib/model/do_model.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:path/path.dart' as Path;
-import 'package:fcs/model/api_helper.dart';
+import 'package:fcs/fcs/common/api_helper.dart';
 import 'package:fcs/model/constants.dart';
 import 'package:fcs/pages/do/do_files.dart';
 import 'package:fcs/vo/do.dart';
@@ -27,7 +27,6 @@ class DOModel extends BaseModel {
     _loadDOs();
   }
 
-
   @override
   logout() async {
     if (listener != null) await listener.cancel();
@@ -247,7 +246,8 @@ class DOModel extends BaseModel {
         .where("status", isEqualTo: do_approved_status)
         .where("delivery_date", isGreaterThanOrEqualTo: date)
         .where("delivery_date", isLessThan: dateAddOne)
-        .orderBy("delivery_date").orderBy("user_name")
+        .orderBy("delivery_date")
+        .orderBy("user_name")
         .limit(100)
         .getDocuments();
     snapshots.documents.forEach((d) {

lib/model/main_model.dart

@@ -22,7 +22,7 @@ import 'package:fcs/widget/NetworkConnectivity.dart';
 import '../config.dart';
 import '../vo/status.dart';
 import '../vo/user.dart';
-import 'api_helper.dart';
+import '../fcs/common/api_helper.dart';
 import 'base_model.dart';
 import 'constants.dart';
 import 'firebase_helper.dart';
@@ -97,10 +97,10 @@ class MainModel extends ChangeNotifier {
           phone: '+959123456789',
           mail: 'kbz@gmail.com'),
       PaymentMethod(
-          name: 'PayPal',
+        name: 'PayPal',
-          accountName: 'FCS',
+        accountName: 'FCS',
-          link: 'https://www.paypal.com/donate/buttons',
+        link: 'https://www.paypal.com/donate/buttons',
-         ),
+      ),
     ];
     return methods;
   }

lib/model/report_model.dart

@@ -6,7 +6,7 @@ import 'package:fcs/vo/report.dart';
 import 'package:fcs/vo/report_user.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:fcs/model/api_helper.dart' as api;
+import 'package:fcs/fcs/common/api_helper.dart' as api;
 import 'package:fcs/vo/report.dart';
 
 import '../config.dart';

lib/pages/add_pin_editor.dart

@@ -8,7 +8,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart' as Theme;
+import '../fcs/common/theme.dart' as Theme;
 import 'util.dart';
 
 class AddPINEditor extends StatefulWidget {

lib/pages/announcement.dart

@@ -12,7 +12,7 @@ import 'package:fcs/widget/popupmenu.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:zefyr/zefyr.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import 'announcement_editor.dart';
 
 class AnnouncementPage extends StatefulWidget {

lib/pages/announcement_editor.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/announcement_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/announcement.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/announcement_list.dart

@@ -8,7 +8,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import 'announcement.dart';
 import 'announcement_editor.dart';
 
@@ -43,15 +43,13 @@ class _AnnouncementListState extends State<AnnouncementList> {
       inAsyncCall: _isLoading,
       child: Scaffold(
         appBar: AppBar(
-          backgroundColor: primaryColor,
+            backgroundColor: primaryColor,
-          title: 
+            title: LocalText(
-           LocalText(
+              context,
-            context,
+              "announcement.title",
-            "announcement.title",
+              color: Colors.white,
-            color: Colors.white,
+              fontSize: 20,
-            fontSize: 20,
+            )),
-          )
-        ),
         floatingActionButton: isOwnerAndAbove || hasAdmin
             ? FloatingActionButton(
                 backgroundColor: primaryColor,
@@ -118,19 +116,22 @@ class _AnnouncementListState extends State<AnnouncementList> {
                                 ],
                               ),
                             ),
-                                                    Column(
+                            Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
+                              mainAxisAlignment: MainAxisAlignment.center,
-                          children: <Widget>[
+                              children: <Widget>[
-                            Padding(
+                                Padding(
-                              padding: const EdgeInsets.all(8.0),
+                                  padding: const EdgeInsets.all(8.0),
-                              child: Text(announce.time==null?"":timeFormatter.format(announce.time)),
+                                  child: Text(announce.time == null
-                            ),
+                                      ? ""
-                            announce.fromToday()
+                                      : timeFormatter.format(announce.time)),
-                                ? Container()
+                                ),
-                                : Text(announce.time==null?"":dateFormatter.format(announce.time)),
+                                announce.fromToday()
-                          ],
+                                    ? Container()
-                        )
+                                    : Text(announce.time == null
-
+                                        ? ""
+                                        : dateFormatter.format(announce.time)),
+                              ],
+                            )
                           ],
                         ),
                       ),

lib/pages/banks/bank_edit.dart

@@ -5,7 +5,7 @@ import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/bank_account.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/local_text_field.dart';

lib/pages/banks/banks.dart

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/banks/bank_edit.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/bank_account.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/barcode_screen_page.dart

@@ -5,7 +5,7 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/block_list.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/user_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/buyer_info.dart

@@ -12,7 +12,7 @@ import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import 'document_log_page.dart';
 
 class BuyerInfo extends StatefulWidget {

lib/pages/buyer_list.dart

@@ -9,7 +9,7 @@ import 'package:fcs/widget/popupmenu.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import 'buyer_list_row.dart';
 
 class BuyerList extends StatefulWidget {

lib/pages/buyer_list_row.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 
 import 'buyer_info.dart';

lib/pages/buying_online.dart

@@ -7,7 +7,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import '../widget/label_widgets.dart';
 import '../widget/local_text.dart';
 import 'instruction.dart';

lib/pages/calculate_shipment_cost_editor.dart

@@ -6,17 +6,19 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class CalculateShipmentCostEditor extends StatefulWidget {
   final PickUp pickUp;
   CalculateShipmentCostEditor({this.pickUp});
 
   @override
-  _CalculateShipmentCostEditorState createState() => _CalculateShipmentCostEditorState();
+  _CalculateShipmentCostEditorState createState() =>
+      _CalculateShipmentCostEditorState();
 }
 
-class _CalculateShipmentCostEditorState extends State<CalculateShipmentCostEditor> {
+class _CalculateShipmentCostEditorState
+    extends State<CalculateShipmentCostEditor> {
   TextEditingController _addressEditingController = new TextEditingController();
   TextEditingController _fromTimeEditingController =
       new TextEditingController();

lib/pages/chage_phone_number.dart

@@ -9,7 +9,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart' as Theme;
+import '../fcs/common/theme.dart' as Theme;
 import 'confirm_email.dart';
 import 'util.dart';
 

lib/pages/change_password.dart

@@ -9,7 +9,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart' as Theme;
+import '../fcs/common/theme.dart' as Theme;
 import 'util.dart';
 
 class ChangePassword extends StatefulWidget {

lib/pages/confirm_email.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
@@ -38,7 +38,7 @@ class _ConfirmEmailState extends State<ConfirmEmail> {
     try {
       await userModel.confirmEmail(
           widget.id, widget.email, widget.phoneNumber, _sms.text);
-      Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false);
+      Navigator.pushNamedAndRemoveUntil(context, "/welcome", (r) => false);
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
     }

lib/pages/contact.dart

@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 

lib/pages/contact_editor.dart

@@ -5,7 +5,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/phone_input.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/setting.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/local_text_field.dart';

lib/pages/custom_editor.dart

@@ -4,7 +4,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class CustomEditor extends StatefulWidget {
   final Custom custom;

lib/pages/customer_editor.dart

@@ -4,7 +4,7 @@ import 'package:fcs/model/employee_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/role.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/customer_list.dart

@@ -7,10 +7,10 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 
 import 'package:provider/provider.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import '../vo/user.dart';
 import '../widget/local_text.dart';
 import 'customer_editor.dart';

lib/pages/delivery/delivery_item.dart

@@ -12,7 +12,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/photo_page.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/widget/img_file.dart';
 import 'package:fcs/widget/local_text.dart';
@@ -425,8 +425,8 @@ class _DeliveryItemState extends State<DeliveryItem> {
                                 label: LocalText(context, "do.storage"),
                               ),
                               MyDataColumn(
-                                label: LocalText(context, "do.quantity"),numeric: true
+                                  label: LocalText(context, "do.quantity"),
-                              ),
+                                  numeric: true),
                             ],
                             rows: getProductRow(doObj.doLines),
                           ),
@@ -446,7 +446,7 @@ class _DeliveryItemState extends State<DeliveryItem> {
 
   List<MyDataRow> getProductRow(List<DOLine> doLines) {
     ProductModel productModel = Provider.of<ProductModel>(context);
-     if (doLines.isNotEmpty) {
+    if (doLines.isNotEmpty) {
       doLines.forEach((d) {
         productModel.products.forEach((p) {
           if (p.id == d.productID) {
@@ -471,9 +471,7 @@ class _DeliveryItemState extends State<DeliveryItem> {
           MyDataCell(
             new Text(d.storageName, style: textStyle),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(d.qty)),
-            NumberCell(d.qty)
-          ),
         ],
       );
     }).toList();

lib/pages/delivery/delivery_list.dart

@@ -7,7 +7,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/delivery/delivery_item.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/popupmenu.dart';

lib/pages/device_list.dart

@@ -8,7 +8,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/popupmenu.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import 'util.dart';
 
 class PhoneDeviceList extends StatefulWidget {

lib/pages/discount_by_weight_editor.dart

@@ -5,7 +5,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class DiscountByWeightEditor extends StatefulWidget {
   final Discount discount;

lib/pages/discount_editor.dart

@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class DiscountEditor extends StatefulWidget {
   final Discount discount;

lib/pages/discount_list.dart

@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class DiscountList extends StatefulWidget {
   @override
@@ -95,7 +95,8 @@ class _DiscountListState extends State<DiscountList> {
                       crossAxisAlignment: CrossAxisAlignment.end,
                       children: <Widget>[
                         Padding(
-                          padding: const EdgeInsets.only(left: 10.0,bottom: 5.0),
+                          padding:
+                              const EdgeInsets.only(left: 10.0, bottom: 5.0),
                           child: Text(
                             '\$ ${discount.amount.toString()}',
                             style: TextStyle(

lib/pages/do/do_approve.dart

@@ -13,7 +13,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/photo_page.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';
@@ -539,8 +539,9 @@ class _DOApprovalState extends State<DOApproval> {
                                       label: LocalText(context, "do.storage"),
                                     ),
                                     MyDataColumn(
-                                      label: LocalText(context, "do.quantity"),numeric: true
+                                        label:
-                                    ),
+                                            LocalText(context, "do.quantity"),
+                                        numeric: true),
                                   ],
                                   rows: getProductRow(doObj.doLines),
                                 ),
@@ -633,16 +634,20 @@ class _DOApprovalState extends State<DOApproval> {
                 MyDataColumn(label: LocalText(context, "po.number")),
                 MyDataColumn(label: LocalText(context, "po.product")),
                 MyDataColumn(
-                  label: LocalText(context, "do.po_qty"),numeric: true,
+                  label: LocalText(context, "do.po_qty"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "do.po_balance_qty"),numeric: true,
+                  label: LocalText(context, "do.po_balance_qty"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "po.retrieved.amount"),numeric: true,
+                  label: LocalText(context, "po.retrieved.amount"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "do.do_qty"),numeric: true,
+                  label: LocalText(context, "do.do_qty"),
+                  numeric: true,
                 ),
               ],
               rows: getPOProductRow(),

lib/pages/do/do_creation_form.dart

@@ -9,7 +9,7 @@ import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/do_product_item.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';
@@ -415,9 +415,7 @@ class _DOFormState extends State<DOForm> {
               columns: [
                 MyDataColumn(label: LocalText(context, "do.product")),
                 MyDataColumn(
-                  label: LocalText(context, "po.avail.qty"),
+                    label: LocalText(context, "po.avail.qty"), numeric: true),
-                  numeric: true
-                ),
                 MyDataColumn(
                   label: LocalText(context, "do.do_qty"),
                   numeric: true,
@@ -464,19 +462,17 @@ class _DOFormState extends State<DOForm> {
               style: textStyle,
             ),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(d.poBalQty)),
-            NumberCell(d.poBalQty)
-          ),
           MyDataCell(
             Container(
                 color: Colors.cyan,
-                  child: Row(
+                child: Row(
-                    mainAxisAlignment: MainAxisAlignment.end,
+                  mainAxisAlignment: MainAxisAlignment.end,
-                    children: <Widget>[
+                  children: <Widget>[
-                      new Text(d.qty == null ? "0" : d.qty.toString(),
+                    new Text(d.qty == null ? "0" : d.qty.toString(),
-                          style: textStyle),
+                        style: textStyle),
-                    ],
+                  ],
-                  )),
+                )),
           ),
         ],
       );
@@ -504,16 +500,20 @@ class _DOFormState extends State<DOForm> {
                 MyDataColumn(label: LocalText(context, "po.number")),
                 MyDataColumn(label: LocalText(context, "po.product")),
                 MyDataColumn(
-                  label: LocalText(context, "do.po_qty"),numeric: true,
+                  label: LocalText(context, "do.po_qty"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "po.avail.qty"),numeric: true,
+                  label: LocalText(context, "po.avail.qty"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "po.retrieved.amount"),numeric: true,
+                  label: LocalText(context, "po.retrieved.amount"),
+                  numeric: true,
                 ),
                 MyDataColumn(
-                  label: LocalText(context, "do.do_qty"),numeric: true,
+                  label: LocalText(context, "do.do_qty"),
+                  numeric: true,
                 ),
               ],
               rows: getPOProductRow(),
@@ -540,8 +540,8 @@ class _DOFormState extends State<DOForm> {
       });
 
       doSubmission.dopoLies.sort((p1, p2) {
-        if (p1.displayOrder!=p2.displayOrder)
+        if (p1.displayOrder != p2.displayOrder)
-        return p1.displayOrder.compareTo(p2.displayOrder);
+          return p1.displayOrder.compareTo(p2.displayOrder);
         return p1.poNumber.compareTo(p2.poNumber);
       });
     }
@@ -560,15 +560,9 @@ class _DOFormState extends State<DOForm> {
               style: textStyle,
             ),
           ),
-          MyDataCell(
+          MyDataCell(NumberCell(d.poQty)),
-            NumberCell(d.poQty)
+          MyDataCell(NumberCell(d.poBalQty)),
-          ),
+          MyDataCell(NumberCell(d.getPoBalanceQty)),
-          MyDataCell(
-            NumberCell(d.poBalQty)
-          ),
-          MyDataCell(
-            NumberCell(d.getPoBalanceQty)
-          ),
           MyDataCell(
             Container(
                 color: Colors.grey,

lib/pages/do/do_creation_todelete.dart

@@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';

lib/pages/do/do_list.dart

@@ -6,7 +6,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/do/do_creation_form.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/popupmenu.dart';

lib/pages/do/do_product_item.dart

@@ -3,7 +3,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/do/do_storage_item.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/util.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/storage.dart';

lib/pages/do/photo_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 
 import '../util.dart';

lib/pages/do/po_selection.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/pages/document_log_page.dart

@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/log_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/document_log.dart';
 import 'package:fcs/vo/role.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/email_page.dart

@@ -4,7 +4,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shared_pref.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
@@ -82,7 +82,8 @@ class _EmailPageState extends State<EmailPage> {
       child: InkWell(
           onTap: () {
             SharedPref.saveSkippedRecoverEmail(true);
-            Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false);
+            Navigator.pushNamedAndRemoveUntil(
+                context, "/welcome", (r) => false);
           },
           child: Row(
             mainAxisAlignment: MainAxisAlignment.end,

lib/pages/fcs_profile_page.dart

@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class FCSProfilePage extends StatefulWidget {
   final PickUp pickUp;

lib/pages/forget_password.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/user_model.dart';
 import 'package:fcs/pages/reset_password.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/instruction.dart

@@ -1,4 +1,4 @@
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
@@ -53,9 +53,10 @@ class _InstructionPageState extends State<InstructionPage> {
         ),
         body: Container(
           padding: EdgeInsets.only(left: 5, right: 5, top: 5),
-          child: Card(elevation: 0,
+          child: Card(
+              elevation: 0,
               child: Expanded(
-                              child: FittedBox(
+                child: FittedBox(
                     child: Image.asset(widget.image), fit: BoxFit.contain),
               )),
         ),

lib/pages/invitation_page.dart

@@ -3,7 +3,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class InvitationPage extends StatefulWidget {
   @override

lib/pages/invoice/box_addition.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model_fcs/box_model.dart';
 import 'package:fcs/model_fcs/package_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
@@ -61,7 +61,9 @@ class _BoxAdditionState extends State<BoxAddition> {
                         icon: Icon(Icons.pages)),
                     items: boxModel.processed
                         .map((e) => DropdownMenuItem(
-                            child: Text('${e.shipmentNumber}-${e.receiverNumber} #${e.boxNumber}'), value: e))
+                            child: Text(
+                                '${e.shipmentNumber}-${e.receiverNumber} #${e.boxNumber}'),
+                            value: e))
                         .toList(),
                     onChanged: (map) => {},
                   ),

lib/pages/invoice/invoce_list.dart

@@ -3,7 +3,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model_fcs/package_model.dart';
 import 'package:fcs/pages_fcs/package_list_row.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:provider/provider.dart';
@@ -39,7 +39,7 @@ class _InvoiceListState extends State<InvoiceList> {
 
   @override
   Widget build(BuildContext context) {
-        var owner = Provider.of<MainModel>(context).isOwner();
+    var owner = Provider.of<MainModel>(context).isOwner();
 
     return LocalProgress(
       inAsyncCall: _isLoading,
@@ -73,16 +73,19 @@ class _InvoiceListState extends State<InvoiceList> {
                 ],
               ),
             ),
-            floatingActionButton:owner? FloatingActionButton.extended(
+            floatingActionButton: owner
-              onPressed: () {
+                ? FloatingActionButton.extended(
-                _newInvoice();
+                    onPressed: () {
-              },
+                      _newInvoice();
-              icon: Icon(Icons.add),
+                    },
-              label: Text(AppTranslations.of(context).text("invoices.add")),
+                    icon: Icon(Icons.add),
-              backgroundColor: primaryColor,
+                    label:
-            ):null,
+                        Text(AppTranslations.of(context).text("invoices.add")),
+                    backgroundColor: primaryColor,
+                  )
+                : null,
             body: TabBarView(
-              children: [ _pending(), _paided()],
+              children: [_pending(), _paided()],
             )),
       ),
     );

lib/pages/invoice/invoice_editor.dart

@@ -2,7 +2,7 @@ import 'package:fcs/model/discount_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model_fcs/box_model.dart';
 import 'package:fcs/pages/invoice/package_addition.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/vo/cargo.dart';
 import 'package:fcs/vo/invoice.dart';
@@ -173,8 +173,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                       decoration: InputDecoration(
                         fillColor: Colors.white,
                         labelText: 'Invoice Date',
-                        labelStyle:
+                        labelStyle: TextStyle(
-                            TextStyle(fontSize: 16,),
+                          fontSize: 16,
+                        ),
                         filled: true,
                         enabledBorder: InputBorder.none,
                         focusedBorder: InputBorder.none,
@@ -194,7 +195,8 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                                 fillColor: Colors.white,
                                 labelText: 'Invoice Number',
                                 labelStyle: TextStyle(
-                                    fontSize: 16,),
+                                  fontSize: 16,
+                                ),
                                 filled: true,
                                 enabledBorder: InputBorder.none,
                                 focusedBorder: InputBorder.none,
@@ -213,8 +215,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                             decoration: InputDecoration(
                                 fillColor: Colors.white,
                                 labelText: 'Customer Name',
-                                labelStyle:
+                                labelStyle: TextStyle(
-                                    TextStyle(fontSize: 16,),
+                                  fontSize: 16,
+                                ),
                                 filled: true,
                                 focusedBorder: UnderlineInputBorder(
                                     borderSide: BorderSide(
@@ -243,7 +246,8 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                                 fillColor: Colors.white,
                                 labelText: 'Customer Name',
                                 labelStyle: TextStyle(
-                                    fontSize: 16,),
+                                  fontSize: 16,
+                                ),
                                 filled: true,
                                 enabledBorder: InputBorder.none,
                                 focusedBorder: InputBorder.none,
@@ -288,7 +292,8 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                                 fillColor: Colors.white,
                                 labelText: 'Status',
                                 labelStyle: TextStyle(
-                                    fontSize: 16, ),
+                                  fontSize: 16,
+                                ),
                                 filled: true,
                                 enabledBorder: InputBorder.none,
                                 focusedBorder: InputBorder.none,
@@ -307,8 +312,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                         decoration: InputDecoration(
                           fillColor: Colors.white,
                           labelText: 'Amount',
-                          labelStyle:
+                          labelStyle: TextStyle(
-                              TextStyle(fontSize: 16,),
+                            fontSize: 16,
+                          ),
                           filled: true,
                           enabledBorder: InputBorder.none,
                           focusedBorder: InputBorder.none,
@@ -327,8 +333,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                         decoration: InputDecoration(
                           fillColor: Colors.white,
                           labelText: 'Balance',
-                          labelStyle:
+                          labelStyle: TextStyle(
-                              TextStyle(fontSize: 16, ),
+                            fontSize: 16,
+                          ),
                           filled: true,
                           enabledBorder: InputBorder.none,
                           focusedBorder: InputBorder.none,
@@ -347,8 +354,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                         decoration: InputDecoration(
                           fillColor: Colors.white,
                           labelText: 'Handling Fee',
-                          labelStyle:
+                          labelStyle: TextStyle(
-                              TextStyle(fontSize: 16,),
+                            fontSize: 16,
+                          ),
                           filled: true,
                           enabledBorder: InputBorder.none,
                           focusedBorder: InputBorder.none,
@@ -367,8 +375,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                         decoration: InputDecoration(
                           fillColor: Colors.white,
                           labelText: 'Customs Fee',
-                          labelStyle:
+                          labelStyle: TextStyle(
-                              TextStyle(fontSize: 16,),
+                            fontSize: 16,
+                          ),
                           filled: true,
                           icon: Icon(
                             FontAwesomeIcons.moneyBill,
@@ -388,8 +397,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
                         decoration: InputDecoration(
                           fillColor: Colors.white,
                           labelText: 'Customs Fee Description',
-                          labelStyle:
+                          labelStyle: TextStyle(
-                              TextStyle(fontSize: 16,),
+                            fontSize: 16,
+                          ),
                           filled: true,
                           icon: Icon(
                             Icons.comment,

lib/pages/invoice/invoice_list_row.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/invoice/payment_pdf_screen.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/invoice.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/cupertino.dart';
@@ -132,29 +132,30 @@ class _InvoiceListRowState extends State<InvoiceListRow> {
           //   padding: const EdgeInsets.all(0),
           //   child: getStatus(_invoice.status),
           // ),
-          _invoice.status=="Pending"?
+          _invoice.status == "Pending"
-          Padding(
+              ? Padding(
-            padding: const EdgeInsets.only(left: 10.0),
+                  padding: const EdgeInsets.only(left: 10.0),
-            child: InkWell(
+                  child: InkWell(
-                child: RaisedButton(
+                      child: RaisedButton(
-              child: Row(
+                    child: Row(
-                children: <Widget>[                  
+                      children: <Widget>[
-                  Icon(
+                        Icon(
-                    Icons.payment,
+                          Icons.payment,
-                    color: primaryColor,
+                          color: primaryColor,
-                  ),
+                        ),
-                  Padding(
+                        Padding(
-                    padding: const EdgeInsets.only(left:8.0),
+                          padding: const EdgeInsets.only(left: 8.0),
-                    child: Text("Payment"),
+                          child: Text("Payment"),
-                  )
+                        )
-                ],
+                      ],
-              ),
+                    ),
-              onPressed: () {
+                    onPressed: () {
-                Navigator.of(context)
+                      Navigator.of(context).push(
-                    .push(BottomUpPageRoute(PaymentPage(invoice: _invoice)));
+                          BottomUpPageRoute(PaymentPage(invoice: _invoice)));
-              },
+                    },
-            )),
+                  )),
-          ):Container(),
+                )
+              : Container(),
           Padding(
             padding: const EdgeInsets.only(left: 8.0),
             child: InkWell(

lib/pages/invoice/package_addition.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model_fcs/package_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/invoice/package_info.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/pickup_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
@@ -61,7 +61,9 @@ class _PackageInfoState extends State<PackageInfo> {
                     padding: EdgeInsets.only(top: 10),
                     child: Row(
                       children: <Widget>[
-                        Icon(Icons.calendar_today,),
+                        Icon(
+                          Icons.calendar_today,
+                        ),
                         Padding(
                           padding: const EdgeInsets.only(right: 8.0, left: 15),
                           child: labeledText(

lib/pages/invoice/payment_page.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/util.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/invoice.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/invoice/payment_pdf_screen.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -30,7 +30,7 @@ class _PaymentPDFScreenState extends State<PaymentPDFScreen>
     return Scaffold(
       appBar: AppBar(
         backgroundColor: primaryColor,
-        title:Text("Invoice File"),
+        title: Text("Invoice File"),
         actions: <Widget>[
           IconButton(
             icon: Icon(Icons.share),

lib/pages/log_list.dart

@@ -6,7 +6,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 
 class LogList extends StatefulWidget {
   @override

lib/pages/login_page.dart

@@ -10,7 +10,7 @@ import 'package:fcs/widget/bubble_indication_painter.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart' as Theme;
+import '../fcs/common/theme.dart' as Theme;
 import 'forget_password.dart';
 import 'sms_page.dart';
 import 'util.dart';
@@ -662,14 +662,13 @@ class _LoginPageState extends State<LoginPage>
     var phoneNumber = signupPhoneNumberController.text;
     try {
       await authModel.signup(name, password, confirmPassword, phoneNumber);
-       Navigator.push(
+      Navigator.push(
         context,
         MaterialPageRoute(
           builder: (context) =>
               SmsCodePage(id: phoneNumber, password: password),
         ),
       );
-      
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
     } finally {

lib/pages/manual/instruction_data_page.dart

@@ -7,7 +7,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/manual_model.dart';
 import 'package:fcs/pages/manual/moveable_stack_item.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/manual.dart';
 import 'package:path/path.dart' as Path;
 import 'package:fcs/widget/progress.dart';

lib/pages/manual/manual_page.dart

@@ -9,7 +9,7 @@ import 'package:fcs/vo/manual.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../../theme/theme.dart';
+import '../../fcs/common/theme.dart';
 import 'slide_page.dart';
 
 class ManualPage extends StatefulWidget {

lib/pages/message_detail.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model_fcs/message_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/message.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
@@ -82,7 +82,7 @@ class MessageDetail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-  DateFormat dateFormat=DateFormat("HH:mm");
+    DateFormat dateFormat = DateFormat("HH:mm");
     MessageModel messageModel = Provider.of<MessageModel>(context);
     List<Message> messages = messageModel.getMessage(msg.receiverName);
     List<Bubble> bubbles = messages

lib/pages/my_registeration.dart

@@ -10,7 +10,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import '../widget/localization/app_translations.dart';
 import 'my_registeration_item.dart';
 

lib/pages/my_registeration_info.dart

@@ -6,7 +6,7 @@ import 'package:fcs/model/reg_model.dart';
 import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../theme/theme.dart';
+import '../fcs/common/theme.dart';
 import '../util.dart';
 import '../widget/localization/app_translations.dart';
 import 'my_registeration.dart';
@@ -50,13 +50,17 @@ class _MyRegisterationInfoState extends State<MyRegisterationInfo> {
         labeledText(context, regModel.reg.bizType, "buyer.type_biz");
     final statusBox = labeledText(context, regModel.reg.status, "reg.status");
     final dailyQuotaBox = labeledText(
-        context, formatNumber(regModel.reg.dailyQuota), "reg.quota",number: true);
+        context, formatNumber(regModel.reg.dailyQuota), "reg.quota",
+        number: true);
     final dailyQuotaUsedBox = labeledText(
-        context, formatNumber(regModel.reg.dailyQuotaUsed), "reg.quota.used",number: true);
+        context, formatNumber(regModel.reg.dailyQuotaUsed), "reg.quota.used",
+        number: true);
     final maxQuotaBox = labeledText(
-        context, formatNumber(regModel.reg.maxQuota), "reg.max_quota",number: true);
+        context, formatNumber(regModel.reg.maxQuota), "reg.max_quota",
+        number: true);
     final maxQuotaUsedBox = labeledText(
-        context, formatNumber(regModel.reg.maxQuotaUsed), "reg.max_quota.used",number: true);
+        context, formatNumber(regModel.reg.maxQuotaUsed), "reg.max_quota.used",
+        number: true);
     final nricFrontBox =
         labeledImg(context, regModel.reg.nricFrontUrl, "reg_info.nric_front");
     final nricBackBox =

lib/pages/my_registeration_item.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/theme/theme.dart';
+import 'package:fcs/fcs/common/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/progress.dart';