From 887f8e666c145f01186958218bb3370d8a2fdce3 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 6 Jan 2023 13:40:51 +0530
Subject: [PATCH 1/6] CET app Credit PD fIXES: ps

---
 .../controllers/SMC_Credit_PD_Controller.php  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 47d17a54..4388a067 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -270,6 +270,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 	function uploadCreditPDDataToCETApp_get()
 	{
 		log_message('ERROR', '#### upload SMC Credit PDData To CETApp Called');
+		
 		$smc_credit_pd =  $this->uri->segment(2);
 		$mater_details = $this->PD_Model->getPDMasterDetails($smc_credit_pd);
 		$pd_section_data = $this->SMC_Credit_PD_Model->getSMCTemplateForPD($smc_credit_pd,$mater_details[0]['fk_product_id'],null,null,'REPORT');
@@ -283,12 +284,13 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 					foreach ($pd_section_data as $key => $value) {
 						if (isset($value['json']) && $value['json'] != '') {
 							$filter_form_id[$key] = $value['fk_form_id'];
-							$CETAPP_creditPD_data[$value['form_name']] = $value['json'];
+							
+							$CETAPP_creditPD_data[$value['form_name']] = json_decode($value['json'],true);
 						} else {
 							if (in_array($value['fk_form_id'], $forms_data_to_be_get_direct_from_excel_sheet)) {
 								$data_from_excel = $this->loadDataFromExcelBusiProcess($mater_details, $value['fk_form_id']);
 								$filter_form_id[$key] = $value['fk_form_id'];
-								$CETAPP_creditPD_data[$value['form_name']] = $data_from_excel;
+								$CETAPP_creditPD_data[$value['form_name']] = json_decode($data_from_excel,true);
 							}
 						}
 					}
@@ -356,7 +358,18 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 					}
 				}
 				cet_creditpd::pushwithcetcreditpdapi($common_fields, $CETAPP_creditPD_data);
-
+				// print_r($CETAPP_creditPD_data);
+ 				// $path = $this->external_path ."/pd_reports/" . $mater_details[0]['pd_id'] . "/new-file-5-".$mater_details[0]['pd_id'].".json";
+ 				// $json = json_decode($view_data['pd_section_data'],true);
+				// $fp = fopen($path, 'w');
+				// fwrite($fp, $jsonString);
+				// fclose($fp);
+				// if(file_put_contents($path, $output_data))
+				//  {
+				//       $message = "<label class='text-success'>File createed and  data added Success fully</p>";
+				// 	  echo $message;
+				//  }die();
+				
 				$data['dataStatus'] = true;
 				$data['status'] = REST_Controller::HTTP_OK;
 				$data['msg'] = 'Data Shared Successfully';

From 413dee02559ad350a9be10f992099edd90643f39 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 6 Jan 2023 17:12:18 +0530
Subject: [PATCH 2/6] CETapp credit pd FIxes : PS

---
 .../controllers/SMC_Credit_PD_Controller.php  | 39 +++++++++++++------
 .../helpers/cet_creditpd_helper.php           | 10 +++++
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 4388a067..60a8cb3c 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -270,27 +270,46 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 	function uploadCreditPDDataToCETApp_get()
 	{
 		log_message('ERROR', '#### upload SMC Credit PDData To CETApp Called');
-		
+		$this->load->helper('smc_creditpd');
 		$smc_credit_pd =  $this->uri->segment(2);
 		$mater_details = $this->PD_Model->getPDMasterDetails($smc_credit_pd);
 		$pd_section_data = $this->SMC_Credit_PD_Model->getSMCTemplateForPD($smc_credit_pd,$mater_details[0]['fk_product_id'],null,null,'REPORT');
 		log_message('ERROR', '#### Total Credit PD is ' . count($pd_section_data));
 		if (!empty($pd_section_data)) {	
 			$forms_data_to_be_get_direct_from_excel_sheet = array(3, 9, 10, 15);
+			$companylist = $this->getCompanyName($pd_section_data[0]);
 			if (count($pd_section_data) > 0) {
 					$common_fields = array('pdid'=>$mater_details[0]['pd_id'],
 								       'product'=>$mater_details[0]['product_abbr'],
  							           'caseno'=>$mater_details[0]['pd_sno']);
-					foreach ($pd_section_data as $key => $value) {
+					// foreach ($pd_section_data as $key => $value) {
+					// 	if (isset($value['json']) && $value['json'] != '') {
+					// 		$filter_form_id[$key] = $value['fk_form_id'];	
+					// 		$CETAPP_creditPD_data[$value['form_name']] = json_decode($value['json'],true);
+					// 	} else {
+					// 		if (in_array($value['fk_form_id'], $forms_data_to_be_get_direct_from_excel_sheet)) {
+					// 			$data_from_excel = $this->loadDataFromExcelBusiProcess($mater_details, $value['fk_form_id']);
+					// 			$filter_form_id[$key] = $value['fk_form_id'];
+					// 			$CETAPP_creditPD_data[$value['form_name']] = json_decode($data_from_excel,true);
+					// 		}
+					// 	}
+					// }
+					foreach ($pd_section_data as $key => $value) 
+					{
 						if (isset($value['json']) && $value['json'] != '') {
+							$value['json'] = smc_creditpd::getSMCCreditPDReportContent($value,$smc_credit_pd,$companylist);
 							$filter_form_id[$key] = $value['fk_form_id'];
-							
-							$CETAPP_creditPD_data[$value['form_name']] = json_decode($value['json'],true);
-						} else {
-							if (in_array($value['fk_form_id'], $forms_data_to_be_get_direct_from_excel_sheet)) {
+							// $view_data['pd_section_data'][$value['fk_form_id']] = $value['json'];
+							$CETAPP_creditPD_data[$value['form_name']] = $value['json'];
+						}
+						else
+						{
+					 		if (in_array($value['fk_form_id'], $forms_data_to_be_get_direct_from_excel_sheet)) {
 								$data_from_excel = $this->loadDataFromExcelBusiProcess($mater_details, $value['fk_form_id']);
-								$filter_form_id[$key] = $value['fk_form_id'];
+								//print_r($data_from_excel);die();
+								// $view_data['pd_section_data'][$value['fk_form_id']] = $data_from_excel;
 								$CETAPP_creditPD_data[$value['form_name']] = json_decode($data_from_excel,true);
+								$filter_form_id[$key] = $value['fk_form_id'];
 							}
 						}
 					}
@@ -342,9 +361,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 						$CETAPP_creditPD_data['Key Stakeholders in Business']['key_stakeholders'] = $temp_arr;
 				    }
 				} // ### LFMP key_stakeholders ends
-				if ((in_array(1, $filter_form_id)) && (in_array(21, $filter_form_id)))
-				// && (in_array(4,$filter_form_id)))
-				{
+				// print_r($filter_form_id);die();
 					$officer_id = isset($mater_details[0]['fk_updatedby']) ? $mater_details[0]['fk_updatedby'] : '';
 					$visit_date = isset($mater_details[0]['pd_visit_date']) ? $mater_details[0]['pd_visit_date'] : '';
 					if (!empty($officer_id)) {
@@ -356,7 +373,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 							}
 						}
 					}
-				}
+				
 				cet_creditpd::pushwithcetcreditpdapi($common_fields, $CETAPP_creditPD_data);
 				// print_r($CETAPP_creditPD_data);
  				// $path = $this->external_path ."/pd_reports/" . $mater_details[0]['pd_id'] . "/new-file-5-".$mater_details[0]['pd_id'].".json";
diff --git a/api/application/helpers/cet_creditpd_helper.php b/api/application/helpers/cet_creditpd_helper.php
index 9e5cc907..ff8d5d90 100644
--- a/api/application/helpers/cet_creditpd_helper.php
+++ b/api/application/helpers/cet_creditpd_helper.php
@@ -26,6 +26,16 @@ class CET_CREDITPD
 		$headers = array('Content-Type: application/json');
 		$ch = curl_init();
 		$output_data = json_encode( $fields );
+		// log_message('ERROR','#### output_data '.$output_data);	
+		// $path = $path ."/tmp/".$fields['pdid'].".json";
+		// $fp = fopen($path, 'w');
+        // fwrite($fp, $output_data);
+		//  if(file_put_contents($path, $output_data))
+		//  {
+		//       $message = "<label class='text-success'>File createed and  data added Success fully</p>";
+		// 	  echo $message;
+		//  }die();
+		//  print_r($fields);die();
 		// log_message('ERROR',"PullcreditPDData api Request Format : ".$output_data);
 		// curl_setopt( $ch,CURLOPT_URL, "https://demo.devopsmcfinance.com/cet_creditpd/api/PullCreditPdData");                                 	                                 
 		curl_setopt( $ch,CURLOPT_URL, CET_CREDIT_PD_INTEGRATION_URL);

From 5b0c17735f900e9f6f47fc3d7b98ca2a2fa556dd Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 6 Jan 2023 20:50:15 +0530
Subject: [PATCH 3/6] Sales PD CET app : ps

---
 .../controllers/Sales_PD_Controller.php       | 62 +++++++++++--------
 .../helpers/cet_salespd_helper.php            |  2 +
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index 10d6d261..bab5090a 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -276,7 +276,6 @@ class Sales_PD_Controller extends REST_Controller {
 		log_message('ERROR','#### upload SalesPDData To CETApp Called');
 		$sales_pd_id =  $this->uri->segment(2);
 		if(!empty($sales_pd_id)){
-		log_message('ERROR','#### Sales PD = '.$sales_pd_id);
 		$columns = array('SALES_PD_DATA.*','ENTITY.short_name','PRODUCT.abbr','USERPROFILE.smc_emp_code');
 		$table = SALES_PD_DATA.' as SALES_PD_DATA';
 		$joins = array(
@@ -293,7 +292,8 @@ class Sales_PD_Controller extends REST_Controller {
 
 			$where_condition_array = array('SALES_PD_DATA.sales_pd_id' => $sales_pd_id);
 			$sales_pd_data = $this->Sales_PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array);
-			log_message('ERROR','#### Total Sales PD is '.count($sales_pd_data));
+			// log_message('ERROR', '#### Sales PD ('.$sales_pd_id.') There are ' . count($sales_pd_data).' Forms ');
+			log_message('ERROR', '#### Sales PD ('.$sales_pd_id.')');
 		if(count($sales_pd_data)>0)
 		{
 				$all_section_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('sales_pd_id' => $sales_pd_id,'isactive' => 1),SALESPD_SECTION_DATA,array(),'','section_id','ASC');
@@ -307,18 +307,7 @@ class Sales_PD_Controller extends REST_Controller {
 					$section_fields['section'.$section['section_id'] ] = $this->processSalesPDJSON($section);					
 				}
 				
-				$photograph_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite','isactive' => 1),SALEPD_DOCS);
-
-				if(count($photograph_data)>0){
-					for ($i = 0; $i < count($photograph_data); $i++){
-						$img_fields  = $common_fields;
-						$img_fields['img_name'] = $photograph_data[$i]['img_name'];
-						$img_split = explode( ',', $photograph_data[$i]['img']);
-						$img_fields['img'] = $img_split[1];
-						// $img_fields[0]['img'] = $photograph_data[$i]['img'];
-						cet_salespd::pushwithcetphotographapi($img_fields,$i);
-					}
-				}
+				
 
 				// cet_salespd::pushwithcetsalespdapi($common_fields,$section_fields,1);
 				$CETAPP_salesPD_data = $section_fields;
@@ -331,20 +320,39 @@ class Sales_PD_Controller extends REST_Controller {
 						}
 					}
 				}
-				cet_salespd::pushwithcetsalespdapi($common_fields,$CETAPP_salesPD_data,1);
-
-				$satellite_image = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite','isactive' => 1),SALEPD_DOCS);
-				if(!empty($satellite_image)){
-					$stt_fields = $common_fields;
-					$stt_fields['img_name']  = $satellite_image[0]['img_name'];
-					$stt_fields['img'] = $satellite_image[0]['img'];
-					cet_salespd::pushwithcetphotographapi($stt_fields,0);
+				$result = cet_salespd::pushwithcetsalespdapi($common_fields,$CETAPP_salesPD_data,1);
+				if($result == true){
+					$photograph_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite','isactive' => 1),SALEPD_DOCS);
+					$satellite_image = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite','isactive' => 1),SALEPD_DOCS);
+					log_message('ERROR', '#### Sales PD ('.$sales_pd_id.') There are ' . count($photograph_data).' Images');
+					if(count($photograph_data)>0){
+						for ($i = 0; $i < count($photograph_data); $i++){
+							$img_fields  = $common_fields;
+							$img_fields['img_name'] = $photograph_data[$i]['img_name'];
+							$img_split = explode( ',', $photograph_data[$i]['img']);
+							$img_fields['img'] = $img_split[1];
+							// $img_fields[0]['img'] = $photograph_data[$i]['img'];
+							cet_salespd::pushwithcetphotographapi($img_fields,$i);
+						}
+					}
+					
+					if(!empty($satellite_image)){
+						log_message('ERROR', '#### Sales PD ('.$sales_pd_id.')  satellite Available');	
+						$stt_fields = $common_fields;
+						$stt_fields['img_name']  = $satellite_image[0]['img_name'];
+						$stt_fields['img'] = $satellite_image[0]['img'];
+						cet_salespd::pushwithcetphotographapi($stt_fields,0);
+					}
+					$data['dataStatus'] = true;
+					$data['status'] = REST_Controller::HTTP_OK;
+					$data['msg'] = 'Data Shared Successfully';
+					$this->response($data,REST_Controller::HTTP_OK);
+				}else{
+					log_message('ERROR', '#### Section Details pushed Images Details Not Pushed');
+					$data['dataStatus'] = false;
+					$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+					$data['msg'] = 'Section Details pushed Images Details Not Pushed ! Try Later';
 				}
-
-				$data['dataStatus'] = true;
-				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = 'Data Shared Successfully';
-				$this->response($data,REST_Controller::HTTP_OK);
 		}
 		else
 		{
diff --git a/api/application/helpers/cet_salespd_helper.php b/api/application/helpers/cet_salespd_helper.php
index d4268517..240904b1 100644
--- a/api/application/helpers/cet_salespd_helper.php
+++ b/api/application/helpers/cet_salespd_helper.php
@@ -65,6 +65,7 @@ class CET_SALESPD
 		$response = json_decode($result);
 		log_message('ERROR',"CET APP SALES PDID (".$pdid.") "."PullSalesPDData api response :".json_encode($response));
 		curl_close( $ch );
+		return $response->status == 200 ? true : false;
 		
 	}
 	// multipart/form-data;
@@ -97,6 +98,7 @@ class CET_SALESPD
 		  log_message('ERROR',"###CET APP SALES PDID (".$pdid.") ".$log_msg."response :".json_encode($response));
 		  curl_close( $ch );
 		  unlink($file);
+		  return $response->status == 200 ? true : false;
 	}	
 }
 

From 0170fd35a14a713750c0923b7d878cf5b8078095 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 6 Jan 2023 22:07:59 +0530
Subject: [PATCH 4/6] SMC Credit PD Changes : ps

---
 .../controllers/SMC_Credit_PD_Controller.php  | 49 +++++++++++--------
 .../helpers/cet_creditpd_helper.php           | 15 +++---
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 60a8cb3c..3c13051d 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -274,7 +274,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 		$smc_credit_pd =  $this->uri->segment(2);
 		$mater_details = $this->PD_Model->getPDMasterDetails($smc_credit_pd);
 		$pd_section_data = $this->SMC_Credit_PD_Model->getSMCTemplateForPD($smc_credit_pd,$mater_details[0]['fk_product_id'],null,null,'REPORT');
-		log_message('ERROR', '#### Total Credit PD is ' . count($pd_section_data));
+		log_message('ERROR', '#### Credit PD ('.$smc_credit_pd.') There are ' . count($pd_section_data).' Forms ');
 		if (!empty($pd_section_data)) {	
 			$forms_data_to_be_get_direct_from_excel_sheet = array(3, 9, 10, 15);
 			$companylist = $this->getCompanyName($pd_section_data[0]);
@@ -312,23 +312,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 								$filter_form_id[$key] = $value['fk_form_id'];
 							}
 						}
-					}
-					$photograph_data = $this->SMC_Credit_PD_Model->selectCustomRecords(array('doc_id', 'fk_smc_credit_pd_id','img','img_name','isactive'),array('fk_smc_credit_pd_id' => $smc_credit_pd,'isactive' => 1,'img_name!=' => 'satellite'),SMC_CREDIT_PD_DOCS);
-					$satellite_image = $this->SMC_Credit_PD_Model->selectCustomRecords(array('doc_id', 'fk_smc_credit_pd_id','img','img_name','isactive'),array('fk_smc_credit_pd_id' => $smc_credit_pd,'isactive' => 1,'img_name=' => 'satellite'),SMC_CREDIT_PD_DOCS);
-							if(count($photograph_data)>0){
-							 for ($i = 0; $i < count($photograph_data); $i++){
-								$img_fields  = $common_fields;
-								$img_fields['img_name'] = $photograph_data[$i]['img_name'];
-								$img_split = explode( ',', $photograph_data[$i]['img']);
-								$img_fields['img'] = $img_split[1];
-								cet_creditpd::pushwithcetphotographapi($img_fields,$i);
-							}}
-							if(!empty($satellite_image)){
-								$stt_fields = $common_fields;
-								$stt_fields['img_name']  = $satellite_image[0]['img_name'];
-								$stt_fields['img'] = $satellite_image[0]['img'];
-								cet_creditpd::pushwithcetphotographapi($stt_fields,0);
-						    }
+					}		
 				if ($mater_details[0]['product_abbr'] == 'LFMP' && (array_key_exists("key_stakeholders",$pd_section_data[5])) ) {	
 					$LFMP_KeyStackholders = $pd_section_data[5]['key_stakeholders'];
 						$temp_arr = [];
@@ -374,8 +358,27 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 						}
 					}
 				
-				cet_creditpd::pushwithcetcreditpdapi($common_fields, $CETAPP_creditPD_data);
-				// print_r($CETAPP_creditPD_data);
+				$result = cet_creditpd::pushwithcetcreditpdapi($common_fields, $CETAPP_creditPD_data);
+				if($result == true){
+					$photograph_data = $this->SMC_Credit_PD_Model->selectCustomRecords(array('doc_id', 'fk_smc_credit_pd_id','img','img_name','isactive'),array('fk_smc_credit_pd_id' => $smc_credit_pd,'isactive' => 1,'img_name!=' => 'satellite'),SMC_CREDIT_PD_DOCS);
+					$satellite_image = $this->SMC_Credit_PD_Model->selectCustomRecords(array('doc_id', 'fk_smc_credit_pd_id','img','img_name','isactive'),array('fk_smc_credit_pd_id' => $smc_credit_pd,'isactive' => 1,'img_name=' => 'satellite'),SMC_CREDIT_PD_DOCS);
+					log_message('ERROR', '#### Credit PD ('.$smc_credit_pd.') There are ' . count($photograph_data).' Images');
+					if(count($photograph_data)>0){
+						for ($i = 0; $i < count($photograph_data); $i++){
+						$img_fields  = $common_fields;
+						$img_fields['img_name'] = $photograph_data[$i]['img_name'];
+						$img_split = explode( ',', $photograph_data[$i]['img']);
+						$img_fields['img'] = $img_split[1];
+						$resultimages = cet_creditpd::pushwithcetphotographapi($img_fields,$i);
+					}}
+					if(!empty($satellite_image)){
+						log_message('ERROR', '#### Credit PD ('.$smc_credit_pd.') satellite Available');	
+						$stt_fields = $common_fields;
+						$stt_fields['img_name']  = $satellite_image[0]['img_name'];
+						$stt_fields['img'] = $satellite_image[0]['img'];
+						$resultstatellite = cet_creditpd::pushwithcetphotographapi($stt_fields,0);
+					}
+									// print_r($CETAPP_creditPD_data);
  				// $path = $this->external_path ."/pd_reports/" . $mater_details[0]['pd_id'] . "/new-file-5-".$mater_details[0]['pd_id'].".json";
  				// $json = json_decode($view_data['pd_section_data'],true);
 				// $fp = fopen($path, 'w');
@@ -390,6 +393,12 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 				$data['dataStatus'] = true;
 				$data['status'] = REST_Controller::HTTP_OK;
 				$data['msg'] = 'Data Shared Successfully';
+				}else{
+					log_message('ERROR', '#### Section Details pushed Images Details Not Pushed');
+					$data['dataStatus'] = false;
+					$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+					$data['msg'] = 'Section Details pushed Images Details Not Pushed ! Try Later';
+				}
 				$this->response($data, REST_Controller::HTTP_OK);
 			} else {
 				log_message('ERROR', '#### There is No Data Found relevant Credit PDID ');
diff --git a/api/application/helpers/cet_creditpd_helper.php b/api/application/helpers/cet_creditpd_helper.php
index ff8d5d90..c8c378c8 100644
--- a/api/application/helpers/cet_creditpd_helper.php
+++ b/api/application/helpers/cet_creditpd_helper.php
@@ -8,6 +8,7 @@ class CET_CREDITPD
 	public static function pushwithcetcreditpdapi($fields,$data)
 	{   
 		log_message('ERROR','#### Inside cet creditpd helper fns');	
+		$CI =&get_instance();
 		if (array_key_exists("Photograph's", $data)) {
 			unset($data["Photograph's"]);
 		}
@@ -27,14 +28,15 @@ class CET_CREDITPD
 		$ch = curl_init();
 		$output_data = json_encode( $fields );
 		// log_message('ERROR','#### output_data '.$output_data);	
-		// $path = $path ."/tmp/".$fields['pdid'].".json";
-		// $fp = fopen($path, 'w');
-        // fwrite($fp, $output_data);
+		// $path = $CI->external_path."/tmp/".$fields['pdid']."1.json";
+		// // $fp = fopen($path, 'w');
+        // // fwrite($fp, $output_data);
 		//  if(file_put_contents($path, $output_data))
 		//  {
 		//       $message = "<label class='text-success'>File createed and  data added Success fully</p>";
 		// 	  echo $message;
-		//  }die();
+		//  }
+		//  return false;
 		//  print_r($fields);die();
 		// log_message('ERROR',"PullcreditPDData api Request Format : ".$output_data);
 		// curl_setopt( $ch,CURLOPT_URL, "https://demo.devopsmcfinance.com/cet_creditpd/api/PullCreditPdData");                                 	                                 
@@ -48,7 +50,7 @@ class CET_CREDITPD
 		$response = json_decode($result);
 		log_message('ERROR',"CET APP CREDIT PDID (".$pdid.") response :".json_encode($response));
 		curl_close( $ch );
-		
+		return $response->status == 200 ? true : false;		
 	}	
 
 	// multipart/form-data;
@@ -69,6 +71,7 @@ class CET_CREDITPD
 		$ch = curl_init();
 		$log_msg = " PullcreditPdPhotographsData api (".$fields['img_name'].")";
 		$fields['img'] = $curlFile;
+		log_message('ERROR',"CET APP CREDIT PDID (".$pdid.") response :".json_encode($fields));
 		curl_setopt( $ch,CURLOPT_URL, CET_CREDIT_PD_INTEGRATION_IMG_URL);                                 	                                 
 		curl_setopt( $ch,CURLOPT_POST, true );  
 		curl_setopt( $ch,CURLOPT_HTTPHEADER, $headers );
@@ -81,7 +84,7 @@ class CET_CREDITPD
 		  curl_close( $ch );
 		  unlink($file);
 		  // unlink($file_name_with_full_path); 
-		  
+		  return $response->status == 200 ? true : false;
 	}	
 }
 

From 15406674cc422841ccc0859f5316605c36688430 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Sat, 7 Jan 2023 14:27:17 +0530
Subject: [PATCH 5/6] Bulk Data upload IN Cet app : ps

---
 api/application/config/constants.php          |  2 +
 api/application/config/routes.php             |  4 +
 .../controllers/SMC_Credit_PD_Controller.php  | 91 +++++++++++++++++--
 .../controllers/Sales_PD_Controller.php       | 78 +++++++++++++++-
 .../helpers/authorization_helper.php          |  2 +-
 5 files changed, 164 insertions(+), 13 deletions(-)

diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 800e1db4..bf978f8e 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -96,6 +96,8 @@ defined('ROUTE_LOGIN_V')        OR define('ROUTE_LOGIN_V', 'generateSatelliteImg
 defined('ROUTE_LOGIN_U')        OR define('ROUTE_LOGIN_U', 'generateOTP');
 defined('ROUTE_LOGIN_T')        OR define('ROUTE_LOGIN_T', 'verifyOTP'); 
 defined('ROUTE_LOGIN_S')        OR define('ROUTE_LOGIN_S', 'purge_pddata'); 
+defined('ROUTE_LOGIN_H')        OR define('ROUTE_LOGIN_H', 'transferCreditPDToCETApp'); 
+defined('ROUTE_LOGIN_G')        OR define('ROUTE_LOGIN_G', 'transferSalesPDToCETApp'); 
 defined('ROUTE_LOGIN_F')        OR define('ROUTE_LOGIN_F', 'previewDigiLockerDocs'); 
 // defined('ROUTE_LOGIN_F')        OR define('ROUTE_LOGIN_F', 'downloadDigiLockerDocs'); 
 defined('ROUTE_LOGIN_E')        OR define('ROUTE_LOGIN_E', 'getDigiLockerDocs'); 
diff --git a/api/application/config/routes.php b/api/application/config/routes.php
index d80d4741..40f75386 100755
--- a/api/application/config/routes.php
+++ b/api/application/config/routes.php
@@ -421,3 +421,7 @@ $route['checkjsonPD']='Data_Dump_Controller/checkjsonPD';
 $route['deleteS3Image']='Data_Dump_Controller/deleteS3Images';
 
 $route['saveShortsVideo'] = 'PD_Controller/saveShortsVideo'; 
+
+$route['transferSalesPDToCETApp'] = 'Sales_PD_Controller/transferSalesPDToCETApp'; 
+$route['transferCreditPDToCETApp'] = 'SMC_Credit_PD_Controller/transferCreditPDToCETApp'; 
+
diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 3c13051d..93c7ab78 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -269,9 +269,87 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 	}
 	function uploadCreditPDDataToCETApp_get()
 	{
-		log_message('ERROR', '#### upload SMC Credit PDData To CETApp Called');
-		$this->load->helper('smc_creditpd');
 		$smc_credit_pd =  $this->uri->segment(2);
+		if($smc_credit_pd){
+			log_message('ERROR', '#### upload SMC-Credit PDData To CETApp Function Called');
+			$response = $this->dataSynchronization($smc_credit_pd);
+			if($response){
+				$data['dataStatus'] = true;
+				$data['status'] = REST_Controller::HTTP_OK;
+				$data['msg'] = 'Data Shared Successfully';
+				$this->response($data,REST_Controller::HTTP_OK);
+			}else{
+				$data['dataStatus'] = false;
+				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+				$data['msg'] = 'Something went wrong! Try Later';
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}
+		}else{
+			$msg = 'Can`t Upload ID Not Founded  ! Try Later';
+			$data['dataStatus'] = false;
+			$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+			$data['msg'] = $msg;
+			log_message('ERROR', $msg);
+			$this->response($data, REST_Controller::HTTP_OK);
+		}
+		
+	}
+	public function transferCreditPDToCETApp_get()
+	{	
+		$from_date = $this->get('from_date');
+		$to_date = $this->get('to_date');
+		if(($from_date != "" || $from_date != null) && ($to_date != "" || $to_date != null)){
+			$newDate1 = date("Y-m-d", strtotime($from_date));  
+			$newDate2 = date("Y-m-d", strtotime($to_date));  
+			$smc_lender_id = ENVIRONMENT == 'production' ? 7 : 35; //SMC lender id MWISE in live and demo 
+			$msg = " SMC-Credit PDData To CETApp Date Given Format => " . $from_date ." to ".$to_date;
+			// $where  = 'DATE(PDTRIGGER.completed_on) BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
+			$columns = array('PDTRIGGER.pd_id', 'PDTRIGGER.pd_status');
+			$table = PDTRIGGER . ' as PDTRIGGER';
+			
+			$where  = '(SELECT
+    					MAX(DATE(logmaster.createdon))
+  						FROM h_common_masters as logmaster
+  						WHERE logmaster.new_value = "COMPLETED"  AND PDTRIGGER.pd_id = logmaster.primary_key)
+    					BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
+			$where_arr = array('PDTRIGGER.fk_lender_id' => $smc_lender_id,'PDTRIGGER.pd_status' => COMPLETED,  $where => null);
+			$details = $this->SMC_Credit_PD_Model->selectCustomRecords($columns, $where_arr, $table);
+			log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details));
+			if(!empty($details)){
+				$flag = 0;
+				for ($i = 0; $i < count($details); $i++) {
+					$smc_credit_pd = $details[$i]['pd_id'];
+					// echo $smc_credit_pd;
+					$result = $this->dataSynchronization($smc_credit_pd);
+					$flag = $result == true ? $flag+1 : $flag;
+				}
+				$data['dataStatus'] = true;
+				$data['status'] = REST_Controller::HTTP_OK;
+				$data['msg'] = $flag.' Data Shared Successfully';
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}else{
+				$msg = 'There is no data for Given Date  ! Try Later';
+				$data['dataStatus'] = false;
+				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+				$data['msg'] = $msg;
+				log_message('ERROR', $msg);
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}
+			
+		}
+		else {
+			$msg = 'Can`t Upload Date Not Founded  ! Try Later';
+			$data['dataStatus'] = false;
+			$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+			$data['msg'] = $msg;
+			log_message('ERROR', $msg);
+			$this->response($data, REST_Controller::HTTP_OK);
+		}
+		
+	}
+	function dataSynchronization($smc_credit_pd)
+	{
+		$this->load->helper('smc_creditpd');
 		$mater_details = $this->PD_Model->getPDMasterDetails($smc_credit_pd);
 		$pd_section_data = $this->SMC_Credit_PD_Model->getSMCTemplateForPD($smc_credit_pd,$mater_details[0]['fk_product_id'],null,null,'REPORT');
 		log_message('ERROR', '#### Credit PD ('.$smc_credit_pd.') There are ' . count($pd_section_data).' Forms ');
@@ -308,7 +386,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 								$data_from_excel = $this->loadDataFromExcelBusiProcess($mater_details, $value['fk_form_id']);
 								//print_r($data_from_excel);die();
 								// $view_data['pd_section_data'][$value['fk_form_id']] = $data_from_excel;
-								$CETAPP_creditPD_data[$value['form_name']] = json_decode($data_from_excel,true);
+								$CETAPP_creditPD_data[$value['form_name']] =  $data_from_excel;
 								$filter_form_id[$key] = $value['fk_form_id'];
 							}
 						}
@@ -390,16 +468,15 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 				// 	  echo $message;
 				//  }die();
 				
-				$data['dataStatus'] = true;
-				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = 'Data Shared Successfully';
+				return $result;
 				}else{
 					log_message('ERROR', '#### Section Details pushed Images Details Not Pushed');
 					$data['dataStatus'] = false;
 					$data['status'] = REST_Controller::HTTP_NO_CONTENT;
 					$data['msg'] = 'Section Details pushed Images Details Not Pushed ! Try Later';
+					$this->response($data, REST_Controller::HTTP_OK);
 				}
-				$this->response($data, REST_Controller::HTTP_OK);
+				
 			} else {
 				log_message('ERROR', '#### There is No Data Found relevant Credit PDID ');
 				$data['dataStatus'] = false;
diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index bab5090a..b20229df 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -273,8 +273,79 @@ class Sales_PD_Controller extends REST_Controller {
 
 	function uploadSalesPDDataToCETApp_get()
 	{
-		log_message('ERROR','#### upload SalesPDData To CETApp Called');
 		$sales_pd_id =  $this->uri->segment(2);
+		if($sales_pd_id){
+			log_message('ERROR', '#### upload Sales PDData To CETApp Function Called');
+			$response = $this->dataSynchronization($sales_pd_id);
+			if($response){
+				$data['dataStatus'] = true;
+				$data['status'] = REST_Controller::HTTP_OK;
+				$data['msg'] = 'Data Shared Successfully';
+				$this->response($data,REST_Controller::HTTP_OK);
+			}else{
+				$data['dataStatus'] = false;
+				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+				$data['msg'] = 'Something went wrong! Try Later';
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}
+		}else{
+			$msg = 'Can`t Upload. ID Not Founded  ! Try Later';
+			$data['dataStatus'] = false;
+			$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+			$data['msg'] = $msg;
+			log_message('ERROR', $msg);
+			$this->response($data, REST_Controller::HTTP_OK);
+		}
+		
+	}
+	public function transferSalesPDToCETApp_get()
+	{
+		$from_date = $this->get('from_date');
+		$to_date = $this->get('to_date');
+		if(($from_date != "" || $from_date != null) && ($to_date != "" || $to_date != null)){
+			$newDate1 = date("Y-m-d", strtotime($from_date));  
+			$newDate2 = date("Y-m-d", strtotime($to_date));  
+			$msg = " SMC-Credit PDData Transfer To CETApp Date Given Format => " . $from_date ." to ".$to_date;
+			// $where  = 'DATE(PDTRIGGER.completed_on) BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
+			$columns = array('SALES_PD_DATA.sales_pd_id','SALES_PD_DATA.status', 'SALES_PD_DATA.completed_date');
+			$table = SALES_PD_DATA . ' as SALES_PD_DATA';
+			$where  = 'DATE(SALES_PD_DATA.completed_date)
+    					BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
+			$where_arr = array('SALES_PD_DATA.status' => COMPLETED,  $where => null);
+			$details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table);
+			log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details));
+			if(!empty($details)){
+				$flag = 0;
+				for ($i = 0; $i < count($details); $i++) {
+					$sales_pd_id = $details[$i]['sales_pd_id'];
+					// echo $sales_pd_id;
+					$result = $this->dataSynchronization($sales_pd_id);
+					$flag = ($result == true) ? $flag+1 : $flag;
+				}
+				$data['dataStatus'] = true;
+				$data['status'] = REST_Controller::HTTP_OK;
+				$data['msg'] = $flag.' Data Shared Successfully';
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}else{
+				$msg = 'There is no data for Given Date  ! Try Later';
+				$data['dataStatus'] = false;
+				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+				$data['msg'] = $msg;
+				log_message('ERROR', $msg);
+				$this->response($data, REST_Controller::HTTP_OK);	
+			}
+		}
+		else {
+			$msg = 'Can`t Upload Date Not Founded  ! Try Later';
+			$data['dataStatus'] = false;
+			$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+			$data['msg'] = $msg;
+			log_message('ERROR', $msg);
+			$this->response($data, REST_Controller::HTTP_OK);
+		}
+	}
+	function dataSynchronization($sales_pd_id)
+	{
 		if(!empty($sales_pd_id)){
 		$columns = array('SALES_PD_DATA.*','ENTITY.short_name','PRODUCT.abbr','USERPROFILE.smc_emp_code');
 		$table = SALES_PD_DATA.' as SALES_PD_DATA';
@@ -343,10 +414,7 @@ class Sales_PD_Controller extends REST_Controller {
 						$stt_fields['img'] = $satellite_image[0]['img'];
 						cet_salespd::pushwithcetphotographapi($stt_fields,0);
 					}
-					$data['dataStatus'] = true;
-					$data['status'] = REST_Controller::HTTP_OK;
-					$data['msg'] = 'Data Shared Successfully';
-					$this->response($data,REST_Controller::HTTP_OK);
+					return $result;
 				}else{
 					log_message('ERROR', '#### Section Details pushed Images Details Not Pushed');
 					$data['dataStatus'] = false;
diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php
index 8ccfe153..977d3fab 100644
--- a/api/application/helpers/authorization_helper.php
+++ b/api/application/helpers/authorization_helper.php
@@ -72,7 +72,7 @@ class AUTHORIZATION
     }
         
 		
-		if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName ==  ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C || $routingName == ROUTE_LOGIN_D || $routingName == ROUTE_LOGIN_E || $routingName == ROUTE_LOGIN_F || $routingName == ROUTE_LOGIN_S)
+		if( $routingName == ROUTE_LOGIN_X || $routingName == ROUTE_LOGIN_Y || $routingName == ROUTE_LOGIN_Z || $routingName == ROUTE_LOGIN_W || $routingName == ROUTE_LOGIN_V || $routingName ==  ROUTE_LOGIN_A || $routingName == TURN_SERVER_API || $routingName == VIDEO_CHAT_ACCESS_KEY_API || $routingName ==SAVEROOMINFO_API || $routingName ==SAVESMCCREDITPDIMAGE_API || $routingName ==GETSMCPDIMGSECTIONDATA_API || $routingName == ROUTE_LOGIN_T || $routingName == ROUTE_LOGIN_U || $routingName == ROUTE_LOGIN_B || $routingName == ROUTE_LOGIN_C || $routingName == ROUTE_LOGIN_D || $routingName == ROUTE_LOGIN_E || $routingName == ROUTE_LOGIN_F || $routingName == ROUTE_LOGIN_S || $routingName == ROUTE_LOGIN_G || $routingName == ROUTE_LOGIN_H)
 		  {
 			return true; 
 		  }

From b7dd905545f21f0c12336c27169dbf5b7878e4b2 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Sat, 7 Jan 2023 16:20:17 +0530
Subject: [PATCH 6/6] is_the_data_transfer_cet flag changes added : ps

---
 .../controllers/SMC_Credit_PD_Controller.php  | 43 ++++++++++++++-----
 .../controllers/Sales_PD_Controller.php       | 42 +++++++++++++-----
 2 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 93c7ab78..deca81ee 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -272,18 +272,31 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 		$smc_credit_pd =  $this->uri->segment(2);
 		if($smc_credit_pd){
 			log_message('ERROR', '#### upload SMC-Credit PDData To CETApp Function Called');
-			$response = $this->dataSynchronization($smc_credit_pd);
-			if($response){
-				$data['dataStatus'] = true;
-				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = 'Data Shared Successfully';
-				$this->response($data,REST_Controller::HTTP_OK);
+			$columns = array('PDTRIGGER.pd_id');
+			$table = PDTRIGGER . ' as PDTRIGGER';
+			$where_arr = array('PDTRIGGER.is_the_data_transfer_cet'=>0,'PDTRIGGER.pd_status' => COMPLETED,'PDTRIGGER.pd_id'=>$smc_credit_pd);
+			$details = $this->SMC_Credit_PD_Model->selectCustomRecords($columns, $where_arr, $table);
+			if(!empty($details)){
+				$response = $this->dataSynchronization($smc_credit_pd);
+				if($response){
+					$data['dataStatus'] = true;
+					$data['status'] = REST_Controller::HTTP_OK;
+					$data['msg'] = 'Data Shared Successfully';
+					$this->response($data,REST_Controller::HTTP_OK);
+				}else{
+					$data['dataStatus'] = false;
+					$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+					$data['msg'] = 'Something went wrong! Try Later';
+					$this->response($data, REST_Controller::HTTP_OK);	
+				}
 			}else{
+				log_message('ERROR', $smc_credit_pd.' Data already uploaded');
 				$data['dataStatus'] = false;
 				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
-				$data['msg'] = 'Something went wrong! Try Later';
+				$data['msg'] = 'Data already uploaded! Try Later';
 				$this->response($data, REST_Controller::HTTP_OK);	
 			}
+			
 		}else{
 			$msg = 'Can`t Upload ID Not Founded  ! Try Later';
 			$data['dataStatus'] = false;
@@ -312,20 +325,28 @@ class SMC_Credit_PD_Controller extends REST_Controller {
   						FROM h_common_masters as logmaster
   						WHERE logmaster.new_value = "COMPLETED"  AND PDTRIGGER.pd_id = logmaster.primary_key)
     					BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
-			$where_arr = array('PDTRIGGER.fk_lender_id' => $smc_lender_id,'PDTRIGGER.pd_status' => COMPLETED,  $where => null);
+			$where_arr = array('PDTRIGGER.is_the_data_transfer_cet'=>0,'PDTRIGGER.fk_lender_id' => $smc_lender_id,'PDTRIGGER.pd_status' => COMPLETED,  $where => null);
 			$details = $this->SMC_Credit_PD_Model->selectCustomRecords($columns, $where_arr, $table);
 			log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details));
 			if(!empty($details)){
-				$flag = 0;
+				$flag = 0;$ids=array();
 				for ($i = 0; $i < count($details); $i++) {
 					$smc_credit_pd = $details[$i]['pd_id'];
 					// echo $smc_credit_pd;
 					$result = $this->dataSynchronization($smc_credit_pd);
-					$flag = $result == true ? $flag+1 : $flag;
+					// $flag = $result == true ? $flag+1 : $flag;
+					if($result == true){
+						$flag = $flag+1;
+						array_push($ids, $smc_credit_pd);
+						//update here.
+						$update_fields2 = array('is_the_data_transfer_cet' => 1);
+			            $this->SMC_Credit_PD_Model->updateRecords($update_fields2,PDTRIGGER,array('pd_id' => $smc_credit_pd));
+						
+					}
 				}
 				$data['dataStatus'] = true;
 				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = $flag.' Data Shared Successfully';
+				$data['msg'] = implode(', ', $ids).' ( '.$flag.' ) Data Shared Successfully';
 				$this->response($data, REST_Controller::HTTP_OK);	
 			}else{
 				$msg = 'There is no data for Given Date  ! Try Later';
diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php
index b20229df..3ec756e4 100644
--- a/api/application/controllers/Sales_PD_Controller.php
+++ b/api/application/controllers/Sales_PD_Controller.php
@@ -276,16 +276,28 @@ class Sales_PD_Controller extends REST_Controller {
 		$sales_pd_id =  $this->uri->segment(2);
 		if($sales_pd_id){
 			log_message('ERROR', '#### upload Sales PDData To CETApp Function Called');
-			$response = $this->dataSynchronization($sales_pd_id);
-			if($response){
-				$data['dataStatus'] = true;
-				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = 'Data Shared Successfully';
-				$this->response($data,REST_Controller::HTTP_OK);
+			$columns = array('SALES_PD_DATA.sales_pd_id');
+			$table = SALES_PD_DATA . ' as SALES_PD_DATA';
+			$where_arr = array('SALES_PD_DATA.is_the_data_transfer_cet'=>0,'SALES_PD_DATA.status' => COMPLETED,'SALES_PD_DATA.sales_pd_id'=>$sales_pd_id);
+			$details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table);
+			if(!empty($details)){
+				$response = $this->dataSynchronization($sales_pd_id);
+				if($response){
+					$data['dataStatus'] = true;
+					$data['status'] = REST_Controller::HTTP_OK;
+					$data['msg'] = 'Data Shared Successfully';
+					$this->response($data,REST_Controller::HTTP_OK);
+				}else{
+					$data['dataStatus'] = false;
+					$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+					$data['msg'] = 'Something went wrong! Try Later';
+					$this->response($data, REST_Controller::HTTP_OK);	
+				}
 			}else{
+				log_message('ERROR', $sales_pd_id.' Data already uploaded');
 				$data['dataStatus'] = false;
 				$data['status'] = REST_Controller::HTTP_NO_CONTENT;
-				$data['msg'] = 'Something went wrong! Try Later';
+				$data['msg'] = 'Data already uploaded! Try Later';
 				$this->response($data, REST_Controller::HTTP_OK);	
 			}
 		}else{
@@ -311,20 +323,28 @@ class Sales_PD_Controller extends REST_Controller {
 			$table = SALES_PD_DATA . ' as SALES_PD_DATA';
 			$where  = 'DATE(SALES_PD_DATA.completed_date)
     					BETWEEN ' ."'$newDate1'". ' AND ' ."'$newDate2'";
-			$where_arr = array('SALES_PD_DATA.status' => COMPLETED,  $where => null);
+			$where_arr = array('SALES_PD_DATA.is_the_data_transfer_cet'=>0,'SALES_PD_DATA.status' => COMPLETED,  $where => null);
 			$details = $this->Sales_PD_Model->selectCustomRecords($columns, $where_arr, $table);
 			log_message('ERROR', $msg." Changed ".$newDate1." to ".$newDate2." Total Records => " . count($details));
 			if(!empty($details)){
-				$flag = 0;
+				$flag = 0;$ids=array();
 				for ($i = 0; $i < count($details); $i++) {
 					$sales_pd_id = $details[$i]['sales_pd_id'];
 					// echo $sales_pd_id;
 					$result = $this->dataSynchronization($sales_pd_id);
-					$flag = ($result == true) ? $flag+1 : $flag;
+					if($result == true){
+						$flag = $flag+1;
+						//update here.
+						$update_fields2 = array('is_the_data_transfer_cet' => 1);
+			            $this->Sales_PD_Model->updateRecords($update_fields2,SALES_PD_DATA,array('sales_pd_id' => $sales_pd_id));
+						array_push($ids, $sales_pd_id);
+						
+					}
+					// $flag = ($result == true) ? $flag+1 : $flag;
 				}
 				$data['dataStatus'] = true;
 				$data['status'] = REST_Controller::HTTP_OK;
-				$data['msg'] = $flag.' Data Shared Successfully';
+				$data['msg'] = implode(', ', $ids).' ( '.$flag.' ) Data Shared Successfully';
 				$this->response($data, REST_Controller::HTTP_OK);	
 			}else{
 				$msg = 'There is no data for Given Date  ! Try Later';