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

update

Browse Source
This commit is contained in:
Manasit.K
2025-01-07 16:21:43 +07:00
parent f16e5f491a
commit ec588a5c99
5 changed files with 193 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import 'package:flutter/services.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart'; import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
import '../TransferMoney/TransferPromtptPayDialog.dart';
import '../api/api.dart'; import '../api/api.dart';
import '../utils/color_custom.dart'; import '../utils/color_custom.dart';
import 'PayQrDialogV2.dart'; import 'PayQrDialogV2.dart';
@@ -487,15 +486,16 @@ class _TransferBankConfirmState extends State<TransferBankConfirm> {
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return PayQrDialogV2( return PayQrDialogV2(
price: widget.price, price: value["slip"]["slipAmount"] ?? "",
bill: value["requestTransactionID"]??"", bill: value["requestTransactionID"] ?? "",
phone: widget.phone, phone: value["slip"]["promptpayID"] ?? "",
name: value["slipTitleTH"]??"", name: value["slip"]["receiverNameTH"] ?? "",
name_en: value["slipTitleEN"]??"", name_en: value["slip"]["receiverNameEN"] ?? "",
bankName: value["bankName"]??"", bankName: value["slip"]["bankName"] ?? "",
referenceNo:value["referenceNo"]??"", referenceNo: value["slip"]["referenceNo"] ?? "",
slipDateTime: value["slipDateTime"]??"", slipDateTime: value["slip"]["slipDateTime"] ?? "",
transactionId: "", transactionId: value["slip"]["lookref"] ?? "",
senderCom: value["slip"]["senderCompanyEN"] ?? "",
); );
}) })
} }

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

@@ -1,5 +1,4 @@
import 'package:cathaypay_mobile/Home/HomePage.dart'; import 'package:cathaypay_mobile/Home/HomePage.dart';
import 'package:cathaypay_mobile/utils/utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
@@ -7,7 +6,19 @@ import '../api/api.dart';
import '../model/profile_model.dart'; import '../model/profile_model.dart';
class PayQrDialogV2 extends StatefulWidget { class PayQrDialogV2 extends StatefulWidget {
const PayQrDialogV2({Key? key, required this.name, required this.phone, required this.transactionId, required this.price, required this.name_en, required this.bankName, required this.referenceNo, required this.slipDateTime, required this.bill}) : super(key: key); const PayQrDialogV2(
{Key? key,
required this.name,
required this.phone,
required this.transactionId,
required this.price,
required this.name_en,
required this.bankName,
required this.referenceNo,
required this.slipDateTime,
required this.bill,
required this.senderCom})
: super(key: key);
final String name; final String name;
final String name_en; final String name_en;
@@ -18,6 +29,8 @@ class PayQrDialogV2 extends StatefulWidget {
final String referenceNo; final String referenceNo;
final String slipDateTime; final String slipDateTime;
final String bill; final String bill;
final String senderCom;
// "slipTitleTH": "ตรวจสอบ การชำระเงิน", // "slipTitleTH": "ตรวจสอบ การชำระเงิน",
// "slipTitleEN": "payment verification", // "slipTitleEN": "payment verification",
// "slipDateTime": "27 Dec 24 02:23", // "slipDateTime": "27 Dec 24 02:23",
@@ -54,90 +67,86 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Container(
padding: const EdgeInsets.only(left: 20, right: 20), padding: const EdgeInsets.only(left: 20, right: 20),
child: Column(mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ margin: const EdgeInsets.symmetric(vertical: 20),
// Container( child: Card(
// margin: EdgeInsets.only(bottom: 10), color: Color(0xfffbfbfb),
// height: 80, child: Padding(
// width: 80, padding: const EdgeInsets.all(10.0),
// child: Image.asset( child: Column(
// 'assets/images/LOGO.gif', children: [
// height: 120, Container(
// width: 120, height: 150,
// )), width: 180,
Card( child: Image(
color: Color(0xfffbfbfb), image: AssetImage('images/neopay_logo.png'),
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
children: [
Container(height: 180,width: 180,
child: Image(
image: AssetImage('images/neopay_logo.png'),
),
), ),
Text( ),
"Approved or completed successfully", Text(
style: TextStyle( "Approved or completed successfully",
color: Color(0xff65676b), style: TextStyle(
fontSize: 16, color: Color(0xff65676b),
fontWeight: FontWeight.w300, fontSize: 16,
), fontWeight: FontWeight.w300,
) ,
Text(
"ดำเนินการโอน/จ่ายสำเร็จ",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
fontWeight: FontWeight.w300,
),
) ,
Text(
"จำนวนเงิน/Amount ฿"+widget.price,
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
fontWeight: FontWeight.w300,
),
) ,
Container(height: 80,width: 180,
child: Image(
image: AssetImage('images/prompt.png'),
),
), ),
SizedBox(height: 15,), ),
Container( Text(
decoration: BoxDecoration( "ดำเนินการโอน/จ่ายสำเร็จ",
image: DecorationImage( style: TextStyle(
image: AssetImage('images/neo_backgroup.png'), color: Color(0xff65676b),
fit: BoxFit.fill, fontSize: 16,
fontWeight: FontWeight.w300,
), ),
),
Text(
"จำนวนเงิน/Amount ฿" + widget.price,
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
fontWeight: FontWeight.w300,
),
),
Container(
height: 80,
width: 180,
child: Image(
image: AssetImage('images/prompt.png'),
),
),
SizedBox(
height: 15,
),
Container(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('images/neo_backgroup.png'),
fit: BoxFit.fill,
), ),
child:Column(children: [ ),
child: Column(
children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"ผู้รับเงิน", "ผู้รับเงิน",
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
),
), ),
), Text(
Text( widget.name,
widget.name, style: TextStyle(
style: TextStyle( color: Color(0xff65676b),
color: Color(0xff65676b), fontSize: 14,
fontSize: 14, fontWeight: FontWeight.w600,
fontWeight: FontWeight.w600, ),
), )
) ],
], ),
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -184,7 +193,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"retrievalReferenceNumber", "referenceNo",
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
@@ -242,10 +251,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
), ),
) )
], ],
),SizedBox(
height: 35,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -258,7 +264,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
), ),
), ),
Text( Text(
profile?.fullName??"", profile?.fullName ?? "",
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
@@ -279,7 +285,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
), ),
), ),
Text( Text(
profile?.phoneNumber??"", profile?.phoneNumber ?? "",
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
@@ -288,11 +294,37 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
) )
], ],
), ),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
"senderCom.",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 14,
fontWeight: FontWeight.w300,
),
),
Expanded(
child: Text(
widget.senderCom,
textAlign: TextAlign.end,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xff65676b),
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
)
],
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
"เลขที่ทำรายการ", "lookref",
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
@@ -300,7 +332,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
), ),
), ),
Text( Text(
widget.bill, widget.transactionId,
style: TextStyle( style: TextStyle(
color: Color(0xff65676b), color: Color(0xff65676b),
fontSize: 14, fontSize: 14,
@@ -309,58 +341,53 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
) )
], ],
), ),
],) ],
)),
SizedBox(
height: 10,
),
Text(
"Transfer / Payment from Bangkok Bank PromptPay",
style: TextStyle(
color: Color(0xff65676b),
fontSize: 12,
fontWeight: FontWeight.w300,
), ),
),
SizedBox(height: 15,), SizedBox(
height: 10,
),
InkWell( InkWell(
onTap: () async { onTap: () async {
Navigator.popUntil(context, ModalRoute.withName('/HomePage')); Navigator.popUntil(context, ModalRoute.withName('/HomePage'));
Navigator.pushReplacementNamed(context, "/HomePage"); Navigator.pushReplacementNamed(context, "/HomePage");
}, },
child: Container( child: Container(
margin: EdgeInsets.only(top: 20, bottom: 20), margin: EdgeInsets.only(top: 20, bottom: 10),
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(40), borderRadius: BorderRadius.circular(40),
color: Color(0xff9d001b), color: Color(0xff9d001b),
), ),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 12, vertical: 12,
), ),
child: Row( child: Text(
mainAxisSize: MainAxisSize.min, "ปิด",
mainAxisAlignment: MainAxisAlignment.center, textAlign: TextAlign.center,
crossAxisAlignment: CrossAxisAlignment.center, style: GoogleFonts.kanit(
children: [ color: Colors.white,
SizedBox( fontSize: 20,
width: 106, fontWeight: FontWeight.w500,
height: 32,
child: Text(
"ปิด",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
],
), ),
), ),
), ),
], ),
), ],
), ),
), ),
SizedBox( ),
height: 20,
),
]),
); );
} }
} }

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

@@ -1,8 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:cathaypay_mobile/GetPaid/GetPaid.dart';
import 'package:cathaypay_mobile/Home/HomePage.dart'; import 'package:cathaypay_mobile/Home/HomePage.dart';
import 'package:cathaypay_mobile/Pay/PayQrDialog.dart';
import 'package:cathaypay_mobile/PinCodeVadidate.dart'; import 'package:cathaypay_mobile/PinCodeVadidate.dart';
import 'package:cathaypay_mobile/main.dart'; import 'package:cathaypay_mobile/main.dart';
import 'package:cathaypay_mobile/utils/utils.dart'; import 'package:cathaypay_mobile/utils/utils.dart';
@@ -11,8 +9,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:intl/intl.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../api/api.dart'; import '../api/api.dart';
import '../utils/color_custom.dart'; import '../utils/color_custom.dart';
@@ -39,9 +35,11 @@ class _PayQrPageState extends State<PayThaiQr> {
initC2B() { initC2B() {
Utils.loadingProgress(context); Utils.loadingProgress(context);
// var param = jsonEncode(<dynamic, dynamic>{"MobileDeviceNo": payPhone ?? "", "Note": "", "TransactionID": transactionID}); // var param = jsonEncode(<dynamic, dynamic>{"MobileDeviceNo": payPhone ?? "", "Note": "", "TransactionID": transactionID});
var param = jsonEncode( var param = jsonEncode(<dynamic, dynamic>{
<dynamic, dynamic>{"requestTransactionID": Utils.getDateInitPromptPay() + (profile?.phoneNumber?.lastChars(4)), "qrTextRequest": widget.code, "requestTransactionID": Utils.getDateInitPromptPay() + (profile?.phoneNumber?.lastChars(4)),
"amount": "${removeTextPrice()}00"}); "qrTextRequest": widget.code,
"amount": "${removeTextPrice()}00"
});
Api.post(context, Api.payThaiInitial, param).then((value) => { Api.post(context, Api.payThaiInitial, param).then((value) => {
if (value != null) {confirmPayQrC2BAmount(value["requestTransactionID"], value["responseTransactionID"])} else {} if (value != null) {confirmPayQrC2BAmount(value["requestTransactionID"], value["responseTransactionID"])} else {}
@@ -59,18 +57,19 @@ class _PayQrPageState extends State<PayThaiQr> {
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return PayQrDialogV2( return PayQrDialogV2(
price: value["slipAmount"]??"", price: value["slip"]["slipAmount"] ?? "",
bill: value["requestTransactionID"]??"", bill: value["requestTransactionID"] ?? "",
phone: value["promptpayID"]??"", phone: value["slip"]["promptpayID"] ?? "",
name: value["slipTitleTH"]??"", name: value["slip"]["receiverNameTH"] ?? "",
name_en: value["slipTitleEN"]??"", name_en: value["slip"]["receiverNameEN"] ?? "",
bankName: value["bankName"]??"", bankName: value["slip"]["bankName"] ?? "",
referenceNo:value["referenceNo"]??"", referenceNo: value["slip"]["referenceNo"] ?? "",
slipDateTime: value["slipDateTime"]??"", slipDateTime: value["slip"]["slipDateTime"] ?? "",
transactionId: "", transactionId: value["slip"]["lookref"] ?? "",
senderCom: value["slip"]["senderCompanyEN"] ?? "",
); );
/* return PayQrDialog( /* return PayQrDialog(
phone: "", phone: "",
price: removeTextPrice(), price: removeTextPrice(),
name: "", name: "",

8
neowallet_mobile/lib/api/api.dart
View File

@@ -62,10 +62,10 @@ class Api {
//static String getTransaction = BaseUrlBuilding + "api/v2/Payment/getTransaction"; //static String getTransaction = BaseUrlBuilding + "api/v2/Payment/getTransaction";
static String getTransaction = BaseUrlBuilding + "api/v2/EPaymentReport/GetModelLogCriteria"; static String getTransaction = BaseUrlBuilding + "api/v2/EPaymentReport/GetModelLogCriteria";
// static String BaseUrlBuildingCathay = "https://sathorn.cathay-pay.com/"; // static String BaseUrlBuildingCathay = "https://sathorn.cathay-pay.com/";
static String payPromptPayInitial = BaseUrlBuilding + "api/v2/EPaymentBBL/TransferedPromptPayIDInitial"; static String payPromptPayInitial = BaseUrlBuilding + "api/v4/EPaymentBBL/TransferedPromptPayIDInitial";
static String payPromptPayConfirm = BaseUrlBuilding + "api/v2/EPaymentBBL/TransferedPromptPayIDConfirm"; static String payPromptPayConfirm = BaseUrlBuilding + "api/v4/EPaymentBBL/TransferedPromptPayIDConfirm";
static String payThaiInitial = BaseUrlBuilding + "api/v2/EPaymentBBL/TransferedPromptPayQRInitial"; static String payThaiInitial = BaseUrlBuilding + "api/v4/EPaymentBBL/TransferedPromptPayQRInitial";
static String payThaiConfirm = BaseUrlBuilding + "api/v2/EPaymentBBL/TransferedPromptPayQRConfirm"; static String payThaiConfirm = BaseUrlBuilding + "api/v4/EPaymentBBL/TransferedPromptPayQRConfirm";
static String user = BaseUrlBuilding + "api/v1/User"; static String user = BaseUrlBuilding + "api/v1/User";

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.2+9 version: 1.0.3+10
environment: environment:
sdk: '>=2.19.3 <3.0.0' sdk: '>=2.19.3 <3.0.0'