From 69cc7aeb061458fc0cbb49b5de18595dff55c317 Mon Sep 17 00:00:00 2001 From: venbaittech Date: Wed, 27 Nov 2024 13:46:23 +0530 Subject: [PATCH] key store --- android/app/build.gradle | 24 ++- android/app/google-services.json | 26 +-- android/app/src/debug/google-services.json | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../ind/nhance/frontend}/MainActivity.kt | 2 +- ios/Runner/Info.plist | 2 + lib/main.dart | 8 +- lib/pages/enrollment/addons.dart | 175 +----------------- linux/CMakeLists.txt | 2 +- macos/Runner/Configs/AppInfo.xcconfig | 2 +- my-release-key.jks | Bin 0 -> 2756 bytes 11 files changed, 41 insertions(+), 204 deletions(-) rename android/app/src/main/kotlin/{com/example/nhance_app_pwa => nh/ind/nhance/frontend}/MainActivity.kt (75%) create mode 100644 my-release-key.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index 9d88b72..5be799e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,8 +23,14 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file("key.properties") +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + android { - namespace "com.example.nhance_app_pwa" + namespace "nh.ind.nhance.frontend" compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -43,7 +49,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.nhance_app_pwa" + applicationId "nh.ind.nhance.frontend" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 23 @@ -52,11 +58,23 @@ android { versionName flutterVersionName } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + // signingConfig signingConfigs.debug + signingConfig signingConfigs.release + minifyEnabled true // Enable code shrinking for smaller APKs + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } diff --git a/android/app/google-services.json b/android/app/google-services.json index 318f47a..945fed9 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,36 +1,26 @@ { "project_info": { - "project_number": "508866094093", - "project_id": "nhance-app-4fedb", - "storage_bucket": "nhance-app-4fedb.appspot.com" + "project_number": "1084115316849", + "project_id": "nhance-ee8d1", + "storage_bucket": "nhance-ee8d1.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:508866094093:android:9969e766daa5b770366144", + "mobilesdk_app_id": "1:1084115316849:android:963ff492c3d23ab06c6bd0", "android_client_info": { - "package_name": "com.example.nhance_app_pwa" + "package_name": "nh.ind.nhance.frontend" } }, - "oauth_client": [ - { - "client_id": "508866094093-n8l9fkevuc7vp50evicvhogiiibsc30m.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAZdKJco4fe0e1HP1A249BVZzA3WMYb_3g" + "current_key": "AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "508866094093-n8l9fkevuc7vp50evicvhogiiibsc30m.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } } diff --git a/android/app/src/debug/google-services.json b/android/app/src/debug/google-services.json index 7598588..9f9141c 100644 --- a/android/app/src/debug/google-services.json +++ b/android/app/src/debug/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:203846206303:android:01f39a22f39a50539b6cea", "android_client_info": { - "package_name": "com.example.nhance_app_pwa" + "package_name": "nh.ind.nhance.frontend" } }, "oauth_client": [], diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c33638b..717732d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/android/app/src/main/kotlin/com/example/nhance_app_pwa/MainActivity.kt b/android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt similarity index 75% rename from android/app/src/main/kotlin/com/example/nhance_app_pwa/MainActivity.kt rename to android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt index 50994c6..134f34a 100644 --- a/android/app/src/main/kotlin/com/example/nhance_app_pwa/MainActivity.kt +++ b/android/app/src/main/kotlin/nh/ind/nhance/frontend/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.nhance_app_pwa +package nh.ind.nhance.frontend import io.flutter.embedding.android.FlutterFragmentActivity diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 11b88b4..aac0205 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -4,6 +4,8 @@ NSFaceIDUsageDescription We use Face ID to protect your data in the app. + CFBundleIdentifier + nh.ind.nhance.frontend CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName diff --git a/lib/main.dart b/lib/main.dart index ac3d72a..016710e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -33,10 +33,10 @@ Future main() async { if (Firebase.apps.isEmpty) { await Firebase.initializeApp( options: const FirebaseOptions( - apiKey: 'AIzaSyAZdKJco4fe0e1HP1A249BVZzA3WMYb_3g', - appId: '1:508866094093:android:9969e766daa5b770366144', - messagingSenderId: '508866094093', - projectId: 'nhance-app-4fedb')); + apiKey: 'AIzaSyC4yHbCX4mQu0jO81pJrDwxKLQlTQWofrc', + appId: '1:1084115316849:android:963ff492c3d23ab06c6bd0', + messagingSenderId: '1084115316849', + projectId: 'nhance-ee8d1')); await dotenv.load(fileName: Environment.fileName); } diff --git a/lib/pages/enrollment/addons.dart b/lib/pages/enrollment/addons.dart index ea1d8b1..a3e9a4c 100644 --- a/lib/pages/enrollment/addons.dart +++ b/lib/pages/enrollment/addons.dart @@ -173,15 +173,13 @@ class _addOnsDetailsState extends State { }); // Decode the JWT token received from the API response Map? decodedToken = Jwt.parseJwt(token); - print(decodedToken); + selfEmpStatus = prefs.getString('selfEmpStatus'); empClientBranchId = prefs.getString('empClientBranchId'); empCodeString = prefs.getString('empCode'); - print(empCodeString); // Check if emp_code is correct empPrimaryId = prefs.getString('empPrimaryId'); gpaEmpName = prefs.getString('gpaEmpName'); client_id = prefs.getString('client_id'); - print(client_id); // Call the API when the page enters if (prefs.containsKey('clientLogo') && prefs.containsKey('clientName')) { @@ -212,15 +210,11 @@ class _addOnsDetailsState extends State { } final response = await apiService.getClientLogoAndDetailsToApi( client_id!, empCodeString!, empClientBranchId!); - print('check 1'); if (response['status'] == 'success') { if (response.containsKey('data')) { dynamic clientDetails = response['data']; - print(clientDetails); clientName = clientDetails['client']['client_name']; - print(clientName); clientLogo = clientDetails['client']['client_logo']; - print(clientLogo); } else { // Handle other status messages if needed print('API request failed with status: ${response['status']}'); @@ -248,7 +242,6 @@ class _addOnsDetailsState extends State { if (response['status'] == 'success') { setState(() { gpaPolicies = response['data']; - print('gpaPolicies'); }); } else { setState(() { @@ -276,10 +269,8 @@ class _addOnsDetailsState extends State { if (response['status'] == 'success') { // setState(() { gmcPolicies = response['data']; - print('gmcPolicies'); // }); // Assuming data is a List - print(gmcPolicies); } else { setState(() { gmcDataIsEmpty = 0; @@ -306,8 +297,6 @@ class _addOnsDetailsState extends State { if (response.containsKey('data')) { setState(() { topUpSiPolicies = response['data']; - print('topUpSiPolicies'); - print(topUpSiPolicies); }); if (topUpSiPolicies.isNotEmpty) { // setState(() { @@ -315,8 +304,6 @@ class _addOnsDetailsState extends State { await topUpSiPolicies['gmc_si_topup']['client_policy_id']; topUpSlabRates = await topUpSiPolicies['gmc_si_topup']['SlabRates']; - print('topUpSlabRates'); - print(topUpSlabRates); topUpPolicyName = await topUpSiPolicies['gmc_si_topup']['policy_name']; @@ -325,22 +312,15 @@ class _addOnsDetailsState extends State { topUpFamilyFloater = await topUpSiPolicies['gmc_si_topup'] ['policy_terms']['family_floater']; - print('topUpFamilyFloater'); - print(topUpFamilyFloater); topUpMappedFamilyFloatersSi = await topUpSiPolicies['gmc_si_topup'] ['family_floaters_of_only_si_array']; - print('topUpMappedFamilyFloatersSi'); - print(topUpMappedFamilyFloatersSi); - print('topUpECardDownload'); topUpECardDownload = topUpSiPolicies['gmc_si_topup']['eCardDownload']; - print(topUpECardDownload); String intOpenForEnrollment = topUpSiPolicies['gmc_si_topup']['OpenForEnrollment']; topUpOpenForEnrollment = int.parse(intOpenForEnrollment); - print(topUpOpenForEnrollment); topUpTypeName = topUpSiPolicies['gmc_si_topup']['type']; @@ -349,7 +329,6 @@ class _addOnsDetailsState extends State { topUpSiSelectedSI = topUpSiValue != 0 ? topUpSiValue.toString() : null; if (topUpSiSelectedSI != null) { - print('topUpSiSelectedSI'); setState(() { _topUpSiSwitcher = true; topUpSiPremiumValue = (topUpSiPolicies['gmc_si_topup'] @@ -396,8 +375,6 @@ class _addOnsDetailsState extends State { if (response.containsKey('data')) { setState(() { topUpSiParentPolicies = response['data']; - print('topUpSiParentPolicies'); - print(topUpSiParentPolicies); }); if (topUpSiParentPolicies.isNotEmpty) { // setState(() { @@ -407,8 +384,6 @@ class _addOnsDetailsState extends State { topUpParentSlabRates = await topUpSiParentPolicies['gmc_si_parent_topup']['SlabRates']; - print('topUpParentSlabRates'); - print(topUpParentSlabRates); topUpParentPolicyName = await topUpSiParentPolicies['gmc_si_parent_topup'] @@ -420,24 +395,17 @@ class _addOnsDetailsState extends State { topUpParentFamilyFloater = await topUpSiParentPolicies['gmc_si_parent_topup'] ['policy_terms']['family_floater']; - print('topUpParentFamilyFloater'); - print(topUpParentFamilyFloater); topUpParentMappedFamilyFloatersSi = await topUpSiParentPolicies['gmc_si_parent_topup'] ['family_floaters_of_only_si_array']; - print('topUpParentMappedFamilyFloatersSi'); - print(topUpParentMappedFamilyFloatersSi); - print('topUpECardDownload'); topUpParentECardDownload = topUpSiParentPolicies['gmc_si_parent_topup']['eCardDownload']; - print(topUpParentECardDownload); String intOpenForEnrollment = topUpSiParentPolicies['gmc_si_parent_topup'] ['OpenForEnrollment']; topUpParentOpenForEnrollment = int.parse(intOpenForEnrollment); - print(topUpParentOpenForEnrollment); topUpParentTypeName = topUpSiParentPolicies['gmc_si_parent_topup']['type']; @@ -448,7 +416,6 @@ class _addOnsDetailsState extends State { topUpParentSiSelectedSI = topUpParentSiValue != 0 ? topUpParentSiValue.toString() : null; if (topUpParentSiSelectedSI != null) { - print('topUpParentSiSelectedSI'); setState(() { _topUpParentSiSwitcher = true; topUpParentSiPremiumValue = @@ -497,8 +464,6 @@ class _addOnsDetailsState extends State { if (response.containsKey('data')) { setState(() { addOnsDependentPolicies = response['data']; - print('addOnsDependentPolicies'); - print(addOnsDependentPolicies); }); if (addOnsDependentPolicies.isNotEmpty) { // setState(() { @@ -509,7 +474,6 @@ class _addOnsDetailsState extends State { addOnsDependentSlabRates = await addOnsDependentPolicies['gmc_dependent_addon'] ['SlabRates']; - print(addOnsDependentSlabRates); addOnsDependentPolicyName = await addOnsDependentPolicies['gmc_dependent_addon'] @@ -521,15 +485,11 @@ class _addOnsDetailsState extends State { addOnsDependentFamilyFloater = await addOnsDependentPolicies['gmc_dependent_addon'] ['policy_terms']['family_floater']; - print('addOnsDependentFamilyFloater'); - print(addOnsDependentFamilyFloater); setState(() { addOnsDependentMappedFamilyFloatersDependent = addOnsDependentPolicies['gmc_dependent_addon'] ['family_floaters_of_dependent_and_si_array']; - print('addOnsDependentMappedFamilyFloatersDependent'); - print(addOnsDependentMappedFamilyFloatersDependent); }); String intOpenForEnrollment = @@ -567,8 +527,6 @@ class _addOnsDetailsState extends State { addOnsDependentECardDownload = addOnsDependentPolicies['gmc_dependent_addon'] ['eCardDownload']; - print('addOnsDependentECardDownload'); - print(addOnsDependentECardDownload); } } else { print('No data found in the response'); @@ -609,23 +567,18 @@ class _addOnsDetailsState extends State { } Future _selectDate(BuildContext context, formType) async { - print(formType); var ageValidation = formType['age_validation']; int min = int.parse(ageValidation['min']); // Parsing the string to an integer int max = int.parse(ageValidation['max']); // Parsing the string to an integer - print(min); - print(max); late DateTime minDate; late DateTime maxDate; final DateTime now = DateTime.now(); maxDate = DateTime(now.year - min, now.month, now.day); - print(maxDate); minDate = DateTime(now.year - max, now.month, now.day); - print(minDate); // Ensure initialDate is within the range of minDate and maxDate DateTime initialDate = @@ -653,7 +606,6 @@ class _addOnsDetailsState extends State { } Future deleteItem(Map deletedItem) async { - print(deletedItem); try { var id = deletedItem['employee_id']; final response = await apiService.deleteItemToApi(id); @@ -672,7 +624,6 @@ class _addOnsDetailsState extends State { getGmcSiParentTopUp(); getGmcDependentAddOns(); ToastHelper.showSuccessToast(context, 'Item deleted successfully'); - print('Item deleted successfully'); } else { // Handle errors ToastHelper.showErrorToast(context, 'Failed to delete item'); @@ -686,9 +637,6 @@ class _addOnsDetailsState extends State { void saveAddOnsDetails(Map formData, Map floatedData, action) async { // Construct the array of objects - print(formData); - print(floatedData); - print(action); formDataList.add({ 'relationship': formData['relationship'], 'name': formData['memberName'], @@ -725,7 +673,6 @@ class _addOnsDetailsState extends State { getGmcSiParentTopUp(); getGmcDependentAddOns(); ToastHelper.showSuccessToast(context, 'Saved Successfully...'); - print('Form data sent successfully.'); } else { ToastHelper.showErrorToast(context, 'Failed'); print('Failed to send form data. Error: ${response}'); @@ -741,31 +688,22 @@ class _addOnsDetailsState extends State { } void sendAddonsGmcDependentToAPI() async { - print(_addOnsDependentSwitcher); - print('continue'); - print(addOnsSelectedDependent); if (_addOnsDependentSwitcher == true) { if (addOnsSelectedDependent == null || addOnsSelectedDependent.isEmpty) { return; // Return if addOnsSelectedDependent is null or empty } else { - print('createOrUpdateEmployeePolicySiAmount'); try { dynamic getTrueObjects = addOnsDependentMappedFamilyFloatersDependent .where((element) => element['is_value_exist'] == true) .toList(); - print(getTrueObjects); - List> getTrueDataObjects = getTrueObjects .map>( (element) => element['data'] as Map) .toList(); - print(getTrueDataObjects); - List> selectedValues = []; // try { - print('fff'); if (getTrueDataObjects != null || getTrueDataObjects.isNotEmpty) { for (var floater in getTrueDataObjects) { String employee_id = floater['employee_id']; @@ -784,7 +722,6 @@ class _addOnsDetailsState extends State { // Add the map to the list selectedValues.add(floaterData); } - print(selectedValues); } // Iterate through familyMembers list and send each member's data to the API @@ -798,10 +735,8 @@ class _addOnsDetailsState extends State { _relationShipController.clear(); _memberNameController.clear(); _dobController.clear(); - print('Saved successfully!'); } else { ToastHelper.showErrorToast(context, 'Failed to save'); - print('Operation Failed!'); } } catch (error) { print('Error saving family members'); @@ -813,32 +748,22 @@ class _addOnsDetailsState extends State { } void sendAddonsGmcSiToAPI() async { - print(_topUpSiSwitcher); - print('continue'); - print(topUpSiSelectedSI); if (_topUpSiSwitcher == true) { if (topUpSiSelectedSI == null || topUpSiSelectedSI.isEmpty) { - print('topUpSiSelectedSI'); return; // Return if addOnsSelectedDependent is null or empty } else { - print('createOrUpdateEmployeePolicySiAmount'); try { dynamic getTrueObjects = topUpMappedFamilyFloatersSi .where((element) => element['is_value_exist'] == true) .toList(); - print(getTrueObjects); - List> getTrueDataObjects = getTrueObjects .map>( (element) => element['data'] as Map) .toList(); - print(getTrueDataObjects); - List> selectedValues = []; // try { - print('fff'); if (getTrueDataObjects != null || getTrueDataObjects.isNotEmpty) { for (var floater in getTrueDataObjects) { String employee_id = floater['employee_id']; @@ -857,7 +782,6 @@ class _addOnsDetailsState extends State { // Add the map to the list selectedValues.add(floaterData); } - print(selectedValues); } final response = @@ -870,7 +794,6 @@ class _addOnsDetailsState extends State { _relationShipController.clear(); _memberNameController.clear(); _dobController.clear(); - print('Saved successfully!'); } else { print('Failed to Save...'); } @@ -884,32 +807,22 @@ class _addOnsDetailsState extends State { } void sendAddonsGmcParentSiToAPI() async { - print(_topUpParentSiSwitcher); - print('continue'); - print(topUpParentSiSelectedSI); if (_topUpParentSiSwitcher == true) { if (topUpParentSiSelectedSI == null || topUpParentSiSelectedSI.isEmpty) { - print('topUpSiSelectedSI'); return; // Return if addOnsSelectedDependent is null or empty } else { - print('createOrUpdateEmployeePolicySiAmount'); try { dynamic getTrueObjects = topUpParentMappedFamilyFloatersSi .where((element) => element['is_value_exist'] == true) .toList(); - print(getTrueObjects); - List> getTrueDataObjects = getTrueObjects .map>( (element) => element['data'] as Map) .toList(); - print(getTrueDataObjects); - List> selectedValues = []; // try { - print('fff'); if (getTrueDataObjects != null || getTrueDataObjects.isNotEmpty) { for (var floater in getTrueDataObjects) { String employee_id = floater['employee_id']; @@ -928,7 +841,6 @@ class _addOnsDetailsState extends State { // Add the map to the list selectedValues.add(floaterData); } - print(selectedValues); } final response = @@ -941,7 +853,6 @@ class _addOnsDetailsState extends State { _relationShipController.clear(); _memberNameController.clear(); _dobController.clear(); - print('Saved successfully!'); } else { print('Failed to Save...'); } @@ -1013,8 +924,6 @@ class _addOnsDetailsState extends State { void topUpSiCalculation(choosedSiValue) async { try { - print(choosedSiValue); - var calculation = { 'client_policy_id': topUpClientPolicyId, 'emp_code': empCodeString, @@ -1022,13 +931,11 @@ class _addOnsDetailsState extends State { 'client_branch_id': empClientBranchId }; - print(calculation); // Iterate through familyMembers list and send each member's data to the API final response = await apiService.topUpSiCalculationToAPI(calculation); if (response['status'] == 'success') { - print(response); List? topUpEmpArray; for (var item in response['data']) { if (item.containsKey(empCodeString)) { @@ -1038,8 +945,6 @@ class _addOnsDetailsState extends State { } if (topUpEmpArray != null) { - print('Array for emp_code $empCodeString:'); - print(topUpEmpArray); double topUpRataPremimumSum = 0; for (var item in topUpEmpArray) { var topUpRataPremimum = item['policy_details']['rata_premimum']; @@ -1047,7 +952,6 @@ class _addOnsDetailsState extends State { topUpRataPremimumSum += topUpRataPremimum; } } - print('Sum of rata_premimum: $topUpRataPremimumSum'); double topUpGstSum = 0; for (var item in topUpEmpArray) { @@ -1056,18 +960,13 @@ class _addOnsDetailsState extends State { topUpGstSum += topUpGst; } } - print('Sum of gst: $topUpGstSum'); setState(() { topUpSiPremiumValue = (topUpRataPremimumSum as double).toInt(); - print(topUpSiPremiumValue); topUpSiPremiumGst = (topUpGstSum as double).toInt(); - print(topUpSiPremiumGst); topUpSiTotalAmt = topUpSiPremiumValue + topUpSiPremiumGst; // topUpSiTotalAmt = (topUpSum as double).toInt(); - - print(topUpSiTotalAmt); }); sendAddonsGmcSiToAPI(); } else { @@ -1083,8 +982,6 @@ class _addOnsDetailsState extends State { void topUpParentSiCalculation(choosedSiValue) async { try { - print(choosedSiValue); - var calculation = { 'client_policy_id': topUpParentClientPolicyId, 'emp_code': empCodeString, @@ -1092,14 +989,12 @@ class _addOnsDetailsState extends State { 'client_branch_id': empClientBranchId }; - print(calculation); // Iterate through familyMembers list and send each member's data to the API final response = await apiService.topUpParentSiCalculationToAPI(calculation); if (response['status'] == 'success') { - print(response['data']); List? topUpEmpArray; for (var item in response['data']) { if (item.containsKey(empCodeString)) { @@ -1109,8 +1004,6 @@ class _addOnsDetailsState extends State { } if (topUpEmpArray != null) { - print('Array for emp_code $empCodeString:'); - print(topUpEmpArray); double topUpRataPremimumSum = 0; for (var item in topUpEmpArray) { var topUpRataPremimum = item['policy_details']['rata_premimum']; @@ -1118,7 +1011,6 @@ class _addOnsDetailsState extends State { topUpRataPremimumSum += topUpRataPremimum; } } - print('Sum of rata_premimum: $topUpRataPremimumSum'); double topUpGstSum = 0; for (var item in topUpEmpArray) { @@ -1127,16 +1019,12 @@ class _addOnsDetailsState extends State { topUpGstSum += topUpGst; } } - print('Sum of gst: $topUpGstSum'); setState(() { topUpParentSiPremiumValue = (topUpRataPremimumSum as double).toInt(); - print(topUpParentSiPremiumValue); topUpParentSiPremiumGst = (topUpGstSum as double).toInt(); - print(topUpSiPremiumGst); topUpParentSiTotalAmt = topUpParentSiPremiumValue + topUpParentSiPremiumGst; - print(topUpParentSiTotalAmt); }); sendAddonsGmcParentSiToAPI(); } else { @@ -1152,8 +1040,6 @@ class _addOnsDetailsState extends State { void addOnsDependentCalculation(choosedDependentValue) async { try { - print(choosedDependentValue); - var calculation = { 'client_policy_id': addOnsDependentClientPolicyId, 'emp_code': empCodeString, @@ -1161,14 +1047,12 @@ class _addOnsDetailsState extends State { 'client_branch_id': empClientBranchId }; - print(calculation); // Iterate through familyMembers list and send each member's data to the API final response = await apiService.addOnsDependentCalculationToAPI(calculation); if (response['status'] == 'success') { - print(response['data']); List? addOnsEmpArray; for (var item in response['data']) { if (item.containsKey(empCodeString)) { @@ -1178,8 +1062,6 @@ class _addOnsDetailsState extends State { } if (addOnsEmpArray != null) { - print('Array for emp_code $empCodeString:'); - print(addOnsEmpArray); double addOnsRataPremimumSum = 0; for (var item in addOnsEmpArray) { var addOnsRataPremimum = item['policy_details']['rata_premimum']; @@ -1187,7 +1069,6 @@ class _addOnsDetailsState extends State { addOnsRataPremimumSum += addOnsRataPremimum; } } - print('Sum of rata_premimum: $addOnsRataPremimumSum'); double addOnsGstSum = 0; for (var item in addOnsEmpArray) { @@ -1196,16 +1077,12 @@ class _addOnsDetailsState extends State { addOnsGstSum += addOnsGst; } } - print('Sum of gst: $addOnsGstSum'); setState(() { addOnDependentPremiumValue = (addOnsRataPremimumSum as double).toInt(); - print(addOnDependentPremiumValue); addOnsDependentPremiumGst = (addOnsGstSum as double).toInt(); - print(addOnsDependentPremiumGst); addOnsDependentTotalAmt = addOnDependentPremiumValue + addOnsDependentPremiumGst; - print(topUpSiTotalAmt); }); } else { print('Array not found for emp_code $empCodeString'); @@ -1222,12 +1099,9 @@ class _addOnsDetailsState extends State { setState(() { isLoading = true; }); - print('sendAddOnAPI'); if (gpaDataIsEmpty != 0) { - print('gpaDataIsEmpty : $gpaDataIsEmpty'); for (var item in gpaPolicies) { - print('ClientPolicyId'); // Extract ClientPolicyId value from each object String clientPolicyId = item['ClientPolicyId']; // Convert to integer and add to iAgreeForAddOn list @@ -1244,9 +1118,7 @@ class _addOnsDetailsState extends State { } } - print('iAgreeForAddOn'); iAgreeForAddOn = iAgreeForAddOn.toSet().toList(); - print(iAgreeForAddOn); // Output: [90, 92, 88, 89] Map apiParams = { 'emp_code': empCodeString, @@ -1262,7 +1134,6 @@ class _addOnsDetailsState extends State { isLoading = false; isChecked = false; }); - print('response.statusCode == 200'); ToastHelper.showSuccessToast(context, 'Saved Successfully...'); } else { setState(() { @@ -1270,7 +1141,6 @@ class _addOnsDetailsState extends State { }); // Handle other status codes ToastHelper.showErrorToast(context, 'failed to save'); - print('Request failed with status: ${response['code']}'); } } catch (e) { setState(() { @@ -1285,8 +1155,6 @@ class _addOnsDetailsState extends State { final SharedPreferences prefs = await SharedPreferences.getInstance(); if (prefs.containsKey('hrtoken')) { String? mobileNo = prefs.getString('fromHrLoginMobileNo'); - print('mobileNo'); - print(mobileNo); Navigator.pushNamed(context, 'empDetails', arguments: {'mobile': mobileNo}); } else { @@ -1295,7 +1163,6 @@ class _addOnsDetailsState extends State { } void checkSiTopUp() async { - print('checkSiTopUp'); List> siData = [ { 'topUpSiPremiumValue': topUpSiPremiumValue, @@ -1308,7 +1175,6 @@ class _addOnsDetailsState extends State { } void checkSiParentTopUp() async { - print('checkSiParentTopUp'); List> siParentData = [ { 'topUpParentSiPremiumValue': topUpParentSiPremiumValue, @@ -1321,7 +1187,6 @@ class _addOnsDetailsState extends State { } void checkDependentTopUp() async { - print('checkDependentTopUp'); List> dependentData = [ { 'addOnDependentPremiumValue': addOnDependentPremiumValue, @@ -1335,10 +1200,6 @@ class _addOnsDetailsState extends State { @override Widget build(BuildContext context) { - print('CVC'); - print('Check1: $topUpSiPolicies'); - print('CVC'); - print('Check2: $addOnsDependentPolicies'); if (gpaDataIsEmpty == 0 && gmcDataIsEmpty == 0) { return Scaffold( appBar: CustomAppBar(), @@ -3823,7 +3684,6 @@ class _addOnsDetailsState extends State { if (_topUpSiSwitcher == false) { removeAddonsGmcSiToAPI(); } else { - print('checkSiTopUp'); checkSiTopUp(); } @@ -3831,7 +3691,6 @@ class _addOnsDetailsState extends State { false) { removeAddonsGmcParentSiToAPI(); } else { - print('checkSiParentTopUp'); checkSiParentTopUp(); } @@ -3839,7 +3698,6 @@ class _addOnsDetailsState extends State { false) { removeAddonsGmcDependentToAPI(); } else { - print('checkDependentTopUp'); checkDependentTopUp(); sendAddonsGmcDependentToAPI(); } @@ -3949,25 +3807,14 @@ class _addOnsDetailsState extends State { Future _launchURL(String url) async { final Uri uri = Uri.parse(url); // Parse the URL properly - print('_launchURL $uri'); if (uri != null) { - print('If $uri'); await launchUrl(uri, mode: LaunchMode.externalApplication); } else { - print('else $uri'); throw 'Could not launch $url'; } } void openForm(Map floaterData, action) { - print(action); - print(floaterData); - print(relationshipOptions); - print('test'); - print(_relationShipController); - print(_memberNameController); - print(_dobController); - dynamic popupName = floaterData['button_name']; // Check if the action is 'Edit' selectedRelationships = relationshipOptions @@ -3976,32 +3823,23 @@ class _addOnsDetailsState extends State { ) .toList(); - print(selectedRelationships); - print(addOnsDependentMappedFamilyFloatersDependent); if (action == 'Add') { if (floaterData['form_type'] == 'parent_in_law' || floaterData['form_type'] == 'parent') { - print('Add'); // Filter the addOnsDependentMappedFamilyFloatersDependent list to get only the objects where is_value_exist is true dynamic getTrueObjects = addOnsDependentMappedFamilyFloatersDependent .where((element) => element['is_value_exist'] == true) .toList(); - print(getTrueObjects); - List> getTrueDataObjects = getTrueObjects .map>( (element) => element['data'] as Map) .toList(); - print(getTrueDataObjects); - selectedRelationships.removeWhere((relationship) => getTrueDataObjects.any((dataObject) => dataObject['relationship'] == relationship['relationship_name'])); - - print(selectedRelationships); } } @@ -4280,25 +4118,17 @@ class _addOnsDetailsState extends State { dynamic getTrueObjects = gmcMappedFamilyFloaters .where((element) => element['is_value_exist'] == true) .toList(); - print('getTrueObjects'); - print(getTrueObjects); if (getTrueObjects.length > 0) { - print('true'); gmcSumInsured = gmcMappedFamilyFloaters[0]["data"]["basic_cover_si"]; } else { - print('false'); gmcSumInsured = item['Policy_Terms']['sum_insured']; } gmcTypeName = item['type']; }); - print('forEach Card'); - print(gmcMappedFamilyFloaters); dynamic getTrueObjects = gmcMappedFamilyFloaters .where((element) => element['is_value_exist'] == true) .toList(); - print(getTrueObjects); - Widget card = getTrueObjects.length > 0 ? Card( elevation: 0, @@ -4465,9 +4295,6 @@ class _addOnsDetailsState extends State { List cards = []; for (var item in data) { - print('item'); - print(item); - String? gpaPolicyName = item['Policy_Name']; String? gpaPolicyType = item['type']; String? gpaECardDownload = item['eCardDownload']; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 32967b9..5af18bd 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -7,7 +7,7 @@ project(runner LANGUAGES CXX) set(BINARY_NAME "nhance_app_pwa") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.nhance_app_pwa") +set(APPLICATION_ID "nh.ind.nhance.frontend") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index e7044f3..6e32976 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = nhance_app_pwa // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.nhanceAppPwa +PRODUCT_BUNDLE_IDENTIFIER = nh.ind.nhance.frontend // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. diff --git a/my-release-key.jks b/my-release-key.jks new file mode 100644 index 0000000000000000000000000000000000000000..239547e5c002fbb902d39f8c1d86dcbaa50d17f3 GIT binary patch literal 2756 zcma)8c{mdeAK#c^$h9@eHGbusHpfK9TJD@V7AZzZ5*7Nz49k5+q#AOCk|X5yqipUY zM>%IyYK|OHgz@$sPrv8=>wW+DKA-3NIlg~>o-c|5Y2yHLq9~B7U|ywYljto0AU80V z0=WR9KnTBRTNH(>@xLUlQV@l!_!nL9Yo37l{*&T|06B6gT)1DPF3R(Ff=dA9h&uWA z%8yb8LFJ02%4xL@oqx>s3CLXTnb)fl4(H&I7vccQp!mT&|Gvn<%LPD5f_Yt|O@JPp zAfOUR=!o)HYygvej~G)s)xVz308v11KQ}GNQKJQ%;6dfMmEnsu0bgBf!_u#89HO|% zB%<^3UQ)b$2Z=xNGg8!@3nwOD8&rB^nTlJ;huTBUkd3{i3kUkf{=Q6GVIl9TZVd48 z*~x|)dsy}W907>hUS|&O&8G>LCF)cgmdx&P*9HrX@)rbHZJ&QHYSW+A{N{#*cNkUf z*n5#M&CY_#s9O_t1BAF8767Nei)G=CGX89c?xiTW)(!zVt>X1~x*+W_{b##1`|1vz z$EK7Tt>mtJ=I(7E#3j{5+d^CN*G2Fi?^F_?T#>~1wd9-CjoZ(Pi=MyA>%4Yq+g6LL zK?Q_)jqQX5#=P`-@B!|jlJjMVJW|86CSTd-Yf#JH_sNc`r>?1OMUh%0?W^*aB}Rq1 zxp|Pye295#YRF$-4FIMZlTWP?2dBSo5Tf(@d&ul81><4*rtie+8N1^hF$}w$Ws2}n zUYBI`XAtSop_?ieSb9B(8kTtLDxhg^;;SxPZL5iCcyj0 z6U*+AW^3_xfOpRj*6^nebQFg4sf1IR*Ia3_f?tz||fHIoyS^V9Wn8dA8!MyJ0{6}0INMt6Gik^ zCr-~`sQez+ZM63+1=$sag{nl`$Z5~<5!s6$8mA>6jn?Epy1dsBI`%B`)gVAO%Yl7! z)~yg2u{-Vfv!9J8ac*~hZ}YQ_fP8Yl7!mW9)`=u;k1bWSC6aMd8sqgdyx|kU7iC7C zo)VgfS{+O(BBjjr3X6SY1@>Yz0JvQqQiPFP)ra0fyp>@zBN)j}{-2nj|S&T}Rt@NOoQoztrummCybrri%Ov%;HQP&@u8Pe0PHA{s_U*QO&o z(u;}|p%0TPSQp>$E1IQ=deJ`(fZRFNrsCY3#YRBgV?T?apL!O~nYbw(CRe4pphYTm zhp3BabCmq=y5xnT#ihgmzJNObB)|vY@h>C-t^vFOM8GW+;%_4i4F!qVdHZ_EptaQ1 z&?nU}+9y#M42l9u{cYj~=TbnFUlf@G2>1oJ|5kwitFqZ~Ggkw2H{@-hh|KGjWLdi= zc;Ww3*zj=kgD9cS&Juw$A;5?_87L7P+A z#B_(^qNhZVwKQbjYys@VrcWPmlla4HUztHjzH~S&!PgLOTuTeIWXRSzFVNOXZSW>K zgY&zj5ojyXmxNhxj=$FI98@du!fUPKjv({EZz?@L{guSrE+~0}Ik#pfs}3)-YT|n} zy*?BtY;@;H!kxg+1I{}129I8e4Noj_ns)chuG2VQBScvBd)A^#><>Wf1zMyYE9qbc z;|?*ATIO5zzUF?+X5K=xI@=9Gl^*tT9JO=vvOj9rnt)5G1}E0`StA}w`!-tXT0O)V zZ}~5pp~6Zuf@E^82)62i30H21#C->T`Y4(fGcN8(^AjCuPepXrTtJ$E<;aselEchn z4r(kPe}O4mSTMQ7B?dMc_(YC*UHIT8f==Y6H31`K{M8}2b$L+<>n8l1U)tfyu|pbl zqZUnOtSUuvJHvC%QK{~Iy*t{ZwO>)`CS%3da1em892xkTg?B^SQ<-|q#8t%_?myLKA!yRPA zhdQAB$x+Yu=0!6xGV?0fQn7~wA8^V3ZX1!ZnLAL^5si-s-=3Um)jc!Xo*$i6&!9tOEX5H zW9H+5zyN#qad{j#@Y0FyuIU;qFB literal 0 HcmV?d00001