From baf49c22c08464896457ed78e55a494e1727a0a1 Mon Sep 17 00:00:00 2001
From: sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 10 Dec 2021 20:16:23 +0530
Subject: [PATCH] code committed : ps

---
 api/application/controllers/PD_Controller.php       | 10 ++++++----
 api/application/helpers/getprocessedjson_helper.php |  2 +-
 api/application/models/PD_Model.php                 |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index d628ad5f..3dc43b3b 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -2887,9 +2887,10 @@ public function assignPDTempalate($data)
 			$processed_json =  GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid);
 			break;
 
-			// case 21: 
-			// $processed_json =  GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid);
-			// break;
+			// Buiness Banking Form 
+			case 21: 
+			$processed_json =  GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid);
+			break;
 
 			case 22: 
 			$processed_json = GETPROCESSEDJSON::convertBusinessAssetsForm($records,$formid);
@@ -6700,7 +6701,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 			  	
 
 		  		$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
-		  		
+		  		//$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); Removed ( step 2 )
 		  		$form_array[] = array('form_id' => 14,'form_name' => 'Financial Information');
 		  		$form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details');
 		  		$form_array[] = array('form_id' => 2,'form_name' => 'Client Details');
@@ -6716,6 +6717,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 
 			  	$form_array[] = array('form_id' => 13,'form_name' => 'About Business');
 		  		$form_array[] = array('form_id' => 22,'form_name' => 'Business Assets');
+				//$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');Removed ( step 2 )
 		  		$form_array[] = array('form_id' => 14,'form_name' => 'Financial Information');
 		  		$form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details');
 		  		$form_array[] = array('form_id' => 2,'form_name' => 'Client Details');
diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php
index 67953d15..18c40120 100644
--- a/api/application/helpers/getprocessedjson_helper.php
+++ b/api/application/helpers/getprocessedjson_helper.php
@@ -377,7 +377,7 @@ class GETPROCESSEDJSON
 					  }
 					  }
 					}
-				}
+				 }
 
 				}// buiness banking.....
 		}
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index d3e0cf1e..381c4f34 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -2299,7 +2299,7 @@ class PD_Model extends SPARQ_Model {
 
 	//Get SMC CityWise Agency
 	function getCityWiseSMCAgency($city){
-		    $this->db->select('AGENCYLIST.agency_id as entity_id, AGENCYLIST.agency_name as full_name, AGENCYLIST.agency_abbr as short_name,AGENCYLIST.fk_city_id,AGENCYLIST.mail_id');
+		    $this->db->select('AGENCYLIST.agency_id as entity_id, AGENCYLIST.agency_name as full_name as name,AGENCYLIST.agency_name as full_name, AGENCYLIST.agency_abbr as short_name,AGENCYLIST.fk_city_id,AGENCYLIST.mail_id');
             $this->db->from(AGENCYLIST.' as AGENCYLIST');
 			$this->db->where('AGENCYLIST.isactive',1);
 			if($city!=""){
@@ -2315,7 +2315,7 @@ class PD_Model extends SPARQ_Model {
 			// $role = array(28,29);
 			$role = array(29);
 		// }
-		    $this->db->select('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILEROLES.user_role');
+		    $this->db->select('USERPROFILE.userid,USERPROFILE.first_name,USERPROFILE.last_name,USERPROFILE.first_name as name,USERPROFILEROLES.user_role');
             $this->db->from(USERPROFILE.' as USERPROFILE');
             $this->db->join(USERPROFILEROLES.' as USERPROFILEROLES','USERPROFILEROLES.fk_userid = USERPROFILE.userid and USERPROFILEROLES.isactive = 1','LEFT');
 			$this->db->join(ROLES.' as ROLES','ROLES.role_id = USERPROFILEROLES.user_role and ROLES.isactive = 1','LEFT');
@@ -2324,7 +2324,7 @@ class PD_Model extends SPARQ_Model {
 			$this->db->where_in('USERPROFILEROLES.user_role',$role);
 			// if(!empty($entity)){ $this->db->where('USERPROFILE.fk_entity_id',$entity); }
 			$result = $this->db->get()->result_array();
-			// print_r($this->db->last_query());die();
+			print_r($this->db->last_query());die();
 	   		return $result;  
 	}