fix invoice display

lib/pages/invoice/invoice_list.dart

@@ -121,7 +121,9 @@ class _InvoiceListState extends State<InvoiceList> {
                         itemBuilder: (BuildContext context, int index) {
                           return InvoiceListRow(
                             key: ValueKey(invoiceModel.invoices[index].id),
-                              invoice: invoiceModel.invoices[index]);
+                            invoice: invoiceModel.invoices[index],
+                            forCustomer: widget.forCustomer,
+                          );
                         }),
                     onRefresh: () => invoiceModel.refresh(),
                   ),

lib/pages/invoice/invoice_list_row.dart

@@ -13,7 +13,8 @@ import '../widgets/pdf_screen.dart';
 class InvoiceListRow extends StatelessWidget {
   final dateFormatter = new DateFormat('dd MMM yyyy');
   final Invoice invoice;
-  InvoiceListRow({Key key, this.invoice}) : super(key: key);
+  final bool forCustomer;
+  InvoiceListRow({Key key, this.invoice, this.forCustomer}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -91,7 +92,10 @@ class InvoiceListRow extends StatelessWidget {
                     ),
                     onPressed: () {
                       Navigator.of(context).push(CupertinoPageRoute(
-                          builder: (context) => PaymentPage(invoice: invoice)));
+                          builder: (context) => PaymentPage(
+                                invoice: invoice,
+                                forCustomer: forCustomer,
+                              )));
                     },
                   )),
                 )

lib/pages/invoice/payment/payment_page.dart

@@ -6,26 +6,23 @@ import 'package:fcs/domain/entities/payment.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/invoice/payment/payment_page_edit.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/image_file_picker.dart';
 import 'package:fcs/pages/widgets/img_picker.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_button.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/progress.dart';
-import 'package:fcs/pages/widgets/show_img.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:image_picker/image_picker.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class PaymentPage extends StatefulWidget {
   final Invoice invoice;
-  PaymentPage({this.invoice});
+  final bool forCustomer;
+  PaymentPage({this.invoice, this.forCustomer});
 
   @override
   _PaymentPageState createState() => _PaymentPageState();
@@ -164,7 +161,9 @@ class _PaymentPageState extends State<PaymentPage> {
                         child: Column(
                       children: [Text('\$ ${p.amount}'), Text('${p.status}')],
                     ))),
-                Expanded(
+                widget.forCustomer
+                    ? Container()
+                    : Expanded(
                         flex: 1,
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.center,
@@ -184,7 +183,8 @@ class _PaymentPageState extends State<PaymentPage> {
                                     onTap: () => _cancel(p),
                                     child: Padding(
                                       padding: const EdgeInsets.all(8.0),
-                                  child: Icon(Icons.close, color: primaryColor),
+                                      child: Icon(Icons.close,
+                                          color: primaryColor),
                                     ),
                                   ),
                                 ]
@@ -213,7 +213,9 @@ class _PaymentPageState extends State<PaymentPage> {
                   child: Text('Amount',
                       textAlign: TextAlign.center,
                       style: TextStyle(color: Colors.grey))),
-              Expanded(
+              widget.forCustomer
+                  ? Container()
+                  : Expanded(
                       flex: 1,
                       child: Text('Actions',
                           textAlign: TextAlign.center,
@@ -248,7 +250,9 @@ class _PaymentPageState extends State<PaymentPage> {
                           textAlign: TextAlign.center,
                           style: TextStyle(
                               fontWeight: FontWeight.bold, fontSize: 16.0)))),
-              Expanded(
+              widget.forCustomer
+                  ? Container()
+                  : Expanded(
                       flex: 1,
                       child: Container(),
                     ),

lib/pages/shipment/shipment_info.dart

@@ -311,9 +311,7 @@ class _ShipmentInfoState extends State<ShipmentInfo> {
                 children: getBoxList(context, _shipment.boxes),
               ),
               !_isCustomer ? fcsShipmentNumberBox : Container(),
-              ...(_shipment.isAssigned ||
+              ...(!_shipment.isPending
-                      _shipment.isConfirmed ||
-                      _shipment.isPending
                   ? [
                       handlingFeeBox,
                     ]