QR Code loading issue resolved

lib/pages/BookAppointment/BookSuccess.dart

@@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
@@ -604,6 +605,7 @@ class _BookSuccessState extends State<BookSuccess> {
   }
 
   checkPaymentStatus(AppoitmentAllHistoryResultList appo) {
+    GifLoaderDialogUtils.showMyDialog(context);
     DoctorsListService service = new DoctorsListService();
     service
         .checkPaymentStatus(
@@ -617,21 +619,23 @@ class _BookSuccessState extends State<BookSuccess> {
       if (paymentInfo == 'Success') {
         createAdvancePayment(res, appo);
       } else {
+        GifLoaderDialogUtils.hideDialog(context);
         AppToast.showErrorToast(message: res['Response_Message']);
       }
     }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
       print(err);
-    }).showProgressBar(
+    });
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
   }
 
   getApplePayAPQ(AppoitmentAllHistoryResultList appo) {
     DoctorsListService service = new DoctorsListService();
     service
         .checkPaymentStatus(
-        Utils.getAppointmentTransID(
+            Utils.getAppointmentTransID(
-            appo.projectID, appo.clinicID, appo.appointmentNo),
+                appo.projectID, appo.clinicID, appo.appointmentNo),
-        context)
+            context)
         .then((res) {
       print("Printing Payment Status Reponse!!!!");
       print(res);
@@ -644,15 +648,15 @@ class _BookSuccessState extends State<BookSuccess> {
     }).catchError((err) {
       print(err);
     }).showProgressBar(
-        text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
   }
 
   createAdvancePayment(res, AppoitmentAllHistoryResultList appo) {
     DoctorsListService service = new DoctorsListService();
     String paymentReference = res['Fort_id'].toString();
     service
-        .createAdvancePayment(
+        .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'],
-            appo, appo.projectID.toString(), res['Amount'], res['Fort_id'], res['PaymentMethod'], context)
+            res['Fort_id'], res['PaymentMethod'], context)
         .then((res) {
       print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']);
       addAdvancedNumberRequest(
@@ -660,9 +664,10 @@ class _BookSuccessState extends State<BookSuccess> {
           paymentReference,
           appo.appointmentNo.toString());
     }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
       print(err);
-    }).showProgressBar(
+    });
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
   }
 
   addAdvancedNumberRequest(
@@ -675,9 +680,10 @@ class _BookSuccessState extends State<BookSuccess> {
       print(res);
       getAppoQR(context);
     }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
       print(err);
-    }).showProgressBar(
+    });
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
   }
 
   Widget _getQRAppo() {
@@ -831,11 +837,13 @@ class _BookSuccessState extends State<BookSuccess> {
         .generateAppointmentQR(widget.patientShareResponse, context)
         .then((res) {
       print(res);
+      GifLoaderDialogUtils.hideDialog(context);
       navigateToQR(context, res['AppointmentQR']);
     }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(context);
+      AppToast.showErrorToast(message: err);
       print(err);
-    }).showProgressBar(
+    });
-            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
   }
 
   Future navigateToQR(context, String appoQR) async {

lib/pages/BookAppointment/QRCode.dart

@@ -151,6 +151,7 @@ class _QRCodeState extends State<QRCode> {
                 ),
               ),
               Container(
+                margin: EdgeInsets.zero,
                 alignment: Alignment.bottomCenter,
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.end,