manasit/Neo_wallet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
nutchayut
2025-01-07 22:38:57 +07:00
parent 5bcc7d636e
commit 97ec586a44
38 changed files with 142 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neowallet_mobile/lib/Home/ChangeEmail.dart
View File

@@ -50,9 +50,12 @@ class _ChangeEmailPageState extends State<ChangeEmailPage> {
Navigator.pushNamed(context, '/HomePage');
},
)
} else {}
});
}
_current_email.text="";
_new_email.text="";
}
@override
Widget build(BuildContext context) {

3
neowallet_mobile/lib/Home/ChangePassword.dart
View File

@@ -77,6 +77,9 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
} else {}
});
}
_current_pass.text = "";
_new_pass.text = "";
_confirm_pass.text="";
}
@override
Widget build(BuildContext context) {

1
neowallet_mobile/lib/Home/HomePage.dart
View File

@@ -276,6 +276,7 @@ class _HomePageState extends State<HomePage> {
color: Colors.white,
),
),
SizedBox(width: 10,),
InkWell(
onTap: () {

5
neowallet_mobile/lib/Pay/PayQr.dart
View File

@@ -11,6 +11,7 @@ import 'package:flutter/services.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../TransferMoney/TransferPromtptPayDialog.dart';
import '../api/api.dart';
import '../utils/color_custom.dart';
import 'PayQrDialogV2.dart';
@@ -80,11 +81,11 @@ class _PayQrPageState extends State<PayQrPage> {
showDialog(
context: context,
builder: (BuildContext context) {
return PayQrDialog(
return TransferPromtptPayDialog(
phone: payPhone,
price: removeTextPrice(),
name: name,
transactionId: value["data"]["_TranID"],
bill: value["data"]["_TranID"],
);
/* return PayQrDialogV2(
price: value["slipAmount"]??"",

2
neowallet_mobile/lib/TopUp/TopUpMenuPage.dart
View File

@@ -128,7 +128,7 @@ class _TopUpMenuPageState extends State<TopUpMenuPage> {
thickness: 1,
height: 1,
),
_is_history ? TopUpHistory() : TopUpListMenu(),
_is_history ? Expanded(child: TopUpHistory()) : TopUpListMenu(),
Expanded(child: Container()),
HomeBottomMenuWidget()
],

3
neowallet_mobile/lib/TransferMoney/TransferMoneyMenu.dart
View File

@@ -60,6 +60,7 @@ class _TransferMoneyMenuPageState extends State<TransferMoneyMenuPage> {
),
body: Container(
width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height,
child: Column(
children: [
Padding(
@@ -620,7 +621,7 @@ class _TransferMoneyMenuPageState extends State<TransferMoneyMenuPage> {
],
),
),
_is_history?Container(): Expanded(child: Container()),
Expanded(child: Container()),
HomeBottomMenuWidget()
],
),

194
neowallet_mobile/lib/TransferMoney/transfer_history.dart
View File

@@ -82,104 +82,106 @@ class _TopUpHistoryState extends State<TransferHistory> {
@override
Widget build(BuildContext context) {
return ListView.builder(
itemCount: listTrans.length,
shrinkWrap: true,
itemBuilder: (BuildContext context, int index) {
TransferHistoryModel transactions = listTrans[index];
return Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
Utils.convertDateToDay(transactions.updateDate ?? "",context),
style: GoogleFonts.kanit(
color: Color(0xff565656),
fontSize: 16,
),
),
Container(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
transactions.paymentChannel ?? "",
style: GoogleFonts.kanit(
color: Color(0xff65676b),
fontSize: 16,
fontWeight: FontWeight.w300,
),
),
Spacer(),
Text(
"${Utils.moneyFormat(transactions.amount ?? "")} ${"Baht".tr()}",
textAlign: TextAlign.right,
style: GoogleFonts.kanit(
color: Color(0xff65676b),
fontSize: 16,
),
)
],
),
SizedBox(
height: 10,
),
Text(
transactions.payeeFullName ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
"To ${transactions.qrId.toString().split('|').toList().length >= 3 ?transactions.qrId.toString().split('|').toList()[3].startsWith('0') ? transactions.qrId.toString().split('|').toList()[3]:"" : "" }" ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
transactions.phoneNumber ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
Utils.convertDateToTime(transactions.updateDate ?? ""),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 14,
fontWeight: FontWeight.w300,
),
),
// Row(
// children: [
// Spacer(),
// Icon(
// Icons.keyboard_arrow_down,
// color: Colors.grey.shade400,
// size: 30,
// )
// ],
// ),
],
return Expanded(
child: ListView.builder(
itemCount: listTrans.length,
shrinkWrap: true,
itemBuilder: (BuildContext context, int index) {
TransferHistoryModel transactions = listTrans[index];
return Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
Utils.convertDateToDay(transactions.updateDate ?? "",context),
style: GoogleFonts.kanit(
color: Color(0xff565656),
fontSize: 16,
),
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.grey.shade100,
Container(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
transactions.paymentChannel ?? "",
style: GoogleFonts.kanit(
color: Color(0xff65676b),
fontSize: 16,
fontWeight: FontWeight.w300,
),
),
Spacer(),
Text(
"${Utils.moneyFormat(transactions.amount ?? "")} ${"Baht".tr()}",
textAlign: TextAlign.right,
style: GoogleFonts.kanit(
color: Color(0xff65676b),
fontSize: 16,
),
)
],
),
SizedBox(
height: 10,
),
Text(
transactions.payeeFullName ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
"To ${transactions.qrId.toString().split('|').toList().length >= 3 ?transactions.qrId.toString().split('|').toList()[3].startsWith('0') ? transactions.qrId.toString().split('|').toList()[3]:"" : "" }" ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
transactions.phoneNumber ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
),
),
Text(
Utils.convertDateToTime(transactions.updateDate ?? ""),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 14,
fontWeight: FontWeight.w300,
),
),
// Row(
// children: [
// Spacer(),
// Icon(
// Icons.keyboard_arrow_down,
// color: Colors.grey.shade400,
// size: 30,
// )
// ],
// ),
],
),
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.grey.shade100,
),
),
),
],
),
);
});
],
),
);
}),
);
}
}