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
2024-12-12 10:12:19 +07:00
parent 43c32ef6cf
commit ed510b00d1
52 changed files with 1256 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neowallet_mobile/lib/Pay/PayPage.dart
View File

@@ -299,7 +299,7 @@ class _PayPageState extends State<PayPage> {
),
Expanded(
child: Text(
"สแกน QR Code CATHAY PAY".tr(),
"สแกน QR Code NEO PAY".tr(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(

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

@@ -13,6 +13,7 @@ import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
import '../TransferMoney/TransferPromtptPayDialog.dart';
import '../api/api.dart';
import '../utils/color_custom.dart';
class PayPromptPay extends StatefulWidget {
const PayPromptPay({Key? key}) : super(key: key);
@@ -97,36 +98,24 @@ class _TransferPromptPayState extends State<PayPromptPay> {
});
},
child: Container(
margin: EdgeInsets.only(left: 20, right: 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(
"Next".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
width: double.infinity,
margin: const EdgeInsets.symmetric(horizontal: 15),
child: Card(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40),
),
child: Container(
padding: EdgeInsets.all(10),
child: Text(
"Next".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: ColorCustom.greyBorder,
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
),
@@ -425,36 +414,24 @@ class _TransferPromptPayDetailState extends State<TransferPromptPayDetail> {
Utils.showAlertDialog(context, "Price must more than 10 Baht");
}
},
child: Container(
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(
"Confirm".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
child: SizedBox(
width: double.infinity,
child: Card(
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,
),
),
],
),
),
),
),

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

@@ -4,14 +4,15 @@ import 'package:cathaypay_mobile/Home/HomePage.dart';
import 'package:cathaypay_mobile/Pay/PayQrDialog.dart';
import 'package:cathaypay_mobile/PinCodeVadidate.dart';
import 'package:cathaypay_mobile/utils/utils.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.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 '../utils/color_custom.dart';
class PayQrPage extends StatefulWidget {
const PayQrPage({Key? key, required this.code}) : super(key: key);
@@ -184,7 +185,7 @@ class _PayQrPageState extends State<PayQrPage> {
],
elevation: 0,
title: Text(
"จ่ายเงิน",
"Pay".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.black,
@@ -201,7 +202,7 @@ class _PayQrPageState extends State<PayQrPage> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"ชื่อ",
"ชื่อ".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -240,7 +241,7 @@ class _PayQrPageState extends State<PayQrPage> {
Row(
children: [
Text(
"เบอร์โทรศัพท์",
"เบอร์โทรศัพท์".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 14,
@@ -262,7 +263,7 @@ class _PayQrPageState extends State<PayQrPage> {
height: 10,
),
Text(
"จำนวนเงินที่โอน / จ่าย",
"จำนวนเงินที่โอน / จ่าย".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -318,7 +319,7 @@ class _PayQrPageState extends State<PayQrPage> {
controller: price,
style: TextStyle(fontSize: 24),
decoration: InputDecoration(
hintText: 'จำนวนเงินที่โอน',
hintText: "จำนวนเงินที่โอน / จ่าย".tr(),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
@@ -328,7 +329,7 @@ class _PayQrPageState extends State<PayQrPage> {
height: 10,
),
Text(
"ใช้แต้ม Cathay Pay แทนเงินสด",
"ใช้แต้ม NEO PAY แทนเงินสด".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -336,7 +337,7 @@ class _PayQrPageState extends State<PayQrPage> {
),
),
Text(
"คะแนนของคุณ : 12,000 แต้ม",
"${"คะแนนของคุณ".tr()} : 12,000 ${"แต้ม".tr()}",
style: TextStyle(
color: Color(0xff9d001b),
fontSize: 14,
@@ -361,7 +362,7 @@ class _PayQrPageState extends State<PayQrPage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"0 แต้ม",
"10 ${"แต้ม".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Color(0xff65676b),
@@ -395,7 +396,7 @@ class _PayQrPageState extends State<PayQrPage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"0 บาท",
"100 ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Colors.white,
@@ -408,7 +409,7 @@ class _PayQrPageState extends State<PayQrPage> {
),
Center(
child: Text(
"1 แต้ม = 10 สตางค์",
"1 แต้ม = 10 สตางค์".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xff65676b),
@@ -418,6 +419,8 @@ class _PayQrPageState extends State<PayQrPage> {
),
),
Container(
height: 136,
color: Colors.transparent,
child: Column(
children: [
SizedBox(
@@ -426,7 +429,7 @@ class _PayQrPageState extends State<PayQrPage> {
Row(
children: [
Text(
"ยอดเงินทั้งหมด",
"ยอดเงินทั้งหมด".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -443,7 +446,7 @@ class _PayQrPageState extends State<PayQrPage> {
),
),
Text(
" บาท",
" ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Color(0xff65676b),
@@ -465,36 +468,24 @@ class _PayQrPageState extends State<PayQrPage> {
checkTypePay();
}
},
child: Container(
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(
"ยืนยัน",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
child: SizedBox(
width: double.infinity,
child: Card(
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,
),
),
],
),
),
),
),
@@ -503,8 +494,6 @@ class _PayQrPageState extends State<PayQrPage> {
),
],
),
height: 136,
color: Colors.transparent,
),
SizedBox(
height: 10,

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

@@ -1,10 +1,12 @@
import 'dart:convert';
import 'package:cathaypay_mobile/GetPaid/GetPaid.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/main.dart';
import 'package:cathaypay_mobile/utils/utils.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -13,6 +15,7 @@ import 'package:intl/intl.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
import '../api/api.dart';
import '../utils/color_custom.dart';
class PayThaiQr extends StatefulWidget {
const PayThaiQr({Key? key, required this.code}) : super(key: key);
@@ -95,7 +98,7 @@ class _PayQrPageState extends State<PayThaiQr> {
],
elevation: 0,
title: Text(
"จ่ายเงิน",
"Pay".tr(),
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.black,
@@ -112,7 +115,7 @@ class _PayQrPageState extends State<PayThaiQr> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"จำนวนเงินที่โอน / จ่าย",
"จำนวนเงินที่โอน / จ่าย".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -168,7 +171,7 @@ class _PayQrPageState extends State<PayThaiQr> {
controller: price,
style: TextStyle(fontSize: 24),
decoration: InputDecoration(
hintText: 'จำนวนเงินที่โอน',
hintText: "จำนวนเงินที่โอน / จ่าย".tr(),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 16),
),
@@ -178,7 +181,7 @@ class _PayQrPageState extends State<PayThaiQr> {
height: 10,
),
Text(
"ใช้แต้ม Cathay Pay แทนเงินสด",
"ใช้แต้ม NEO PAY แทนเงินสด".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -186,7 +189,7 @@ class _PayQrPageState extends State<PayThaiQr> {
),
),
Text(
"คะแนนของคุณ : 12,000 แต้ม",
"${"คะแนนของคุณ".tr()} : 12,000 ${"แต้ม".tr()}",
style: TextStyle(
color: Color(0xff9d001b),
fontSize: 14,
@@ -211,7 +214,7 @@ class _PayQrPageState extends State<PayThaiQr> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"0 แต้ม",
"10 ${"แต้ม".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Color(0xff65676b),
@@ -245,7 +248,7 @@ class _PayQrPageState extends State<PayThaiQr> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"0 บาท",
"100 ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Colors.white,
@@ -258,7 +261,7 @@ class _PayQrPageState extends State<PayThaiQr> {
),
Center(
child: Text(
"1 แต้ม = 10 สตางค์",
"1 แต้ม = 10 สตางค์".tr(),
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xff65676b),
@@ -278,7 +281,7 @@ class _PayQrPageState extends State<PayThaiQr> {
Row(
children: [
Text(
"ยอดเงินทั้งหมด",
"ยอดเงินทั้งหมด".tr(),
style: TextStyle(
color: Color(0xff65676b),
fontSize: 16,
@@ -295,7 +298,7 @@ class _PayQrPageState extends State<PayThaiQr> {
),
),
Text(
" บาท",
" ${"Baht".tr()}",
textAlign: TextAlign.right,
style: TextStyle(
color: Color(0xff65676b),
@@ -318,36 +321,25 @@ class _PayQrPageState extends State<PayThaiQr> {
initC2B();
}
},
child: Container(
child: SizedBox(
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(
"ยืนยัน",
textAlign: TextAlign.center,
style: GoogleFonts.kanit(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.w500,
),
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,
),
),
],
),
),
),
),