vusakhoza/velocity-pay-flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes on tran flow

Browse Source
This commit is contained in:
Vusumuzi Khoza
2026-03-26 19:53:24 +02:00
parent ce1e73448f
commit 2f01bc0a3e
7 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/.env
View File

@@ -1,5 +1,5 @@
BASE_URL=https://peakapi.qantra.co.zw/api
; BASE_URL=http://192.168.100.26:6950/api
; BASE_URL=https://peakapi.qantra.co.zw/api
BASE_URL=http://192.168.100.138:6950/api
; BASE_URL=http://173.212.247.232:6950/api
; BASE_URL=http://10.69.5.201:6950/api
; BASE_URL=http://192.168.120.160:6950/api
@@ -7,5 +7,5 @@ BASE_URL=https://peakapi.qantra.co.zw/api
; BASE_URL=http://172.20.5.105:6950/api
; BASE_URL=http://10.10.3.92:6950/api
CLIENTID=77433712483-ng7pntvcpf6tnjccriuqm8dbna8vvp3b.apps.googleusercontent.com
SIMULATE_PAYMENT_SUCCESS=false
; SIMULATE_PAYMENT_SUCCESS=true
; SIMULATE_PAYMENT_SUCCESS=false
SIMULATE_PAYMENT_SUCCESS=true

6
lib/http/http.dart
View File

@@ -11,9 +11,9 @@ class Http {
Http() {
dio.options.baseUrl = baseUrl;
dio.options.connectTimeout = const Duration(seconds: 120);
dio.options.receiveTimeout = const Duration(seconds: 120);
dio.options.sendTimeout = const Duration(seconds: 120);
// dio.options.connectTimeout = const Duration(seconds: 120);
// dio.options.receiveTimeout = const Duration(seconds: 120);
// dio.options.sendTimeout = const Duration(seconds: 120);
dio.interceptors.add(
LogInterceptor(
request: true,

22
lib/screens/confirm/confirm_controller.dart
View File

@@ -53,7 +53,7 @@ class ConfirmController extends ChangeNotifier {
});
}
Future<void> doTransaction() async {
Future<Map<String, dynamic>?> doTransaction() async {
try {
model.isLoading = true;
notifyListeners();
@@ -82,20 +82,9 @@ class ConfirmController extends ChangeNotifier {
transactionController.updateReceiptData(response);
if (transactionController.model.selectedPaymentProcessor.authType == "WEB") {
if (context.mounted) {
if(kIsWeb){
// the one we use here depends on when mpgs embedded bug will be fixed
context.push('/gateway-web');
// context.push('/gateway-redirect');
}else {
context.push('/gateway');
}
}
} else {
await pollTransaction(transactionController.model.receiptData?['id']);
context.push('/poll');
}
model.isLoading = false;
notifyListeners();
return response;
} else {
model.status = response['status'];
model.errorMessage = response['errorMessage'];
@@ -111,6 +100,7 @@ class ConfirmController extends ChangeNotifier {
model.isLoading = false;
notifyListeners();
return null;
}
Future<void> pollTransaction(String uid) async {
@@ -125,6 +115,7 @@ class ConfirmController extends ChangeNotifier {
if (response['status'] == 'SUCCESS') {
model.status = response['status'];
transactionController.updateReceiptData(response);
model.isCancelled = true;
notifyListeners();
break;
}
@@ -145,6 +136,5 @@ class ConfirmController extends ChangeNotifier {
void dispose() {
// TODO: implement dispose
super.dispose();
model.isCancelled = true;
}
}

35
lib/screens/confirm/confirm_screen.dart
View File

@@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:qpay/models/responsive_policy.dart';
@@ -59,6 +60,36 @@ class _ConfirmScreenState extends State<ConfirmScreen>
super.dispose();
}
void _handlePayment() async {
try {
if (controller.model.isLoading) return;
final response = await controller.doTransaction();
if (response!['status'] == 'FAILED') {
return;
}
if (!mounted) return;
if (controller.transactionController.model.selectedPaymentProcessor.authType == "WEB") {
if(kIsWeb){
// the one we use here depends on when mpgs embedded bug will be fixed
context.push('/gateway-web');
// context.push('/gateway-redirect');
}else {
context.push('/gateway');
}
} else {
if (!mounted) return;
context.push('/poll');
}
}catch (e,s) {
print(e);
print(s);
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -384,9 +415,7 @@ class _ConfirmScreenState extends State<ConfirmScreen>
borderRadius: BorderRadius.circular(12),
),
onTap: () async {
if (controller.model.isLoading) return;
await controller.doTransaction();
_handlePayment();
},
child: ListTile(
leading: Container(

3
lib/screens/gateway/gateway_controller.dart
View File

@@ -62,17 +62,18 @@ class GatewayController extends ChangeNotifier {
model.status = response['status'];
transactionController.model.paymentStatus = response['paymentStatus'];
finishLoading();
if(model.status == 'SUCCESS') {
transactionController.updateReceiptData(response);
}
notifyListeners();
} catch (e) {
finishLoading();
logger.e(e);
_showErrorSnackBar(
"Network error. Please try again or contact support",
);
}
finishLoading();
}
Future<void> pollTransaction(String uid) async {

1
lib/screens/poll/poll_screen.dart
View File

@@ -104,6 +104,7 @@ class _PollScreenState extends State<PollScreen> {
child: OutlinedButton(
child: Text('Retry'),
onPressed: () {
controller.model.isCancelled = false;
controller.pollTransaction(transactionController.model.confirmationData['id']);
},
),

6
web/index.html
View File

@@ -33,10 +33,10 @@
<title>Velocity</title>
<link rel="manifest" href="manifest.json">
<script src="https://na.gateway.mastercard.com/static/checkout/checkout.min.js">
</script>
<!-- <script src="https://test-gateway.mastercard.com/static/checkout/checkout.min.js">-->
<!-- <script src="https://na.gateway.mastercard.com/static/checkout/checkout.min.js">-->
<!-- </script>-->
<script src="https://test-gateway.mastercard.com/static/checkout/checkout.min.js">
</script>
<script type="text/javascript">
function configure(sessionID) {