diff --git a/ios/GoogleService-Info.plist b/ios/GoogleService-Info.plist index 633037cb..382b4d06 100644 --- a/ios/GoogleService-Info.plist +++ b/ios/GoogleService-Info.plist @@ -2,24 +2,18 @@ - CLIENT_ID - 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt - ANDROID_CLIENT_ID - 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com API_KEY - AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA + AIzaSyBSlC2DpoYFRS7N99Sm31kUj_Ikezsz2e8 GCM_SENDER_ID - 815750722565 + 768176874884 PLIST_VERSION 1 BUNDLE_ID - com.HMG.HMG-Smartphone + com.redseaglobal.redseahealth PROJECT_ID - api-project-815750722565 + red-sea-health---patient STORAGE_BUCKET - api-project-815750722565.appspot.com + red-sea-health---patient.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -31,8 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:815750722565:ios:328ec247a81a2ca23c186c - DATABASE_URL - https://api-project-815750722565.firebaseio.com + 1:768176874884:ios:e981d28ce58399b9dca9d1 \ No newline at end of file diff --git a/ios/Podfile b/ios/Podfile index 87d62e9b..944c0bb5 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -64,7 +64,7 @@ post_install do |installer| File.open(xcconfig_path, "w") { |file| file << xcconfig_mod } if build_configuration.build_settings['WRAPPER_EXTENSION'] == 'bundle' - build_configuration.build_settings['DEVELOPMENT_TEAM'] = '3A359E86ZF' + build_configuration.build_settings['DEVELOPMENT_TEAM'] = '64C4BL5J6N' end if target.name == 'MapboxMobileEvents' `xcrun -sdk iphoneos bitcode_strip -r Pods/MapboxMobileEvents/MapboxMobileEvents.xcframework/ios-arm64_armv7/MapboxMobileEvents.framework/MapboxMobileEvents -o Pods/MapboxMobileEvents/MapboxMobileEvents.xcframework/ios-arm64_armv7/MapboxMobileEvents.framework/MapboxMobileEvents` diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist index c179ec60..382b4d06 100644 --- a/ios/Runner/GoogleService-Info.plist +++ b/ios/Runner/GoogleService-Info.plist @@ -2,37 +2,29 @@ - CLIENT_ID - 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt - ANDROID_CLIENT_ID - 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com API_KEY - AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA + AIzaSyBSlC2DpoYFRS7N99Sm31kUj_Ikezsz2e8 GCM_SENDER_ID - 815750722565 + 768176874884 PLIST_VERSION 1 BUNDLE_ID - com.HMG.HMG-Smartphone + com.redseaglobal.redseahealth PROJECT_ID - api-project-815750722565 + red-sea-health---patient STORAGE_BUCKET - api-project-815750722565.appspot.com + red-sea-health---patient.firebasestorage.app IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED - + IS_APPINVITE_ENABLED - + IS_GCM_ENABLED - + IS_SIGNIN_ENABLED - + GOOGLE_APP_ID - 1:815750722565:ios:328ec247a81a2ca23c186c - DATABASE_URL - https://api-project-815750722565.firebaseio.com + 1:768176874884:ios:e981d28ce58399b9dca9d1 - + \ No newline at end of file diff --git a/lib/config/config.dart b/lib/config/config.dart index 70915eb7..8ca36300 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -706,7 +706,8 @@ var IS_DOCTOR_AVAILABLE_BY_CALENDAR_SCHEDULE = 'Services/OUTPs.svc/REST/HIS_IsDo var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; var payFortEnvironment = FortEnvironment.production; -var applePayMerchantId = "merchant.com.hmgwebservices"; +// var applePayMerchantId = "merchant.com.hmgwebservices"; +var applePayMerchantId = "merchant.com.rsgwebservices.hmg.redseahealth"; // var payFortEnvironment = FortEnvironment.test; // var applePayMerchantId = "merchant.com.hmgwebservices.uat"; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index edce26ff..0f498787 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -187,7 +187,7 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; //0560717232 - // body['PatientID'] = 5690832; //4609100 + // body['PatientID'] = 10716; //4609100 // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 diff --git a/lib/pages/insurance/insurance_page.dart b/lib/pages/insurance/insurance_page.dart index 3ec71a0f..28145947 100644 --- a/lib/pages/insurance/insurance_page.dart +++ b/lib/pages/insurance/insurance_page.dart @@ -40,7 +40,7 @@ class InsurancePage extends StatelessWidget { onTap: () { getDetails( setupID: '010266', - projectID: 15, + projectID: 425, patientIdentificationID: projectViewModel.user!.patientIdentificationNo!, //model.user.patientIdentificationNo, patientID: projectViewModel.user!.patientID!, @@ -99,7 +99,7 @@ class InsurancePage extends StatelessWidget { ? InkWell( onTap: () { getDetails( - projectID: 15, + projectID: 425, patientIdentificationID: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList![index].patientIdenficationNumber!, setupID: '010266', patientID: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList![index].responseID!, diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 537aaafd..f866b9fd 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -709,37 +709,37 @@ class _ConfirmLogin extends State { } checkIfUserAgreedBefore(CheckActivationCode result) { - if (projectViewModel.havePrivilege(109)) { - this.authService.checkIfUserAgreed().then((result) { - if (result['IsPatientAlreadyAgreed']) { - goToHome(); - } else { - this.authService.getUserAgreementContent().then((result) { - GifLoaderDialogUtils.hideDialog(AppGlobal.context); - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: UserLoginAgreementPage( - userAgreementText: result['UserAgreementContent'], - authenticatedUserObject: authenticatedUserObject, - appointmentRateViewModel: appointmentRateViewModel, - selectedOption: selectedOption, - isArabic: projectViewModel.isArabic, - ), - ), - (r) => false); - }).catchError((err) { - GifLoaderDialogUtils.hideDialog(context); - print(err); - }); - } - }).catchError((err) { - GifLoaderDialogUtils.hideDialog(context); - print(err); - }); - } else { + // if (projectViewModel.havePrivilege(109)) { + // this.authService.checkIfUserAgreed().then((result) { + // if (result['IsPatientAlreadyAgreed']) { + // goToHome(); + // } else { + // this.authService.getUserAgreementContent().then((result) { + // GifLoaderDialogUtils.hideDialog(AppGlobal.context); + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: UserLoginAgreementPage( + // userAgreementText: result['UserAgreementContent'], + // authenticatedUserObject: authenticatedUserObject, + // appointmentRateViewModel: appointmentRateViewModel, + // selectedOption: selectedOption, + // isArabic: projectViewModel.isArabic, + // ), + // ), + // (r) => false); + // }).catchError((err) { + // GifLoaderDialogUtils.hideDialog(context); + // print(err); + // }); + // } + // }).catchError((err) { + // GifLoaderDialogUtils.hideDialog(context); + // print(err); + // }); + // } else { goToHome(); - } + // } // if (result.isNeedUserAgreement == true) { // // move to agreement page. diff --git a/lib/pages/medical/allergies_page.dart b/lib/pages/medical/allergies_page.dart index 599d91b0..2c0160e3 100644 --- a/lib/pages/medical/allergies_page.dart +++ b/lib/pages/medical/allergies_page.dart @@ -47,7 +47,7 @@ class AllergiesPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts(TranslationBase.of(context).remarks+" :"), + Texts(TranslationBase.of(context).remarks+" : " + model.allergies[index].remarks! ?? ''), Texts(TranslationBase.of(context).description + ": " + model.allergies[index].description! ?? ''), ], ), diff --git a/lib/pages/medical/prescriptions/prescription_details_inp.dart b/lib/pages/medical/prescriptions/prescription_details_inp.dart index 2742662b..08b4af66 100644 --- a/lib/pages/medical/prescriptions/prescription_details_inp.dart +++ b/lib/pages/medical/prescriptions/prescription_details_inp.dart @@ -134,8 +134,10 @@ class PrescriptionDetailsPageINP extends StatelessWidget { ), TableRow( children: [ - Utils.tableColumnValue(prescriptionReport?.routeN ?? '', isLast: true, mProjectViewModel: projectViewModel), - Utils.tableColumnValue(prescriptionReport?.frequencyN ?? '', isLast: true, mProjectViewModel: projectViewModel), + // Utils.tableColumnValue(prescriptionReport?.routeN ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(prescriptionReport?.route ?? '', isLast: true, mProjectViewModel: projectViewModel), + // Utils.tableColumnValue(prescriptionReport?.frequencyN ?? '', isLast: true, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(prescriptionReport?.frequency ?? '', isLast: true, mProjectViewModel: projectViewModel), Utils.tableColumnValue(prescriptionReport?.doseDailyQuantity.toString() ?? '', isLast: true, mProjectViewModel: projectViewModel), Utils.tableColumnValue(prescriptionReport?.days.toString() ?? '', isLast: true, mProjectViewModel: projectViewModel), ], diff --git a/lib/pages/medical/prescriptions/prescription_items_page.dart b/lib/pages/medical/prescriptions/prescription_items_page.dart index 70ce271a..f34db3c7 100644 --- a/lib/pages/medical/prescriptions/prescription_items_page.dart +++ b/lib/pages/medical/prescriptions/prescription_items_page.dart @@ -72,7 +72,7 @@ class PrescriptionItemsPage extends StatelessWidget { prescriptions.doctorRate, prescriptions.actualDoctorRate, prescriptions.noOfPatientsRate, - projectViewModel.user.emailAddress!, + projectViewModel.user.emailAddress ?? "", ), isNeedToShowButton: (model.prescriptionReportListINP.length > 0 || model.prescriptionReportEnhList.length > 0) ? projectViewModel.havePrivilege(13) : false, buttonTitle: TranslationBase.of(context).download, diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 692dfd5c..ff6b44f7 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -40,7 +40,8 @@ class MyInAppBrowser extends InAppBrowser { // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + static String SERVICE_URL = 'https://rsgwebservices.hmg.com/Payment/pages/RsgSendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS diff --git a/pubspec.yaml b/pubspec.yaml index 613c8bd8..b8bec549 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: diplomaticquarterapp description: A new Flutter application. -#version: 4.6.030+1 -version: 4.6.0984+40500984 +version: 0.0.1+1 +#version: 4.6.0984+40500984 environment: # sdk: ">=3.0.0 <3.13.0" @@ -95,7 +95,7 @@ dependencies: jiffy: ^6.2.1 #Flutter WebRTC - screen_brightness: ^2.1.5 +# screen_brightness: ^2.1.5 map_launcher: ^3.0.1 flutter_countdown_timer: ^4.1.0 carousel_slider: ^5.0.0