Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -4,6 +4,7 @@ import 'package:fcs/pages/discount_list.dart';
|
||||
import 'package:fcs/pages/payment_method_page.dart';
|
||||
import 'package:fcs/pages/shipment_list.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';
|
||||
@@ -190,6 +191,10 @@ class _HomePageState extends State<HomePage> {
|
||||
icon: FontAwesomeIcons.info,
|
||||
btnCallback: () =>
|
||||
Navigator.of(context).push(BottomUpPageRoute(Term())));
|
||||
final deliveryBtn = _buildBtn2("delivery.title",
|
||||
icon: MaterialCommunityIcons.truck_fast,
|
||||
btnCallback: () =>
|
||||
Navigator.of(context).push(BottomUpPageRoute(DeliverList())));
|
||||
|
||||
List<Widget> widgets = [];
|
||||
customer ? widgets.add(buyingBtn) : "";
|
||||
@@ -200,7 +205,8 @@ class _HomePageState extends State<HomePage> {
|
||||
owner ? widgets.add(fcsProfileBtn) : "";
|
||||
widgets.add(shipmentCostBtn);
|
||||
customer || owner ? widgets.add(packagesBtn) : "";
|
||||
customer || owner ? widgets.add(boxesBtn) : "";
|
||||
owner ? widgets.add(boxesBtn) : "";
|
||||
owner ? widgets.add(deliveryBtn) : "";
|
||||
owner ? widgets.add(customersBtn) : "";
|
||||
customer || owner ? widgets.add(invoicesBtn) : "";
|
||||
customer || owner ? widgets.add(paymentMethodBtn) : "";
|
||||
|
||||
Reference in New Issue
Block a user