insert confrim payment btn in invoice

This commit is contained in:
Thinzar Win
2020-06-02 15:30:11 +06:30
parent d2a9039b27
commit 647405e1be
5 changed files with 37 additions and 25 deletions

View File

@@ -1,5 +1,6 @@
import 'package:fcs/model/customer_model.dart';
import 'package:fcs/pages/search_page.dart';
import 'package:fcs/widget/bottom_up_page_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:intl/intl.dart';
@@ -68,12 +69,8 @@ class _CustomerListState extends State<CustomerList> {
children: <Widget>[
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CustomerEditor(customer: user)),
);
Navigator.of(context).push(
BottomUpPageRoute(CustomerEditor(customer: user)));
},
child: Row(
children: <Widget>[

View File

@@ -346,7 +346,23 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
),
))),
],
))
)),
widget.invoice == null
? Container()
: Align(
alignment: Alignment.bottomCenter,
child: Center(
child: Container(
width: 250,
child: FlatButton(
child: Text('Confirm Payment'),
color: primaryColor,
textColor: Colors.white,
onPressed: () {
Navigator.pop(context);
},
),
)))
],
),
),

View File

@@ -1,5 +1,6 @@
import 'package:fcs/model/pickup_model.dart';
import 'package:fcs/pages/pickup_list_row.dart';
import 'package:fcs/widget/bottom_up_page_route.dart';
import 'package:provider/provider.dart';
import 'package:fcs/model/buyer_model.dart';
import 'package:fcs/pages/search_page.dart';
@@ -93,10 +94,7 @@ class _PickUpListState extends State<PickUpList> {
}
_newPickup() {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => new PickUpEditor()),
);
Navigator.of(context).push(BottomUpPageRoute(PickUpEditor()));
}
Widget _upComing() {

View File

@@ -1,6 +1,7 @@
import 'package:fcs/model/pickup_model.dart';
import 'package:fcs/pages/pickup_editor.dart';
import 'package:fcs/vo/pickup.dart';
import 'package:fcs/widget/bottom_up_page_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart';
@@ -44,11 +45,8 @@ class _PickupListRowState extends State<PickupListRow> {
padding: EdgeInsets.only(left: 15, right: 15),
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PickUpEditor(pickUp: _pickUp)),
);
Navigator.of(context)
.push(BottomUpPageRoute(PickUpEditor(pickUp: _pickUp)));
},
child: Row(
children: <Widget>[

View File

@@ -3,6 +3,7 @@ import 'package:fcs/model/shipment_rate_model.dart';
import 'package:fcs/pages/shipment_rates_calculate.dart';
import 'package:fcs/pages/shipment_rates_edit.dart';
import 'package:fcs/vo/pickup.dart';
import 'package:fcs/widget/bottom_up_page_route.dart';
import 'package:provider/provider.dart';
import 'package:fcs/widget/localization/app_translations.dart';
@@ -110,11 +111,13 @@ class _ShipmentRatesState extends State<ShipmentRates> {
itemBuilder: (context, index) {
return _row(
shipmentRateModel.rates[index].description,
"\$ " +shipmentRateModel.rates[index].price.toString(),
"\$ " +
shipmentRateModel.rates[index].price.toString(),
'per pound');
}),
),
_row("Free delivery within Yangon \nfor shipments over","10","pounds"),
_row("Free delivery within Yangon \nfor shipments over", "10",
"pounds"),
_row("Delivery fees", "\$ 5", "below 10 pounds"),
// Padding(
// padding: const EdgeInsets.only(left: 18.0, right: 18),
@@ -128,11 +131,11 @@ class _ShipmentRatesState extends State<ShipmentRates> {
// ),
fcsButton(context, "Calculate", callack: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => ShipmentRatesCal()));
.push(BottomUpPageRoute(ShipmentRatesCal()));
}),
fcsButton(context, "Edit", callack: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => ShipmentRatesEdit()));
.push(BottomUpPageRoute(ShipmentRatesEdit()));
}),
SizedBox(height: 10)
],