diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 3334cb3e..6755c987 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -724,11 +724,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); - $logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIORNMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status'])); + $logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIRONMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status'])); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']); MYHTTPCLIENT::sendPOST($dataToBot); } @@ -754,11 +754,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); - $logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIORNMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status'])); + $logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIRONMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status'])); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']); MYHTTPCLIENT::sendPOST($dataToBot); @@ -2308,7 +2308,7 @@ class PD_Controller extends REST_Controller { $records = $this->saveCoApplicantsFromGeneralInfoForm($records); } - die(); + $fields = array('isactive' => 0); $where_condition_array = array('fk_form_id'=>$formid,'fk_pd_id'=>$pdid); if($company_id != null) @@ -2561,11 +2561,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); $temp_array['pd_co_applicant_id'] = $new_co_appliacant_id; - $logger->info("APPLICANT ADDED FROM GENERAL FORM - ENV (".ENVIORNMENT.")",$temp_array); + $logger->info("APPLICANT ADDED FROM GENERAL FORM - ENV (".ENVIRONMENT.")",$temp_array); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT ADDED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT ADDED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); MYHTTPCLIENT::sendPOST($dataToBot); @@ -2577,45 +2577,45 @@ class PD_Controller extends REST_Controller { } - if($new_applicant['is_new'] == false) - { + // if($new_applicant['is_new'] == false) + // { - $temp_array = array(); - $where_condition_array = array('pd_co_applicant_id'=>$new_applicant['pd_co_applicant_id']); - if($new_applicant['is_person_met'] == true) - { - $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>3,'applicant_title_name'=>$new_applicant['applicant_title_name']); - } + // $temp_array = array(); + // $where_condition_array = array('pd_co_applicant_id'=>$new_applicant['pd_co_applicant_id']); + // if($new_applicant['is_person_met'] == true) + // { + // $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>3,'applicant_title_name'=>$new_applicant['applicant_title_name']); + // } - if($new_applicant['is_applicant'] == true) - { - $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>0,'applicant_title_name'=>$new_applicant['applicant_title_name']); - } + // if($new_applicant['is_applicant'] == true) + // { + // $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>0,'applicant_title_name'=>$new_applicant['applicant_title_name']); + // } - if($new_applicant['is_main_applicant'] == true) - { - $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>1,'applicant_title_name'=>$new_applicant['applicant_title_name']); - } - $new_co_appliacant_id = $this->PD_Model->updateRecords($temp_array,PDAPPLICANTSDETAILS,$where_condition_array); - if($new_co_appliacant_id != "" || $new_co_appliacant_id != null) - { + // if($new_applicant['is_main_applicant'] == true) + // { + // $temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>1,'applicant_title_name'=>$new_applicant['applicant_title_name']); + // } + // $new_co_appliacant_id = $this->PD_Model->updateRecords($temp_array,PDAPPLICANTSDETAILS,$where_condition_array); + // if($new_co_appliacant_id != "" || $new_co_appliacant_id != null) + // { - /*################### LOGGING #########################*/ + // /*################### LOGGING #########################*/ - $logger = MYLOG::logFunction(); - $temp_array['pd_co_applicant_id'] = $new_applicant['pd_co_applicant_id']; - $logger->info("APPLICANT EDITED FROM GENERAL FORM ENV (".ENVIORNMENT.")",$temp_array); + // $logger = MYLOG::logFunction(); + // $temp_array['pd_co_applicant_id'] = $new_applicant['pd_co_applicant_id']; + // $logger->info("APPLICANT EDITED FROM GENERAL FORM ENV (".ENVIRONMENT.")",$temp_array); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT EDITED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); - MYHTTPCLIENT::sendPOST($dataToBot); + // $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT EDITED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); + // MYHTTPCLIENT::sendPOST($dataToBot); - /*################### LOGGING #########################*/ + // /*################### LOGGING #########################*/ - } - } + // } + // } if(array_key_exists('is_active',$new_applicant)) { @@ -2629,11 +2629,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); - $logger->info("APPLICANT DELETED FROM GENERAL FORM ENV (".ENVIORNMENT.")",$new_applicant); + $logger->info("APPLICANT DELETED FROM GENERAL FORM ENV (".ENVIRONMENT.")",$new_applicant); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $new_applicant); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'APPLICANT DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $new_applicant); MYHTTPCLIENT::sendPOST($dataToBot); @@ -2666,11 +2666,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); $temp_array['pd_co_applicant_id'] = $new_co_appliacant_id; - $logger->info("COMPANY ADDED AS APPLICANT FROM GENERAL FORM ENV (". ENVIORNMENT.")",$temp_array); + $logger->info("COMPANY ADDED AS APPLICANT FROM GENERAL FORM ENV (".ENVIRONMENT.")",$temp_array); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'COMPANY ADDED AS APPLICANT FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'COMPANY ADDED AS APPLICANT FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array); MYHTTPCLIENT::sendPOST($dataToBot); @@ -2693,11 +2693,11 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(); $temp_array['pd_co_applicant_id'] = $new_co_appliacant_id; - $logger->info("COMPANY(APPLICANT) DELETED FROM GENERAL FORM ENV (". ENVIORNMENT.")",$company); + $logger->info("COMPANY(APPLICANT) DELETED FROM GENERAL FORM ENV (".ENVIRONMENT.")",$company); - $dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'COMPANY(APPLICANT) DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $company); + $dataToBot = array('ENV'=>ENVIRONMENT,'Task Name'=>'COMPANY(APPLICANT) DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $company); MYHTTPCLIENT::sendPOST($dataToBot); @@ -3326,7 +3326,7 @@ class PD_Controller extends REST_Controller { } $overall_summary_report['sales_calculated_by_itemwise']['sales_revenue'] = $total_sales_itemwise; - $overall_summary_report['sales_calculated_by_itemwise']['purchases'] = $temp_purchases; + $purchases_flag ? $overall_summary_report['sales_calculated_by_itemwise']['purchases'] = $temp_purchases : $overall_summary_report['sales_calculated_by_itemwise']['cost_of_goods_sold'] = $temp_purchases; $overall_summary_report['sales_calculated_by_itemwise']['grossprofit'] = $temp_grossprofit; $overall_summary_report['sales_calculated_by_itemwise']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_calculated_by_itemwise']['netprofit'] = $temp_netprofit; @@ -3385,7 +3385,7 @@ class PD_Controller extends REST_Controller { } $overall_summary_report['sales_calculated_by_monthwise']['sales_revenue'] = $total_sales_monthwise; - $overall_summary_report['sales_calculated_by_monthwise']['purchases'] = $temp_purchases; + $purchases_flag ? $overall_summary_report['sales_calculated_by_monthwise']['purchases'] = $temp_purchases : $overall_summary_report['sales_calculated_by_monthwise']['cost_of_goods_sold'] = $temp_purchases; $overall_summary_report['sales_calculated_by_monthwise']['grossprofit'] = $temp_grossprofit; $overall_summary_report['sales_calculated_by_monthwise']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_calculated_by_monthwise']['netprofit'] = $temp_netprofit; @@ -3422,7 +3422,7 @@ class PD_Controller extends REST_Controller { } $overall_summary_report['sales_declared_by_customer']['sales_revenue'] = $total_sales_declared_by_customer; - $overall_summary_report['sales_declared_by_customer']['purchases'] = $temp_purchases; + $purchases_flag ? $overall_summary_report['sales_declared_by_customer']['purchases'] = $temp_purchases : $overall_summary_report['sales_declared_by_customer']['cost_of_goods_sold'] = $temp_purchases; $overall_summary_report['sales_declared_by_customer']['grossprofit'] = $temp_grossprofit; $overall_summary_report['sales_declared_by_customer']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_declared_by_customer']['netprofit'] = $temp_netprofit; @@ -4278,7 +4278,7 @@ class PD_Controller extends REST_Controller { $data['applicants_details'] = $this->PD_Model->getApplicantsDetails($pdid); $data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); $data['pd_score'] = $this->calculateScore($pdid); - //print_r($data['pd_score']);die(); + print_r($data['pd_score']);die(); //GET ALL PROCESSED JSON for($i = 1;$i<=25;$i++) { @@ -4824,7 +4824,7 @@ class PD_Controller extends REST_Controller { } } - $business_assest_data[] = array('business_assets_mode'=>$business_asset['business_assets_mode'],'business_assets_mode_name'=>$business_assets_mode_name,'business_details'=>$business_asset['business_details'],'business_name_of_the_owner'=>$business_asset['business_name_of_the_owner']); + $business_assest_data[] = array('business_assets_mode'=>$business_asset['business_assets_mode'],'business_assets_mode_name'=>$business_assets_mode_name,'business_details'=>$business_asset['business_details'],'business_name_of_the_owner'=>$business_asset['business_name_of_the_owner'],'business_name_of_the_other_owner' => $business_asset['business_name_of_the_other_owner']); } } @@ -4851,13 +4851,13 @@ class PD_Controller extends REST_Controller { $fields = array('json','company_id'); $where_condition_array = array('isactive' => 1,'fk_form_id' =>4,'fk_pd_id' => $pdid); $other_assest = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON); - + //print_r($other_assest);die(); if(count($other_assest)) { foreach($other_assest as $key => $assest) { $json = json_decode($assest['json'],true); - //print_r($json); + //print_r($json);die(); if(array_key_exists('assets_details',$json)) { foreach($json['assets_details'] as $asset_key => $asset) @@ -4886,7 +4886,7 @@ class PD_Controller extends REST_Controller { } } - $other_assest_data[] = array('assets_mode'=>$asset['assets_mode'],'assets_mode_name'=>$assets_mode_name,'details'=>$asset['details'],'name_of_the_owner'=>$asset['name_of_the_owner']['name']); + $other_assest_data[] = array('assets_mode'=>$asset['assets_mode'],'assets_mode_name'=>$assets_mode_name,'details'=>$asset['details'],'name_of_the_owner'=>$asset['name_of_the_owner'],'other_owner' => $asset['other_owner']); } } diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index 41ac3682..c200e7e1 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -337,23 +337,28 @@ class GETPROCESSEDJSON if(array_key_exists('source_group',$raw_json)) - { - $source_of_own_contribution_master = array(); - foreach($raw_json['source_group'] as $source_group_key => $source_group) { - - $CI->db->SELECT( $master_tables_field_names['SOURCEOFBALANCETRANSFER'] ); - $CI->db->FROM(SOURCEOFBALANCETRANSFER); - $CI->db->WHERE('isactive',1); - $CI->db->WHERE( $master_tables_pkid['SOURCEOFBALANCETRANSFER'] ,$source_group['sources']); - $source_of_own_contribution= $CI->db->GET()->result_array(); - if(count($source_of_own_contribution)) + if($raw_json['source_group'] != "" || $raw_json['source_group'] != null) { - $source_of_own_contribution_master = array_merge($source_of_own_contribution_master,array($source_of_own_contribution[0][$master_tables_field_names['SOURCEOFBALANCETRANSFER']])); + $source_of_own_contribution_master = array(); + foreach($raw_json['source_group'] as $source_group_key => $source_group) + { + + + $CI->db->SELECT( $master_tables_field_names['SOURCEOFBALANCETRANSFER'] ); + $CI->db->FROM(SOURCEOFBALANCETRANSFER); + $CI->db->WHERE('isactive',1); + $CI->db->WHERE( $master_tables_pkid['SOURCEOFBALANCETRANSFER'] ,$source_group['sources']); + $source_of_own_contribution= $CI->db->GET()->result_array(); + if(count($source_of_own_contribution)) + { + $source_of_own_contribution_master = array_merge($source_of_own_contribution_master,array($source_of_own_contribution[0][$master_tables_field_names['SOURCEOFBALANCETRANSFER']])); + } + } + $raw_json['source_of_own_contribution_master'] = $source_of_own_contribution_master; } - } - $raw_json['source_of_own_contribution_master'] = $source_of_own_contribution_master; + } $owners_list_master = array();