diff --git a/assets/local/localization_en.json b/assets/local/localization_en.json index ba827aa..c4616ed 100644 --- a/assets/local/localization_en.json +++ b/assets/local/localization_en.json @@ -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" } \ No newline at end of file diff --git a/assets/local/localization_mu.json b/assets/local/localization_mu.json index 48ae8ad..2580f7f 100644 --- a/assets/local/localization_mu.json +++ b/assets/local/localization_mu.json @@ -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": "လိပ်စာများ" } \ No newline at end of file diff --git a/lib/pages/discount_editor.dart b/lib/pages/discount_editor.dart index f519674..fae6a23 100644 --- a/lib/pages/discount_editor.dart +++ b/lib/pages/discount_editor.dart @@ -50,8 +50,13 @@ class _DiscountEditorState extends State { 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: [], diff --git a/lib/pages/discount_list.dart b/lib/pages/discount_list.dart index 9fa8e1e..765baaf 100644 --- a/lib/pages/discount_list.dart +++ b/lib/pages/discount_list.dart @@ -24,9 +24,14 @@ class _DiscountListState extends State { 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: [ IconButton( @@ -52,7 +57,7 @@ class _DiscountListState extends State { ); }, child: Padding( - padding: const EdgeInsets.all(8.0), + padding: const EdgeInsets.all(10.0), child: Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -61,12 +66,15 @@ class _DiscountListState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - discount.code, - style: TextStyle( - color: primaryColor, - fontSize: 16, - fontWeight: FontWeight.bold, + Padding( + padding: const EdgeInsets.only(bottom: 8.0), + child: Text( + discount.code, + style: TextStyle( + color: primaryColor, + fontSize: 16, + fontWeight: FontWeight.bold, + ), ), ), Row( @@ -86,17 +94,17 @@ class _DiscountListState extends State { Column( crossAxisAlignment: CrossAxisAlignment.end, children: [ - 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()}', + '\$ ${discount.amount.toString()}', style: TextStyle( color: Colors.black, - fontWeight: FontWeight.normal, - fontSize: 15), + fontWeight: FontWeight.bold, + fontSize: 16), ), ), + getStatus(discount.status), ], ), ], diff --git a/lib/pages/payment_editor.dart b/lib/pages/payment_editor.dart index 43d947a..7ed7ba0 100644 --- a/lib/pages/payment_editor.dart +++ b/lib/pages/payment_editor.dart @@ -56,8 +56,13 @@ class _PaymentMethodEditorState extends State { 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: [], @@ -79,8 +84,7 @@ class _PaymentMethodEditorState extends State { // controller: _mailController), // fcsInput('Phone', Icons.phone, // controller: _phoneController), - fcsInput('Phone', Icons.link, - controller: _linkController) + fcsInput('Phone', Icons.link, controller: _linkController) ], ), ), diff --git a/lib/pages/payment_method_page.dart b/lib/pages/payment_method_page.dart index 876e1b6..4b700d6 100644 --- a/lib/pages/payment_method_page.dart +++ b/lib/pages/payment_method_page.dart @@ -23,6 +23,11 @@ class _PaymentMethodPageState extends State { 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"), ), diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart index 0dd3dc7..9345122 100644 --- a/lib/pages/profile_page.dart +++ b/lib/pages/profile_page.dart @@ -318,7 +318,7 @@ class _ProfileState extends State { 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 { }, icon: Icon(Icons.add), label: Text( - 'Add Shipping\nAddress', + 'Add New\nAddress', style: TextStyle(fontSize: 12), ), backgroundColor: primaryColor, diff --git a/lib/pages/shipment_editor.dart b/lib/pages/shipment_editor.dart index b4143d8..27293c1 100644 --- a/lib/pages/shipment_editor.dart +++ b/lib/pages/shipment_editor.dart @@ -237,7 +237,7 @@ class _ShipmentEditorState extends State { 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 { 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 { child: ListView(children: [ // _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 { 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 { child: DropdownButtonFormField( decoration: InputDecoration( fillColor: Colors.white, - labelText: 'Shipment Type', + labelText: 'FCS Shipment Type', icon: Icon(Ionicons.ios_airplane, color: primaryColor)), items: shipmentModel.shipmentType diff --git a/lib/pages_fcs/box_editor.dart b/lib/pages_fcs/box_editor.dart index 4721047..a969342 100644 --- a/lib/pages_fcs/box_editor.dart +++ b/lib/pages_fcs/box_editor.dart @@ -180,7 +180,7 @@ class _BoxEditorState extends State { 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 { onPressed: () {}, icon: Icon(Icons.add), label: Text( - 'Add Shipping\nAddress', + 'Select \nAddress', style: TextStyle(fontSize: 12), ), backgroundColor: primaryColor, diff --git a/lib/pages_fcs/package_editor.dart b/lib/pages_fcs/package_editor.dart index 423d6ce..3daff77 100644 --- a/lib/pages_fcs/package_editor.dart +++ b/lib/pages_fcs/package_editor.dart @@ -556,7 +556,7 @@ class _PackageEditorState extends State { }, icon: Icon(Icons.add), label: Text( - 'Add Shipping\nAddress', + 'Select \nAddress', style: TextStyle(fontSize: 12), ), backgroundColor: primaryColor, diff --git a/lib/pages_fcs/shipping_address_list.dart b/lib/pages_fcs/shipping_address_list.dart index 4207516..02807e5 100644 --- a/lib/pages_fcs/shipping_address_list.dart +++ b/lib/pages_fcs/shipping_address_list.dart @@ -42,7 +42,7 @@ class _ShippingAddressListState extends State { onPressed: () => Navigator.of(context).pop(), ), backgroundColor: primaryColor, - title: Text(AppTranslations.of(context).text("shipping_address")), + title: Text(AppTranslations.of(context).text("shipping_addresses")), actions: [ IconButton( icon: Icon( @@ -79,7 +79,7 @@ class _ShippingAddressListState extends State { }, icon: Icon(Icons.add), label: Text( - 'Add Shipping\nAddress', + 'Add New\nAddress', style: TextStyle(fontSize: 12), ), backgroundColor: primaryColor,