bug fixed
This commit is contained in:
nutchayut
+1
-1
File diff suppressed because one or more lines are too long
Binary file not shown.
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
-1
File diff suppressed because one or more lines are too long
Binary file not shown.
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
File diff suppressed because one or more lines are too long
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_23" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_23" project-jdk-name="21" project-jdk-type="JavaSDK" />
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="io.flutter" />
|
||||
</component>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+2
-2
@@ -326,7 +326,7 @@
|
||||
</data>
|
||||
<key>flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
qDXPWRJVNwGnQrWikv2ZhwfjaKE=
|
||||
kMCsblOR4MJ1asZfegAePeAKC/k=
|
||||
</data>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -912,7 +912,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
X0jO4SG3vKjNEewwdm5tanmdydx7LClt8bpwaU8KoP4=
|
||||
L13tESJpBE1lpgQmQrbXQVswX3/KdsiF2IGA5NkOezo=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
+2
-2
@@ -326,7 +326,7 @@
|
||||
</data>
|
||||
<key>flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
qDXPWRJVNwGnQrWikv2ZhwfjaKE=
|
||||
kMCsblOR4MJ1asZfegAePeAKC/k=
|
||||
</data>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -912,7 +912,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
X0jO4SG3vKjNEewwdm5tanmdydx7LClt8bpwaU8KoP4=
|
||||
L13tESJpBE1lpgQmQrbXQVswX3/KdsiF2IGA5NkOezo=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
BIN
Binary file not shown.
Binary file not shown.
+6
-6
@@ -46,7 +46,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/App</key>
|
||||
<data>
|
||||
x/YrNJewgOmy6mGkpgK+i3oMPWs=
|
||||
WGnkHTJTlZdK0zZx63YvKtUBRJA=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
<data>
|
||||
@@ -54,7 +54,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
|
||||
<data>
|
||||
cJupjxpQj3Oj5JphZetyqNL5fdM=
|
||||
vZNHoRU4oSwRt1u4WkatFK4k8QM=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
|
||||
<data>
|
||||
@@ -374,7 +374,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
qDXPWRJVNwGnQrWikv2ZhwfjaKE=
|
||||
kMCsblOR4MJ1asZfegAePeAKC/k=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -789,7 +789,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
2eZZ/9taWfYT2KrQAF6YkPM/e9FuKX4lv91LUxzM3s4=
|
||||
ywc1b3RKg6WJSfCJU6dI2yMjq0UHSxQ4R4wqVteytM4=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
@@ -803,7 +803,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
YlToKDJszoMWScXKMAVT9mXPsnkp0iiO7ts0Ed42dNY=
|
||||
JpcHyGVsjcsMJpwkF5I6TaG5wB0pbb81FhI95FyHaS8=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
|
||||
@@ -1363,7 +1363,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
X0jO4SG3vKjNEewwdm5tanmdydx7LClt8bpwaU8KoP4=
|
||||
L13tESJpBE1lpgQmQrbXQVswX3/KdsiF2IGA5NkOezo=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
Binary file not shown.
+2
-2
@@ -326,7 +326,7 @@
|
||||
</data>
|
||||
<key>flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
qDXPWRJVNwGnQrWikv2ZhwfjaKE=
|
||||
kMCsblOR4MJ1asZfegAePeAKC/k=
|
||||
</data>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -912,7 +912,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
X0jO4SG3vKjNEewwdm5tanmdydx7LClt8bpwaU8KoP4=
|
||||
L13tESJpBE1lpgQmQrbXQVswX3/KdsiF2IGA5NkOezo=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
BIN
Binary file not shown.
Binary file not shown.
@@ -46,7 +46,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/App</key>
|
||||
<data>
|
||||
x/YrNJewgOmy6mGkpgK+i3oMPWs=
|
||||
WGnkHTJTlZdK0zZx63YvKtUBRJA=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
<data>
|
||||
@@ -54,7 +54,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
|
||||
<data>
|
||||
cJupjxpQj3Oj5JphZetyqNL5fdM=
|
||||
vZNHoRU4oSwRt1u4WkatFK4k8QM=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
|
||||
<data>
|
||||
@@ -374,7 +374,7 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
qDXPWRJVNwGnQrWikv2ZhwfjaKE=
|
||||
kMCsblOR4MJ1asZfegAePeAKC/k=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -789,7 +789,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
2eZZ/9taWfYT2KrQAF6YkPM/e9FuKX4lv91LUxzM3s4=
|
||||
ywc1b3RKg6WJSfCJU6dI2yMjq0UHSxQ4R4wqVteytM4=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
@@ -803,7 +803,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
YlToKDJszoMWScXKMAVT9mXPsnkp0iiO7ts0Ed42dNY=
|
||||
JpcHyGVsjcsMJpwkF5I6TaG5wB0pbb81FhI95FyHaS8=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
|
||||
@@ -1363,7 +1363,7 @@
|
||||
<dict>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
X0jO4SG3vKjNEewwdm5tanmdydx7LClt8bpwaU8KoP4=
|
||||
L13tESJpBE1lpgQmQrbXQVswX3/KdsiF2IGA5NkOezo=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -77,6 +77,9 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
|
||||
} else {}
|
||||
});
|
||||
}
|
||||
_current_pass.text = "";
|
||||
_new_pass.text = "";
|
||||
_confirm_pass.text="";
|
||||
}
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
||||
@@ -276,6 +276,7 @@ class _HomePageState extends State<HomePage> {
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
SizedBox(width: 10,),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
|
||||
|
||||
@@ -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"]??"",
|
||||
|
||||
@@ -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()
|
||||
],
|
||||
|
||||
@@ -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()
|
||||
],
|
||||
),
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
],
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user