CLIX CHANGES

api/application/config/api_user_auth_config.php

@@ -58,7 +58,7 @@ $config['api_user_auth_info'] = array(
 'getPDImages' => array(3,4,5,6,7,10,21,22),
 'updatePDPhoto' => array(3,4,5,6,7,10,21,22),
 'saveHTMLReport' => array(1,2,3,6,7,10),
-'archivePDImages' => array(1,2,3,6,7,10)
+//'archivePDImages' => array(1,2,3,6,7,10)
 );
 
 ?>

api/application/controllers/PD_Controller.php

@@ -4682,7 +4682,11 @@ public function getPDFormDetailsJSON_post()
 		//Get Common Images
 		$data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,'common',null,'report');
 		
-		if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-RI')
+		if($data['pd_master_details'][0]['lender_short_name'] == 'CLIX')
+		{
+			$t = $this->load->view('report_templates/JSONTOREPORT_CLIX',$data,true);
+		}
+		else if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-RI')
 		{
 			$temp = $this->load->view('report_templates/JSONTOREPORT_RI',$data,true);
 		}
@@ -5836,7 +5840,12 @@ public function getPDFormDetailsJSON_post()
 	//print_r($data['pd_images']);//die();	//print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true));
 	// die();
 		//echo "*******************************************";
-		if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-RI')
+		
+		if($data['pd_master_details'][0]['lender_short_name'] == 'CLIX')
+		{
+			$t = $this->load->view('report_templates/JSONTOREPORT_CLIX',$data,true);
+		}
+		else if($data['pd_master_details'][0]['customer_segment_abbr'] == 'SE-RI')
 		{
 			$t = $this->load->view('report_templates/JSONTOREPORT_RI',$data,true);
 		}
@@ -5844,6 +5853,7 @@ public function getPDFormDetailsJSON_post()
 		{
 			$t = $this->load->view('report_templates/JSONTOREPORT',$data,true);
 		}
+		
 		//$t = $this->load->view('temp_html.html',null,true);
 		echo $t;
 		die();
@@ -7848,6 +7858,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 	{
 		$pdid = $this->post('pd_id');
 		$pd_master_details = $this->PD_Model->getPDMasterDetails($pdid);
+		
 		$client = $this->post('client') ? $this->post('client') : 'WEB';
 		//print_r($pd_master_details);die();
 		$business_captions = array("no_of_years_business_run" => "Business Vintage >>", "location_suited_for_busienss" => "Business Location suitability >>", "business_seasonality" => "Seasonality >>", "employees_total" => "Employee Strength >>", "cerificates" => "Business Certifications Sighted >>","owned_property" => "Business Premise Ownership >>", "owned_vechile" => "Vehicle Ownership >>", "business_activity_has_seen" => "Business Activity Observed >>", "minimum_supplier_info" => "Supplier Information Provided >>", "minimum_client_info" => "Client Information Provided >>","stock_raw_material_enough" => "Raw Materials Stock Sufficiency >>", "stock_finished_goods_enough" => "Finished/Traded Stock Sufficiency >>", "vintage_of_business_account" => "Main Business Banking Account Vintage >>");
@@ -7962,7 +7973,12 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 			}
 
 
-			if( !is_numeric($business_form['employees_temporary']) || !is_numeric($business_form['employees_permanent']) || !is_numeric($business_form['employees_appx_salary']) || !is_numeric($business_form['officer_total']))
+			if(!is_numeric($business_form['employees_permanent']) || !is_numeric($business_form['employees_appx_salary']) || !is_numeric($business_form['officer_total']))
+			{
+				$incomplete_details[] = 'Business Section  - Company Employees Details Not Filled';
+			}
+
+			if( !is_numeric($business_form['employees_temporary']) && $pd_master_details[0]['lender_short_name'] != 'CLIX')
 			{
 				$incomplete_details[] = 'Business Section  - Company Employees Details Not Filled';
 			}

api/application/helpers/myutil_helper.php

@@ -10,7 +10,7 @@ class MYUTIL
 	{
 		
 	   $no = round($number);
-	   $point = round($number - $no, 2) * 100;
+	   $point = ($number - $no) == 0 ?  '' : round($number - $no, 2) * 100;
 	   $hundred = null;
 	   $digits_1 = strlen($no);
 	   $i = 0;

api/application/helpers/otherfamilyform_helper.php

@@ -22,8 +22,14 @@ public static function getFamilyDetails($values){
 
           // echo $storeValue['residence_No_of_years'];die();
         $storeValue['residence_ownership']=($fetchVal['residence_ownership'] == 1) ? $fetchVal['ownershipOther'] :(($fetchVal['residence_ownership'] == 3) ? $fetchVal['residence_ownership_master'] : $fetchVal['residence_ownership_master']);
-		$storeValue['rent'] = $fetchVal['rent'];
+        $storeValue['rent'] = $fetchVal['rent'];
+        $storeValue['no_family_members_clix'] = isset($fetchVal['no_family_mem_clix']) ? $fetchVal['no_family_mem_clix'] : '' ;
+        $storeValue['no_dependents_clix'] = isset($fetchVal['no_dependents_clix']) ? $fetchVal['no_dependents_clix'] : '' ;
+
+
         $storeValue['no_family_members']= count($fetchVal['family_members_details']) > 0 ? count($fetchVal['family_members_details']) : '0';
+
+
         $storeValue['family_members_details'] = array_map(function($tag) use ($male_gender_array){
 
             $gender = array_search($tag['family_member_relationship'],$male_gender_array);

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);

api/application/models/PD_Model.php

@@ -1931,7 +1931,7 @@ class PD_Model extends SPARQ_Model {
 	   	$this->db->from(USERPROFILE.' as USERPROFILE');
 	   	$this->db->join(USERPROFILEROLES. ' as USERPROFILEROLES','USERPROFILEROLES.fk_userid = USERPROFILE.userid and USERPROFILEROLES.isactive = 1');
 	   	$this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role');
-	   	 $this->db->join(ENTITYREGION.' as ENTITYREGION','USERPROFILE.fk_city = ENTITYREGION.fk_city_id');
+	   	$this->db->join(ENTITYREGION.' as ENTITYREGION','USERPROFILE.fk_city = ENTITYREGION.fk_city_id','LEFT');
 	   	 //$this->db->join(ENTITYLENDERBRANCH.' as ENTITYLENDERBRANCH',"USERPROFILE.fk_entity_id = ENTITYLENDERBRANCH.fk_entity_id and ENTITYLENDERBRANCH.isactive = 1 and ENTITYLENDERBRANCH.fk_city_id = USERPROFILE.fk_city");
 	   	$this->db->where('USERPROFILE.isactive',1);
 	   	$this->db->where('USERPROFILE.userid',$lender_user_id);

api/application/views/report_templates/JSONTOREPORT.php

@@ -1407,36 +1407,36 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		//this is documents visited
 		$getDocuments=array();
 		if(array_key_exists('shop_eat_act_cert',$businessRow) && strtoupper($businessRow['shop_eat_act_cert'])=='YES'){
-			array_push($getDocuments,array('name'=>'Shop/Est act Certificate.','img' => isset($businessRow['shop_eat_act_cert_pic']) ? $businessRow['shop_eat_act_cert_pic'] : ''));
+			array_push($getDocuments,array('name'=>'Shop/Est act Certificate.','img' => isset($businessRow['shop_eat_act_cert_pic']) ? $businessRow['shop_eat_act_cert_pic'] : '','key_name' => 'shop_eat_act_cert_pic'));
 		}
 		if(array_key_exists('gst_Regn_cert',$businessRow) && strtoupper($businessRow['gst_Regn_cert'])=='YES'){
-			array_push($getDocuments,array('name' => 'GST Registration.','img' => isset($businessRow['gst_Regn_cert_pic']) ? $businessRow['gst_Regn_cert_pic'] : '' ));
+			array_push($getDocuments,array('name' => 'GST Registration.','img' => isset($businessRow['gst_Regn_cert_pic']) ? $businessRow['gst_Regn_cert_pic'] : '' ,'key_name' => 'gst_Regn_cert_pic'));
 		}
 		if(array_key_exists('pf_regn',$businessRow) && strtoupper($businessRow['pf_regn'])=='YES'){
-			array_push($getDocuments,array('name' => 'PF Registration.','img' => isset($businessRow['pf_regn_pic']) ? $businessRow['pf_regn_pic'] : ''));
+			array_push($getDocuments,array('name' => 'PF Registration.','img' => isset($businessRow['pf_regn_pic']) ? $businessRow['pf_regn_pic'] : '','key_name' => 'pf_regn_pic'));
 		}
 		if(array_key_exists('esic_regn',$businessRow) && strtoupper($businessRow['esic_regn'])=='YES'){
-			array_push($getDocuments,array('name' => 'ESIC Registration.','img' => isset($businessRow['esic_regn_pic']) ? $businessRow['esic_regn_pic'] : ''));
+			array_push($getDocuments,array('name' => 'ESIC Registration.','img' => isset($businessRow['esic_regn_pic']) ? $businessRow['esic_regn_pic'] : '','key_name' => 'esic_regn_pic'));
 		}
 		if(array_key_exists('export_import_cert',$businessRow) && strtoupper($businessRow['export_import_cert'])=='YES'){
-			array_push($getDocuments,array('name' => 'Export/Import Certificate.','img' => isset($businessRow['export_import_cert_pic']) ? $businessRow['export_import_cert_pic'] : ''));
+			array_push($getDocuments,array('name' => 'Export/Import Certificate.','img' => isset($businessRow['export_import_cert_pic']) ? $businessRow['export_import_cert_pic'] : '','key_name' => 'export_import_cert_pic'));
 		}
 		if(array_key_exists('factory_cert',$businessRow) && strtoupper($businessRow['factory_cert'])=='YES'){
-			array_push($getDocuments,array('name' => 'Factory Certificate.','img' => isset($businessRow['factory_cert_pic']) ? $businessRow['factory_cert_pic'] : ''));
+			array_push($getDocuments,array('name' => 'Factory Certificate.','img' => isset($businessRow['factory_cert_pic']) ? $businessRow['factory_cert_pic'] : '','key_name' => 'factory_cert_pic'));
 		}
 		if(strtoupper($businessRow['other_documents'])=='YES' && array_key_exists('documents',$businessRow)){
 			foreach($businessRow['documents'] as $docValue){
-				array_push($getDocuments,array('name' => $docValue['document'].'.', 'img' => isset( $docValue['document_pic']) ? $docValue['document_pic'] : ''));
+				array_push($getDocuments,array('name' => $docValue['document'].'.', 'img' => isset( $docValue['document_pic']) ? $docValue['document_pic'] : '','key_name' => 'document'));
 			}
 		}
-
+		//print_r($getDocuments);
 		if(count($getDocuments))
 		{
 			foreach($getDocuments as $getDocument_key => $getDocument_value)
 			{
 				foreach($pd_images[13] as $img_key => $img_value)
 				{
-					if( $getDocument_value['name'] ==  $img_value['pd_document_title'] )
+					if( $getDocument_value['key_name'] ==  $img_value['pd_document_title'] )
 					{
 						$getDocuments[$getDocument_key]['img'] = $img_value['doc_url'];
 						break;
@@ -1444,6 +1444,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 				}
 			}
 		}
+		//print_r($getDocuments);die();
 		$bindEachResult['visit_documents']=$getDocuments;
 			array_push($businessResult,$bindEachResult);