From 5b0c17735f900e9f6f47fc3d7b98ca2a2fa556dd Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 6 Jan 2023 20:50:15 +0530 Subject: [PATCH] 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; } }