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

Merge branch 'master' of phyothandar/fcs into master

Browse Source
This commit is contained in:
sainw
2020-06-30 09:44:48 +00:00
committed by Gogs
parent 9fc7ef5381 0887ec275f
commit cf2ed50ab2
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.deliveryAddress":"My delivery address",
"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.title":"BUYING INSTRUCTIONS",
@@ -498,11 +498,11 @@
"staff.add":"Add",
"staff.update":"Update",
"shipment.title":"Shipments",
"shipment.list.title":"SHIPMENTS",
"shipment.add":"New shipment",
"shipment.form.title":"SHIPMENT",
"shipment.number":"Shipment number",
"shipment.title":"FCS Shipments",
"shipment.list.title":"FCS SHIPMENTS",
"shipment.add":"New FCS shipment",
"shipment.form.title":"FCS SHIPMENT",
"shipment.number":"FCS Shipment Number",
"pickup": "Pickups",
"pickup.title": "PICKUPS",
@@ -590,13 +590,16 @@
"total.amount": "Amount :",
"payment.method.btn":"Payment Methods",
"payment.method.title":"Payment Methods",
"payment.method.new":"Payment Method",
"payment.method.title":"PAYMENT METHODS",
"payment.method.new":"New Payment Method",
"payment.method.form":"PAYMENT METHOD",
"discount.btn":"Discounts",
"discount.title":"Discounts",
"discount.new":"DISCOUNT",
"discount.title":"DISCOUNTS",
"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.update":"Update",
"shipment.title":"တင်ပို့ခြင်းများ",
"shipment.list.title":"တင်ပို့ခြင်းများ",
"shipment.add":"New shipment",
"shipment.form.title":"SHIPMENT",
"shipment.number":"Shipment number",
"shipment.title":"FCS တင်ပို့ခြင်းများ",
"shipment.list.title":"FCS တင်ပို့ခြင်းများ",
"shipment.add":"New FCS shipment",
"shipment.form.title":"FCS SHIPMENT",
"shipment.number":"FCS Shipment Number",
"package.name":"Packages",
@@ -609,10 +609,13 @@
"payment.method.btn":"ငွေပေးချေစနစ်",
"payment.method.title":"ငွေပေးချေစနစ်",
"payment.method.new":"ငွေပေးချေစနစ်အသစ်",
"payment.method.form":"ငွေပေးချေစနစ်",
"discount.btn":"Discounts",
"discount.title":"Discounts",
"discount.new":"Discount",
"discount.btn":"လျှော့စျေးများ",
"discount.title":"လျှော့စျေးများ",
"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(
backgroundColor: Colors.white,
appBar: AppBar(
centerTitle: true,
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,
actions: <Widget>[],

20
lib/pages/discount_list.dart
View File

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

10
lib/pages/payment_editor.dart
View File

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

5
lib/pages/payment_method_page.dart
View File

@@ -23,6 +23,11 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
leading: new IconButton(
icon: new Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
centerTitle: true,
title: Text(
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),
child: ExpansionTile(
title: Text(
"Shipping Addresses",
"My Addresses",
style: TextStyle(
fontWeight: FontWeight.bold, fontStyle: FontStyle.normal),
),
@@ -343,7 +343,7 @@ class _ProfileState extends State<Profile> {
},
icon: Icon(Icons.add),
label: Text(
'Add Shipping\nAddress',
'Add New\nAddress',
style: TextStyle(fontSize: 12),
),
backgroundColor: primaryColor,

10
lib/pages/shipment_editor.dart
View File

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

4
lib/pages_fcs/box_editor.dart
View File

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

2
lib/pages_fcs/package_editor.dart
View File

@@ -556,7 +556,7 @@ class _PackageEditorState extends State<PackageEditor> {
},
icon: Icon(Icons.add),
label: Text(
'Add Shipping\nAddress',
'Select \nAddress',
style: TextStyle(fontSize: 12),
),
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(),
),
backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("shipping_address")),
title: Text(AppTranslations.of(context).text("shipping_addresses")),
actions: <Widget>[
IconButton(
icon: Icon(
@@ -79,7 +79,7 @@ class _ShippingAddressListState extends State<ShippingAddressList> {
},
icon: Icon(Icons.add),
label: Text(
'Add Shipping\nAddress',
'Add New\nAddress',
style: TextStyle(fontSize: 12),
),
backgroundColor: primaryColor,