bug fixed

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

View File

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

View File

@@ -6,6 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:saver_gallery/saver_gallery.dart';
import 'package:screenshot/screenshot.dart';
import '../utils/color_custom.dart';
import '../utils/utils.dart';
class TransferCathayPayDialog extends StatefulWidget {
@@ -258,45 +259,34 @@ class _TransferCathayPayDialogState extends State<TransferCathayPayDialog> {
.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,
height: 51,
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,
),
),
],
),
),
),
)
),
],

View File

@@ -822,7 +822,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
color: Colors.black,
)),
Text(
"โอนเงินผ่านพร้อมเพย์",
"Transfer money via PromptPay".tr(),
style: TextStyle(
color: Color(0xff050505),
fontSize: 20,
@@ -859,7 +859,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"เลขที่บิล",
"เลขที่บิล".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -885,7 +885,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"วันที่ทำรายการ",
"วันที่ทำรายการ".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -909,7 +909,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"จาก",
"จาก".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -956,7 +956,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
Row(
children: [
Text(
"ถึง",
"ถึง".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -1006,7 +1006,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"จำนวนเงิน",
"จำนวนเงิน".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -1050,7 +1050,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
),
child: Center(
child: Text(
"ยกเลิก",
"ยกเลิก".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -1075,14 +1075,22 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
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,
),

View File

@@ -12,6 +12,7 @@ import 'package:screenshot/screenshot.dart';
import '../api/api.dart';
import '../model/profile_model.dart';
import '../utils/color_custom.dart';
class TransferPromtptPayDialog extends StatefulWidget {
const TransferPromtptPayDialog({Key? key, required this.name, required this.phone, required this.price, required this.bill}) : super(key: key);
@@ -249,43 +250,32 @@ class _TransferPromtptPayDialogState extends State<TransferPromtptPayDialog> {
.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(bottom: 15),
width: MediaQuery
.of(context)
.size
.width,
height: 46,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xffad022c),
),
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,
),
),
],
),
),
)),