Merge pull request 'haroon_dev' (#393) from haroon_dev into master

Reviewed-on: #393

lib/core/api_consts.dart

@@ -316,10 +316,8 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  // static final double appVersionID = 21.9;
-  static final double appVersionID = 21.5;
+  static final double appVersionID = 21.6;
 
-  // static final double appVersionID = 50.7;
   static final int appChannelId = 3;
   static final String appIpAddress = "10.20.10.20";
   static final String appGeneralId = "Cs2020@2016\$2958";

lib/features/common/models/family_file_request.dart

@@ -47,7 +47,7 @@ class FamilyFileRequest {
         "SharedPatientIdentificationID": sharedPatientIdentificationId,
         "SearchType": searchType,
         "SharedPatientMobileNumber": sharedPatientMobileNumber,
-        "zipCode": zipCode,
+        "ZipCode": zipCode,
         "isRegister": isRegister,
         "PatientStatus": patientStatus,
         "isDentalAllowedBackend": isDentalAllowedBackend,

lib/features/occasion_theme/occasion_config_model.dart

@@ -68,11 +68,10 @@ class OccasionConfigModel {
   factory OccasionConfigModel.fromJson(Map<String, dynamic> json) {
     return OccasionConfigModel(
       key: (json['key'] as String?) ?? 'none',
-      // enabled: (json['enabled'] as bool?) ?? false,
+      enabled: (json['enabled'] as bool?) ?? false,
+      // enabled: true,
       startDate: _parseDate(json['start_date']),
       endDate: _parseDate(json['end_date']),
-      enabled: true,
-      // TODO: FOR TESTING ONLY — REMOVE BEFORE RELEASE. The "enabled" field is not yet supported in remote config, so we always treat it as true for now.
       primaryColorHex: json['primary_color'] as String?,
       backgroundOpacityImage: json['background_opacity_image'] as String?,
       backgroundImageOpacity: (json['background_image_opacity'] as num?)?.toDouble() ?? 1.0,

lib/presentation/appointments/appointment_payment_page.dart

@@ -858,7 +858,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
     print("onBrowserLoadStart");
     print(url);
 
-    if (selectedPaymentMethod == "tamara") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       if (Platform.isAndroid) {
         Uri uri = new Uri.dataFromString(url);
         tamaraPaymentStatus = uri.queryParameters['status']!;
@@ -897,7 +897,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
 
   void checkPaymentStatus() async {
     LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       await payfortViewModel.checkTamaraPaymentStatus(
           transactionID: transID,
           onSuccess: (apiResponse) async {

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -781,7 +781,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     print("onBrowserLoadStart");
     print(url);
 
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       if (Platform.isAndroid) {
         Uri uri = new Uri.dataFromString(url);
         tamaraPaymentStatus = uri.queryParameters['status'] ?? "";
@@ -821,7 +821,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
 
   void checkPaymentStatus() async {
     LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
-    if (selectedPaymentMethod == "TAMARA") {
+    if (selectedPaymentMethod.toLowerCase() == "tamara") {
       await payfortViewModel.checkTamaraPaymentStatus(
           transactionID: transID,
           onSuccess: (apiResponse) async {

lib/widgets/in_app_browser/InAppBrowser.dart

@@ -314,6 +314,8 @@ class MyInAppBrowser extends InAppBrowser {
 
     if (isLiveCareAppo) {
       form = form.replaceFirst('IS_SCHEDULE_VALUE', "true");
+    } else {
+      form = form.replaceFirst('IS_SCHEDULE_VALUE', "false");
     }
 
     var bytes = utf8.encode(form);