From 0b2002d4dd2ca6d150895a5f36a7d325fc4c0e24 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Tue, 2 Mar 2021 13:37:49 +0200 Subject: [PATCH] finish payment order --- lib/pages/pharmacy/order/OrderDetails.dart | 13 +++++++-- lib/widgets/in_app_browser/InAppBrowser.dart | 29 -------------------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart index 0c71bb38..d5604d2f 100644 --- a/lib/pages/pharmacy/order/OrderDetails.dart +++ b/lib/pages/pharmacy/order/OrderDetails.dart @@ -1,9 +1,11 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -47,6 +49,7 @@ class _OrderDetailsPageState extends State { var isActiveDelivery = true; var dataIsCancel; var dataIsRefund; + BuildContext context; MyInAppBrowser browser; @@ -63,6 +66,7 @@ class _OrderDetailsPageState extends State { @override Widget build(BuildContext context) { + this.context = context; return BaseView( onModelReady: (model) => model.getOrderDetails(widget.orderModel.id), builder: (_, model, wi) => AppScaffold( @@ -758,8 +762,13 @@ class _OrderDetailsPageState extends State { }); } - onBrowserExit(bool isPaymentMade) { + onBrowserExit(AppoitmentAllHistoryResultList appo, bool isPaymentMade) { print("onBrowserExit Called!!!!"); - // if (isPaymentMade) checkPaymentStatus(appo); + if (isPaymentMade) { + AppToast.showSuccessToast( + message: "شكراً\nPayment status for your order is Paid"); + Navigator.pop(context); + Navigator.pop(context); + } } } diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 0dc8a09c..19da88e7 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -337,35 +337,6 @@ class MyInAppBrowser extends InAppBrowser { ''; } - String getPharmacyForm() { - return ' ' + - '' + - '' + - '
' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '
' + - '' + - '' + - ''; - } } class MyChromeSafariBrowser extends ChromeSafariBrowser {