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

Compare commits

base: manasit:10446b1cab99ecd8589c8e549c17e8a156b13c50
Branches Tags
manasit:main
...
compare: manasit:main
Branches Tags
manasit:main

8 Commits
10446b1cab ... main

Author SHA1 Message Date
nutchayut
06271553f6 bug fixed 2025-02-28 14:16:32 +07:00
nutchayut
0cb4ae4124 bug fixed 2025-02-27 21:32:02 +07:00
nutchayut
cc34c258c7 bug fixed 2025-01-31 18:14:50 +07:00
nutchayut
16c55eba77 bug fixed 2025-01-31 18:09:31 +07:00
nutchayut
50fb227c52 bug fixed 2025-01-31 09:18:31 +07:00
nutchayut
f8301b1319 bug fixed 2025-01-28 22:20:11 +07:00
nutchayut
63ccfb45c6 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	neowallet_mobile/.flutter-plugins-dependencies
 2025-01-09 23:51:07 +07:00
nutchayut
b9ec3e6104 bug fixed 2025-01-09 23:50:38 +07:00
19 changed files with 322 additions and 334 deletions
Expand all files Collapse all files

9
neowallet_mobile/assets/translations/en.json
View File

@@ -34,6 +34,8 @@
"Not specified":"Not specified", "Not specified":"Not specified",
"Thai name/english name in passport":"Thai name/english name in passport", "Thai name/english name in passport":"Thai name/english name in passport",
"English name":"English name", "English name":"English name",
"Thai name/english name in passport_passport":"First name - last name, local language as per passport",
"English name_passport":"First name - last name in English",
"nationality":"nationality", "nationality":"nationality",
"Date of birth":"Date of birth", "Date of birth":"Date of birth",
"Mobilephone number":"Mobilephone number", "Mobilephone number":"Mobilephone number",
@@ -148,5 +150,10 @@
"รหัสผ่านปัจจุบัน":"Current Password", "รหัสผ่านปัจจุบัน":"Current Password",
"รหัสผ่านใหม่":"New Password", "รหัสผ่านใหม่":"New Password",
"กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password", "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password",
"บันทึกและปิด":"Save and Close" "บันทึกและปิด":"Save and Close",
"อีเมล":"Email",
"เลขที่บิล": "Bill no.",
"วันที่ทำรายการ": "Date",
"จาก": "From",
"ถึง": "To"
} }

13
neowallet_mobile/assets/translations/th.json
View File

@@ -32,8 +32,10 @@
"Mrs.":"นาง", "Mrs.":"นาง",
"Miss":"นางสาว", "Miss":"นางสาว",
"Not specified":"ไม่ระบุ", "Not specified":"ไม่ระบุ",
"Thai name/english name in passport":"ชื่อภาษาไทย", "Thai name/english name in passport":"ชื่อ-นามสกุล ภาษาไทย",
"English name":"ชื่อภาษาอังกฤษ", "English name":"ชื่อ-นามสกุล ภาษาอังกฤษ",
"Thai name/english name in passport_passport":"ชื่อ-นามสกุล ภาษาไทย",
"English name_passport":"ชื่อ-นามสกุล ภาษาอังกฤษ",
"nationality":"สัญชาติ", "nationality":"สัญชาติ",
"Date of birth":"วันเดือนปีเกิด", "Date of birth":"วันเดือนปีเกิด",
"Mobilephone number":"เบอร์โทรศัพท์", "Mobilephone number":"เบอร์โทรศัพท์",
@@ -148,5 +150,10 @@
"รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน", "รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน",
"รหัสผ่านใหม่":"รหัสผ่านใหม่", "รหัสผ่านใหม่":"รหัสผ่านใหม่",
"กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง", "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง",
"บันทึกและปิด":"บันทึกและปิด" "บันทึกและปิด":"บันทึกและปิด",
"อีเมล":"อีเมล",
"เลขที่บิล": "เลขที่บิล",
"วันที่ทำรายการ": "วันที่ทำรายการ",
"จาก": "จาก",
"ถึง": "ถึง"
} }

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

@@ -91,6 +91,10 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
leading: CupertinoButton( leading: CupertinoButton(
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
_current_pass.text = "";
_new_pass.text = "";
_confirm_pass.text="";
}, },
child: const Icon( child: const Icon(
Icons.arrow_back, Icons.arrow_back,
@@ -100,7 +104,7 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
elevation: 0, elevation: 0,
centerTitle: true, centerTitle: true,
title: Text( title: Text(
"เปลี่ยนอีเมล".tr(), "เปลี่ยนรหัสผ่าน".tr(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: GoogleFonts.kanit( style: GoogleFonts.kanit(
color: Colors.black, color: Colors.black,

2
neowallet_mobile/lib/Login/Login.dart
View File

@@ -176,7 +176,7 @@ class _LoginPageState extends State<LoginPage> {
color: Colors.white, color: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40), borderRadius: BorderRadius.circular(40),
side: BorderSide(color: ColorCustom.red, width: 1) // side: BorderSide(color: ColorCustom.red, width: 1)
), ),
child: Container( child: Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),

246
neowallet_mobile/lib/Login/forgot_password.dart
View File

@@ -9,6 +9,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import '../api/api.dart'; import '../api/api.dart';
import '../utils/color_custom.dart';
class ForgotPassword extends StatefulWidget { class ForgotPassword extends StatefulWidget {
const ForgotPassword({Key? key}) : super(key: key); const ForgotPassword({Key? key}) : super(key: key);
@@ -34,6 +35,8 @@ class _LoginValidateState extends State<ForgotPassword> {
} else if (Platform.isIOS) { } else if (Platform.isIOS) {
iosDeviceInfo = await device.iosInfo; iosDeviceInfo = await device.iosInfo;
} }
email.text ="";
phone.text="";
} }
authen(BuildContext context) { authen(BuildContext context) {
@@ -70,141 +73,140 @@ class _LoginValidateState extends State<ForgotPassword> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Padding( body: SafeArea(
padding: const EdgeInsets.all(20.0), child: Padding(
child: Column( padding: const EdgeInsets.all(20.0),
children: [ child: Column(
Row(children: [ children: [
IconButton( Row(children: [
onPressed: () { IconButton(
Navigator.of(context).pop(); onPressed: () {
}, Navigator.of(context).pop();
icon: Icon( },
Icons.arrow_back_ios, icon: Icon(
color: Colors.black, Icons.arrow_back_ios,
)), color: Colors.black,
Text( )),
"Forgot Password".tr(), Text(
style: TextStyle( "Forgot Password".tr(),
color: Color(0xff050505), style: TextStyle(
fontSize: 20, color: Color(0xff050505),
fontSize: 20,
),
), ),
]),
SizedBox(
height: 50,
), ),
]), Container(
SizedBox(
height: 50,
),
Container(
height: 48,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xfff2f2f2),
),
child: Row(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 10,
),
Center(
child: FaIcon(
FontAwesomeIcons.addressCard,
color: Color(0xff65676b),
)),
Expanded(
child: TextField(
keyboardType: TextInputType.emailAddress,
// inputFormatters: [
// FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
// ],
controller: email,
decoration: InputDecoration(
hintText: 'Email',
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
),
),
],
),
),
/* SizedBox(
height: 10,
),
Container(
height: 48,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xfff2f2f2),
),
child: Row(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 10,
),
Center(
child: FaIcon(
FontAwesomeIcons.phone,
color: Color(0xff65676b),
)),
Expanded(
child: TextField(
keyboardType: TextInputType.phone,
// inputFormatters: [
// FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
// ],
controller: phone,
decoration: InputDecoration(
hintText: 'เบอร์มือถือ',
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
),
),
],
),
),*/
SizedBox(
height: 60,
),
InkWell(
onTap: () {
authen(context);
},
child: Container(
width: 374,
height: 48, height: 48,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
color: Color(0xff9d001b), color: Color(0xfff2f2f2),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( SizedBox(
"ยืนยัน", width: 10,
textAlign: TextAlign.center, ),
style: GoogleFonts.kanit( Center(
color: Colors.white, child: FaIcon(
fontSize: 20, FontAwesomeIcons.addressCard,
fontWeight: FontWeight.w500, color: Color(0xff65676b),
)),
Expanded(
child: TextField(
keyboardType: TextInputType.emailAddress,
// inputFormatters: [
// FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
// ],
controller: email,
decoration: InputDecoration(
hintText: 'อีเมล'.tr(),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
), ),
), ),
], ],
), ),
), ),
), /* SizedBox(
SizedBox( height: 10,
height: 20, ),
), Container(
], height: 48,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
color: Color(0xfff2f2f2),
),
child: Row(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 10,
),
Center(
child: FaIcon(
FontAwesomeIcons.phone,
color: Color(0xff65676b),
)),
Expanded(
child: TextField(
keyboardType: TextInputType.phone,
// inputFormatters: [
// FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
// ],
controller: phone,
decoration: InputDecoration(
hintText: 'เบอร์มือถือ',
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
),
),
],
),
),*/
SizedBox(
height: 60,
),
InkWell(
onTap: () {
authen(context);
},
child: SizedBox(
width: double.infinity,
child: Card(
color: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40),
),
child: Container(
padding: EdgeInsets.all(10),
child: Text(
"Confirm".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: ColorCustom.greyBorder,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
),
)
),
SizedBox(
height: 20,
),
],
),
), ),
), ),
); );

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

@@ -173,7 +173,7 @@ class _TransferPromptPayDetailState extends State<TransferPromptPayDetail> {
// var param = jsonEncode(<dynamic, dynamic>{"IDCardOrMobileDeviceNo": widget.phone, "Amount": priceTemp}); // var param = jsonEncode(<dynamic, dynamic>{"IDCardOrMobileDeviceNo": widget.phone, "Amount": priceTemp});
var param = jsonEncode( var param = jsonEncode(
<dynamic, dynamic>{"requestTransactionID": Utils.getDateInitPromptPay() + widget.phone.lastChars(4), "iDCardorMobileNo": widget.phone, "amount": "${priceTemp}00"}); <dynamic, dynamic>{"requestTransactionID": Utils.getDateInitPromptPay() + widget.phone.lastChars(4), "iDCardorMobileNo": widget.phone, "amount": "${(double.parse(priceTemp).toStringAsFixed(2)).replaceAll(".", "")}"});
Api.post(context, Api.payPromptPayInitial, param).then((value) => { Api.post(context, Api.payPromptPayInitial, param).then((value) => {
if (value != null) if (value != null)
{ {
@@ -517,7 +517,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
color: Colors.black, color: Colors.black,
)), )),
Text( Text(
"โอนเงินผ่านพร้อมเพย์", "Transfer money via PromptPay".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff050505), color: Color(0xff050505),
fontSize: 20, fontSize: 20,
@@ -554,7 +554,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( Text(
"เลขที่บิล", "เลขที่บิล".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 16, fontSize: 16,
@@ -580,7 +580,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"วันที่ทำรายการ", "วันที่ทำรายการ".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 16, fontSize: 16,
@@ -604,7 +604,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"จาก", "จาก".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 16, fontSize: 16,
@@ -651,7 +651,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
Row( Row(
children: [ children: [
Text( Text(
"ถึง", "ถึง".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 16, fontSize: 16,
@@ -701,7 +701,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"จำนวนเงิน", "จำนวนเงิน".tr(),
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 16, fontSize: 16,
@@ -745,7 +745,7 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
), ),
child: Center( child: Center(
child: Text( child: Text(
"ยกเลิก", "ยกเลิก".tr(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
@@ -764,20 +764,29 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
confirmPromptPay(context); confirmPromptPay(context);
} }
}, },
child: Container( child: Container(
margin: EdgeInsets.only(bottom: 15), margin: EdgeInsets.only(bottom: 15),
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
height: 46, height: 46,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100), 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: Center(
child: Text( child: Text(
"ตกลง", "Confirm".tr(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: ColorCustom.greyBorder,
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
), ),

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

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

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

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

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

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

50
neowallet_mobile/lib/Register/register_data.dart
View File

@@ -335,7 +335,7 @@ class _RegisterDataState extends State<RegisterData> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( Text(
"Thai name/english name in passport".tr(), isPassport?"Thai name/english name in passport_passport".tr(): "Thai name/english name in passport".tr(),
style: GoogleFonts.kanit( style: GoogleFonts.kanit(
color: Color(0xff565656), color: Color(0xff565656),
fontSize: 15, fontSize: 15,
@@ -388,35 +388,37 @@ class _RegisterDataState extends State<RegisterData> {
color: Color(0xfff3f3f3), color: Color(0xfff3f3f3),
), ),
), ),
Row( Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Row(
"English name".tr(), children: [
Text(
isPassport? "English name_passport".tr(): "English name".tr(),
style: GoogleFonts.kanit(
color: Color(0xff565656),
fontSize: 15,
),
),Spacer()
],
),
TextField(
style: GoogleFonts.kanit( style: GoogleFonts.kanit(
color: Color(0xff565656), color: Color(0xff565656),
fontSize: 15, fontSize: 14,
), ),
), inputFormatters: <TextInputFormatter>[FilteringTextInputFormatter.allow(RegExp('[a-z A-Z]'))],
Expanded( keyboardType: TextInputType.text,
child: TextField( textAlign: TextAlign.right,
style: GoogleFonts.kanit( controller: nameEnEditText,
color: Color(0xff565656), decoration: InputDecoration(
fontSize: 14, hintText: '',
), suffixIcon: Icon(
inputFormatters: <TextInputFormatter>[FilteringTextInputFormatter.allow(RegExp('[a-z A-Z]'))], Icons.arrow_forward_ios_rounded,
keyboardType: TextInputType.text, size: 15,
textAlign: TextAlign.right, color: Colors.grey,
controller: nameEnEditText,
decoration: InputDecoration(
hintText: '',
suffixIcon: Icon(
Icons.arrow_forward_ios_rounded,
size: 15,
color: Colors.grey,
),
border: InputBorder.none,
), ),
border: InputBorder.none,
), ),
), ),
// Expanded( // Expanded(

4
neowallet_mobile/lib/Register/register_signature.dart
View File

@@ -112,6 +112,8 @@ class _RegisterSignaturePageState extends State<RegisterSignaturePage> {
"work_address": addressJob2.text, "work_address": addressJob2.text,
"image_person_with_card_url": imageEkycPath, "image_person_with_card_url": imageEkycPath,
"signature_url": signaturePath, "signature_url": signaturePath,
"user_name": username.text,
"purpose": target,
}); });
Api.post(context, Api.ekyc, param).then((value) => Api.post(context, Api.ekyc, param).then((value) =>
{ {
@@ -120,7 +122,7 @@ class _RegisterSignaturePageState extends State<RegisterSignaturePage> {
setState(() { setState(() {
loading = false; loading = false;
}), }),
Utils.showAlertDialogCallback(context, "กรุณาเช็ก e-mail เพื่อยืนยัน\nPlease check you e-mail and confirm", (value) { Utils.showAlertDialogCallback(context, "กรุณาเช็ค e-mail เพื่อยืนยัน และรอการตรวจสอบข้อมูลยืนยันตัวตนภายใน 48 ชั่วโมง\nPlease check your email to confirm and wait for verification of your identity within 48 hours", (value) {
Navigator.pushNamed(context, '/'); Navigator.pushNamed(context, '/');
}) })
} }

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

@@ -51,7 +51,7 @@ class _TransferPromptPayDetailState extends State<TopUpAmountPage> {
}); });
var param = jsonEncode(<dynamic, dynamic>{ var param = jsonEncode(<dynamic, dynamic>{
"merchantLocalID": Api.merchantId, "merchantLocalID": Api.merchantId,
"amount": "${number}00", "amount": "${(double.parse(number).toStringAsFixed(2)).replaceAll(".", "")}}",
"invoice": "INV${Utils.getTimestamp()}", "invoice": "INV${Utils.getTimestamp()}",
"ref1": "REF${Utils.getTimestamp()}01", "ref1": "REF${Utils.getTimestamp()}01",
"ref2": "REF${Utils.getTimestamp()}02", "ref2": "REF${Utils.getTimestamp()}02",

4
neowallet_mobile/lib/TransferMoney/TransferCathayPay.dart
View File

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

50
neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart
View File

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

28
neowallet_mobile/lib/TransferMoney/TransferPromptPay.dart
View File

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

48
neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart
View File

@@ -12,6 +12,7 @@ import 'package:screenshot/screenshot.dart';
import '../api/api.dart'; import '../api/api.dart';
import '../model/profile_model.dart'; import '../model/profile_model.dart';
import '../utils/color_custom.dart';
class TransferPromtptPayDialog extends StatefulWidget { class TransferPromtptPayDialog extends StatefulWidget {
const TransferPromtptPayDialog({Key? key, required this.name, required this.phone, required this.price, required this.bill}) : super(key: key); 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 { .then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg"; String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false); SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ"); // Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) { }).catchError((onError) {
print(onError); print(onError);
}); });
Navigator.popUntil( Navigator.popUntil(
context, ModalRoute.withName('/HomePage')); context, ModalRoute.withName('/HomePage'));
}, },
child: Container( child: SizedBox(
margin: EdgeInsets.only(bottom: 15), width: double.infinity,
width: MediaQuery child: Card(
.of(context) color: Colors.white,
.size shape: RoundedRectangleBorder(
.width, borderRadius: BorderRadius.circular(40),
height: 46, ),
decoration: BoxDecoration( child: Container(
borderRadius: BorderRadius.circular(100), padding: EdgeInsets.all(10),
color: Color(0xffad022c), child: Text(
), "บันทึกและปิด".tr(),
child: Row( textAlign: TextAlign.center,
mainAxisSize: MainAxisSize.min, style: GoogleFonts.kanit(
mainAxisAlignment: MainAxisAlignment.center, color: ColorCustom.greyBorder,
crossAxisAlignment: CrossAxisAlignment.center, fontSize: 20,
children: [ fontWeight: FontWeight.w500,
SizedBox(
width: 106,
height: 32,
child: Text(
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
), ),
), ),
], ),
), ),
)), )),

50
neowallet_mobile/lib/Withdraw/WithDrawDialog.dart
View File

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

2
neowallet_mobile/pubspec.yaml
View File

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.4+3 version: 1.0.4+5
environment: environment:
sdk: '>=2.19.3 <3.0.0' sdk: '>=2.19.3 <3.0.0'