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

Merge branch 'main' of https://gitea.71dev.com/manasit/Neo_wallet

Browse Source 
# Conflicts:
#	neowallet_mobile/.flutter-plugins-dependencies
This commit is contained in:
Manasit.K
2025-01-08 22:41:28 +07:00
parent 029371ccce 820cd73b88
commit a7209a41c3
31 changed files with 73 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/.filecache
+1 -1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/app.dill
BIN
View File
Binary file not shown.
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/debug_ios_bundle_flutter_assets.stamp
+1 -1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/flutter_assets.d
+1 -1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/kernel_snapshot_program.d
+1 -1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/kernel_snapshot_program.stamp
+1 -1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/program.dill
BIN
View File
Binary file not shown.
neowallet_mobile/.flutter-plugins-dependencies
+1
View File
File diff suppressed because one or more lines are too long
neowallet_mobile/assets/translations/en.json
+2 -1
View File
@@ -147,5 +147,6 @@
"อีเมลใหม่":"New Email",
"รหัสผ่านปัจจุบัน":"Current Password",
"รหัสผ่านใหม่":"New Password",
"กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password"
"กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password",
"บันทึกและปิด":"Save and Close"
}
neowallet_mobile/assets/translations/th.json
+2 -2
View File
@@ -147,6 +147,6 @@
"อีเมลใหม่":"อีเมลใหม่",
"รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน",
"รหัสผ่านใหม่":"รหัสผ่านใหม่",
"กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง"
"กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง",
"บันทึกและปิด":"บันทึกและปิด"
}
neowallet_mobile/build/f872507f30e2ff2523f0f1d19160266e.cache.dill.track.dill
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/App
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources
+2 -2
View File
@@ -326,7 +326,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
PjERukfPbLPeDLrlkJGosiYKLWM=
gbkSfdY/mq1tEx+4Z/WDiq6byvo=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
@@ -912,7 +912,7 @@
<dict>
<key>hash2</key>
<data>
XhIH8VRAz44NNp3L8KDajZMELpDeQXrtGBfOzc0fiM0=
T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
+2 -2
View File
@@ -326,7 +326,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
PjERukfPbLPeDLrlkJGosiYKLWM=
gbkSfdY/mq1tEx+4Z/WDiq6byvo=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
@@ -912,7 +912,7 @@
<dict>
<key>hash2</key>
<data>
XhIH8VRAz44NNp3L8KDajZMELpDeQXrtGBfOzc0fiM0=
T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Runner
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources
+6 -6
View File
@@ -46,7 +46,7 @@
</data>
<key>Frameworks/App.framework/App</key>
<data>
Vz9rSa7vZ3Od2iGYKZ1jRpi3XXA=
kfxA9GQZWI6PVakbrvb7sQ5CNAw=
</data>
<key>Frameworks/App.framework/Info.plist</key>
<data>
@@ -54,7 +54,7 @@
</data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data>
TzLF/ZksCLorJG7ZnmYOGzlBXas=
tAKFo7k6LHtXeyBw5m2XQyIIv5M=
</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>
PjERukfPbLPeDLrlkJGosiYKLWM=
gbkSfdY/mq1tEx+4Z/WDiq6byvo=
</data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
@@ -789,7 +789,7 @@
<dict>
<key>hash2</key>
<data>
TF1sTOcscT1HCWg6CGpvOdBhKJr1pB3iwX/Cb9BbaNg=
dFnsaN4g1KfVaFqhTb5SnE+Es/XRYVP7ANGrWLHBb88=
</data>
</dict>
<key>Frameworks/App.framework/Info.plist</key>
@@ -803,7 +803,7 @@
<dict>
<key>hash2</key>
<data>
Rl8SU1XTQH8Ejhn3QOXHCm0fN9DpaplnBwLr4804WZw=
FEwEmnZzQ/t/bjtSaArEqhKt+/b2XmzBl/nj/iokPjU=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
@@ -1363,7 +1363,7 @@
<dict>
<key>hash2</key>
<data>
XhIH8VRAz44NNp3L8KDajZMELpDeQXrtGBfOzc0fiM0=
T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
+2 -2
View File
@@ -326,7 +326,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
PjERukfPbLPeDLrlkJGosiYKLWM=
gbkSfdY/mq1tEx+4Z/WDiq6byvo=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
@@ -912,7 +912,7 @@
<dict>
<key>hash2</key>
<data>
XhIH8VRAz44NNp3L8KDajZMELpDeQXrtGBfOzc0fiM0=
T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/iphonesimulator/Runner.app/Runner
BIN
View File
Binary file not shown.
neowallet_mobile/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources
+6 -6
View File
@@ -46,7 +46,7 @@
</data>
<key>Frameworks/App.framework/App</key>
<data>
Vz9rSa7vZ3Od2iGYKZ1jRpi3XXA=
kfxA9GQZWI6PVakbrvb7sQ5CNAw=
</data>
<key>Frameworks/App.framework/Info.plist</key>
<data>
@@ -54,7 +54,7 @@
</data>
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
<data>
TzLF/ZksCLorJG7ZnmYOGzlBXas=
tAKFo7k6LHtXeyBw5m2XQyIIv5M=
</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>
PjERukfPbLPeDLrlkJGosiYKLWM=
gbkSfdY/mq1tEx+4Z/WDiq6byvo=
</data>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
@@ -789,7 +789,7 @@
<dict>
<key>hash2</key>
<data>
TF1sTOcscT1HCWg6CGpvOdBhKJr1pB3iwX/Cb9BbaNg=
dFnsaN4g1KfVaFqhTb5SnE+Es/XRYVP7ANGrWLHBb88=
</data>
</dict>
<key>Frameworks/App.framework/Info.plist</key>
@@ -803,7 +803,7 @@
<dict>
<key>hash2</key>
<data>
Rl8SU1XTQH8Ejhn3QOXHCm0fN9DpaplnBwLr4804WZw=
FEwEmnZzQ/t/bjtSaArEqhKt+/b2XmzBl/nj/iokPjU=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
@@ -1363,7 +1363,7 @@
<dict>
<key>hash2</key>
<data>
XhIH8VRAz44NNp3L8KDajZMELpDeQXrtGBfOzc0fiM0=
T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
</data>
</dict>
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
neowallet_mobile/lib/Pay/PayQrDialog.dart
+4 -2
View File
@@ -286,6 +286,7 @@ class _PayQrDialogState extends State<PayQrDialog> {
*/
import 'dart:io';
import 'dart:typed_data';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:path_provider/path_provider.dart';
@@ -389,7 +390,8 @@ class _PayQrDialogState extends State<PayQrDialog> {
}).catchError((onError) {
print(onError);
});
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
child: Container(
margin: EdgeInsets.only(top: 20, bottom: 20),
@@ -414,7 +416,7 @@ class _PayQrDialogState extends State<PayQrDialog> {
width: 106,
height: 32,
child: Text(
"บันทึกสลิป",
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
neowallet_mobile/lib/Pay/PayQrDialogV2.dart
+2 -1
View File
@@ -1,4 +1,5 @@
import 'package:cathaypay_mobile/Home/HomePage.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:saver_gallery/saver_gallery.dart';
@@ -419,7 +420,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
width: 106,
height: 32,
child: Text(
"บันทึกสลิป",
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
neowallet_mobile/lib/Register/register_ekyc.dart
+2 -1
View File
@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:camera/camera.dart';
import 'package:cathaypay_mobile/Register/register.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
@@ -147,7 +148,7 @@ class _RegisterPicturePageState extends State<RegisterEkycPage> {
elevation: 0,
centerTitle: true,
title: Text(
"ยืนยันตัวตน",
"Verify your identity".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.black,
neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart
+11 -49
View File
@@ -1,5 +1,6 @@
import 'dart:math';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:saver_gallery/saver_gallery.dart';
@@ -252,6 +253,15 @@ class _TransferCathayPayDialogState extends State<TransferCathayPayDialog> {
),
InkWell(
onTap: () async {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
@@ -275,7 +285,7 @@ class _TransferCathayPayDialogState extends State<TransferCathayPayDialog> {
width: 106,
height: 32,
child: Text(
"ปิด",
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
@@ -288,55 +298,7 @@ class _TransferCathayPayDialogState extends State<TransferCathayPayDialog> {
),
),
),
InkWell(
onTap: () async {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
},
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(
"บันทึกสลิป",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
],
),
),
),
],
),
),
neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart
+11 -49
View File
@@ -4,6 +4,7 @@ import 'dart:typed_data';
import 'package:cathaypay_mobile/Home/HomePage.dart';
import 'package:cathaypay_mobile/utils/utils.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:saver_gallery/saver_gallery.dart';
@@ -243,6 +244,15 @@ class _TransferPromtptPayDialogState extends State<TransferPromtptPayDialog> {
InkWell(
onTap: () {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
@@ -259,7 +269,7 @@ class _TransferPromtptPayDialogState extends State<TransferPromtptPayDialog> {
),
child: Center(
child: Text(
"ปิด",
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -268,55 +278,7 @@ class _TransferPromtptPayDialogState extends State<TransferPromtptPayDialog> {
),
)),
)),
InkWell(
onTap: () async {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
},
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(
"บันทึกสลิป",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
],
),
),
),
],
),
),
neowallet_mobile/lib/TransferMoney/transfer_history.dart
+3 -3
View File
@@ -37,7 +37,7 @@ class _TopUpHistoryState extends State<TransferHistory> {
"paymentChannel": "",
"createDatefrom": start,
"createDateto": end,
"requestName": "",
"requestName": profile!.fullName,
"fullName": ""
// "id": "",
// "payeeUserAccountId": "",
@@ -139,14 +139,14 @@ class _TopUpHistoryState extends State<TransferHistory> {
),
),
Text(
"To ${transactions.qrId.toString().split('|').toList().length >= 3 ?transactions.qrId.toString().split('|').toList()[3].startsWith('0') ? transactions.qrId.toString().split('|').toList()[3]:"" : "" }" ?? "",
"To ${transactions.payeeName != null ? transactions.payeeName : 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 ?? "",
"From ${transactions.phoneNumber}" ?? "",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
neowallet_mobile/lib/Withdraw/WithDrawDialog.dart
+12 -49
View File
@@ -1,3 +1,4 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:intl/intl.dart';
@@ -157,6 +158,16 @@ class _WithDrawDialogState extends State<WithDrawDialog> {
),
InkWell(
onTap: () async {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
Navigator.popUntil(
context, ModalRoute.withName('/HomePage'));
},
@@ -180,7 +191,7 @@ class _WithDrawDialogState extends State<WithDrawDialog> {
width: 106,
height: 32,
child: Text(
"ปิด",
"บันทึกและปิด".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
@@ -193,55 +204,7 @@ class _WithDrawDialogState extends State<WithDrawDialog> {
),
),
),
InkWell(
onTap: () async {
screenshotController
.capture(delay: Duration(milliseconds: 10))
.then((capturedImage) async {
String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg";
SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false);
Utils.showAlertDialog(context, "บันทึกสำเร็จ");
}).catchError((onError) {
print(onError);
});
},
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(
"บันทึกสลิป",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
],
),
),
),
])))));
}
}