diff --git a/api/application/config/api_user_auth_config.php b/api/application/config/api_user_auth_config.php index e2bc5e50..bbf223a8 100644 --- a/api/application/config/api_user_auth_config.php +++ b/api/application/config/api_user_auth_config.php @@ -32,7 +32,7 @@ $config['api_user_auth_info'] = array( 'saveNewUser' => array(10), 'updateExistUser' => array(10), //'getUsersDetails' => array(), -'triggerNewPD' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), +//'triggerNewPD' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), //'updatePDMaster' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), 'updatePDDocs' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), 'updatePDApplicants' => array(1,2,3,10,11,12,13,1,15,16,17,18,19,20), diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 527bc1ff..36b7db35 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2235,9 +2235,9 @@ class PD_Controller extends REST_Controller { $records = $this->saveCoApplicantsFromGeneralInfoForm($records); if(!count($inline_forms_photo_status_check)) { - // $records = INLINEPHOTOTRANSFORM::retransformGeneralFormInlinePhotos($records); - // //update general form photos saved once - // $this->PD_Model->saveRecords(array('fk_pd_id' => $pdid,'is_general_photo_saved' => 1),T_PD_INLINE_PHOTO_FORM_STATUS); + $records = INLINEPHOTOTRANSFORM::retransformGeneralFormInlinePhotos($records); + //update general form photos saved once + $this->PD_Model->saveRecords(array('fk_pd_id' => $pdid,'is_general_photo_saved' => 1),T_PD_INLINE_PHOTO_FORM_STATUS); } @@ -2282,7 +2282,7 @@ class PD_Controller extends REST_Controller { $where_condition_array['rental_count_id'] = $rental_count_id; } - //$id = $this->PD_Model->updateRecords($fields,PDFORMDETAILSJSON,$where_condition_array); + $id = $this->PD_Model->updateRecords($fields,PDFORMDETAILSJSON,$where_condition_array); /*****Call Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA******/ @@ -7782,7 +7782,7 @@ class PD_Controller extends REST_Controller { //print_r($score);die(); $score_questions_display = $this->PD_Model->getScoreableQuestionToDispaly($pdid); $t = $this->load->view('report_templates/scorecard',array('pd_score' => $score,'score_questions_display' => $score_questions_display),true); - echo $t;die(); + //echo $t;die(); $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index 46097315..2862345f 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php index 8f167ad3..432c9dbe 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -484,11 +484,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); As Per Loan Applicants during PD ₹' .' '. MYUTIL::customIndianNumberFormat($loan_form['loan_amount']). '
('. MYUTIL::numtowords($loan_form['loan_amount']) .') '; //echo "
"; echo "

"; + echo "

"; + echo "

"; + echo "

"; + echo "

"; + echo "

"; if($pd_master_details[0]['lender_short_name'] == 'CLIX') { - echo '

Disclaimer: The information contained in this report (a) is provided for the benefit of Clix Capital Services Private Limited (hereinafter referred to as Clix) only, and is not for the benefit of any other parties; (b) has been compiled by Sineedge Consulting Private Limited (Hereinafter referred as SCPL) in accordance with the instructions given, by Clix; (c) has been obtained during the visit done at premises as instructed by Clix. Some of the information in this report, by the very nature of it, might have been obtained through informal sources. SCPL wishes to mention that all due care has been exercised by SCPL in collecting information and putting together this report. However, given the nature of some of these verifications, SCPL cannot be held liable for any financial or other loss to Clix on account of any errors or omissions in the report. SCPL does not guarantee absolute accuracy of information contained herein. SCPL does not take any responsibility for any action(s) that the client may take based on the contents of this report.

'; + echo '

Disclaimer: The information contained in this report (a) is provided for the benefit of Clix Capital Services Private Limited (hereinafter referred to as Clix) only, and is not for the benefit of any other parties; (b) has been compiled by Sineedge Consulting Private Limited (Hereinafter referred as SCPL) in accordance with the instructions given, by Clix; (c) has been obtained during the visit done at premises as instructed by Clix. Some of the information in this report, by the very nature of it, might have been obtained through informal sources. SCPL wishes to mention that all due care has been exercised by SCPL in collecting information and putting together this report. However, given the nature of some of these verifications, SCPL cannot be held liable for any financial or other loss to Clix on account of any errors or omissions in the report. SCPL does not guarantee absolute accuracy of information contained herein. SCPL does not take any responsibility for any action(s) that the client may take based on the contents of this report.

'; } + + echo '

Registered / Corporate Office: SineEdge Consulting Private Limited. A-211, Pioneer Urban Square, Golf Course Extension Road, Sector 62, Gurgaon, Haryana - 122002

'; ?> @@ -1088,15 +1095,15 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($final_remark_data['outlet_location'])) { - if($final_remark_data['sealing_activity'] == 'heavy_footfall') + if($final_remark_data['outlet_location'] == 'heavy_footfall') { echo '
  • Heavy Footfall ( Lots of customer in the locality / market place )
    • '; } - else if($final_remark_data['sealing_activity'] == 'medium_footfall') + else if($final_remark_data['outlet_location'] == 'medium_footfall') { echo '
  • Medium Footfall ( Meduim no of customer in the locality / market place )
    • '; } - else if($final_remark_data['sealing_activity'] == 'low_footfall') + else if($final_remark_data['outlet_location'] == 'low_footfall') { echo '
  • LOw Footfall ( Few customer in the locality / market place )
    • '; } @@ -1127,6 +1134,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $is_current_product_bl = $pd_master_details[0]['product_abbr'] == "BL" ? true: false; $is_current_product_lab = $pd_master_details[0]['product_abbr'] == "LAP" ? true: false; + $is_current_product_laep = $pd_master_details[0]['product_abbr'] == "LAEP" ? true: false; // echo $pd_master_details[0]['product_abbr']; // echo '-bl-'. $is_current_product_bl; // echo '-lap-'.$is_current_product_lab; @@ -1134,7 +1142,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $loan_table_dispaly_rows = array(); $loan_table_dispaly_rows[] = array('particulars' => 'Total Loan Amount applied for','details' => "₹"." ".$loan_amount.' ('.MYUTIL::numtowords($loan_form['loan_amount']).')'); - if($is_current_product_bl) + if($is_current_product_bl || $is_current_product_laep) { $to_dispaly = !strcasecmp($loan_form['is_there_total_fund'], 'yes disclose') ? ('Disclosed '."₹"." ".MYUTIL::customIndianNumberFormat($loan_form['fund_amt']).' ('.MYUTIL::numtowords($loan_form['fund_amt']).')'):'Not Disclosed'; $loan_table_dispaly_rows[] = array('particulars' => 'Total Fund Requirement','details' => $to_dispaly); @@ -1181,7 +1189,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } else{ //echo 'sdn-'.((!$is_current_product_bl) && !$is_current_product_lab); die(); - if((!$is_current_product_bl) && !$is_current_product_lab) + if((!$is_current_product_bl) && !$is_current_product_lab && !$is_current_product_laep) { $loan_table_dispaly_rows[] = array('particulars' => 'Amount of Own Contribution','details' =>"₹"." ".MYUTIL::customIndianNumberFormat($loan_form['own_contribution']).' ('.MYUTIL::numtowords($loan_form['own_contribution']).')' ); $source_of_own_contribution = null; @@ -1198,7 +1206,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $loan_table_dispaly_rows[] = array('particulars' => 'EMI Comfortable Paying','details' => $rupee_symbol." ".MYUTIL::customIndianNumberFormat($loan_form['emi_level']).' ('.MYUTIL::numtowords($loan_form['emi_level']).')' ); - if(!$is_current_product_bl) + if(!$is_current_product_bl && !$is_current_product_laep) { $loan_table_dispaly_rows[] = array('particulars' => 'Type of Property Being Mortgaged','details' => $loan_form['property_type_master']); @@ -1365,7 +1373,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($businessRow['employees_appx_salary']) && $businessRow['employees_appx_salary'] != "") { - $bindEachResult['employees_appx_salary'] = 'Approximately '.$rupee_symbol.' '.$businessRow['employees_appx_salary']. 'is being paid as salary to employees'; + $bindEachResult['employees_appx_salary'] = 'Approximately '.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($businessRow['employees_appx_salary']). ' is being paid as salary to employees'; } if(isset($businessRow['officer_total']) && $businessRow['officer_total'] > 0) { @@ -2753,7 +2761,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if($total_payments_percent_on_credit_for_supplier > 0) { //$company_name = MYUTIL::findCompanyName($all_company_details,$supplierRow['company_id'],1); - echo "

    Out of total purchases done by ". $company_name_for_supplier_form_dispaly .", ". $total_payments_percent_on_credit_for_supplier ." % is done on credit in advance rest on delivery.

    "; + echo "

    Out of total purchases done by ". $company_name_for_supplier_form_dispaly .", ". $total_payments_percent_on_credit_for_supplier ." % is done on credit.

    "; //in advance rest on delivery. } } @@ -2770,7 +2778,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $stock_form_remarks = ''; if(isset($pd_processed_forms[11][$business_count])) { - $stRow = $pd_processed_forms[11][$business_count]; + $stRow = $pd_processed_forms[11][$business_count]; $stockRow = json_decode($stRow['processed_json'],true); //print_r($stockRow); $stock_form_remarks = $stockRow['stock_remarks']; @@ -3904,34 +3912,36 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo '

    Annexure A

    '; if(isset($ai_core_details) && count($ai_core_details['sales_items_by_monthwise'])) { - echo "
    "; + //echo "
    "; echo '

    Kuchha Sales Book/Bills Details:

    '; //print_r($ai_core_details_processed['sales_month_wise_to_display']);die(); foreach($ai_core_details_processed['sales_month_wise_to_display'] as $sale_month_wise) { - echo '
    '; + //echo '
    '; + echo 'Item name : ' . $sale_month_wise['sales_item'].'
    '; if($sale_month_wise['sales_type'] == 1) { - echo ''.$sale_month_wise['month_count'].' month sales value : '.$rupee_symbol.''.MYUTIL::customIndianNumberFormat($sale_month_wise['total_months_value']).' Annual Sales value:'.$rupee_symbol.'' .MYUTIL::customIndianNumberFormat(($sale_month_wise['total_months_value'] * (12 / $sale_month_wise['month_count']) )).''; + echo ''.$sale_month_wise['month_count'].' month sales value : '.$rupee_symbol.''.MYUTIL::customIndianNumberFormat($sale_month_wise['total_months_value']).' Annual Sales value:'.$rupee_symbol.'' .MYUTIL::customIndianNumberFormat(($sale_month_wise['total_months_value'] * (12 / $sale_month_wise['month_count']) )).' (i.e. ' . (12 / $sale_month_wise['month_count']).' * '. $sale_month_wise['total_months_value'] .')'; } else { echo 'Annual Sales value:'. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat(($sale_month_wise['total_months_value'] )).''; } echo '
    '; + echo '
    '; $row_count = ceil(count($sale_month_wise['months']) / 5); //print_r(($sale_month_wise['months'])); // echo $row_count; //die(); - echo ''; + echo '
    '; for($i = 0; $i <= $row_count; $i++) { $from = $i== 0 ? $i : ($i + 3); $to = ($from + 3); - echo '
    '; + //echo ''; for($j = $from ; $j <= $to ;$j++) { //$sale_month_wise['months'] as $sale_month_data @@ -3940,7 +3950,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { //print_r($sale_month_wise['months'][$j]) ;die(); - echo ''; + echo ''; + echo '   '; } } - echo ''; + //echo ''; } - echo '
    '; + echo '
    '; //echo ''; echo '
    '; echo ''; @@ -3959,27 +3969,34 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo ''; + $month_sub_total = 0; foreach($sale_month_wise['months'][$j]['month_data'] as $m_key => $month) { + if($sale_month_wise['sales_type'] == 1) { echo ''; + $month_sub_total += $month['value']; } - if($m_key == 20)break; + //if($m_key == 20)break; else if($sale_month_wise['sales_type'] == 2) { echo ''; + $month_sub_total += $month['frequency_value']; } } + echo ''; + $month_sub_total = 0; echo ''; echo '
    '.$month['date'] .' '.$month['value'] .'
    '.$month['frequency_name'] .' '.$month['frequency_value'] .'
    Total '. MYUTIL::customIndianNumberFormat ( $month_sub_total ) .'
    '; - echo '
    '; + echo '
    '; echo '
    '; //}