Tamara implementation & enhancements

lib/core/api/api_client.dart

@@ -34,6 +34,7 @@ abstract class ApiClient {
     required Function(dynamic response, int statusCode) onSuccess,
     required Function(String error, int statusCode) onFailure,
     Map<String, dynamic>? queryParams,
+    bool isAllowAny,
     bool isExternal,
     bool isRCService,
   });
@@ -324,6 +325,7 @@ class ApiClientImp implements ApiClient {
       {required Function(dynamic response, int statusCode) onSuccess,
       required Function(String error, int statusCode) onFailure,
       Map<String, dynamic>? queryParams,
+      bool isAllowAny = false,
       bool isExternal = false,
       bool isRCService = false}) async {
     String url;

lib/core/api_consts.dart

@@ -743,6 +743,9 @@ class ApiConsts {
   static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
   // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
 
+  static String TAMARA_URL = "https://mdlaboratories.com/tamaralive/Home/Checkout";
+  static String GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamaralive/Home/GetInstallments";
+
 // var payFortEnvironment = FortEnvironment.test;
 // var applePayMerchantId = "merchant.com.hmgwebservices.uat";
 
@@ -753,18 +756,25 @@ class ApiConsts {
         payFortEnvironment = FortEnvironment.production;
         applePayMerchantId = "merchant.com.hmgwebservices";
         SERVICE_URL = "https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx";
+        TAMARA_URL = "https://mdlaboratories.com/tamaralive/Home/Checkout";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamaralive/Home/GetInstallments";
         break;
       case AppEnvironmentTypeEnum.dev:
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx';
+        TAMARA_URL = "https://mdlaboratories.com/tamara/Home/Checkout";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamara/Home/GetInstallments";
         break;
       case AppEnvironmentTypeEnum.uat:
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx';
+        TAMARA_URL = "https://mdlaboratories.com/tamara/Home/Checkout";
+        // GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamara/Home/GetInstallments";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamaralive/Home/GetInstallments";
         break;
       case AppEnvironmentTypeEnum.preProd:
         
@@ -772,18 +782,24 @@ class ApiConsts {
         payFortEnvironment = FortEnvironment.production;
         applePayMerchantId = "merchant.com.hmgwebservices";
         SERVICE_URL = "https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx";
+        TAMARA_URL = "https://mdlaboratories.com/tamara/Home/Checkout";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamara/Home/GetInstallments";
         break;
       case AppEnvironmentTypeEnum.qa:
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx';
+        TAMARA_URL = "https://mdlaboratories.com/tamara/Home/Checkout";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamara/Home/GetInstallments";
         break;
       case AppEnvironmentTypeEnum.staging:
         baseUrl = "https://uat.hmgwebservices.com/";
         payFortEnvironment = FortEnvironment.test;
         applePayMerchantId = "merchant.com.hmgwebservices.uat";
         SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx';
+        TAMARA_URL = "https://mdlaboratories.com/tamara/Home/Checkout";
+        GET_TAMARA_INSTALLMENTS_URL = "https://mdlaboratories.com/tamara/Home/GetInstallments";
         break;
     }
   }

lib/features/medical_file/medical_file_view_model.dart

@@ -108,12 +108,17 @@ class MedicalFileViewModel extends ChangeNotifier {
     final result = await medicalFileRepo.getPatientVaccinesList();
 
     result.fold(
-      (failure) async => await errorHandlerService.handleError(
+      // (failure) async => await errorHandlerService.handleError(
-        failure: failure,
+      //   failure: failure,
-        onOkPressed: () {
+      //   onOkPressed: () {
-          onError!(failure.message);
+      //     onError!(failure.message);
-        },
+      //   },
-      ),
+      // ),
+      (failure) async {
+        // onError!(failure.message);
+        isPatientVaccineListLoading = false;
+        notifyListeners();
+      },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
           // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
@@ -134,12 +139,16 @@ class MedicalFileViewModel extends ChangeNotifier {
     final result = await medicalFileRepo.getPatientSickLeavesList();
 
     result.fold(
-      (failure) async => await errorHandlerService.handleError(
+      // (failure) async => await errorHandlerService.handleError(
-        failure: failure,
+      //   failure: failure,
-        onOkPressed: () {
+      //   onOkPressed: () {
-          onError!(failure.message);
+      //     onError!(failure.message);
-        },
+      //   },
-      ),
+      // ),
+      (failure) async {
+        isPatientSickLeaveListLoading = false;
+        notifyListeners();
+      },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
           // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});

lib/features/my_appointments/models/resp_models/get_tamara_installments_details_response_model.dart

@@ -0,0 +1,83 @@
+class GetTamaraInstallmentsDetailsResponseModel {
+  String? name;
+  String? description;
+  MinLimit? minLimit;
+  MinLimit? maxLimit;
+  List<SupportedInstalments>? supportedInstalments;
+
+  GetTamaraInstallmentsDetailsResponseModel({this.name, this.description, this.minLimit, this.maxLimit, this.supportedInstalments});
+
+  GetTamaraInstallmentsDetailsResponseModel.fromJson(Map<String, dynamic> json) {
+    name = json['name'];
+    description = json['description'];
+    minLimit = json['minLimit'] != null ? new MinLimit.fromJson(json['minLimit']) : null;
+    maxLimit = json['maxLimit'] != null ? new MinLimit.fromJson(json['maxLimit']) : null;
+    if (json['supportedInstalments'] != null) {
+      supportedInstalments = <SupportedInstalments>[];
+      json['supportedInstalments'].forEach((v) {
+        supportedInstalments!.add(new SupportedInstalments.fromJson(v));
+      });
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['name'] = this.name;
+    data['description'] = this.description;
+    if (this.minLimit != null) {
+      data['minLimit'] = this.minLimit!.toJson();
+    }
+    if (this.maxLimit != null) {
+      data['maxLimit'] = this.maxLimit!.toJson();
+    }
+    if (this.supportedInstalments != null) {
+      data['supportedInstalments'] = this.supportedInstalments!.map((v) => v.toJson()).toList();
+    }
+    return data;
+  }
+}
+
+class MinLimit {
+  String? currency;
+  num? amount;
+
+  MinLimit({this.currency, this.amount});
+
+  MinLimit.fromJson(Map<String, dynamic> json) {
+    currency = json['currency'];
+    amount = json['amount'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['currency'] = this.currency;
+    data['amount'] = this.amount;
+    return data;
+  }
+}
+
+class SupportedInstalments {
+  int? instalments;
+  MinLimit? minLimit;
+  MinLimit? maxLimit;
+
+  SupportedInstalments({this.instalments, this.minLimit, this.maxLimit});
+
+  SupportedInstalments.fromJson(Map<String, dynamic> json) {
+    instalments = json['instalments'];
+    minLimit = json['minLimit'] != null ? new MinLimit.fromJson(json['minLimit']) : null;
+    maxLimit = json['maxLimit'] != null ? new MinLimit.fromJson(json['maxLimit']) : null;
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['instalments'] = this.instalments;
+    if (this.minLimit != null) {
+      data['minLimit'] = this.minLimit!.toJson();
+    }
+    if (this.maxLimit != null) {
+      data['maxLimit'] = this.maxLimit!.toJson();
+    }
+    return data;
+  }
+}

lib/features/my_appointments/my_appointments_repo.dart

@@ -7,6 +7,7 @@ import 'package:hmg_patient_app_new/core/cache_consts.dart';
 import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart';
 import 'package:hmg_patient_app_new/core/exceptions/api_failure.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/get_tamara_installments_details_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/hospital_model.dart' show HospitalsModel;
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart';
@@ -44,6 +45,8 @@ abstract class MyAppointmentsRepo {
   Future<Either<Failure, GenericApiModel<List<PatientAppointmentHistoryResponseModel>>>> getPatientDoctorsList();
 
   Future<Either<Failure, GenericApiModel<dynamic>>> insertLiveCareVIDARequest({required clientRequestID, required PatientAppointmentHistoryResponseModel patientAppointmentHistoryResponseModel});
+
+  Future<Either<Failure, GenericApiModel<GetTamaraInstallmentsDetailsResponseModel>>> getTamaraInstallmentsDetails();
 }
 
 class MyAppointmentsRepoImp implements MyAppointmentsRepo {
@@ -543,4 +546,41 @@ class MyAppointmentsRepoImp implements MyAppointmentsRepo {
       return Left(UnknownFailure(e.toString()));
     }
   }
+
+  @override
+  Future<Either<Failure, GenericApiModel<GetTamaraInstallmentsDetailsResponseModel>>> getTamaraInstallmentsDetails() async {
+    try {
+      GenericApiModel<GetTamaraInstallmentsDetailsResponseModel>? apiResponse;
+      Failure? failure;
+      await apiClient.get(
+        ApiConsts.GET_TAMARA_INSTALLMENTS_URL,
+        isExternal: true,
+        isAllowAny: true,
+        onFailure: (error, statusCode, {messageStatus, failureType}) {
+          failure = failureType;
+        },
+        onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
+          try {
+            final list = response;
+
+            final tamaraInstallmentsList = GetTamaraInstallmentsDetailsResponseModel.fromJson(list.first);
+
+            apiResponse = GenericApiModel<GetTamaraInstallmentsDetailsResponseModel>(
+              messageStatus: messageStatus,
+              statusCode: statusCode,
+              errorMessage: null,
+              data: tamaraInstallmentsList,
+            );
+          } catch (e) {
+            failure = DataParsingFailure(e.toString());
+          }
+        },
+      );
+      if (failure != null) return Left(failure!);
+      if (apiResponse == null) return Left(ServerFailure("Unknown error"));
+      return Right(apiResponse!);
+    } catch (e) {
+      return Left(UnknownFailure(e.toString()));
+    }
+  }
 }

lib/features/my_appointments/my_appointments_view_model.dart

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/get_tamara_installments_details_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_share_response_model.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_repo.dart';
 import 'package:hmg_patient_app_new/services/error_handler_service.dart';
 
-import '../../core/utils/doctor_response_mapper.dart' show DoctorMapper;
-
 class MyAppointmentsViewModel extends ChangeNotifier {
   int selectedTabIndex = 0;
 
@@ -32,6 +31,9 @@ class MyAppointmentsViewModel extends ChangeNotifier {
 
   PatientAppointmentShareResponseModel? patientAppointmentShareResponseModel;
 
+  GetTamaraInstallmentsDetailsResponseModel? getTamaraInstallmentsDetailsResponseModel;
+  bool isTamaraDetailsLoading = false;
+
   MyAppointmentsViewModel({required this.myAppointmentsRepo, required this.errorHandlerService, required this.appState});
 
   void onTabChange(int index) {
@@ -50,6 +52,7 @@ class MyAppointmentsViewModel extends ChangeNotifier {
       patientMyDoctorsList.clear();
       isPatientMyDoctorsLoading = true;
     }
+    isTamaraDetailsLoading = true;
     isAppointmentPatientShareLoading = true;
     notifyListeners();
   }
@@ -79,6 +82,11 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  setIsTamaraDetailsLoading(bool val) {
+    isTamaraDetailsLoading = val;
+    notifyListeners();
+  }
+
   setAppointmentReminder(bool value, PatientAppointmentHistoryResponseModel item) {
     int index = patientAppointmentsHistoryList.indexOf(item);
     if (index != -1) {
@@ -142,7 +150,13 @@ class MyAppointmentsViewModel extends ChangeNotifier {
     final result = await myAppointmentsRepo.getPatientShareAppointment(projectID: projectID, clinicID: clinicID, appointmentNo: appointmentNo, isLiveCareAppointment: isLiveCareAppointment);
 
     result.fold(
-      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (failure) async {
+        await errorHandlerService.handleError(
+            failure: failure,
+            onOkPressed: () {
+              onError!(failure.message);
+            });
+      },
       (apiResponse) {
         if (apiResponse.messageStatus == 2) {
           // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
@@ -337,4 +351,31 @@ class MyAppointmentsViewModel extends ChangeNotifier {
       },
     );
   }
+
+  Future<void> getTamaraInstallmentsDetails({Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await myAppointmentsRepo.getTamaraInstallmentsDetails();
+
+    result.fold(
+      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (apiResponse) {
+        getTamaraInstallmentsDetailsResponseModel = apiResponse.data!;
+        isTamaraDetailsLoading = false;
+        notifyListeners();
+        if (onSuccess != null) {
+          onSuccess(apiResponse);
+        }
+
+        // if (apiResponse.messageStatus == 2) {
+        //   onError!(apiResponse.errorMessage!);
+        //   // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
+        // } else if (apiResponse.messageStatus == 1) {
+        //   getTamaraInstallmentsDetailsResponseModel = apiResponse.data!;
+        //   notifyListeners();
+        //   if (onSuccess != null) {
+        //     onSuccess(apiResponse);
+        //   }
+        // }
+      },
+    );
+  }
 }

lib/presentation/appointments/appointment_payment_page.dart

@@ -51,17 +51,28 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
 
   String transID = "";
 
+  bool isShowTamara = false;
+
   @override
   void initState() {
     scheduleMicrotask(() {
       payfortViewModel.initPayfortViewModel();
+      myAppointmentsViewModel.getTamaraInstallmentsDetails().then((val) {
+        if (myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! >= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.minLimit!.amount! &&
+            myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax! <= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.maxLimit!.amount!) {
+          setState(() {
+            isShowTamara = true;
+          });
+        }
+      });
       payfortViewModel.setIsApplePayConfigurationLoading(false);
       myAppointmentsViewModel.getPatientShareAppointment(
         widget.patientAppointmentHistoryResponseModel.projectID,
         widget.patientAppointmentHistoryResponseModel.clinicID,
-        widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+          widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false, onError: (err) {
-        widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment ?? false,
+        Navigator.of(context).pop();
-      );
+        Navigator.of(context).pop();
+      });
     });
     super.initState();
   }
@@ -162,11 +173,12 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                         openPaymentURL("visa");
                       }),
                       SizedBox(height: 16.h),
-                      Container(
+                      isShowTamara
-                        decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                          ? Container(
-                          color: AppColors.whiteColor,
+                              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
-                          borderRadius: 20.h,
+                                color: AppColors.whiteColor,
-                          hasShadow: false,
+                                borderRadius: 20.h,
+                                hasShadow: false,
                         ),
                         child: Row(
                           mainAxisSize: MainAxisSize.max,
@@ -196,7 +208,8 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                       ).paddingSymmetrical(24.h, 0.h).onPress(() {
                         selectedPaymentMethod = "TAMARA";
                         openPaymentURL("tamara");
-                      }),
+                            })
+                          : SizedBox.shrink(),
                     ],
                   ),
                 ),

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -56,10 +56,20 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
 
   String transID = "";
 
+  bool isShowTamara = false;
+
   @override
   void initState() {
     scheduleMicrotask(() {
       payfortViewModel.initPayfortViewModel();
+      myAppointmentsViewModel.getTamaraInstallmentsDetails().then((val) {
+        if (num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total!) >= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.minLimit!.amount! &&
+            num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total!) <= myAppointmentsViewModel.getTamaraInstallmentsDetailsResponseModel!.maxLimit!.amount!) {
+          setState(() {
+            isShowTamara = true;
+          });
+        }
+      });
     });
     super.initState();
   }
@@ -67,9 +77,9 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
   @override
   Widget build(BuildContext context) {
     appState = getIt.get<AppState>();
-    myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context);
+    myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context, listen: false);
     immediateLiveCareViewModel = Provider.of<ImmediateLiveCareViewModel>(context, listen: false);
-    payfortViewModel = Provider.of<PayfortViewModel>(context);
+    payfortViewModel = Provider.of<PayfortViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
       body: Consumer<MyAppointmentsViewModel>(builder: (context, myAppointmentsVM, child) {
@@ -161,9 +171,10 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                         openPaymentURL("visa");
                       }),
                       SizedBox(height: 16.h),
-                      Container(
+                      isShowTamara
-                        decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                          ? Container(
-                          color: AppColors.whiteColor,
+                              decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
+                                color: AppColors.whiteColor,
                           borderRadius: 20.h,
                           hasShadow: false,
                         ),
@@ -195,7 +206,8 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                       ).paddingSymmetrical(24.h, 0.h).onPress(() {
                         selectedPaymentMethod = "TAMARA";
                         openPaymentURL("tamara");
-                      }),
+                            })
+                          : SizedBox.shrink(),
                     ],
                   ),
                 ),
@@ -442,6 +454,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     applePayInsertRequest.clientRequestID = transID;
     applePayInsertRequest.clinicID = immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID!;
 
+    // TODO: Need to pass dynamic currency coming from the API
     applePayInsertRequest.currency = appState.getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED";
     applePayInsertRequest.customerEmail = "CustID_${appState.getAuthenticatedUser()!.patientId.toString()}@HMG.com";
     applePayInsertRequest.customerID = appState.getAuthenticatedUser()!.patientId.toString();

lib/presentation/home/landing_page.dart

@@ -344,10 +344,10 @@ class _LandingPageState extends State<LandingPage> {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          "Quick Links".toText16(isBold: true),
+                          "Quick Links".needTranslation.toText16(isBold: true),
                           Row(
                             children: [
-                              "View medical file".toText12(color: AppColors.primaryRedColor),
+                              "View medical file".needTranslation.toText12(color: AppColors.primaryRedColor),
                               SizedBox(width: 2.h),
                               Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 10.h),
                             ],

lib/presentation/lab/lab_result_item_view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/app_export.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
+import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
@@ -49,7 +50,7 @@ class LabResultItemView extends StatelessWidget {
                         backgroundColor: getLabOrderStatusColor(labOrder?.status ?? 0).withOpacity(0.15),
                         textColor: getLabOrderStatusColor(labOrder?.status ?? 0),
                       ).toShimmer2(isShow: isLoading, width: 100),
-                      if (!isLoading) Icon(isExpanded ? Icons.expand_less : Icons.expand_more),
+                      // if (!isLoading) Icon(isExpanded ? Icons.expand_less : Icons.expand_more),
                     ],
                   ),
                   SizedBox(height: 8.h),
@@ -59,7 +60,7 @@ class LabResultItemView extends StatelessWidget {
                         isLoading ? "" : labOrder!.doctorImageURL!,
                         width: 24.h,
                         height: 24.h,
-                        fit: BoxFit.fill,
+                        fit: BoxFit.cover,
                         errorBuilder: (cxt, child, tr) {
                           return SizedBox(height: 24, width: 24);
                         },
@@ -69,71 +70,83 @@ class LabResultItemView extends StatelessWidget {
                     ],
                   ),
                   SizedBox(height: 8.h),
-                  Wrap(
+                  Row(
-                    spacing: 8.h,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    runSpacing: 0.h,
                     children: [
-                      AppCustomChipWidget(labelText: isLoading ? "null" : DateUtil.formatDateToDate(DateUtil.convertStringToDate(labOrder!.createdOn), false)).toShimmer2(isShow: isLoading, width: 70),
+                      Wrap(
-                      AppCustomChipWidget(labelText: isLoading ? "null" : labOrder!.clinicDescription!).toShimmer2(isShow: isLoading, width: 100),
+                        spacing: 8.h,
+                        runSpacing: 0.h,
+                        children: [
+                          AppCustomChipWidget(labelText: isLoading ? "null" : DateUtil.formatDateToDate(DateUtil.convertStringToDate(labOrder!.createdOn), false)).toShimmer2(isShow: isLoading, width: 70),
+                          AppCustomChipWidget(labelText: isLoading ? "null" : labOrder!.clinicDescription!).toShimmer2(isShow: isLoading, width: 100),
+                        ],
+                      ),
+                      Utils.buildSvgWithAssets(
+                        icon: AppAssets.forward_arrow_icon_small,
+                        iconColor: AppColors.textColor,
+                        width: 20.h,
+                        height: 14.h,
+                        fit: BoxFit.contain,
+                      ),
                     ],
                   ),
                 ],
               ),
             ),
-            AnimatedSwitcher(
+            // AnimatedSwitcher(
-              duration: Duration(milliseconds: 300),
+            //   duration: Duration(milliseconds: 300),
-              switchInCurve: Curves.easeIn,
+            //   switchInCurve: Curves.easeIn,
-              switchOutCurve: Curves.easeOut,
+            //   switchOutCurve: Curves.easeOut,
-              transitionBuilder: (Widget child, Animation<double> animation) {
+            //   transitionBuilder: (Widget child, Animation<double> animation) {
-                return FadeTransition(
+            //     return FadeTransition(
-                  opacity: animation,
+            //       opacity: animation,
-                  child: SizeTransition(
+            //       child: SizeTransition(
-                    sizeFactor: animation,
+            //         sizeFactor: animation,
-                    axisAlignment: 0.0,
+            //         axisAlignment: 0.0,
-                    child: child,
+            //         child: child,
-                  ),
+            //       ),
-                );
+            //     );
-              },
+            //   },
-              child: isExpanded
+            //   child: isExpanded
-                  ? Container(
+            //       ? Container(
-                      key: ValueKey<int>(index),
+            //           key: ValueKey<int>(index),
-                      padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h),
+            //           padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 8.h),
-                      child: Column(
+            //           child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
+            //             crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
+            //             children: [
-                          ...labOrder!.testDetails!.map((detail) {
+            //               ...labOrder!.testDetails!.map((detail) {
-                            return Padding(
+            //                 return Padding(
-                              padding: EdgeInsets.only(bottom: 8.h),
+            //                   padding: EdgeInsets.only(bottom: 8.h),
-                              child: '● ${detail.description}'.toText14(weight: FontWeight.w500),
+            //                   child: '● ${detail.description}'.toText14(weight: FontWeight.w500),
-                            );
+            //                 );
-                          }).toList(),
+            //               }).toList(),
-                          SizedBox(height: 16.h),
+            //               SizedBox(height: 16.h),
-                          Row(
+            //               Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            //                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
+            //                 children: [
-                              SizedBox(),
+            //                   SizedBox(),
-                              CustomButton(
+            //                   CustomButton(
-                                icon: AppAssets.view_report_icon,
+            //                     icon: AppAssets.view_report_icon,
-                                iconColor: AppColors.primaryRedColor,
+            //                     iconColor: AppColors.primaryRedColor,
-                                iconSize: 16.h,
+            //                     iconSize: 16.h,
-                                text: LocaleKeys.viewReport.tr(context: context),
+            //                     text: LocaleKeys.viewReport.tr(context: context),
-                                onPressed: () {},
+            //                     onPressed: () {},
-                                backgroundColor: AppColors.secondaryLightRedColor,
+            //                     backgroundColor: AppColors.secondaryLightRedColor,
-                                borderColor: AppColors.secondaryLightRedColor,
+            //                     borderColor: AppColors.secondaryLightRedColor,
-                                textColor: AppColors.primaryRedColor,
+            //                     textColor: AppColors.primaryRedColor,
-                                fontSize: 14,
+            //                     fontSize: 14,
-                                fontWeight: FontWeight.bold,
+            //                     fontWeight: FontWeight.bold,
-                                borderRadius: 12,
+            //                     borderRadius: 12,
-                                padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
+            //                     padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
-                                height: 40.h,
+            //                     height: 40.h,
-                              ),
+            //                   ),
-                            ],
+            //                 ],
-                          ),
+            //               ),
-                        ],
+            //             ],
-                      ),
+            //           ),
-                    )
+            //         )
-                  : SizedBox.shrink(key: ValueKey<int>(-index)),
+            //       : SizedBox.shrink(key: ValueKey<int>(-index)),
-            ),
+            // ),
           ],
         ),
       ),

lib/presentation/medical_file/medical_file_page.dart

@@ -79,7 +79,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
         insuranceViewModel.initInsuranceProvider();
         medicalFileViewModel.setIsPatientSickLeaveListLoading(true);
         medicalFileViewModel.getPatientSickLeaveList();
-        medicalFileViewModel.getFamilyFiles();
+        // medicalFileViewModel.getFamilyFiles();
         medicalFileViewModel.onTabChanged(0);
       }
     });
@@ -582,7 +582,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                                             myAppointmentsVM.patientMyDoctorsList[index].doctorImageURL!,
                                             width: 64.h,
                                             height: 64.h,
-                                            fit: BoxFit.fill,
+                                            fit: BoxFit.cover,
                                           ).circle(100).toShimmer2(isShow: false, radius: 50.h),
                                           SizedBox(height: 8.h),
                                           Expanded(

lib/presentation/medical_file/patient_sickleaves_list_page.dart

@@ -30,10 +30,7 @@ class _PatientSickleavesListPageState extends State<PatientSickleavesListPage> {
   void initState() {
     scheduleMicrotask(() {
       medicalFileViewModel.setIsPatientSickLeaveListLoading(true);
-      medicalFileViewModel.getPatientSickLeaveList(onError: (error) {
+      medicalFileViewModel.getPatientSickLeaveList();
-        Navigator.of(context).pop();
-        Navigator.of(context).pop();
-      });
     });
     super.initState();
   }
@@ -75,6 +72,7 @@ class _PatientSickleavesListPageState extends State<PatientSickleavesListPage> {
                                     child: PatientSickLeaveCard(
                                       patientSickLeavesResponseModel: medicalFileVM.patientSickLeaveList.first,
                                       isLoading: false,
+                                      isSickLeaveListPage: true,
                                     ).paddingSymmetrical(24.h, 0.0),
                                   ),
                                 ),

lib/presentation/medical_file/vaccine_list_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
+import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/medical_file/medical_file_view_model.dart';
@@ -28,10 +29,7 @@ class _VaccineListPageState extends State<VaccineListPage> {
   void initState() {
     scheduleMicrotask(() {
       medicalFileViewModel.setIsPatientVaccineListLoading(true);
-      medicalFileViewModel.getPatientVaccinesList(onError: (error) {
+      medicalFileViewModel.getPatientVaccinesList();
-        Navigator.of(context).pop();
-        Navigator.of(context).pop();
-      });
     });
     super.initState();
   }
@@ -51,7 +49,11 @@ class _VaccineListPageState extends State<VaccineListPage> {
                 SizedBox(height: 16.h),
                 ListView.separated(
                   scrollDirection: Axis.vertical,
-                  itemCount: medicalFileVM.isPatientVaccineListLoading ? 5 : medicalFileVM.patientVaccineList.length,
+                  itemCount: medicalFileVM.isPatientVaccineListLoading
+                      ? 5
+                      : medicalFileVM.patientVaccineList.isNotEmpty
+                          ? medicalFileVM.patientVaccineList.length
+                          : 1,
                   shrinkWrap: true,
                   physics: NeverScrollableScrollPhysics(),
                   padding: EdgeInsets.only(left: 24.h, right: 24.h),
@@ -102,8 +104,9 @@ class _VaccineListPageState extends State<VaccineListPage> {
                               ),
                             ),
                           )
-                        : AnimationConfiguration.staggeredList(
+                        : medicalFileVM.patientVaccineList.isNotEmpty
-                            position: index,
+                            ? AnimationConfiguration.staggeredList(
+                                position: index,
                             duration: const Duration(milliseconds: 1000),
                             child: SlideAnimation(
                               verticalOffset: 100.0,
@@ -166,7 +169,8 @@ class _VaccineListPageState extends State<VaccineListPage> {
                                 ),
                               ),
                             ),
-                          );
+                              )
+                            : Utils.getNoDataWidget(context, noDataText: "No vaccines data found...".needTranslation);
                   },
                   separatorBuilder: (BuildContext cxt, int index) => SizedBox(height: 16.h),
                 ),

lib/presentation/medical_file/widgets/lab_rad_card.dart

@@ -54,7 +54,7 @@ class LabRadCard extends StatelessWidget {
               SizedBox.shrink(),
               Transform.flip(
                 flipX: appState.isArabic() ? true : false,
-                child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)
+                child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon_small, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)
                     .toShimmer2(isShow: false, radius: 12.h),
               ),
             ],

lib/presentation/medical_file/widgets/patient_sick_leave_card.dart

@@ -23,11 +23,12 @@ import 'package:open_filex/open_filex.dart';
 import 'package:provider/provider.dart';
 
 class PatientSickLeaveCard extends StatelessWidget {
-  PatientSickLeaveCard({super.key, required this.patientSickLeavesResponseModel, this.isLoading = false});
+  PatientSickLeaveCard({super.key, required this.patientSickLeavesResponseModel, this.isLoading = false, this.isSickLeaveListPage = false});
 
   late MedicalFileViewModel medicalFileViewModel;
   PatientSickLeavesResponseModel patientSickLeavesResponseModel;
   bool isLoading;
+  bool isSickLeaveListPage = false;
 
   @override
   Widget build(BuildContext context) {
@@ -128,7 +129,7 @@ class PatientSickLeaveCard extends StatelessWidget {
                         ).toShimmer2(isShow: isLoading),
                       ),
                 SizedBox(width: 8.h),
-                Expanded(
+                isSickLeaveListPage ? SizedBox.shrink() : Expanded(
                   flex: 1,
                   child: Container(
                     height: 40.h,

lib/widgets/in_app_browser/InAppBrowser.dart

@@ -219,12 +219,12 @@ class MyInAppBrowser extends InAppBrowser {
 
       // service.tamaraInsertRequest(tamaraRequestModel, context).then((res) {
       //   // if (context != null) GifLoaderDialogUtils.hideDialog(context);
-      //   generateTamaraURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate,
+      generateTamaraURL(amount, orderDesc, transactionID, projId, emailId, paymentMethod, patientType, patientName, patientID, authenticatedUser, isLiveCareAppo, servID, LiveServID, appoDate, appoNo,
-      //           appoNo, clinicID, doctorID, "", installments)
+              clinicID, doctorID, "", installments)
-      //       .then((value) {
+          .then((value) {
-      //     paymentType = _PAYMENT_TYPE.PATIENT;
+        paymentType = _PAYMENT_TYPE.PATIENT;
-      //     this.browser.openUrlRequest(urlRequest: URLRequest(url: WebUri.uri(Uri.parse(value))), options: _InAppBrowserOptions);
+        this.browser.openUrlRequest(urlRequest: URLRequest(url: WebUri.uri(Uri.parse(value))), options: _InAppBrowserOptions);
-      //   });
+      });
       // }).catchError((err) {
       //   print(err);
       //   // if (context != null) GifLoaderDialogUtils.hideDialog(context);
@@ -333,12 +333,12 @@ class MyInAppBrowser extends InAppBrowser {
     form = form.replaceFirst('PROJECT_ID_VALUE', projId);
     form = form.replaceFirst('PAYMENT_OPTION_VALUE', paymentMethod);
     form = form.replaceFirst('LANG_VALUE', currentLanguageID);
-    form = form.replaceFirst('SERVICE_URL_VALUE', "https://mdlaboratories.com/tamaralive/Home/Checkout");
+    form = form.replaceFirst('SERVICE_URL_VALUE', ApiConsts.TAMARA_URL);
 
-    form = form.replaceFirst('INSTALLMENTS_VALUE', installments);
+    form = form.replaceFirst('INSTALLMENTS_VALUE', "3");
     form = form.replaceFirst('CUSTNATIONALID_VALUE', authUser.patientIdentificationNo!);
     form = form.replaceFirst('CUSTMOBILE_VALUE', authUser.mobileNumber!);
-    form = form.replaceFirst('CUSTDOB_VALUE', DateUtil.getDayMonthYearDateFormatted(authUser.strDateofBirth!));
+    form = form.replaceFirst('CUSTDOB_VALUE', DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(authUser.dateofBirth!)));
 
     form = form.replaceFirst('CURRENCY_VALUE', authUser.outSa == 0 ? "SAR" : "AED");
     form = form.replaceFirst('COUNTRY_CODE_VALUE', authUser.outSa == 0 ? "966" : "971");