ui improvements
This commit is contained in:
@@ -62,11 +62,12 @@ class ConfirmController extends ChangeNotifier {
|
||||
.formData = transactionController.model.formData.copyWith(
|
||||
type: "REQUEST",
|
||||
trace: transactionController.model.confirmationData['trace'],
|
||||
id: transactionController.model.confirmationData['id'],
|
||||
authType: transactionController.model.selectedPaymentProcessor.authType,
|
||||
);
|
||||
|
||||
dynamic response = await http.post(
|
||||
'/transaction',
|
||||
'/public/transaction',
|
||||
transactionController.model.formData,
|
||||
);
|
||||
logger.i(response.toString());
|
||||
@@ -107,12 +108,11 @@ class ConfirmController extends ChangeNotifier {
|
||||
|
||||
Future<void> pollTransaction(String uid) async {
|
||||
while (!model.isCancelled) {
|
||||
|
||||
// Check again after delay in case it was cancelled during the delay
|
||||
if (model.isCancelled) break;
|
||||
|
||||
try {
|
||||
dynamic response = await http.get('/transaction/poll/$uid');
|
||||
dynamic response = await http.get('/public/transaction/poll/$uid');
|
||||
logger.i(response.toString());
|
||||
|
||||
if (response['status'] == 'SUCCESS') {
|
||||
|
||||
@@ -200,72 +200,99 @@ class _ConfirmScreenState extends State<ConfirmScreen>
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Our Charge",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
if (controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["charge"] !=
|
||||
0)
|
||||
Column(
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Our Charge",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["charge"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["charge"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Gateway Charge",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
const SizedBox(height: 10),
|
||||
],
|
||||
),
|
||||
if (controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["gatewayCharge"] !=
|
||||
0)
|
||||
Column(
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Gateway Charge",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["gatewayCharge"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["gatewayCharge"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Tax",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
const SizedBox(height: 10),
|
||||
],
|
||||
),
|
||||
if (controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["tax"] !=
|
||||
0)
|
||||
Column(
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
"Tax",
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["tax"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Text(
|
||||
controller
|
||||
.transactionController
|
||||
.model
|
||||
.confirmationData["tax"]
|
||||
.toString(),
|
||||
style: TextStyle(fontSize: 16),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
const SizedBox(height: 10),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
@@ -287,11 +314,28 @@ class _ConfirmScreenState extends State<ConfirmScreen>
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 5),
|
||||
Text(
|
||||
"NB: Your payment provider may charge additional fees.",
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
_buildPaymentProcessorButton(),
|
||||
const SizedBox(height: 20),
|
||||
Center(
|
||||
child: OutlinedButton(
|
||||
child: Text('Cancel'),
|
||||
onPressed: () {
|
||||
context.go('/');
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user