sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify

Browse Source
This commit is contained in:
PhyoThandar
2020-06-02 15:21:26 +06:30
parent 4a5488e9c7
commit 89df7a716b
5 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/local/localization_en.json
View File

@@ -552,7 +552,7 @@
"contact": "CONTACTS",
"fcs.profile": "FCS PROFILE",
"fcs.profile": "PROFILE",
"contact.usa.phone": "USA Phone",
"contact.mm.phone": "Myanmar Phone"

5
assets/local/localization_mu.json
View File

@@ -558,6 +558,9 @@
"rate":"အဆင့်သတ်မှတ်ချက်များ",
"rate.title":"အဆင့်သတ်မှတ်ချက်များ",
"rate.edit.title":"အဆင့်သတ်မှတ်ချက်များပြုပြင်ရန်",
"rate.cal.title":"အဆင့်သတ်မှတ်ချက်များတွက်ချက်ရန်",
"message.btn":"မက်ဆေ့ခ်ျများ",
"message.title":"မက်ဆေ့ခ်ျများ",
@@ -580,7 +583,7 @@
"contact": "ဆက်သွယ်ရန်",
"fcs.profile": "FCS ပရိုဖိုင်",
"fcs.profile": "ပရိုဖိုင်",
"contact.usa.phone": "ယူအက်စ်အေ ဖုန်းနံပါတ်",
"contact.mm.phone": "မြန်မာ ဖုန်းနံပါတ်"

31
lib/pages/shipment_rates.dart
View File

@@ -2,6 +2,7 @@ import 'package:fcs/model/pickup_model.dart';
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/pages/term.dart';
import 'package:fcs/vo/pickup.dart';
import 'package:provider/provider.dart';
import 'package:fcs/widget/localization/app_translations.dart';
@@ -31,14 +32,6 @@ class _ShipmentRatesState extends State<ShipmentRates> {
PickUp _pickUp;
bool _isLoading = false;
List<String> texts = [
"Minimum shipping weight is 1lbs.",
"Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on specifications. Please contact us for pricing.",
"Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.",
"Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.",
"Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.",
"Payments made in Myanmar will incur 2% tranfer fee"
];
@override
void initState() {
@@ -62,13 +55,6 @@ class _ShipmentRatesState extends State<ShipmentRates> {
Widget build(BuildContext context) {
var shipmentRateModel = Provider.of<ShipmentRateModel>(context);
var textList = texts
.map(
(e) => TextSpan(
text: "\n * " + e + "\n",
style: TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
)
.toList();
final usaAddress = Container(
child: TextFormField(
maxLines: null,
@@ -116,16 +102,11 @@ class _ShipmentRatesState extends State<ShipmentRates> {
),
_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),
// child: RichText(
// // overflow: TextOverflow.fade,
// text: TextSpan(
// style: TextStyle(color: primaryColor),
// children: textList,
// ),
// ),
// ),
fcsButton(context, "Terms & Conditions", callack: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => Term()));
}),
fcsButton(context, "Calculate", callack: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (_) => ShipmentRatesCal()));

27
lib/pages/shipment_rates_calculate.dart
View File

@@ -58,8 +58,14 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
child: Scaffold(
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(
Icons.close,
),
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("rate.title")),
title: Text(AppTranslations.of(context).text("rate.cal.title")),
),
body: Padding(
padding: const EdgeInsets.all(8.0),
@@ -77,13 +83,22 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
shipmentRateModel.rates[index].price.toString() +
" per pound",
'',
"",input: true);
"",
input: true);
}),
),
SizedBox(height: 50),
Center(child: Text("Delivery fee:\$ 5",style: TextStyle(color:primaryColor,fontSize:16),)),
Center(
child: Text(
"Delivery fee:\$ 5",
style: TextStyle(color: primaryColor, fontSize: 16),
)),
SizedBox(height: 20),
Center(child: Text("Total estimated amount:\$ 38",style: TextStyle(color:primaryColor,fontSize:20),))
Center(
child: Text(
"Total estimated amount:\$ 38",
style: TextStyle(color: primaryColor, fontSize: 20),
))
],
),
),
@@ -120,7 +135,9 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
),
Container(
width: 70,
child: TextField(textAlign: TextAlign.end,)),
child: TextField(
textAlign: TextAlign.end,
)),
],
));
}

29
lib/pages/shipment_rates_edit.dart
View File

@@ -30,14 +30,6 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
PickUp _pickUp;
bool _isLoading = false;
List<String> texts = [
"Minimum shipping weight is 1lbs.",
"Oversized goods, Light weight/Large volume items, laptops, phones, tablets may incur extra charges based on specifications. Please contact us for pricing.",
"Goods with lithium battary needs extra packaging and declaration. Please inform us ahead of time so that we can process your package accordingly.",
"Loose Batteries, Drones, and Prescription medicines are not allowed on aircraft.",
"Payment: We accept money orders, any US bank transfers via Zelle, AYA, KBZ and CB. No COD except for pick-ups.",
"Payments made in Myanmar will incur 2% tranfer fee"
];
@override
void initState() {
@@ -61,14 +53,6 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
Widget build(BuildContext context) {
var shipmentRateModel = Provider.of<ShipmentRateModel>(context);
var textList = texts
.map(
(e) => TextSpan(
text: "\n * " + e + "\n",
style: TextStyle(fontWeight: FontWeight.normal, fontSize: 13)),
)
.toList();
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
@@ -88,7 +72,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
child: ListView(
children: <Widget>[
Container(
height: 145,
height: 190,
child: ListView.builder(
itemCount: shipmentRateModel.rates.length,
itemBuilder: (context, index) {
@@ -103,16 +87,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
FontAwesomeIcons.weightHanging,
value: "10"),
fcsInput("Delivery fees", Icons.attach_money, value: "5"),
Padding(
padding: const EdgeInsets.only(left: 8.0, right: 8),
child: RichText(
// overflow: TextOverflow.fade,
text: TextSpan(
style: TextStyle(color: primaryColor),
children: textList,
),
),
),
SizedBox(height: 10),
fcsButton(context, "Save", callack: () {}),
SizedBox(height: 10)
],