From d1683709dc77c974dca8334a19c423b93a5af0b9 Mon Sep 17 00:00:00 2001 From: SurendarSuri30 Date: Thu, 15 May 2025 14:03:17 +0530 Subject: [PATCH] otp issue fix --- .env | 9 +- .env.development | 9 +- .env.test | 10 +-- .env.uat | 10 +-- .../arm64-v8a/configure_fingerprint.bin | 24 +++--- .../armeabi-v7a/configure_fingerprint.bin | 24 +++--- .../3z5wb2k9/x86/configure_fingerprint.bin | 24 +++--- .../3z5wb2k9/x86_64/configure_fingerprint.bin | 24 +++--- .../arm64-v8a/configure_fingerprint.bin | 24 +++--- .../armeabi-v7a/configure_fingerprint.bin | 24 +++--- .../2d6z485o/x86/configure_fingerprint.bin | 24 +++--- .../2d6z485o/x86_64/configure_fingerprint.bin | 24 +++--- android/app/build.gradle | 4 +- android/app/google-services.json | 2 +- ios/Runner/Info.plist | 18 ++++ lib/pages/enrollment/addons.dart | 67 +++++++++++---- lib/pages/enrollment/empReview.dart | 86 ++++++++++++++++--- .../session/settingUpPinAndBiometric.dart | 6 +- lib/pages/verify.dart | 68 +++++++++------ pubspec.yaml | 4 +- 20 files changed, 313 insertions(+), 172 deletions(-) diff --git a/.env b/.env index 611d01d..78a3f2e 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ -API_URL=https://venbait.in/nhance/dev/employeeRest/ -API_URL_Enrollment=https://venbait.in/enrollment/employeeRest/ +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ +#CHAT_BOT_URL=https://venbait.in/nhance/dev +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ TICKET_API_URL=https://venbait.in/nhance/dev/api ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/nhance/app/dev/ -ENV=development +BASE_HREF=/app/ +ENV=production diff --git a/.env.development b/.env.development index 611d01d..78a3f2e 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ -API_URL=https://venbait.in/nhance/dev/employeeRest/ -API_URL_Enrollment=https://venbait.in/enrollment/employeeRest/ +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ +#CHAT_BOT_URL=https://venbait.in/nhance/dev +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ TICKET_API_URL=https://venbait.in/nhance/dev/api ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/nhance/app/dev/ -ENV=development +BASE_HREF=/app/ +ENV=production diff --git a/.env.test b/.env.test index c4f2062..20ebfc0 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,7 @@ -API_URL=https://appstage.nhanceindia.in/arena/crm/employeeRest/ +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ #CHAT_BOT_URL=https://venbait.in/nhance/dev -API_URL_Enrollment=https://appstage.nhanceindia.in/arena/enrolment/employeeRest/ +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ TICKET_API_URL=https://venbait.in/nhance/dev/api -#ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/arena/app/ -ENV=uat \ No newline at end of file +ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH +BASE_HREF=/app/ +ENV=production \ No newline at end of file diff --git a/.env.uat b/.env.uat index c4f2062..20ebfc0 100644 --- a/.env.uat +++ b/.env.uat @@ -1,7 +1,7 @@ -API_URL=https://appstage.nhanceindia.in/arena/crm/employeeRest/ +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ #CHAT_BOT_URL=https://venbait.in/nhance/dev -API_URL_Enrollment=https://appstage.nhanceindia.in/arena/enrolment/employeeRest/ +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ TICKET_API_URL=https://venbait.in/nhance/dev/api -#ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/arena/app/ -ENV=uat \ No newline at end of file +ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH +BASE_HREF=/app/ +ENV=production \ No newline at end of file diff --git a/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/configure_fingerprint.bin index 7ea7cd2..cded6ab 100644 --- a/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2 ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/additional_project_files.txt  2  ǵƨ2} +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/additional_project_files.txt  2  ǵƨ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/android_gradle_build.json  2 ɵƨ2 +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/android_gradle_build.json  2 ɵƨ2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/android_gradle_build_mini.json  2 ʵƨ2o +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/android_gradle_build_mini.json  2 ʵƨ2o m -k/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build.ninja  2 ƨ2s +k/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build.ninja  2 ƨ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build.ninja.txt  2x +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build.ninja.txt  2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build_file_index.txt  2 _ ʵƨ2y +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/build_file_index.txt  2 _ ʵƨ2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/compile_commands.json  2 } +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/compile_commands.json  2 } { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/compile_commands.json.bin  2 +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/compile_commands.json.bin  2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/metadata_generation_command.txt  2  ʵƨ2v +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/metadata_generation_command.txt  2  ʵƨ2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/prefab_config.json  2  ( ʵƨ2{ +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/prefab_config.json  2  ( ʵƨ2{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/symbol_folder_index.txt  2  n ʵƨ2 \ No newline at end of file +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/arm64-v8a/symbol_folder_index.txt  2  n ʵƨ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/configure_fingerprint.bin index 6bf949b..fcb8d2b 100644 --- a/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/additional_project_files.txt  2  ƨ2 +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/additional_project_files.txt  2  ƨ2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/android_gradle_build.json  2 ƨ2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/android_gradle_build.json  2 ƨ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/android_gradle_build_mini.json  2 ƨ2q +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/android_gradle_build_mini.json  2 ƨ2q o -m/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build.ninja  2 ƨ2u +m/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build.ninja  2 ƨ2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build.ninja.txt  2z +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build.ninja.txt  2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build_file_index.txt  2 _ ƨ2{ +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/build_file_index.txt  2 _ ƨ2{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/compile_commands.json  2  +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/compile_commands.json  2  } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/compile_commands.json.bin  2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/compile_commands.json.bin  2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/metadata_generation_command.txt  2  ƨ2x +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/metadata_generation_command.txt  2  ƨ2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/prefab_config.json  2  ( ƨ2} +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/prefab_config.json  2  ( ƨ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/symbol_folder_index.txt  2  p ƨ2 \ No newline at end of file +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/armeabi-v7a/symbol_folder_index.txt  2  p ƨ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/3z5wb2k9/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/3z5wb2k9/x86/configure_fingerprint.bin index ad8cb7d..fffc8ab 100644 --- a/android/app/.cxx/Debug/3z5wb2k9/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/3z5wb2k9/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/additional_project_files.txt  2  ƿƨ2w +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/additional_project_files.txt  2  ƿƨ2w u -s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/android_gradle_build.json  2 ǿƨ2| +s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/android_gradle_build.json  2 ǿƨ2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/android_gradle_build_mini.json  2 ǿƨ2i +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/android_gradle_build_mini.json  2 ǿƨ2i g -e/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build.ninja  2 ƨ2m +e/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build.ninja  2 ƨ2m k -i/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build.ninja.txt  2r +i/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build.ninja.txt  2r p -n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build_file_index.txt  2 _ ǿƨ2s +n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/build_file_index.txt  2 _ ǿƨ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/compile_commands.json  2 w +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/compile_commands.json  2 w u -s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/compile_commands.json.bin  2 +s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/compile_commands.json.bin  2 } { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/metadata_generation_command.txt  2  ǿƨ2p +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/metadata_generation_command.txt  2  ǿƨ2p n -l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/prefab_config.json  2  ( ǿƨ2u +l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/prefab_config.json  2  ( ǿƨ2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/symbol_folder_index.txt  2  h ǿƨ2 \ No newline at end of file +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86/symbol_folder_index.txt  2  h ǿƨ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/3z5wb2k9/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/3z5wb2k9/x86_64/configure_fingerprint.bin index c74c88f..d91b2c1 100644 --- a/android/app/.cxx/Debug/3z5wb2k9/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/3z5wb2k9/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ָ2 ހ2} +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/additional_project_files.txt  ָ2  ƨ2z +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/additional_project_files.txt  2  ƨ2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/android_gradle_build.json  ָ2 ƨ2 +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/android_gradle_build.json  2 ƨ2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/android_gradle_build_mini.json  ׸2 ƨ2l +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/android_gradle_build_mini.json  2 ƨ2l j -h/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build.ninja  ׸2 ƨ2p +h/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build.ninja  2 ƨ2p n -l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build.ninja.txt  ׸2u +l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build.ninja.txt  2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build_file_index.txt  ׸2 _ ƨ2v +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/build_file_index.txt  2 _ ƨ2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/compile_commands.json  ׸2 z +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/compile_commands.json  2 z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/compile_commands.json.bin  ׸2 +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/compile_commands.json.bin  2  ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/metadata_generation_command.txt  ׸2  ƨ2s +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/metadata_generation_command.txt  2  ƨ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/prefab_config.json  ׸2  ( ƨ2x +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/prefab_config.json  2  ( ƨ2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/symbol_folder_index.txt  ׸2  k ƨ2 \ No newline at end of file +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/3z5wb2k9/x86_64/symbol_folder_index.txt  2  k ƨ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/configure_fingerprint.bin index 7b5b139..1a883fc 100644 --- a/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݄2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߫2 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/additional_project_files.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/additional_project_files.txt  ߫2  2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/android_gradle_build.json  ݄2 2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/android_gradle_build.json  ߫2 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/android_gradle_build_mini.json  ݄2 2x +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/android_gradle_build_mini.json  ߫2 2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build.ninja  ݄2 2| +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build.ninja  ߫2 2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build.ninja.txt  ݄2 +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build.ninja.txt  ߫2  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build_file_index.txt  ݄2 _ 2 +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/build_file_index.txt  ߫2 _ 2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/compile_commands.json  ݄2  +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/compile_commands.json  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/compile_commands.json.bin  ݄2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/compile_commands.json.bin  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/metadata_generation_command.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/metadata_generation_command.txt  ߫2  2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/prefab_config.json  ݄2  ( 2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/prefab_config.json  ߫2  ( 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/symbol_folder_index.txt  ݄2  w 2 \ No newline at end of file +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/arm64-v8a/symbol_folder_index.txt  ߫2  w 2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/configure_fingerprint.bin index 2b59bdb..684582a 100644 --- a/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݄2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߫2 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/additional_project_files.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/additional_project_files.txt  ߫2  2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/android_gradle_build.json  ݄2 2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/android_gradle_build.json  ߫2 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/android_gradle_build_mini.json  ݄2 2z +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/android_gradle_build_mini.json  ߫2 2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build.ninja  ݄2 2~ +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build.ninja  ߫2 2~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build.ninja.txt  ݄2 +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build.ninja.txt  ߫2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build_file_index.txt  ݄2 _ 2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/build_file_index.txt  ߫2 _ 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/compile_commands.json  ݄2  +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/compile_commands.json  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/compile_commands.json.bin  ݄2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/compile_commands.json.bin  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/metadata_generation_command.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/metadata_generation_command.txt  ߫2  2  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/prefab_config.json  ݄2  ( 2 +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/prefab_config.json  ߫2  ( 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/symbol_folder_index.txt  ݄2  y 2 \ No newline at end of file +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/armeabi-v7a/symbol_folder_index.txt  ߫2  y 2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/configure_fingerprint.bin index 9e8a429..191451b 100644 --- a/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݄2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߫2 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/additional_project_files.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/additional_project_files.txt  ߫2  2 ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/android_gradle_build.json  ݄2 2 +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/android_gradle_build.json  ߫2 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/android_gradle_build_mini.json  ݄2 2r +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/android_gradle_build_mini.json  ߫2 2r p -n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build.ninja  ݄2 2v +n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build.ninja  ߫2 2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build.ninja.txt  ݄2{ +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build.ninja.txt  ߫2{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build_file_index.txt  ݄2 _ 2| +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/build_file_index.txt  ߫2 _ 2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/compile_commands.json  ݄2  +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/compile_commands.json  ߫2  ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/compile_commands.json.bin  ݄2 +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/compile_commands.json.bin  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/metadata_generation_command.txt  ݄2  2y +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/metadata_generation_command.txt  ߫2  2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/prefab_config.json  ݄2  ( 2~ +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/prefab_config.json  ߫2  ( 2~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/symbol_folder_index.txt  ݄2  q 2 \ No newline at end of file +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86/symbol_folder_index.txt  ߫2  q 2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/configure_fingerprint.bin index 481dd66..03c5cf0 100644 --- a/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݄2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߫2 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/additional_project_files.txt  ݄2  2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/additional_project_files.txt  ߫2  2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/android_gradle_build.json  ݄2 2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/android_gradle_build.json  ߫2 2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/android_gradle_build_mini.json  ݄2 2u +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/android_gradle_build_mini.json  ߫2 2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build.ninja  ݄2 2y +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build.ninja  ߫2 2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build.ninja.txt  ݄2~ +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build.ninja.txt  ߫2~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build_file_index.txt  ݄2 _ 2 +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/build_file_index.txt  ߫2 _ 2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/compile_commands.json  ݄2  +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/compile_commands.json  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/compile_commands.json.bin  ݄2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/compile_commands.json.bin  ߫2   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/metadata_generation_command.txt  ݄2  2| +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/metadata_generation_command.txt  ߫2  2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/prefab_config.json  ݄2  ( 2 +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/prefab_config.json  ߫2  ( 2  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/symbol_folder_index.txt  ݄2  t 2 \ No newline at end of file +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/2d6z485o/x86_64/symbol_folder_index.txt  ߫2  t 2 \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 424b6a4..4ead3e5 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,12 +19,12 @@ if (project.hasProperty('google-services.json')) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '5' + flutterVersionCode = '9' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0.5' + flutterVersionName = '1.0.9' } def keystoreProperties = new Properties() diff --git a/android/app/google-services.json b/android/app/google-services.json index bcc523a..e3d1bee 100755 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -26,4 +26,4 @@ } ], "configuration_version": "1" -} \ No newline at end of file +} diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index e7fe90a..496dd2c 100755 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -4,6 +4,8 @@ CADisableMinimumFrameDurationOnPhone + FirebaseAppDelegateProxyEnabled + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -28,6 +30,22 @@ https + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + $(PRODUCT_BUNDLE_IDENTIFIER) + + + + + LSApplicationQueriesSchemes + + tel + LSRequiresIPhoneOS NSFaceIDUsageDescription diff --git a/lib/pages/enrollment/addons.dart b/lib/pages/enrollment/addons.dart index 28ef199..9216cf7 100755 --- a/lib/pages/enrollment/addons.dart +++ b/lib/pages/enrollment/addons.dart @@ -38,7 +38,8 @@ class _addOnsDetailsState extends State { bool isChecked = false; bool disclaimeStatus = false; bool _addOnsDependentSwitcher = - false; // Declare the _isSwitched variable here + false; + // bool isPremiumSummery = false; bool _topUpSiSwitcher = false; bool _topUpParentSiSwitcher = false; dynamic _token; @@ -109,6 +110,7 @@ class _addOnsDetailsState extends State { dynamic topUpParentSiPremiumValue; dynamic topUpParentSiPremiumGst; dynamic topUpParentSiTotalAmt; + dynamic topUpParenIsPremiumSummery; dynamic topUpParentTypeName; int topUpParentOpenForEnrollment = 0; dynamic addOnsDependentPolicies = []; @@ -120,6 +122,7 @@ class _addOnsDetailsState extends State { dynamic addOnsDependentPolicyName; dynamic addOnsDependentPolicyType; dynamic addOnsDependentECardDownload; + dynamic addOnsDependentIsPremiumSummery; int addOnsDependentOpenForEnrollment = 0; dynamic siValue; dynamic addOnDependentPremiumValue; @@ -130,6 +133,7 @@ class _addOnsDetailsState extends State { dynamic addOnsDependentTotalAmt; // dynamic topUpSiTotalAmt; dynamic topUpSiTotalAmt; + dynamic topUpSiPremiumSummery; late TextEditingController _relationShipController; late TextEditingController _dobController; late TextEditingController _memberNameController; @@ -483,6 +487,8 @@ class _addOnsDetailsState extends State { topUpSiTotalAmt = topUpSiPremiumValue + topUpSiPremiumGst; + topUpSiPremiumSummery = topUpSiPolicies['gmc_si_topup']['is_premium_summery']; + // topUpSiTotalAmt = (topUpSum as double).toInt(); }); } @@ -576,6 +582,10 @@ class _addOnsDetailsState extends State { topUpParentSiTotalAmt = topUpParentSiPremiumValue + topUpParentSiPremiumGst; + + topUpParenIsPremiumSummery = topUpSiParentPolicies['gmc_si_parent_topup']['is_premium_summery']; + print('topUpParenIsPremiumSummery $topUpParenIsPremiumSummery'); + }); } // }); @@ -618,46 +628,56 @@ class _addOnsDetailsState extends State { addOnsDependentClientPolicyId = addOnsDependentPolicies['gmc_dependent_addon'] ['client_policy_id']; + print('1 $addOnsDependentClientPolicyId'); addOnsDependentSlabRates = await addOnsDependentPolicies['gmc_dependent_addon'] ['SlabRates']; - + print('2 $addOnsDependentSlabRates'); addOnsDependentPolicyName = await addOnsDependentPolicies['gmc_dependent_addon'] ['policy_name']; - + print('3 $addOnsDependentPolicyName'); addOnsDependentPolicyType = await addOnsDependentPolicies['gmc_dependent_addon']['type']; - + print('4 $addOnsDependentPolicyType'); addOnsDependentFamilyFloater = await addOnsDependentPolicies['gmc_dependent_addon'] ['policy_terms']['family_floater']; - + print('5 $addOnsDependentFamilyFloater'); setState(() { addOnsDependentMappedFamilyFloatersDependent = addOnsDependentPolicies['gmc_dependent_addon'] ['family_floaters_of_dependent_and_si_array']; - + print('6 $addOnsDependentMappedFamilyFloatersDependent'); String intOpenForEnrollment = addOnsDependentPolicies['gmc_dependent_addon'] ['OpenForEnrollment']; + print('7 $intOpenForEnrollment'); addOnsDependentOpenForEnrollment = int.parse(intOpenForEnrollment); - + print('8 $addOnsDependentOpenForEnrollment'); addOnsdependentValue = addOnsDependentPolicies['gmc_dependent_addon'] ['family_floaters_of_dependent_and_si_value']; + print('9 $addOnsdependentValue'); + // final checkValue = addOnsdependentValue + + // addOnsDependentPolicies['gmc_dependent_addon'] + // ['family_floaters_of_dependent_and_si_premium_value']; + final checkValue = int.parse(addOnsdependentValue.toString()) + + int.parse(addOnsDependentPolicies['gmc_dependent_addon'] + ['family_floaters_of_dependent_and_si_premium_value'] + .toString()); - final checkValue = addOnsdependentValue + - addOnsDependentPolicies['gmc_dependent_addon'] - ['family_floaters_of_dependent_and_si_premium_value']; - print('checkValue $checkValue'); + print('10 $checkValue'); if (checkValue == 0) { + print('11'); addOnsSelectedDependent = null; _addOnsDependentSwitcher = false; } else { + print('12 $addOnsdependentValue'); addOnsSelectedDependent = addOnsdependentValue.toString(); + print('13 $addOnsSelectedDependent'); } // addOnsSelectedDependent = await addOnsdependentValue != 0 // ? addOnsdependentValue.toString() @@ -684,6 +704,17 @@ class _addOnsDetailsState extends State { addOnsDependentECardDownload = addOnsDependentPolicies['gmc_dependent_addon'] ['eCardDownload']; + + addOnsDependentIsPremiumSummery = addOnsDependentPolicies['gmc_dependent_addon']['is_premium_summery']; + print('addOnsDependentIsPremiumSummery $addOnsDependentIsPremiumSummery'); + // if(addOnsDependentIsPremiumSummery == 1){ + // print('isPremiumSummery true'); + // isPremiumSummery = true; + // } else { + // print('isPremiumSummery false'); + // isPremiumSummery = false; + // } + }); } else { print('No data found in the response'); @@ -2136,7 +2167,7 @@ class _addOnsDetailsState extends State { if (_addOnsDependentSwitcher) SizedBox(height: 20), if (Responsive.isDesktop(context) && - _addOnsDependentSwitcher) + _addOnsDependentSwitcher && addOnsDependentIsPremiumSummery == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -2261,7 +2292,7 @@ class _addOnsDetailsState extends State { ], ), if (!Responsive.isDesktop(context) && - _addOnsDependentSwitcher == true) + _addOnsDependentSwitcher == true && addOnsDependentIsPremiumSummery == '1') Container( child: Column( crossAxisAlignment: @@ -2779,7 +2810,7 @@ class _addOnsDetailsState extends State { if (_topUpSiSwitcher == true) SizedBox(height: 20), if (Responsive.isDesktop(context) && - _topUpSiSwitcher == true) + _topUpSiSwitcher == true && topUpSiPremiumSummery == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -2898,7 +2929,7 @@ class _addOnsDetailsState extends State { ], ), if (!Responsive.isDesktop(context) && - _topUpSiSwitcher == true) + _topUpSiSwitcher == true && topUpSiPremiumSummery == '1') Container( child: Column( crossAxisAlignment: @@ -3416,7 +3447,7 @@ class _addOnsDetailsState extends State { if (_topUpParentSiSwitcher == true) SizedBox(height: 20), if (Responsive.isDesktop(context) && - _topUpParentSiSwitcher == true) + _topUpParentSiSwitcher == true && topUpParenIsPremiumSummery == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -3535,7 +3566,7 @@ class _addOnsDetailsState extends State { ], ), if (!Responsive.isDesktop(context) && - _topUpParentSiSwitcher == true) + _topUpParentSiSwitcher == true && topUpParenIsPremiumSummery == '1') Container( child: Column( crossAxisAlignment: @@ -3753,6 +3784,7 @@ class _addOnsDetailsState extends State { : EdgeInsets.all(10), child: Column( children: [ + Container( child: Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -3961,6 +3993,7 @@ class _addOnsDetailsState extends State { ], ), ), + SizedBox(height: 10), Container( child: Row( diff --git a/lib/pages/enrollment/empReview.dart b/lib/pages/enrollment/empReview.dart index 9464cf6..ae20c58 100755 --- a/lib/pages/enrollment/empReview.dart +++ b/lib/pages/enrollment/empReview.dart @@ -60,6 +60,7 @@ class _empReviewDetailsState extends State { dynamic gpaECardDownload; dynamic gpaGstValue; dynamic gpaSiPremiumValue; + dynamic gpaIsPremiumSummery; dynamic gpaTotalableValue; late bool isValueValid; dynamic gpaTotalAmt; @@ -69,6 +70,7 @@ class _empReviewDetailsState extends State { dynamic gmcTotalableValue; late bool gmcIsValueValid; dynamic gmcECardDownload; + dynamic gmcIsPremiumSummery; dynamic gmcDisclaimer; dynamic gmcClintPolicyId = 0; dynamic gmcMappedFamilyFloaters = []; @@ -126,6 +128,7 @@ class _empReviewDetailsState extends State { dynamic topUpSumInsured; dynamic topUpFloaterTextHeading; dynamic topUpECardDownload; + dynamic topUpIsPremiumSummary; dynamic topUpDisclaimer; int showHideTopUpCard = 0; int showHideAddOnsCard = 0; @@ -139,6 +142,7 @@ class _empReviewDetailsState extends State { dynamic topUpParentFamilyFloater; dynamic topUpParentMappedFamilyFloatersSi; dynamic topUpParentECardDownload; + dynamic topUpParentIsPremiumSummary; dynamic topUpParentSiValue; dynamic topUpParentSiSelectedSI; dynamic topUpParentTypeName; @@ -156,7 +160,10 @@ class _empReviewDetailsState extends State { dynamic topUpOpenForEnrollment; dynamic topUpParentOpenForEnrollment; dynamic addOnsDependentOpenForEnrollment; + dynamic addOnsDependentIsPremiumSummary; bool gmcEnrollmentStatus = false; + bool gpahasPremiumSummary = false; + bool gmchasPremiumSummary = false; List> allDisclaimer = []; // Declare this to store all disclaimers late List checkboxValues; @@ -378,6 +385,14 @@ class _empReviewDetailsState extends State { setState(() { gpaPolicies = response['data']; print('gpaPolicies'); + + for (var policy in gpaPolicies) { + if (policy['is_premium_summery'] == "1") { + gpahasPremiumSummary = true; + break; + } + } + for (var item in gpaPolicies) { // Extract disclaimer value from each object if (item['OpenForEnrollment'] == '1') { @@ -455,6 +470,14 @@ class _empReviewDetailsState extends State { setState(() { gmcPolicies = response['data']; print('gmcPolicies $gmcPolicies'); + + for (var policy in gmcPolicies) { + if (policy['is_premium_summery'] == "1") { + gmchasPremiumSummary = true; + break; + } + } + for (var item in gmcPolicies) { if (item['OpenForEnrollment'] == '1') { dynamic disclaimer = item['disclaimer']; @@ -566,6 +589,15 @@ class _empReviewDetailsState extends State { topUpECardDownload = topUpSiPolicies['gmc_si_topup']['eCardDownload']; + setState(() { + topUpIsPremiumSummary = topUpSiPolicies['gmc_si_topup']['is_premium_summery']; + }); + + + // if(topUpIsPremiumSummary == '1'){ + // tabHide = '0'; + // } + topUpDisclaimer = await topUpSiPolicies['gmc_si_topup']['disclaimer']; @@ -681,7 +713,16 @@ class _empReviewDetailsState extends State { print('topUpECardDownload'); topUpParentECardDownload = topUpSiParentPolicies['gmc_si_parent_topup']['eCardDownload']; - print(topUpParentECardDownload); + + setState(() { + topUpParentIsPremiumSummary = topUpSiParentPolicies['gmc_si_parent_topup']['is_premium_summery']; + print(topUpParentECardDownload); + }); + + + // if(topUpParentIsPremiumSummary == '1'){ + // tabHide = '0'; + // } // String intOpenForEnrollment = // topUpSiParentPolicies['gmc_si_parent_topup'] // ['OpenForEnrollment']; @@ -850,6 +891,14 @@ class _empReviewDetailsState extends State { addOnsDependentOpenForEnrollment = await addOnsDependentPolicies['gmc_dependent_addon'] ['OpenForEnrollment']; + + setState(() { + addOnsDependentIsPremiumSummary = addOnsDependentPolicies['gmc_dependent_addon']['is_premium_summery']; + }); + + // if(addOnsDependentIsPremiumSummary == '1'){ + // tabHide = '0'; + // } print( 'addOnsDependentOpenForEnrollment $addOnsDependentOpenForEnrollment'); print('activeDependentData $activeDependentData'); @@ -1267,6 +1316,7 @@ class _empReviewDetailsState extends State { ), ), SizedBox(height: 16), + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') Card( elevation: 0, color: Colors.white, @@ -1305,6 +1355,7 @@ class _empReviewDetailsState extends State { ))), ], ), + Row( children: [ Expanded( @@ -1358,6 +1409,7 @@ class _empReviewDetailsState extends State { ), ])), ), + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') SizedBox(height: 16), if (gpaPolicies != null && gpaPolicies.length > 0) Column( @@ -2046,6 +2098,7 @@ class _empReviewDetailsState extends State { : EdgeInsets.all(10), child: Column( children: [ + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') Container( child: Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -2078,7 +2131,7 @@ class _empReviewDetailsState extends State { ], ), ), - SizedBox(height: 15), + SizedBox(height: 15), Container( child: Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -2098,6 +2151,7 @@ class _empReviewDetailsState extends State { 3: FlexColumnWidth(2), }, children: [ + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') TableRow( children: [ TableCell( @@ -2186,7 +2240,7 @@ class _empReviewDetailsState extends State { gmcPolicies.length > 0) ...gmcBuildPolicyRows( gmcPolicies, context), - if (activeSiData == 1) + if (activeSiData == 1 && topUpIsPremiumSummary == '1') TableRow( children: [ TableCell( @@ -2272,7 +2326,7 @@ class _empReviewDetailsState extends State { ), ], ), - if (activeSiParentData == 1) + if (activeSiParentData == 1 && topUpParentIsPremiumSummary == '1') TableRow( children: [ TableCell( @@ -2358,7 +2412,7 @@ class _empReviewDetailsState extends State { ), ], ), - if (activeDependentData == 1) + if (activeDependentData == 1 && addOnsDependentIsPremiumSummary == '1') TableRow( children: [ TableCell( @@ -2450,7 +2504,8 @@ class _empReviewDetailsState extends State { ], ), ), - SizedBox(height: 10), + SizedBox(height:10), + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') Container( child: Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -2508,6 +2563,7 @@ class _empReviewDetailsState extends State { ], ), ), + SizedBox(height: 15), Container( child: Row( @@ -2798,6 +2854,10 @@ class _empReviewDetailsState extends State { String? gpaECardDownload = item['eCardDownload']; gpaGstValue = item['si_gst_value']; gpaSiPremiumValue = item['si_premium_value']; + setState(() { + gpaIsPremiumSummery = item['is_premium_summery']; + }); + gpaTotalableValue = gpaSiPremiumValue + gpaGstValue; isValueValid = (gpaSiPremiumValue != 0 && gpaGstValue != 0); String? gpaSumInsured; @@ -2974,7 +3034,7 @@ class _empReviewDetailsState extends State { Column( children: familyFloaterContainers, ), - if (Responsive.isDesktop(context) && isValueValid) + if (Responsive.isDesktop(context) && isValueValid && gpaIsPremiumSummery == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -3055,7 +3115,7 @@ class _empReviewDetailsState extends State { ))), ], ), - if (!Responsive.isDesktop(context) && isValueValid) + if (!Responsive.isDesktop(context) && isValueValid && gpaIsPremiumSummery == '1') Container( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -3144,6 +3204,7 @@ class _empReviewDetailsState extends State { ))), ], ), + if(gpahasPremiumSummary == true || gmchasPremiumSummary == true || topUpIsPremiumSummary == '1' || topUpParentIsPremiumSummary == '1' || addOnsDependentIsPremiumSummary == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -3214,6 +3275,10 @@ class _empReviewDetailsState extends State { item['family_floaters_of_dependent_and_si_premium_value']; gmcTotalableValue = gmcGstValue + gmcSiPremiumValue; gmcIsValueValid = (gmcSiPremiumValue != 0 && gmcGstValue != 0); + setState(() { + gmcIsPremiumSummery = item['is_premium_summery']; + }); + // gmcSumInsured = item['Policy_Terms']['sum_insured']; gmcMappedFamilyFloaters = item['mapped_family_floaters']; // allDisclaimer = allDisclaimer.toSet().toList(); @@ -3391,7 +3456,7 @@ class _empReviewDetailsState extends State { }).toList(), ), ), - if (Responsive.isDesktop(context) && gmcIsValueValid) + if (Responsive.isDesktop(context) && gmcIsValueValid && gmcIsPremiumSummery == '1') Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -3475,7 +3540,7 @@ class _empReviewDetailsState extends State { ))), ], ), - if (!Responsive.isDesktop(context) && gmcIsValueValid) + if (!Responsive.isDesktop(context) && gmcIsValueValid && gmcIsPremiumSummery == '1') Container( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -3662,6 +3727,7 @@ class _empReviewDetailsState extends State { .map((policy) { var siGstValue = policy["si_gst_value"] ?? 0; var siPremiumValue = policy["si_premium_value"] ?? 0; + dynamic si_is_premium_summery = policy['is_premium_summery']; if (siGstValue == 0 || siPremiumValue == 0) return null; // Skip invalid policies diff --git a/lib/pages/session/settingUpPinAndBiometric.dart b/lib/pages/session/settingUpPinAndBiometric.dart index a20c974..3309adf 100755 --- a/lib/pages/session/settingUpPinAndBiometric.dart +++ b/lib/pages/session/settingUpPinAndBiometric.dart @@ -135,7 +135,11 @@ class _pinSettingPageState extends State { Future setSkipStatus() async { await _authService.saveSkipStatus(0); - Navigator.pushReplacementNamed(context, 'home'); + if (_postToken != null && _postToken.isNotEmpty) { + Navigator.pushReplacementNamed(context, 'home'); + } else { + Navigator.pushReplacementNamed(context, 'empDetails'); + } } @override diff --git a/lib/pages/verify.dart b/lib/pages/verify.dart index 44770ac..2287925 100755 --- a/lib/pages/verify.dart +++ b/lib/pages/verify.dart @@ -395,6 +395,8 @@ class _MyVerifyState extends State { if (isMobilePlatform()) { // if (prefs.containsKey('mpin') && mpinText == 'Mpin - exist') { if (enrollToken != null && enrollToken.isNotEmpty) { + final SharedPreferences prefs = await SharedPreferences.getInstance(); + prefs.setString('empMobileNo', widget.mobileNumber); await initNotification(); Navigator.pushReplacementNamed(context, 'pinSettingPage'); } @@ -413,39 +415,55 @@ class _MyVerifyState extends State { void verifyOTP(String otp) async { try { - setState(() { - _isLoading = true; - }); - PhoneAuthCredential credential = PhoneAuthProvider.credential( - verificationId: verificationId, + // setState(() { + // _isLoading = true; + // }); + + final credential = PhoneAuthProvider.credential( + verificationId: verificationId, // Make sure this is up-to-date smsCode: otp, ); - await FirebaseAuth.instance - .signInWithCredential(credential) - .then((user) async { - if (user != null) { - // Handle successful verification - // ToastHelper.showSuccessToast(context, 'Successfully Login...!'); - bool otpVerifyStatus = true; - generateToken(otpVerifyStatus); - } else { - setState(() { - _isLoading = false; - }); - ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again'); - } - }); + final userCredential = await FirebaseAuth.instance.signInWithCredential(credential); + + if (userCredential.user != null) { + bool otpVerifyStatus = true; + generateToken(otpVerifyStatus); + } else { + ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again.'); + } + + // await FirebaseAuth.instance.signInWithCredential(credential).then((userCredential) async { + // if (userCredential.user != null) { + // bool otpVerifyStatus = true; + // generateToken(otpVerifyStatus); + // } else { + // setState(() { + // _isLoading = false; + // }); + // ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again'); + // } + // }); + } on FirebaseAuthException catch (e) { + if (e.code == 'code-expired') { + ToastHelper.showErrorToast(context, 'OTP expired. Please request a new one.'); + } else if (e.code == 'invalid-verification-code') { + ToastHelper.showErrorToast(context, 'Invalid OTP entered. Please try again.'); + } else if (e.code == 'session-expired') { + ToastHelper.showErrorToast(context, 'Session expired. Try restarting the verification.'); + } else { + ToastHelper.showErrorToast(context, 'Error: ${e.message}'); + } } catch (e) { - setState(() { - _isLoading = false; - }); + // setState(() { + // _isLoading = false; + // }); print('Error: $e'); - ToastHelper.showErrorToast( - context, 'Failed to verify OTP. Please try again.'); + ToastHelper.showErrorToast(context, 'Failed to verify OTP. Please try again.'); } } + void _resendOTP() { setState(() { _secondsRemaining = 60; diff --git a/pubspec.yaml b/pubspec.yaml index 8445bc0..0c2b6cf 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,8 +16,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -#version: 1.0.5+5 -version: 1.0.0+1 +version: 1.0.9+9 +#version: 1.0.0+1 environment: sdk: '>=3.3.3 <4.0.0'