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-09 23:50:38 +07:00
parent 783d240879
commit b9ec3e6104
17 changed files with 279 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
neowallet_mobile/lib/Pay/PayPromptPay.dart
View File

@@ -517,7 +517,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
color: Colors.black,
)),
Text(
"โอนเงินผ่านพร้อมเพย์",
"Transfer money via PromptPay".tr(),
style: TextStyle(
color: Color(0xff050505),
fontSize: 20,
@@ -554,7 +554,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"เลขที่บิล",
"เลขที่บิล".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -580,7 +580,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"วันที่ทำรายการ",
"วันที่ทำรายการ".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -604,7 +604,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"จาก",
"จาก".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -651,7 +651,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
Row(
children: [
Text(
"ถึง",
"ถึง".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -701,7 +701,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"จำนวนเงิน",
"จำนวนเงิน".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -745,7 +745,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
),
child: Center(
child: Text(
"ยกเลิก",
"ยกเลิก".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -764,20 +764,29 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
confirmPromptPay(context);
}
},
child: Container(
margin: EdgeInsets.only(bottom: 15),
width: MediaQuery.of(context).size.width / 4,
height: 46,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xffad022c),
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 4,
offset: Offset(0, 2), // changes position of shadow
),
],
),
child: Center(
child: Text(
"ตกลง",
"Confirm".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
color: ColorCustom.greyBorder,
fontSize: 18,
fontWeight: FontWeight.w300,
),

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

@@ -397,7 +397,7 @@ class _PayQrPageState extends State<PayQrPage> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xff9d001b),
color: Color(0xfff2f2f2),
),
padding: const EdgeInsets.symmetric(
horizontal: 20,
@@ -412,7 +412,7 @@ class _PayQrPageState extends State<PayQrPage> {
"100 ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Colors.white,
color: Color(0xff65676b),
),
),
],

53
neowallet_mobile/lib/Pay/PayQrDialog.dart
View File

@@ -293,6 +293,7 @@ import 'package:path_provider/path_provider.dart';
import 'package:saver_gallery/saver_gallery.dart';
import 'package:screenshot/screenshot.dart';
import '../utils/color_custom.dart';
import '../utils/utils.dart';
class PayQrDialog extends StatefulWidget {
@@ -386,48 +387,34 @@ class _PayQrDialogState extends State<PayQrDialog> {
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
// Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
child: Container(
margin: EdgeInsets.only(top: 20, bottom: 20),
width: MediaQuery
.of(context)
.size
.width,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(40),
color: Color(0xff9d001b),
),
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 12,
),
child: Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 106,
height: 32,
child: Text(
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
child: SizedBox(
width: double.infinity,
child: Card(
color: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40),
),
child: Container(
padding: EdgeInsets.all(10),
child: Text(
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: ColorCustom.greyBorder,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
)
),
],
),

48
neowallet_mobile/lib/Pay/PayQrDialogV2.dart
View File

@@ -7,6 +7,7 @@ import 'package:screenshot/screenshot.dart';
import '../api/api.dart';
import '../model/profile_model.dart';
import '../utils/color_custom.dart';
import '../utils/utils.dart';
class PayQrDialogV2 extends StatefulWidget {
@@ -402,38 +403,27 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
child: Container(
margin: EdgeInsets.only(top: 20, bottom: 20),
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(40),
color: Color(0xff9d001b),
),
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 12,
),
child: Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 206,
height: 32,
child: Text(
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
child: SizedBox(
width: double.infinity,
child: Card(
color: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40),
),
child: Container(
padding: EdgeInsets.all(10),
child: Text(
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: ColorCustom.greyBorder,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
)
),
SizedBox(
height: 20,

4
neowallet_mobile/lib/Pay/PayThaiQr.dart
View File

@@ -247,7 +247,7 @@ class _PayQrPageState extends State<PayThaiQr> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xff9d001b),
color: Color(0xfff2f2f2),
),
padding: const EdgeInsets.symmetric(
horizontal: 20,
@@ -262,7 +262,7 @@ class _PayQrPageState extends State<PayThaiQr> {
"100 ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Colors.white,
color: Color(0xff65676b),
),
),
],