From 28299afd9867ba0efd87b2bb1563644388e381ac Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Tue, 12 Nov 2019 11:55:50 +0530 Subject: [PATCH] MONEYWISE REPORT TRIGGER UPDATE NAME TRIM --- api/application/controllers/PD_Controller.php | 30 +++++----- .../report_templates/JSONTOREPORT_CLIX.php | 56 +++++++++++++++---- 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 6f6dcb82..e9693da6 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -554,7 +554,7 @@ class PD_Controller extends REST_Controller { foreach($pd_applicant_details as $pd_applicant_detail) { $pd_applicant_detail['fk_pd_id'] = $pd_id; - $pd_applicant_detail['applicant_name'] = MYUTIL::applicantNameCamelCaseConvertion($pd_applicant_detail['applicant_name']); + $pd_applicant_detail['applicant_name'] = trim(MYUTIL::applicantNameCamelCaseConvertion($pd_applicant_detail['applicant_name'])); $co_applicant_id = $this->PD_Model->saveRecords($pd_applicant_detail,PDAPPLICANTSDETAILS); if($co_applicant_id != null || $co_applicant_id != '') { @@ -1272,6 +1272,7 @@ public function assignPDTempalate($data) //print_r($this->post());die(); foreach($pd_applicant_details as $pd_applicant_detail) { + $pd_applicant_detail['applicant_name'] = trim($pd_applicant_detail['applicant_name']); if($pd_applicant_detail['pd_co_applicant_id'] != null || $pd_applicant_detail['pd_co_applicant_id'] != "") { //$pd_id = $pd_applicant_detail['fk_pd_id']; @@ -2559,7 +2560,7 @@ public function assignPDTempalate($data) case 24: $processed_json = GETPROCESSEDJSON::convertCreditManagerQueriesForm($records,$formid); - $records['docs_to_be_sighted'] = $processed_json['docs_to_be_sighted']; + $records['docs_to_be_sighted'] = isset($processed_json['docs_to_be_sighted']) ? $processed_json['docs_to_be_sighted'] : null; unset($processed_json['docs_to_be_sighted']); @@ -2953,19 +2954,22 @@ public function getPDFormDetailsJSON_post() { $bucketname = LENDER_BUCKET_NAME_PREFIX.$pd_master_details[0]['fk_lender_id']; //echo $bucketname; - + //print_r($credit_manager_form_data);die(); foreach ($pd_documnets as $doc_key => $doc_value) { - foreach ($credit_manager_form_data['docs_to_be_sighted'] as $docs_to_be_sighted_key => $docs_to_be_sighted_value) + if(is_array($credit_manager_form_data['docs_to_be_sighted']) && count($credit_manager_form_data['docs_to_be_sighted'])) { - if(isset($docs_to_be_sighted_value['img']) && $docs_to_be_sighted_value['img'] == $doc_value['pd_document_id']) + foreach ($credit_manager_form_data['docs_to_be_sighted'] as $docs_to_be_sighted_key => $docs_to_be_sighted_value) { - $key = 'pd'.$pd_id.'/'.$doc_value['pd_document_name']; - //echo $key;die(); - $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes'); - //echo $doc_value['pd_document_id'] .'********'.$singed_uri.'*******'; - $credit_manager_form_data['docs_to_be_sighted'][$docs_to_be_sighted_key]['img'] = $singed_uri; + if(isset($docs_to_be_sighted_value['img']) && $docs_to_be_sighted_value['img'] == $doc_value['pd_document_id']) + { + $key = 'pd'.$pd_id.'/'.$doc_value['pd_document_name']; + //echo $key;die(); + $singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes'); + //echo $doc_value['pd_document_id'] .'********'.$singed_uri.'*******'; + $credit_manager_form_data['docs_to_be_sighted'][$docs_to_be_sighted_key]['img'] = $singed_uri; + } } } } @@ -5893,10 +5897,10 @@ public function getPDFormDetailsJSON_post() // die(); // foreach($u as $v) // { - // $this->aws_cognito->adminSetUserPassword('harshita.nadigatla@imgc.com'); + $this->aws_cognito->adminSetUserPassword('harshita.nadigatla@imgc.com'); // } - //die(); + die(); $is_regenerate = 0; @@ -6020,7 +6024,7 @@ public function getPDFormDetailsJSON_post() $t = ""; if(!count($add_on_pd)) { - if($data['pd_master_details'][0]['lender_short_name'] == 'CLIX') + if($data['pd_master_details'][0]['lender_short_name'] == 'CLIX' || $data['pd_master_details'][0]['lender_short_name'] == 'MONEYWISE') { $t = $this->load->view('report_templates/JSONTOREPORT_CLIX',$data,true); } diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 5f95d092..9d707026 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -1333,7 +1333,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $bindEachResult["company_details"]=$companyList; // this is for partner details if(array_key_exists('partners',$businessRow)){ - $bindEachResult["partner"]=Businessform::getPartnerDetails($businessRow['partners']); + $bindEachResult["partner"]=Businessform::getPartnerDetails($businessRow['partners'],$pd_master_details[0]['pd_id']); } else { $getPartner=array(); @@ -1523,7 +1523,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + @@ -2428,6 +2428,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_fifth_row = ''; $client_sixth_row = ''; $client_seventh_row = ''; + $client_eigth_row = ''; $to_no_of_clients = 0; $done_on_credit = 0; $name_of_the_company = ''; @@ -2454,6 +2455,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_fifth_row = '5Payment Terms'; $client_sixth_row = '6Payment Mode'; $client_seventh_row = '7No of Days Credit'; + $client_eigth_row = '8Contribution to Total Turnover in %'; // this is for manufacturing @@ -2495,6 +2497,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_sixth_row .= $main_raw_material['manufacturing_payment_mode'] ? ''. $main_raw_material['manufacturing_payment_mode'] .'' : 'NA';; $client_seventh_row .= $main_raw_material['manufacturing_credit_days_from'] && $main_raw_material['manufacturing_credit_days_to'] ? ''. $main_raw_material['manufacturing_credit_days_from'].' to '. $main_raw_material['manufacturing_credit_days_to'].' days'.'' :' NIL ' ; + + $client_eigth_row .= isset($main_raw_material['manufacturing_contribution_total_turnover']) && $main_raw_material['manufacturing_contribution_total_turnover'] != "" ? ''. $main_raw_material['manufacturing_contribution_total_turnover'].'' :' NA ' ; } @@ -2539,6 +2543,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_sixth_row .= $trading_product['trade_product_payment_mode'] ? ''. $trading_product['trade_product_payment_mode'] .'' : 'NA';; $client_seventh_row .= $trading_product['trade_product_credit_days_from'] && $trading_product['trade_product_credit_days_to']? ''. $trading_product['trade_product_credit_days_from'].' to '. $trading_product['trade_product_credit_days_to'].' days'.'' :' NIL ' ; + + $client_eigth_row .= isset($main_raw_material['trade_product_contribution_total_turnover']) && $main_raw_material['trade_product_contribution_total_turnover'] != "" ? ''. $main_raw_material['trade_product_contribution_total_turnover'].'' :' NA ' ; } @@ -2584,6 +2590,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_sixth_row .= $service_product['service_provider_product_payment_mode'] ? ''. $service_product['service_provider_product_payment_mode'] .'' : 'NA'; $client_seventh_row .= $service_product['service_provider_product_credit_days_from'] && $service_product['service_provider_product_credit_days_to']? ''. $service_product['service_provider_product_credit_days_from'].' to '. $service_product['service_provider_product_credit_days_to'].' days'.'' :' NIL ' ; + + $client_eigth_row .= isset($main_raw_material['service_provider_contribution_total_turnover']) && $main_raw_material['service_provider_contribution_total_turnover'] != "" ? ''. $main_raw_material['service_provider_contribution_total_turnover'].'' :' NA ' ; } } @@ -2601,6 +2609,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_fifth_row .= ''; $client_sixth_row .= ''; $client_seventh_row .= ''; + $client_eigth_row .= ''; //echo $client_third_row; ?> @@ -2631,9 +2640,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - - - + + + + + + + @@ -2707,6 +2725,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_fifth_row = '5Payment Terms'; $supplier_sixth_row = '6Payment Mode'; $supplier_seventh_row = '7No of Days Credit'; + $supplier_eigth_row = '8Contribution to Total Purchase in %'; if(isset($pd_processed_forms[1][$business_count])) { @@ -2752,7 +2771,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - $supplier_fourth_row .= $raw['person_stdcode'] && $raw['person_landline'] ? ''. $raw['person_stdcode'].' '.$raw['person_landline'].'' : ''.'Not Provided'.''; + $supplier_fourth_row .= $raw['person_stdcode'] && $raw['person_landline'] ? ''. $raw['person_stdcode'].' '.$raw['person_landline'].'' : ''.'Not Provided'.''; @@ -2764,6 +2783,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_seventh_row .= $raw['manufacturing_credit_days_from'] && $raw['manufacturing_credit_days_to'] ? ''. $raw['manufacturing_credit_days_from'].' to '. $raw['manufacturing_credit_days_to'].' days' : 'NA'; //array_push($supplierResult,$temp); + $supplier_eigth_row .= isset($raw['manufacturing_contribution_total_purchase']) && $raw['manufacturing_contribution_total_purchase'] != "" ? ''.$raw['manufacturing_contribution_total_purchase'] .'' : ' NA ' ; } } @@ -2808,6 +2828,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_sixth_row .= $tradeRow['trade_product_payment_mode'] ? ''. $tradeRow['trade_product_payment_mode'] .'' : 'NA'; $supplier_seventh_row .= $tradeRow['trade_product_credit_days_from'] && $tradeRow['trade_product_credit_days_to'] ? ''. $tradeRow['trade_product_credit_days_from'].' to '. $tradeRow['trade_product_credit_days_to'].' days' : 'NA'; + + $supplier_eigth_row .= isset($raw['trade_product_contribution_total_purchase']) && $raw['trade_product_contribution_total_purchase'] != "" ? ''.$raw['trade_product_contribution_total_purchase'] .'' : ' NA ' ; ///array_push($supplierResult,$temp); //} @@ -2852,6 +2874,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_sixth_row .= $serviceRow['service_provider_payment_mode'] ? ''. $serviceRow['service_provider_payment_mode'] .'' : 'NA'; $supplier_seventh_row .= $serviceRow['service_provider_credit_days_from'] && $serviceRow['service_provider_credit_days_to'] ? ''. $serviceRow['service_provider_credit_days_from'].' to '. $serviceRow['service_provider_credit_days_to'].' days' : 'NA'; + + $supplier_eigth_row .= isset($raw['service_provider_contribution_total_purchase']) && $raw['service_provider_contribution_total_purchase'] != "" ? ''.$raw['service_provider_contribution_total_purchase'] .'' : ' NA ' ; //array_push($supplierResult,$temp); //} @@ -2866,6 +2890,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_fifth_row .= ''; $supplier_sixth_row .= ''; $supplier_seventh_row .= ''; + $supplier_eigth_row .= ''; } // echo "dsfnsdkfnj**********"; // print_r($supplierResult);// @@ -2901,9 +2926,15 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo $supplier_second_row; echo $supplier_third_row; echo $supplier_fourth_row; - // echo $supplier_fifth_row; - // echo $supplier_sixth_row; - // echo $supplier_seventh_row; + + if($pd_master_details[0]['lender_short_name'] == 'MONEYWISE') + { + + echo $supplier_fifth_row; + echo $supplier_sixth_row; + echo $supplier_seventh_row; + echo $supplier_eigth_row; + } ?> @@ -2996,6 +3027,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_raw_materials_sufficient_enough = null; $is_raw_materials_sufficient_enough_remarks = null; + $how_was_the_stock_validated = isset($stockRow['stock_validated']) ? $stockRow['stock_validated'] : null; $is_sufficiant_service_goods = $stockRow['is_sufficiant_service_goods']; $bindStockResult["company_name"]=MYUTIL::findCompanyName($all_company_details,$stockRow['company_id'],1); // this is for stock manufacturing details @@ -3177,6 +3209,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo '

Stock not required to be maintained.

'; } + + echo '

'. $how_was_the_stock_validated ? 'How was stock validated :- '.$how_was_the_stock_validated : ''.'

'; $stock_photo_count = array_filter($pd_images[11],function($d) use ($business_count){ if($d['company_id'] == ($business_count + 1)){ return 1;}else {return 0;} }); $stock_img_row_count = ceil(count($stock_photo_count) / 3); @@ -3637,7 +3671,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $is_personal_info_available = 1; if(count($otherAssetRow['assets_details'])>0){ - $otherAssetResult=ASSETSFORM::getOthersAssetsDetails($otherAssetRow['assets_details'],,$pd_master_details[0]['pd_id']); + $otherAssetResult=ASSETSFORM::getOthersAssetsDetails($otherAssetRow['assets_details'],$pd_master_details[0]['pd_id']); //print_r($otherAssetResult); }