Merge branch 'master' of phyothandar/fcs into master

assets/local/localization_en.json

@@ -328,6 +328,26 @@
     "invoice.payment":"Payment Receipt",
     "invoice.add_box":"Add Box",
     "invoice.add_package":"Add Package",
+    "invoice.date":"Invoice Date",
+    "invoice.number":"Invoice Number",
+    "invoice.customer_name":"Customer Name",
+    "invoice.status":"Status",
+    "invoice.amount":"Amount",
+    "invoice.total":"Total Amount",
+    "invoice.balance":"Balance",
+    "invoice.handling_fee":"Handling Fee",
+    "invoice.custom_fee":"Custom Fee",
+    "invoice.custom_fee_desc":"Custom Fee Description",
+    "invoice.discount":"Discounts",
+    "invoice.payment_method":"Payment Method",
+    "invoice.delivery_fee":"Delivery Fee : ",
+    "invoice.payment_attachment":"Payment Attachment",
+    "invoice.box_info":"Box Information",
+    "invoice.cargo_table":"Cargo Table",
+    "invoice.btn_create":"Create Invoice",
+    "invoice.btn_save":"Save Invoice",
+    "invoice.btn_payment_receipt":"Attachment Payment Receipt",
+    "invoice.description": "Description",
     "Invoices End ================================================================":"",
 
     "Discount Start ================================================================":"",

assets/local/localization_mu.json

@@ -230,9 +230,9 @@
     "box.package.desc":"Description",
     "box.package.market":"Market",
     "box.add_package":"Add Package",
-    "box.number":"Box Number",
-    "box.length":"အရှည်",
-    "box.width":"အကျယ်",
+    "box.number":"Box နံပါတ်",
+    "box.length":"အလျား",
+    "box.width":"အနံ",
     "box.height":"အမြင့်",
     "box.shipment_info":"တင်ပို့သတင်းအချက်အလက်",
     "box.cargo_type":"ကုန်ပစ္စည်းအမျိုးအစားများ",
@@ -327,7 +327,27 @@
     "invoice.form.title":"ငွေတောင်းခံလွှာ",
     "invoice.payment":"လက်ခံဖြတ်ပိုင်း",
     "invoice.add_package":"Add Package",
-    "invoice.add_box":"Add Box",
+    "invoice.add_box":"Box အသစ်",
+    "invoice.date":"ငွေတောင်းခံလွှာ ရက်စွဲ",
+    "invoice.number":"ငွေတောင်းခံလွှာ နံပါတ်",
+    "invoice.customer_name":"ဝယ်ယူသူနာမည်",
+    "invoice.status":"အခြေအနေ",
+    "invoice.amount":"ပမာဏ",
+    "invoice.total":"စုစုပေါင်းပမာဏ",
+    "invoice.balance":"ပေးချေရန်ကျန်ရှိငွေ",
+    "invoice.handling_fee":"ထိန်းသိမ်းခ",
+    "invoice.custom_fee":"ကုန်သွယ်ခွန်",
+    "invoice.custom_fee_desc":"ကုန်သွယ်ခွန်အကြောင်းအရာ",
+    "invoice.discount":"လျှော့စျေး : ",
+    "invoice.payment_method":"ငွေပေးချေစနစ်",
+    "invoice.delivery_fee":"ပို့ဆောင်ခ",
+    "invoice.payment_attachment":"ပေးချေပြီးဖိုင်များ",
+    "invoice.box_info":"Box အချက်အလက်",
+    "invoice.cargo_table":"ကုန်ပစ္စည်းဇယား",
+    "invoice.btn_create":"ငွေတောင်းခံလွှာ ပြုလုပ်ရန်",
+    "invoice.btn_save":"ငွေတောင်းခံလွှာ သိမ်းရန်",
+    "invoice.btn_payment_receipt":"ငွေလက်ခံဖြတ်ပိုင်း ထည့်ရန်",
+    "invoice.description": "အကြောင်းအရာ",
     "Invoices End ================================================================":"",
 
     "Discount Start ================================================================":"",

lib/pages/invoice/invoce_list.dart

@@ -1,6 +1,10 @@
+import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/invoice/model/invoice_model.dart';
+import 'package:fcs/pages/package_search/package_serach.dart';
+import 'package:fcs/pages/user_search/user_serach.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
@@ -31,6 +35,7 @@ class _InvoiceListState extends State<InvoiceList> {
   @override
   Widget build(BuildContext context) {
     var owner = true;
+    var invoiceModel = Provider.of<InvoiceModel>(context);
 
     return LocalProgress(
       inAsyncCall: _isLoading,
@@ -48,21 +53,9 @@ class _InvoiceListState extends State<InvoiceList> {
                   color: Colors.white, fontSize: 20),
               actions: <Widget>[
                 IconButton(
-                  icon: Icon(
-                    Icons.search,
-                    color: Colors.white,
-                  ),
-                  iconSize: 30,
-                  // onPressed: () => showPlacesSearch(context),
-                ),
+                    icon: Icon(Icons.search, color: Colors.white),
+                    onPressed: () {}),
               ],
-              bottom: TabBar(
-                unselectedLabelColor: Colors.grey,
-                tabs: [
-                  Tab(text: "Pending"),
-                  Tab(text: "Paid"),
-                ],
-              ),
             ),
             floatingActionButton: owner
                 ? FloatingActionButton.extended(
@@ -71,12 +64,27 @@ class _InvoiceListState extends State<InvoiceList> {
                     },
                     icon: Icon(Icons.add),
                     label:
-                        Text(AppTranslations.of(context).text("invoices.add")),
+                        LocalText(context, 'invoices.add', color: Colors.white),
                     backgroundColor: primaryColor,
                   )
                 : null,
-            body: TabBarView(
-              children: [_pending(), _paided()],
+            body: Column(
+              children: <Widget>[
+                Expanded(
+                  child: new ListView.separated(
+                      separatorBuilder: (context, index) => Divider(
+                            color: Colors.black,
+                          ),
+                      scrollDirection: Axis.vertical,
+                      padding: EdgeInsets.only(top: 15),
+                      shrinkWrap: true,
+                      itemCount: invoiceModel.invoices.length,
+                      itemBuilder: (BuildContext context, int index) {
+                        return InvoiceListRow(
+                            invoice: invoiceModel.invoices[index]);
+                      }),
+                ),
+              ],
             )),
       ),
     );

lib/pages/invoice/payment_page.dart

@@ -1,6 +1,7 @@
 import 'package:fcs/domain/entities/invoice.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
+import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
@@ -57,7 +58,8 @@ class _PaymentPageState extends State<PaymentPage> {
 
   @override
   Widget build(BuildContext context) {
-    // var images = isNew ? [] : _images;
+    final saveBox = fcsButton(context, getLocalString(context, 'btn.save'));
+
     return LocalProgress(
       inAsyncCall: _isLoading,
       child: Scaffold(
@@ -128,13 +130,15 @@ class _PaymentPageState extends State<PaymentPage> {
                                       color: Colors.black, fontSize: 16),
                                 ),
                               ),
-                              Container(
-                                  padding: EdgeInsets.only(left: 10),
-                                  child: MultiImageFile(
-                                    enabled: true,
-                                    controller: multiImgController,
-                                    title: "Receipt File",
-                                  )),
+                              Expanded(
+                                child: Container(
+                                    padding: EdgeInsets.only(left: 10),
+                                    child: MultiImageFile(
+                                      enabled: true,
+                                      controller: multiImgController,
+                                      title: "Receipt File",
+                                    )),
+                              ),
                             ],
                           ),
                         ),
@@ -179,6 +183,8 @@ class _PaymentPageState extends State<PaymentPage> {
                   ],
                 ),
               ),
+              saveBox,
+              SizedBox(height: 10),
             ],
           ),
         ),

lib/pages/main/home_page.dart

@@ -298,7 +298,7 @@ class _HomePageState extends State<HomePage> {
       true ? widgets.add(boxesBtn) : "";
       true ? widgets.add(deliveryBtn) : "";
       user.hasCustomers() ? widgets.add(customersBtn) : "";
-      // true ? widgets.add(invoicesBtn) : "";
+      true ? widgets.add(invoicesBtn) : "";
       // true ? widgets.add(discountBtn) : "";
     }
     widgets.add(faqBtn);