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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Thinzar Win
2020-06-30 16:28:53 +06:30
parent a8caaf6073 cf2ed50ab2
commit 1fe8df2f13
11 changed files with 76 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
assets/local/localization_en.json
View File

@@ -480,7 +480,7 @@
"user.shipping_address":"USA SHIPPING ADDRESS", "user.shipping_address":"USA SHIPPING ADDRESS",
"user.deliveryAddress":"My delivery address", "user.deliveryAddress":"My delivery address",
"user.buying_instruction":"See below instructions to add USA shipping address while shoping online", "user.buying_instruction":"See below instructions to add USA shipping address while shoping online",
"user.form.shipping_address":"SHIPPING ADDRESS", "user.form.shipping_address":"ADDRESS",
"buy_online":"Buying Instructions", "buy_online":"Buying Instructions",
"buy_online.title":"BUYING INSTRUCTIONS", "buy_online.title":"BUYING INSTRUCTIONS",
@@ -498,11 +498,11 @@
"staff.add":"Add", "staff.add":"Add",
"staff.update":"Update", "staff.update":"Update",
"shipment.title":"Shipments", "shipment.title":"FCS Shipments",
"shipment.list.title":"SHIPMENTS", "shipment.list.title":"FCS SHIPMENTS",
"shipment.add":"New shipment", "shipment.add":"New FCS shipment",
"shipment.form.title":"SHIPMENT", "shipment.form.title":"FCS SHIPMENT",
"shipment.number":"Shipment number", "shipment.number":"FCS Shipment Number",
"pickup": "Shipments", "pickup": "Shipments",
"pickup.title": "SHIPMENTS", "pickup.title": "SHIPMENTS",
@@ -590,13 +590,16 @@
"total.amount": "Amount :", "total.amount": "Amount :",
"payment.method.btn":"Payment Methods", "payment.method.btn":"Payment Methods",
"payment.method.title":"Payment Methods", "payment.method.title":"PAYMENT METHODS",
"payment.method.new":"Payment Method", "payment.method.new":"New Payment Method",
"payment.method.form":"PAYMENT METHOD",
"discount.btn":"Discounts", "discount.btn":"Discounts",
"discount.title":"Discounts", "discount.title":"DISCOUNTS",
"discount.new":"DISCOUNT", "discount.new":"New Discount",
"discount.form":"DISCOUNT",
"custom.form.title":"CUSTOM" "custom.form.title":"CUSTOM",
"shipping_addresses": "ADDRESSES"
} }

21
assets/local/localization_mu.json
View File

@@ -531,11 +531,11 @@
"staff.add":"Add", "staff.add":"Add",
"staff.update":"Update", "staff.update":"Update",
"shipment.title":"တင်ပို့ခြင်းများ", "shipment.title":"FCS တင်ပို့ခြင်းများ",
"shipment.list.title":"တင်ပို့ခြင်းများ", "shipment.list.title":"FCS တင်ပို့ခြင်းများ",
"shipment.add":"New shipment", "shipment.add":"New FCS shipment",
"shipment.form.title":"SHIPMENT", "shipment.form.title":"FCS SHIPMENT",
"shipment.number":"Shipment number", "shipment.number":"FCS Shipment Number",
"package.name":"Packages", "package.name":"Packages",
@@ -609,10 +609,13 @@
"payment.method.btn":"ငွေပေးချေစနစ်", "payment.method.btn":"ငွေပေးချေစနစ်",
"payment.method.title":"ငွေပေးချေစနစ်", "payment.method.title":"ငွေပေးချေစနစ်",
"payment.method.new":"ငွေပေးချေစနစ်အသစ်", "payment.method.new":"ငွေပေးချေစနစ်အသစ်",
"payment.method.form":"ငွေပေးချေစနစ်",
"discount.btn":"Discounts", "discount.btn":"လျှော့စျေးများ",
"discount.title":"Discounts", "discount.title":"လျှော့စျေးများ",
"discount.new":"Discount", "discount.new":"လျှော့စျေး",
"discount.form":"လျှော့စျေး",
"custom.form.title":"အကောက်ခွန်" "custom.form.title":"အကောက်ခွန်",
"shipping_addresses": "လိပ်စာများ"
} }

7
lib/pages/discount_editor.dart
View File

@@ -50,8 +50,13 @@ class _DiscountEditorState extends State<DiscountEditor> {
child: Scaffold( child: Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBar( appBar: AppBar(
centerTitle: true,
title: Text( title: Text(
AppTranslations.of(context).text("discount.new"), AppTranslations.of(context).text("discount.form"),
),
leading: new IconButton(
icon: new Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,
actions: <Widget>[], actions: <Widget>[],

32
lib/pages/discount_list.dart
View File

@@ -24,9 +24,14 @@ class _DiscountListState extends State<DiscountList> {
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
centerTitle: true,
title: Text( title: Text(
AppTranslations.of(context).text("discount.title"), AppTranslations.of(context).text("discount.title"),
), ),
leading: new IconButton(
icon: new Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor, backgroundColor: primaryColor,
actions: <Widget>[ actions: <Widget>[
IconButton( IconButton(
@@ -52,7 +57,7 @@ class _DiscountListState extends State<DiscountList> {
); );
}, },
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(10.0),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -61,12 +66,15 @@ class _DiscountListState extends State<DiscountList> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Padding(
discount.code, padding: const EdgeInsets.only(bottom: 8.0),
style: TextStyle( child: Text(
color: primaryColor, discount.code,
fontSize: 16, style: TextStyle(
fontWeight: FontWeight.bold, color: primaryColor,
fontSize: 16,
fontWeight: FontWeight.bold,
),
), ),
), ),
Row( Row(
@@ -86,17 +94,17 @@ class _DiscountListState extends State<DiscountList> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[ children: <Widget>[
getStatus(discount.status),
Padding( Padding(
padding: const EdgeInsets.only(left: 10.0), padding: const EdgeInsets.only(left: 10.0,bottom: 5.0),
child: Text( child: Text(
'\$${discount.amount.toString()}', '\$ ${discount.amount.toString()}',
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.normal, fontWeight: FontWeight.bold,
fontSize: 15), fontSize: 16),
), ),
), ),
getStatus(discount.status),
], ],
), ),
], ],

10
lib/pages/payment_editor.dart
View File

@@ -56,8 +56,13 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
child: Scaffold( child: Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBar( appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
title: Text( title: Text(
AppTranslations.of(context).text("payment.method.new"), AppTranslations.of(context).text("payment.method.form"),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,
actions: <Widget>[], actions: <Widget>[],
@@ -79,8 +84,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
// controller: _mailController), // controller: _mailController),
// fcsInput('Phone', Icons.phone, // fcsInput('Phone', Icons.phone,
// controller: _phoneController), // controller: _phoneController),
fcsInput('Phone', Icons.link, fcsInput('Phone', Icons.link, controller: _linkController)
controller: _linkController)
], ],
), ),
), ),

5
lib/pages/payment_method_page.dart
View File

@@ -23,6 +23,11 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
leading: new IconButton(
icon: new Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
centerTitle: true,
title: Text( title: Text(
AppTranslations.of(context).text("payment.method.title"), AppTranslations.of(context).text("payment.method.title"),
), ),

4
lib/pages/profile_page.dart
View File

@@ -318,7 +318,7 @@ class _ProfileState extends State<Profile> {
padding: EdgeInsets.only(top: 5, left: 10), padding: EdgeInsets.only(top: 5, left: 10),
child: ExpansionTile( child: ExpansionTile(
title: Text( title: Text(
"Shipping Addresses", "My Addresses",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontStyle: FontStyle.normal), fontWeight: FontWeight.bold, fontStyle: FontStyle.normal),
), ),
@@ -343,7 +343,7 @@ class _ProfileState extends State<Profile> {
}, },
icon: Icon(Icons.add), icon: Icon(Icons.add),
label: Text( label: Text(
'Add Shipping\nAddress', 'Add New\nAddress',
style: TextStyle(fontSize: 12), style: TextStyle(fontSize: 12),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,

10
lib/pages/shipment_editor.dart
View File

@@ -237,7 +237,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Create Shipment'), child: Text('Create FCS Shipment'),
color: primaryColor, color: primaryColor,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
@@ -254,7 +254,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
child: Container( child: Container(
width: 250, width: 250,
child: FlatButton( child: FlatButton(
child: Text('Update Shipment'), child: Text('Update FCS Shipment'),
color: primaryColor, color: primaryColor,
textColor: Colors.white, textColor: Colors.white,
onPressed: () { onPressed: () {
@@ -284,7 +284,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
child: ListView(children: <Widget>[ child: ListView(children: <Widget>[
// _showCustomerData(mainModel.customer), // _showCustomerData(mainModel.customer),
widget.shipment == null widget.shipment == null
? fcsInput('Shipment Number', Ionicons.ios_airplane, ? fcsInput('FCS Shipment Number', Ionicons.ios_airplane,
controller: _shipmentNumberController) controller: _shipmentNumberController)
: Container( : Container(
child: TextFormField( child: TextFormField(
@@ -292,7 +292,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
readOnly: true, readOnly: true,
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Colors.white, fillColor: Colors.white,
labelText: 'Shipment Number', labelText: 'FCS Shipment Number',
labelStyle: labelStyle:
TextStyle(fontSize: 16, color: Colors.grey), TextStyle(fontSize: 16, color: Colors.grey),
filled: true, filled: true,
@@ -328,7 +328,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
child: DropdownButtonFormField( child: DropdownButtonFormField(
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Colors.white, fillColor: Colors.white,
labelText: 'Shipment Type', labelText: 'FCS Shipment Type',
icon: Icon(Ionicons.ios_airplane, icon: Icon(Ionicons.ios_airplane,
color: primaryColor)), color: primaryColor)),
items: shipmentModel.shipmentType items: shipmentModel.shipmentType

4
lib/pages_fcs/box_editor.dart
View File

@@ -180,7 +180,7 @@ class _BoxEditorState extends State<BoxEditor> {
value: _box.shipmentNumber, value: _box.shipmentNumber,
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Colors.white, fillColor: Colors.white,
labelText: 'Shipment Number', labelText: 'FCS Shipment Number',
icon: Icon(Ionicons.ios_airplane, icon: Icon(Ionicons.ios_airplane,
color: primaryColor) color: primaryColor)
// prefixIcon: Icon(Icons.play_arrow) // prefixIcon: Icon(Icons.play_arrow)
@@ -439,7 +439,7 @@ class _BoxEditorState extends State<BoxEditor> {
onPressed: () {}, onPressed: () {},
icon: Icon(Icons.add), icon: Icon(Icons.add),
label: Text( label: Text(
'Add Shipping\nAddress', 'Select \nAddress',
style: TextStyle(fontSize: 12), style: TextStyle(fontSize: 12),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,

2
lib/pages_fcs/package_editor.dart
View File

@@ -556,7 +556,7 @@ class _PackageEditorState extends State<PackageEditor> {
}, },
icon: Icon(Icons.add), icon: Icon(Icons.add),
label: Text( label: Text(
'Add Shipping\nAddress', 'Select \nAddress',
style: TextStyle(fontSize: 12), style: TextStyle(fontSize: 12),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,

4
lib/pages_fcs/shipping_address_list.dart
View File

@@ -42,7 +42,7 @@ class _ShippingAddressListState extends State<ShippingAddressList> {
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("shipping_address")), title: Text(AppTranslations.of(context).text("shipping_addresses")),
actions: <Widget>[ actions: <Widget>[
IconButton( IconButton(
icon: Icon( icon: Icon(
@@ -79,7 +79,7 @@ class _ShippingAddressListState extends State<ShippingAddressList> {
}, },
icon: Icon(Icons.add), icon: Icon(Icons.add),
label: Text( label: Text(
'Add Shipping\nAddress', 'Add New\nAddress',
style: TextStyle(fontSize: 12), style: TextStyle(fontSize: 12),
), ),
backgroundColor: primaryColor, backgroundColor: primaryColor,