diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 0fa247b93..64b921ecb 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -82,20 +82,25 @@ export const environment = { mifosInterbankTransfersApiUrl: loadedEnv['mifosInterbankTransfersApiUrl'] || 'https://apis.mifos.community', mifosInterbankTransfersApiProvider: loadedEnv['mifosInterbankTransfersApiProvider'] || '/vnext1', mifosInterbankTransfersApiVersion: loadedEnv['mifosInterbankTransfersApiVersion'] || '/v1.0', - mifosInterbankTransfersEnabled: loadedEnv['mifosInterbankTransfersEnabled'] ?? true, + mifosInterbankTransfersEnabled: + loadedEnv['mifosInterbankTransfersEnabled'] !== 'false' && loadedEnv['mifosInterbankTransfersEnabled'] !== false, /** Remittance Module Integration */ mifosRemittanceApiUrl: loadedEnv['mifosRemittanceApiClientUrl'] || '', mifosRemittanceApiProvider: loadedEnv['mifosRemittanceApiProvider'] || '', mifosRemittanceApiVersion: loadedEnv['mifosRemittanceApiVersion'] || '', - mifosRemittanceEnabled: loadedEnv['mifosRemittanceEnabled'] === true || false, + mifosRemittanceEnabled: + loadedEnv['mifosRemittanceEnabled'] !== 'false' && loadedEnv['mifosRemittanceEnabled'] !== false, mifosRemittanceApiHeader: loadedEnv['mifosRemittanceApiClientHeader'] || '', mifosRemittanceApiKey: loadedEnv['mifosRemittanceApiClientKey'] || '', minPasswordLength: loadedEnv['minPasswordLength'] || 12, /** External National ID System integration */ - enableExternalNationalIdSystem: loadedEnv['enableExternalNationalIdSystem'] === 'true' || false, + enableExternalNationalIdSystem: + loadedEnv['enableExternalNationalIdSystem'] === 'true' || + loadedEnv['enableExternalNationalIdSystem'] === true || + false, externalNationalIdSystemUrl: loadedEnv['externalNationalIdSystemUrl'] || '', externalNationalIdSystemApiHeader: loadedEnv['externalNationalIdSystemApiHeader'] || '', externalNationalIdSystemApiKey: loadedEnv['externalNationalIdSystemApiKey'] || '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f1ee4fa67..e9eaf5931 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -84,13 +84,15 @@ export const environment = { mifosInterbankTransfersApiUrl: window.env?.mifosInterbankTransfersApiUrl || 'https://apis.mifos.community', mifosInterbankTransfersApiProvider: window.env?.mifosInterbankTransfersApiProvider || '/vnext1', mifosInterbankTransfersApiVersion: window.env?.mifosInterbankTransfersApiVersion || '/v1.0', - mifosInterbankTransfersEnabled: window.env?.mifosInterbankTransfersEnabled ?? true, + mifosInterbankTransfersEnabled: + window.env?.mifosInterbankTransfersEnabled !== 'false' && window.env?.mifosInterbankTransfersEnabled !== false, /** Remittance Module Integration */ mifosRemittanceApiUrl: window.env?.mifosRemittanceApiClientUrl || '', mifosRemittanceApiProvider: window.env?.mifosRemittanceApiProvider || '', mifosRemittanceApiVersion: window.env?.mifosRemittanceApiVersion || '', - mifosRemittanceEnabled: window.env?.mifosRemittanceEnabled === true || false, + mifosRemittanceEnabled: + loadedEnv['mifosRemittanceEnabled'] !== 'false' && loadedEnv['mifosRemittanceEnabled'] !== false, mifosRemittanceApiHeader: window.env?.mifosRemittanceApiClientHeader || '', mifosRemittanceApiKey: window.env?.mifosRemittanceApiClientKey || '', @@ -99,7 +101,8 @@ export const environment = { * When enabled, client creation/editing will lookup external National ID * and auto-fill client details (name, DOB, gender) from the external system. */ - enableExternalNationalIdSystem: loadedEnv.enableExternalNationalIdSystem === 'true' || false, + enableExternalNationalIdSystem: + loadedEnv.enableExternalNationalIdSystem === 'true' || loadedEnv.enableExternalNationalIdSystem === true || false, externalNationalIdSystemUrl: loadedEnv.externalNationalIdSystemUrl || '', externalNationalIdSystemApiHeader: loadedEnv.externalNationalIdSystemApiHeader || '', externalNationalIdSystemApiKey: loadedEnv.externalNationalIdSystemApiKey || '', diff --git a/src/typings.d.ts b/src/typings.d.ts index 9aa755387..1f5571404 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -39,9 +39,9 @@ interface Window { mifosInterbankTransfersApiUrl?: string; mifosInterbankTransfersApiProvider?: string; mifosInterbankTransfersApiVersion?: string; - mifosInterbankTransfersEnabled?: boolean; + mifosInterbankTransfersEnabled?: string | boolean; minPasswordLength?: number; - enableExternalNationalIdSystem?: string; + enableExternalNationalIdSystem?: string | boolean; externalNationalIdSystemUrl?: string; externalNationalIdSystemApiHeader?: string; externalNationalIdSystemApiKey?: string; @@ -49,7 +49,7 @@ interface Window { mifosRemittanceApiUrl?: string; mifosRemittanceApiProvider?: string; mifosRemittanceApiVersion?: string; - mifosRemittanceEnabled?: boolean; + mifosRemittanceEnabled?: string | boolean; mifosRemittanceApiKey?: string; }; }