From 32757c85f8af592841b6abbea20fdf08ba6e90ee Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@cloudsolutions.com.sa>
Date: Wed, 31 Jan 2024 09:53:56 +0300
Subject: [PATCH] updates

---
 .../new_Home_health_care_step_three_page.dart        |  8 --------
 lib/pages/BookAppointment/BookSuccess.dart           |  2 +-
 lib/pages/Covid-DriveThru/covid-payment-summary.dart | 12 +++++++-----
 lib/pages/ToDoList/ToDo.dart                         |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
index d580f2bb..61a51d1b 100644
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
@@ -104,14 +104,6 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
                     ),
                     Container(
                         height: 200,
-                        // child: GoogleMap(
-                        //   mapType: MapType.normal,
-                        //   markers: markers,
-                        //   initialCameraPosition: _kGooglePlex,
-                        //   onMapCreated: (GoogleMapController controller) {
-                        //     _controller.complete(controller);
-                        //   },
-                        // ),
                         decoration: containerColorRadiusBorderWidth(Colors.transparent, 12,Colors.transparent,0.5),
                         clipBehavior: Clip.antiAlias,
                         child: Image.network(
diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart
index 810f977b..b959abd1 100644
--- a/lib/pages/BookAppointment/BookSuccess.dart
+++ b/lib/pages/BookAppointment/BookSuccess.dart
@@ -791,7 +791,7 @@ class _BookSuccessState extends State<BookSuccess> {
   onBrowserExit(AppoitmentAllHistoryResultList appo, bool isPaymentMade) {
     try {
       if (selectedPaymentMethod == "TAMARA") {
-        checkTamaraPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), appo);
+        checkTamaraPaymentStatus(transID, appo);
         // if (tamaraPaymentStatus != null && tamaraPaymentStatus.toLowerCase() == "approved") {
         //   updateTamaraRequestStatus("success", "14", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID, num.parse(selectedInstallments), appo);
         // } else {
diff --git a/lib/pages/Covid-DriveThru/covid-payment-summary.dart b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
index e1f00173..5ba533da 100644
--- a/lib/pages/Covid-DriveThru/covid-payment-summary.dart
+++ b/lib/pages/Covid-DriveThru/covid-payment-summary.dart
@@ -31,7 +31,6 @@ class CovidPaymentSummary extends StatefulWidget {
   MyInAppBrowser browser;
   AuthenticatedUser authenticatedUser;
   AppSharedPreferences sharedPref = AppSharedPreferences();
-  String transID = "";
 
   CovidPaymentSummary({@required this.patientShareResponse, this.selectedPaymentMethod});
 
@@ -44,6 +43,8 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
   String tamaraPaymentStatus;
   String tamaraOrderID;
 
+  String transID = "";
+
   @override
   Widget build(BuildContext context) {
     projectViewModel = Provider.of(context);
@@ -216,7 +217,7 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
 
   openPayment(String paymentMethod, AuthenticatedUser authenticatedUser, num amount, PatientShareResponse patientShareResponse, AppoitmentAllHistoryResultList appo) async {
     widget.browser = new MyInAppBrowser(onExitCallback: onBrowserExit, appo: appo, onLoadStartCallback: onBrowserLoadStart, context: context);
-
+    transID = Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo);
     widget.browser.openPaymentBrowser(
         amount,
         "Covid appointment payment",
@@ -276,7 +277,8 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
     print("onBrowserExit Called!!!!");
     try {
       if (widget.selectedPaymentMethod == "TAMARA") {
-        checkTamaraPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), appo);
+        // checkTamaraPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), appo);
+        checkTamaraPaymentStatus(transID, appo);
         // if (tamaraPaymentStatus != null && tamaraPaymentStatus.toLowerCase() == "approved") {
         //   updateTamaraRequestStatus("success", "14", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID, num.parse(widget.selectedInstallmentPlan), appo);
         // } else {
@@ -299,7 +301,7 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
       if (res["status"].toString().toLowerCase() == "success") {
         updateTamaraRequestStatus("success", "14", orderID, tamaraOrderID, num.parse(widget.selectedInstallmentPlan), appo);
       } else {
-        updateTamaraRequestStatus("Failed", "00", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID != null ? tamaraOrderID : "",
+        updateTamaraRequestStatus("Failed", "00", transID, tamaraOrderID != null ? tamaraOrderID : "",
             num.parse(widget.selectedInstallmentPlan), appo);
       }
     }).catchError((err) {
@@ -376,7 +378,7 @@ class _CovidPaymentSummaryState extends State<CovidPaymentSummary> {
   checkPaymentStatus(AppoitmentAllHistoryResultList appo) {
     GifLoaderDialogUtils.showMyDialog(context);
     DoctorsListService service = new DoctorsListService();
-    service.checkPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), false, context).then((res) {
+    service.checkPaymentStatus(transID, false, context).then((res) {
       print("Printing Payment Status Reponse!!!!");
       print(res);
       String paymentInfo = res['Response_Message'];
diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart
index d16c6579..00c5b25b 100644
--- a/lib/pages/ToDoList/ToDo.dart
+++ b/lib/pages/ToDoList/ToDo.dart
@@ -1126,7 +1126,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
   onBrowserExit(AppoitmentAllHistoryResultList appo, bool isPaymentMade) {
     print("onBrowserExit Called!!!!");
     if (selectedPaymentMethod == "TAMARA") {
-      checkTamaraPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), appo);
+      checkTamaraPaymentStatus(transID, appo);
       // if (tamaraPaymentStatus != null && tamaraPaymentStatus.toLowerCase() == "approved") {
       //   updateTamaraRequestStatus("success", "14", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID, num.parse(selectedInstallments), appo);
       // } else {
@@ -1146,7 +1146,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
         updateTamaraRequestStatus("success", "14", orderID, res["tamara_order_id"], num.parse(selectedInstallments), appo);
       } else {
         updateTamaraRequestStatus(
-            "Failed", "00", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID != null ? tamaraOrderID : "", num.parse(selectedInstallments), appo);
+            "Failed", "00", transID, tamaraOrderID != null ? tamaraOrderID : "", num.parse(selectedInstallments), appo);
       }
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);