From f19bd23f2925c61d407ef1e4f7b4ef3f5f253770 Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Mon, 7 Sep 2020 23:29:13 +0530 Subject: [PATCH] TELE PD FINAL FEEDBACKS --- api/application/config/customconfig_one.php | 52 +++++++++---------- api/application/libraries/AWS_COGNITO.php | 2 +- .../report_templates/JSONTOREPORT_CLIX.php | 2 +- .../report_templates/JSONTOREPORT_DI_AI.php | 2 +- .../JSONTOREPORT_DI_AI_ADDON.php | 2 +- .../JSONTOREPORT_DI_AI_TELE_PD.php | 19 +++++-- .../report_templates/JSONTOREPORT_RI.php | 2 +- .../report_templates/JSONTOREPORT_SAL.php | 2 +- 8 files changed, 47 insertions(+), 36 deletions(-) diff --git a/api/application/config/customconfig_one.php b/api/application/config/customconfig_one.php index 8fc29f26..dcde1acb 100644 --- a/api/application/config/customconfig_one.php +++ b/api/application/config/customconfig_one.php @@ -7,13 +7,13 @@ if(ENVIRONMENT == 'development' || ENVIRONMENT == 'testing') /* public key for encrypt AWS JWT SINE_EDGE_USER_POOL_ID_TOKEN */ $config['jwt_public_key_sineedge'] = '-----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqTsyy4r3nrjumED4To7w -r1rfjMEzL+hcF8OwGm89aHoEzKLZqr12uQw3eK7tVV97QV8aYOi0zUinHlOVx1PM -Dgik5jW8aCBvGM5S6PAZXn3fj59HYtKL0HIQ1cxaoIUVXjRHD/QkcCEZuG5dIxij -8NOCnE+Ip2nVm9WXbKSb/KXuF+p69Osm8VpVz7hpa/Hcf50iOe3R82dpCytUKBX4 -eq0HukzvikhFNglSw5GV0pK0syZxvu/ERMg3ja4r9an8fMayVS2YpybtRl6CCCVP -7LKZG/M5n9UutA8GWMFeDw0qcI3kLdo6ijbdpGDUqjs+OY6MBH+uKLrzsqVNTamC -RwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq8ClFHysSXbkPJ+LGAus +KsPFcSKlsCe7+hwP01p32gbx4MnwPbgJKyKfTDV4DSNvkgbx5lDlCUyBeXjlYw7P +xZT2jq5GrMpk3A1/P8pMMGkYG+MmyU7OMqtVg8Hetc8+Gika6CfHNFXgKiWk2bOX +TyXg2fOO/MBqvSudpPoaPPTzw7tfYyM7eRMrX/tzwiwuYtmGV8/njX1vbMsYTv5L +XxJWcl39jfrWeUzdJLVfWl0oCIcPBuVoPwkg3SUF0Y1bSkbHKHUAXNG/m4zRbu4A +dud4/A4JdYIJu0zlIkhlzrakxj/bXCgHWq9gqcFWJHlqt1udqArhhqJuy8unlNfV +LwIDAQAB -----END PUBLIC KEY-----'; @@ -21,30 +21,30 @@ RwIDAQAB /* public key for encrypt AWS JWT LENDER_USER_POOL_ID_TOKEN */ $config['jwt_public_key_lender'] = '-----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvWF8GBAVs77bKzpOtnu -mBGQ9kC11Pqw64avOsTE8T0mEbPWCSedqP8ShZtoFRUnZbfCVYcYPkvl+Gx5nxrY -OvrlKxtVVbrcifuKJJ/qjSSUZucQVX1aeWjYofteevcPjJxa5JEQWCjRSeblbbit -KFtoiCHH5lOFOJ9Up25AbSzOfvKT8Q3IuJau+iDyaK7PAJk4zPMtIKwk4Xw0LXVa -VmOght1/MKQnkF1YhV58HUoUirrU00ZNf+aNGQ/RW0Egjdhd+pm0R6fXXDa287fE -Yq6J1S/I5ZhFdb5kxPcuoj3K8ZQ1iIAw4euy0fn0bver8KOQCWCBxlnMUVDzyy0x -DwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm+aqeeGvIEXdpDJUPd6n +ET0uKKPxo3DQzSSJnkHp/8qn2To+6K4Glo4rE989Bb6gcKlj8zB3+dtwAkPF4Pvg +QXWSF/dPbY0UH5GGw5Zhq/3y108D5GXrC/cCYCJW3Q5ClzAwuzXZA+mehOjKdn47 +nWiAnt/06bPGUELK3NF8zjZ7MUciBM1AzvTnZS1b6xrNnmLmoY0Pa3b6cbGFbma4 +wsxGj0gRON9lnZsndz5sqzkZ2qUv2V/Hb2rBbTgxp0CRboHnR+cjmM+umXbdzw0P +FXadCEBqiTmb4IuKokbioZuCgpworLffhNqdMc5lX4BF840/cYcHfSehUEphNrs6 +ywIDAQAB -----END PUBLIC KEY-----'; /* public key for encrypt AWS JWT VENDOR_USER_POOL_ID_TOKEN */ $config['jwt_public_key_vendor'] = '-----BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7da6/Uc4mUyLJlSptAlU -/h2R4MJqFiN1nGUQ8IKf2peOsZGL+M5i1oc7eDvW0xFrH/L12Yf8Qp6bLqaYo9Rw -7T/DucgSh53/eXXmRdDBWUHZH9B6oCYc+rU9nrVPoavtrkKhWQ0A9MP9ii9sYpdZ -IueH1r31XAHxroOE9Zmm4UHnNb/t76NMJ9M3n2a+HaC1Zcf+XYwtPxWvE9Sxz330 -EkbVOlo6n/zLzVikzelVxt2zWPUW8gYTRdBaVLUBAqopWkJ4eDkYECqY1rngiO5u -TbScH7bQtVAEQTaHpnMpDMT1dPDk1f3IRhyJ0Q2y1h9ZOKBj4kK3EFWw80ccBCq7 -rwIDAQAB +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4+qikUGzOGyyby3XGdNp +Y8gzn1UaryfVVLosrbkR2lj2QjXnT+h0Dw3IDmD/4GD0h/XJq2ShxGhMSZqmMJv4 +W+V/RntIo5G1MduR0OoGVKy18pK6znajeToJS3rxyRE7qzUax2tR1FTAP8i8Ce8X +pF6qSJLQZQlN4az77gkvEmjpt2l8c+6t7UvVZdZYXyWKUsscdFlG5MEkW7rwCNKM +2LsnEHv1nCwP1ZRWFVL/kwvnX1xVFeEJcG82XI/0IJhCMB+wmnnMcCuWaigIYbTa +u9Nh1od1bdo7JpEe35BshS8W5BApiRsj2RIQu9V1nt0+Bo0xiqOKz7VLBZ2PBVsR +NwIDAQAB -----END PUBLIC KEY-----'; -$config['sine_egde_pool_id'] = 'ap-south-1_qQ85yQZJO'; -$config['lender_pool_id'] = 'ap-south-1_hFiGyr1Gw'; -$config['vendor_pool_id'] = 'ap-south-1_K57yPaWxV'; +$config['sine_egde_pool_id'] = 'ap-south-1_GqN9ZKRne'; +$config['lender_pool_id'] = 'ap-south-1_4kkhgsYo0'; +$config['vendor_pool_id'] = 'ap-south-1_cBDvQB1ok'; /*Generated token will expire in 1 minute for sample code * Increase this value as per requirement for production @@ -56,8 +56,8 @@ $config['authorization_key'] = 'sparqvenba2018'; $config['s3_resource_key'] = 'AKIAR7TQUR2J6HFMHQ4P'; $config['s3_resource_secret'] = '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'; -$config['cognito_resource_key'] = 'AKIAJ3QDSPT3LDSWRYUQ'; -$config['cognito_resource_secret'] = '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'; +$config['cognito_resource_key'] = 'AKIAR7TQUR2JRYC4VCF5'; +$config['cognito_resource_secret'] = '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'; } else if(ENVIRONMENT == 'production') diff --git a/api/application/libraries/AWS_COGNITO.php b/api/application/libraries/AWS_COGNITO.php index ce60137c..86f5b8d1 100644 --- a/api/application/libraries/AWS_COGNITO.php +++ b/api/application/libraries/AWS_COGNITO.php @@ -47,7 +47,7 @@ class AWS_COGNITO $result = $this->client->adminSetUserPassword([ 'Password' => 'temp1234', // REQUIRED 'Permanent' => false, - 'UserPoolId' => $this->CI->config->item('lender_pool_id'), // REQUIRED + 'UserPoolId' => $this->CI->config->item('sine_egde_pool_id'), // REQUIRED 'Username' => $user_name, // REQUIRED ]); print_r($result); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 86254fd0..ff58113f 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -4261,7 +4261,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 1d9bf7f1..0498fa62 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -4319,7 +4319,7 @@ if($total_no_of_business > 0) { } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php index 57cd6f6a..7d008a8f 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -4427,7 +4427,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php index 20e234ff..7eda4ee5 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php @@ -997,7 +997,7 @@ if ( isset($pdf) ) { The business name board photograph was shared by applicant.Business Form

'; + echo '

The business name board photograph was shared by applicant.Business Form'; } else { - echo '

The business name board photograph was not shared by applicant.Business Form

'; + echo '

The business name board photograph was not shared by applicant.Business Form'; } + + if($address_form['address_proof_provided'] == 'yes') + { + echo ' The address proof was shared by applicant.Business Form'; + } + else + { + echo ' The address proof was not shared by applicant.Business Form'; + } + echo '

'; + // if($business_assets_details['business_assets_for_address'][0]['business_is_pd_visited'] == 'yes') // { @@ -4252,7 +4263,7 @@ if($total_no_of_business > 0) { } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index de4ea9b5..16ae56ef 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1654,7 +1654,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) { diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 05fe3d27..26c46ed4 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -1735,7 +1735,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo '
'; - echo '

Documents to be collected:

'; + echo '

Document to be photographed/scanned:

'; // if(isset($credit_officier_specific_queries['docs_to_be_sighted_processed']) && count($credit_officier_specific_queries['docs_to_be_sighted_processed'])) {