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

update invoice

Browse Source
This commit is contained in:
PhyoThandar
2020-10-13 18:38:00 +06:30
parent 01d12c0eae
commit e61dc5d0e3
4 changed files with 269 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/local/localization_en.json
View File

@@ -368,7 +368,14 @@
"invoice.btn_save":"Save Invoice", "invoice.btn_save":"Save Invoice",
"invoice.btn_payment_receipt":"Attachment Payment Receipt", "invoice.btn_payment_receipt":"Attachment Payment Receipt",
"invoice.description": "Description", "invoice.description": "Description",
"invoice.desc": "Types", "invoice.box.cargo_type": "Cargo Types",
"invoice.cargo_type":"Cargo Types",
"invoice.box.number":"Box number",
"invoice.box.length":"Length",
"invoice.box.width":"Width",
"invoice.boc.height":"Height",
"invoice.discount_value": "Discount",
"invoice.net_amount":"Net Amount",
"Invoices End ================================================================":"", "Invoices End ================================================================":"",
"Discount Start ================================================================":"", "Discount Start ================================================================":"",

9
assets/local/localization_mu.json
View File

@@ -367,8 +367,15 @@
"invoice.btn_create":"ငွေတောင်းခံလွှာ ပြုလုပ်ရန်", "invoice.btn_create":"ငွေတောင်းခံလွှာ ပြုလုပ်ရန်",
"invoice.btn_save":"ငွေတောင်းခံလွှာ သိမ်းရန်", "invoice.btn_save":"ငွေတောင်းခံလွှာ သိမ်းရန်",
"invoice.btn_payment_receipt":"ငွေလက်ခံဖြတ်ပိုင်း ထည့်ရန်", "invoice.btn_payment_receipt":"ငွေလက်ခံဖြတ်ပိုင်း ထည့်ရန်",
"invoice.desc": "အမျိုးအစား", "invoice.box.cargo_type": "ကုန်ပစ္စည်းအမျိုးအစားများ",
"invoice.description": "ငွေတောင်းခံလွှာအကြောင်းအရာ", "invoice.description": "ငွေတောင်းခံလွှာအကြောင်းအရာ",
"invoice.cargo_type":"Cargo Types",
"invoice.box.number":"Box နံပါတ်",
"invoice.box.length":"အလျား",
"invoice.box.width":"အနံ",
"invoice.box.height":"အမြင့်",
"invoice.discount_value": "လျှော့စျေး",
"invoice.net_amount":"Net Amount",
"Invoices End ================================================================":"", "Invoices End ================================================================":"",
"Discount Start ================================================================":"", "Discount Start ================================================================":"",

300
lib/pages/invoice/invoice_editor.dart
View File

@@ -10,10 +10,13 @@ import 'package:fcs/pages/discount/model/discount_model.dart';
import 'package:fcs/pages/main/model/language_model.dart'; import 'package:fcs/pages/main/model/language_model.dart';
import 'package:fcs/pages/main/model/main_model.dart'; import 'package:fcs/pages/main/model/main_model.dart';
import 'package:fcs/pages/main/util.dart'; import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/payment_methods/model/payment_method_model.dart';
import 'package:fcs/pages/user_search/user_serach.dart'; import 'package:fcs/pages/user_search/user_serach.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart'; import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/discount_dropdown.dart';
import 'package:fcs/pages/widgets/display_text.dart'; import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/input_text.dart'; import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/local_dropdown.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart'; import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart'; import 'package:fcs/pages/widgets/multi_img_file.dart';
@@ -38,29 +41,6 @@ class InvoiceEditor extends StatefulWidget {
class _InvoiceEditorState extends State<InvoiceEditor> { class _InvoiceEditorState extends State<InvoiceEditor> {
User user; User user;
List<PaymentMethod> get paymentMethods {
List<PaymentMethod> methods = [
PaymentMethod(
name: 'AYA Bank',
accountName: 'FCS',
account: '100 23404320548398',
phone: '+959123456789',
),
PaymentMethod(
name: 'KBZ Bank',
accountName: 'FCS',
account: '100 23404320548398',
phone: '+959123456789',
),
PaymentMethod(
name: 'PayPal',
accountName: 'FCS',
link: 'https://www.paypal.com/donate/buttons',
),
];
return methods;
}
var dateFormatter = new DateFormat('dd MMM yyyy'); var dateFormatter = new DateFormat('dd MMM yyyy');
TextEditingController _invoiceNumberController = new TextEditingController(); TextEditingController _invoiceNumberController = new TextEditingController();
TextEditingController _dateController = new TextEditingController(); TextEditingController _dateController = new TextEditingController();
@@ -84,6 +64,9 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
double total = 0; double total = 0;
Discount _discount; Discount _discount;
bool isNew = false; bool isNew = false;
Discount selectedDiscount;
int selectedDiscountAmt;
PaymentMethod paymentMethod;
List<Box> selectedBoxes = []; List<Box> selectedBoxes = [];
@@ -185,7 +168,19 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
var mainModel = Provider.of<MainModel>(context); var mainModel = Provider.of<MainModel>(context);
var discountModel = Provider.of<DiscountModel>(context); var discountModel = Provider.of<DiscountModel>(context);
var languageModel = Provider.of<LanguageModel>(context); var paymentMethodModel = Provider.of<PaymentMethodModel>(context);
final discountBox = Container(
child: DiscountDropdown<Discount>(
callback: (v) {
setState(() {
selectedDiscount = v;
});
},
iconData: Entypo.price_ribbon,
selectedValue: selectedDiscount,
values: discountModel.discounts,
));
return LocalProgress( return LocalProgress(
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
@@ -218,7 +213,6 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
labelTextKey: 'invoice.number', labelTextKey: 'invoice.number',
iconData: FontAwesomeIcons.fileInvoice, iconData: FontAwesomeIcons.fileInvoice,
text: _invoiceNumberController.text), text: _invoiceNumberController.text),
widget.invoice == null widget.invoice == null
? Row( ? Row(
children: <Widget>[ children: <Widget>[
@@ -242,22 +236,35 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
text: _nameController.text, text: _nameController.text,
iconData: Feather.user, iconData: Feather.user,
labelTextKey: 'invoice.customer_name'), labelTextKey: 'invoice.customer_name'),
InputText(
controller: _handlingFeeController,
iconData: FontAwesomeIcons.moneyBill,
labelTextKey: 'invoice.handling_fee'),
SizedBox(height: 15),
discountBox,
widget.invoice == null widget.invoice == null
? Container() ? Container()
: DisplayText( : DisplayText(
text: _statusController.text, text: _statusController.text,
iconData: Icons.av_timer, iconData: Icons.av_timer,
labelTextKey: 'invoice.status'), labelTextKey: 'invoice.status'),
SizedBox(height: 30),
SizedBox(height: 15), Container(
Divider(thickness: 1), child: Row(
SizedBox(height: 15), children: [
Icon(MaterialCommunityIcons.package,
LocalText(context, 'invoice.box_info', color: primaryColor),
color: primaryColor, SizedBox(width: 10),
fontWeight: FontWeight.bold, LocalText(
fontSize: 16.0), context,
"invoice.box_info",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
),
],
),
),
Container( Container(
padding: const EdgeInsets.only(top: 15), padding: const EdgeInsets.only(top: 15),
child: SingleChildScrollView( child: SingleChildScrollView(
@@ -272,17 +279,17 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
MyDataColumn( MyDataColumn(
label: LocalText( label: LocalText(
context, context,
"box.number", "invoice.box.number",
color: Colors.grey, color: Colors.grey,
), ),
), ),
MyDataColumn( MyDataColumn(
label: Text( label: Text(
getLocalString(context, "box.length") + getLocalString(context, "invoice.box.length") +
' x ' + ' x ' +
getLocalString(context, "box.width") + getLocalString(context, "invoice.box.width") +
' x ' + ' x ' +
getLocalString(context, "box.height"), getLocalString(context, "invoice.box.height"),
), ),
), ),
], ],
@@ -290,78 +297,75 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
), ),
), ),
), ),
SizedBox(height: 40),
SizedBox(height: 25),
Divider(thickness: 1),
SizedBox(height: 15),
Container( Container(
padding: const EdgeInsets.only(bottom: 10), child: Row(
child: LocalText(context, 'invoice.description', children: [
color: primaryColor, Icon(MaterialCommunityIcons.briefcase_check,
fontWeight: FontWeight.bold, color: primaryColor),
fontSize: 16.0), SizedBox(width: 10),
LocalText(
context,
"invoice.cargo_type",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
),
],
),
), ),
Container( Container(
padding: const EdgeInsets.only(top: 15), padding: const EdgeInsets.only(top: 10),
child: Column(children: getCargoTableByBox(context)), child: Column(children: getCargoTableByBox(context)),
), ),
SizedBox(height: 20),
SizedBox(height: 10),
Divider(thickness: 1),
SizedBox(height: 10),
// InputText(
// controller: _handlingFeeController,
// iconData: FontAwesomeIcons.moneyBill,
// labelTextKey: 'invoice.handling_fee'),
LocalText(context, 'invoice.payment_method',
fontSize: 16,
color: primaryColor,
fontWeight: FontWeight.bold),
Container( Container(
padding: EdgeInsets.only(top: 5, left: 18), padding: EdgeInsets.only(top: 5, left: 18),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
flex: 2, child: LocalText(context, 'invoice.payment_method',
child: Container( fontSize: 16,
color: Colors.grey,
fontWeight: FontWeight.bold),
),
Container(
width: 150.0, width: 150.0,
child: DropdownButtonFormField( child: DropdownButtonFormField(
hint: Text(getLocalString( icon: Icon(Icons.edit),
context, 'invoice.payment_method')), value: paymentMethod,
items: paymentMethods items: paymentMethodModel.paymentMethods
.map((e) => DropdownMenuItem( .map((e) => DropdownMenuItem(
child: Text(e.name), value: e.name)) child: Text(e.name), value: e.name))
.toList(), .toList(),
onChanged: (selected) => {}, onChanged: (selected) => {},
), ),
), ),
],
),
),
SizedBox(height: 30),
!isNew
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: Row(
children: [
Icon(Icons.receipt, color: primaryColor),
SizedBox(width: 10),
LocalText(
context,
"invoice.payment_attachment",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
), ),
], ],
), ),
), ),
Spacer(),
SizedBox(height: 10), Icon(Icons.add, color: primaryColor),
Divider(thickness: 1),
SizedBox(height: 10),
isNew
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
LocalText(context, 'invoice.payment_attachment',
fontSize: 16,
color: primaryColor,
fontWeight: FontWeight.bold),
Padding(
padding: EdgeInsets.only(left: 20, top: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[],
),
),
], ],
) )
: Container() : Container()
@@ -379,7 +383,7 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
getLocalString(context, 'invoice.btn_save')) getLocalString(context, 'invoice.btn_save'))
], ],
)), )),
widget.invoice == null isNew
? Container() ? Container()
: fcsButton(context, : fcsButton(context,
getLocalString(context, 'invoice.btn_payment_receipt')) getLocalString(context, 'invoice.btn_payment_receipt'))
@@ -392,13 +396,15 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
getCargoTableByBox(BuildContext context) { getCargoTableByBox(BuildContext context) {
var discountModel = Provider.of<DiscountModel>(context); var discountModel = Provider.of<DiscountModel>(context);
total = 0;
List<Widget> dataRow = _cargoTypes.map((cargo) { List<Widget> dataRow = _cargoTypes.map((cargo) {
var amount = cargo.weight * cargo.price; var amount = cargo.weight * cargo.price;
total += amount; total += amount;
return Container( return Container(
decoration: BoxDecoration(
border: Border(bottom: BorderSide(color: Colors.grey))),
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 5.0, right: 5.0, top: 10.0, bottom: 10.0), left: 5.0, right: 5.0, top: 15.0, bottom: 15.0),
child: Row( child: Row(
children: [ children: [
Expanded(flex: 2, child: Text('${cargo.type}')), Expanded(flex: 2, child: Text('${cargo.type}')),
@@ -420,16 +426,19 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
dataRow.insert( dataRow.insert(
0, 0,
Container( Container(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.only(
left: 5.0, right: 5.0, top: 15.0, bottom: 15.0),
decoration: BoxDecoration(
border: Border(bottom: BorderSide(color: Colors.grey))),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 2,
child: Text(getLocalString(context, 'invoice.desc'), child: Text(getLocalString(context, 'invoice.box.cargo_type'),
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: primaryColor))), color: Colors.grey))),
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
@@ -440,41 +449,58 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: primaryColor))), color: Colors.grey))),
Expanded( Expanded(
child: Text(getLocalString(context, 'invoice.amount'), child: Text(getLocalString(context, 'invoice.amount'),
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: primaryColor))) color: Colors.grey)))
], ],
), ),
)); ));
dataRow.insert( dataRow.insert(
dataRow.length, dataRow.length,
Container( Container(
padding: const EdgeInsets.only(left: 5.0, right: 5.0), padding: const EdgeInsets.only(
left: 5.0, right: 5.0, top: 10.0, bottom: 10.0),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 2,
child: Container( child: Center(
child: DropdownButtonFormField( child: LocalText(
hint: Text(getLocalString(context, 'invoice.discount'), context,
style: TextStyle(fontSize: 14)), 'invoice.total',
items: discountModel.discounts color: Colors.black,
.map((e) => DropdownMenuItem( ),
child: Text(e.code, style: TextStyle(fontSize: 13)), ),
value: e.code)) ),
.toList(), Expanded(
onChanged: (selected) { child: Text(
var d = discountModel.discounts '\$ $total',
.firstWhere((d) => d.code == selected); style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
setState(() { textAlign: TextAlign.end,
_discount = d; ))
}); ],
}, ),
));
dataRow.insert(
dataRow.length,
Container(
padding: const EdgeInsets.only(left: 5.0, right: 5.0, top: 10),
child: Row(
children: [
Expanded(
flex: 2,
child: Center(
child: LocalText(
context,
'invoice.discount_value',
color: Colors.black,
), ),
), ),
), ),
@@ -494,12 +520,18 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
dataRow.length, dataRow.length,
Container( Container(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 5.0, right: 5.0, top: 10.0, bottom: 0.0), left: 5.0, right: 5.0, top: 20.0, bottom: 0.0),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 2,
child: Text(getLocalString(context, 'invoice.custom_fee'))), child: Center(
child: LocalText(
context,
'invoice.custom_fee',
color: Colors.black,
),
)),
Expanded( Expanded(
child: Text('\$ ${customFee}', child: Text('\$ ${customFee}',
textAlign: TextAlign.end, textAlign: TextAlign.end,
@@ -516,12 +548,19 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
dataRow.length, dataRow.length,
Container( Container(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 5.0, right: 5.0, top: 0.0, bottom: 10.0), left: 5.0, right: 5.0, top: 10.0, bottom: 10.0),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 1,
child: Text(getLocalString(context, 'invoice.delivery_fee'))), child: Container(
alignment: Alignment.centerRight,
child: LocalText(
context,
'invoice.delivery_fee',
color: Colors.black,
),
)),
Switch( Switch(
value: isSwitched, value: isSwitched,
onChanged: (value) { onChanged: (value) {
@@ -548,6 +587,7 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
], ],
), ),
)); ));
dataRow.insert( dataRow.insert(
dataRow.length, dataRow.length,
Container( Container(
@@ -561,6 +601,7 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
)), )),
], ],
))); )));
dataRow.insert( dataRow.insert(
dataRow.length, dataRow.length,
Container( Container(
@@ -570,18 +611,23 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 2,
child: Center(
child: LocalText( child: LocalText(
context, context,
'invoice.total', 'invoice.net_amount',
color: Colors.black, color: Colors.black,
fontSize: 15,
fontWeight: FontWeight.bold,
),
), ),
), ),
Expanded( Expanded(
child: Text( child: Text('\$ ${getTotalBalance(total)}',
'\$ $total',
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
textAlign: TextAlign.end, textAlign: TextAlign.end,
)) style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: primaryColor)))
], ],
), ),
)); ));
@@ -595,10 +641,14 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
children: [ children: [
Expanded( Expanded(
flex: 2, flex: 2,
child: Center(
child: LocalText( child: LocalText(
context, context,
'invoice.balance', 'invoice.balance',
color: Colors.black, color: Colors.black,
fontSize: 15,
fontWeight: FontWeight.bold,
),
), ),
), ),
Expanded( Expanded(
@@ -626,13 +676,11 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
List<MyDataRow> getBoxRow(BuildContext context) { List<MyDataRow> getBoxRow(BuildContext context) {
return _boxes.map((p) { return _boxes.map((p) {
p.cargoTypes.map((cargo) { p.cargoTypes.map((cargo) {
print('cargo => $cargo');
_cargoTypes.asMap().map((index, _cargo) { _cargoTypes.asMap().map((index, _cargo) {
if (_cargo.type == cargo.type) { if (_cargo.type == cargo.type) {
setState(() { setState(() {
_cargoTypes[index].weight += cargo.weight; _cargoTypes[index].weight += cargo.weight;
}); });
print('${_cargoTypes[index].type} =>${_cargoTypes[index]}');
} }
}); });
}); });

69
lib/pages/widgets/discount_dropdown.dart Normal file
View File

@@ -0,0 +1,69 @@
import 'package:fcs/domain/entities/discount.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'local_text.dart';
class DiscountDropdown<T> extends StatelessWidget {
final Function(T) callback;
final IconData iconData;
final T selectedValue;
final List<T> values;
const DiscountDropdown(
{Key key, this.callback, this.iconData, this.selectedValue, this.values})
: super(key: key);
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(left: 5.0, right: 0),
child: Row(
children: [
Padding(
padding: const EdgeInsets.only(left: 0, right: 10),
child: Icon(iconData, color: primaryColor),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(right: 18.0),
child: LocalText(
context,
"invoice.discount",
color: Colors.black54,
fontSize: 16,
),
),
DropdownButton<T>(
isDense: true,
value: selectedValue,
style: TextStyle(color: Colors.black, fontSize: 14),
underline: Container(
height: 1,
color: primaryColor,
),
onChanged: (T newValue) {
callback(newValue);
},
isExpanded: true,
items: values.map<DropdownMenuItem<T>>((T value) {
return DropdownMenuItem<T>(
value: value,
child: Text(value == null ? "" : (value as Discount).code,
overflow: TextOverflow.ellipsis,
style: TextStyle(color: primaryColor)),
);
}).toList(),
),
],
),
),
],
),
);
}
}