diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index b9a52997..018de5b5 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -5112,9 +5112,10 @@ class PD_Controller extends REST_Controller { //print_r($data['pd_images']);die(); //print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true)); //die(); //echo "*******************************************"; - $t = $this->load->view('report_templates/JSONTOREPORT',$data,true); + $t = $this->load->view('report_templates/JSONTOREPORT',$data,true); //$t = $this->load->view('temp_html.html',null,true); - echo $t;die(); + //echo $t; + //die(); $total_replaces = substr_count($t,''); //echo $total_replaces; @@ -6915,7 +6916,19 @@ class PD_Controller extends REST_Controller { array_push($selected_type_of_activity,$value['type_of_activity_id']); } - if($business_form['employees_temporary'] == "" || $business_form['employees_permanent'] == "" || $business_form['employees_appx_salary'] == "") + $is_name_board_seen = false; + if($business_form['was_the_company_name_board_sighted'] == "") + { + $incomplete_details[] = 'Business Section - Name Board Seen Not answered'; + + } + else if($business_form['was_the_company_name_board_sighted'] == "yes") + { + $is_name_board_seen = true; + } + + + if( !is_numeric($business_form['employees_temporary']) || !is_numeric($business_form['employees_permanent']) || !is_numeric($business_form['employees_appx_salary']) || !is_numeric($business_form['officer_total'])) { $incomplete_details[] = 'Business Section - Company Employees Details Not Filled'; } @@ -6925,16 +6938,17 @@ class PD_Controller extends REST_Controller { { $certificate_count = 0; $name_board_image_count = 0; - if(count($pd_images[13])) - { - foreach ($pd_images[13] as $key => $value) { - if(substr_count(strtolower($value['pd_document_title']),strtolower('Name board Seen'))) - { - $name_board_image_count++; + + if(count($pd_images[13])) + { + foreach ($pd_images[13] as $key => $value) { + if(substr_count(strtolower($value['pd_document_title']),strtolower('Name board Seen'))) + { + $name_board_image_count++; + } } } - } - if(!$name_board_image_count){ $incomplete_details[] = 'Busienss Section - Business Name Board Image not captured'; } + if(!$name_board_image_count){ $incomplete_details[] = 'Busienss Section - Business Name Board Image not captured'; } if(isset($business_form['shop_eat_act_cert'])) @@ -7002,7 +7016,7 @@ class PD_Controller extends REST_Controller { { if(isset($business_form['practice_cert'])) { - if(strtoupper($business_form['practice_cert'])=='YES' && $business_form['practice_cert_pic'] == "") + if(strtoupper($business_form['practice_cert'])=='YES' && (!isset($business_form['practice_cert_pic']) || $business_form['practice_cert_pic']== "")) { $certificate_count++; } diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index 86c7a89e..d6e9d5a7 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/helpers/assessedincome_helper.php b/api/application/helpers/assessedincome_helper.php index 92fca961..1aaf0f1e 100644 --- a/api/application/helpers/assessedincome_helper.php +++ b/api/application/helpers/assessedincome_helper.php @@ -6,6 +6,7 @@ class AssessedIncome public static function getSummaryTable($ai_summary_details,$ai_core_details){ //echo "getSummaryTable"; //print_r($ai_summary_details); + $rupee_symbol = "₹"; $ai_table_header_row = ' Summary'; $sale_revenue_row = ' a. Sales / Revenue '; @@ -15,10 +16,11 @@ class AssessedIncome $purchase_row = ' b. Cost of goods sold '; } $gross_profit_loss_row = ' c. Gross Profit / Loss(a-b)'; - $business_expense_row = ' d. Business Expenses '; - $net_profit_loss_row = ' e. Net Profit / Loss(c-d) '; - $house_hold_expense_row = ' f. Household Expenses '; - $disposable_income_row = ' g. Disposable Income'; + $gross_profit_loss_per_row = ' d. Gross Profit / Loss %'; + $business_expense_row = ' e. Business Expenses '; + $net_profit_loss_row = ' f. Net Profit / Loss(c-d) '; + $house_hold_expense_row = ' g. Household Expenses '; + $disposable_income_row = ' h. Disposable Income'; $net_margin_row = ' h. Net Margin % '; $considered_sales_revenue_row = ' a) Considered Sales / Revenue ( Average) '; $considered_net_profit_row = ' b) Considered Net Profit ( Average)'; @@ -42,6 +44,7 @@ class AssessedIncome $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['grossprofit']).''; + $gross_profit_loss_per_row.= ''.(round((($ai_summary_details['sales_declared_by_customer']['grossprofit'] / $ai_summary_details['sales_declared_by_customer']['sales_revenue']) * 100),2)).' %'; $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['business_expenses']).''; $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['netprofit']).''; $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['house_hold_expenses']).''; @@ -66,6 +69,7 @@ class AssessedIncome $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['cost_of_goods_sold']).''; } $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['grossprofit']).''; + $gross_profit_loss_per_row.= ''.(round((($ai_summary_details['sales_calculated_by_itemwise']['grossprofit'] / $ai_summary_details['sales_calculated_by_itemwise']['sales_revenue']) * 100),2)).' %'; $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['business_expenses']).''; $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['netprofit']).''; $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['house_hold_expenses']).''; @@ -90,6 +94,7 @@ class AssessedIncome $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['cost_of_goods_sold']).''; } $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['grossprofit']).''; + $gross_profit_loss_per_row.= ''.(round((($ai_summary_details['sales_calculated_by_monthwise']['grossprofit'] / $ai_summary_details['sales_calculated_by_monthwise']['sales_revenue']) * 100),2)).' %'; $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['business_expenses']).''; $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['netprofit']).''; $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['house_hold_expenses']).''; @@ -108,6 +113,7 @@ class AssessedIncome $sale_revenue_row .= ''; $purchase_row .= ''; $gross_profit_loss_row .= ''; + $gross_profit_loss_per_row .= ''; $business_expense_row .= ''; $net_profit_loss_row .= ''; $house_hold_expense_row .= ''; @@ -131,7 +137,7 @@ class AssessedIncome // echo $considered_net_margint_row; if($house_hold_expense_count != 0){ $house_hold_expense_row = '';$disposable_income_row = ''; $net_margin_row = substr_replace($net_margin_row,'f.',strpos($net_margin_row, 'h.'),2);} - return array('ai_table_header_row' => $ai_table_header_row,'sale_revenue_row' => $sale_revenue_row,'purchase_row' => $purchase_row,'gross_profit_loss_row' => $gross_profit_loss_row,'business_expense_row' => $business_expense_row,'net_profit_loss_row' => $net_profit_loss_row,'house_hold_expense_row' => $house_hold_expense_row,'disposable_income_row'=>$disposable_income_row,'net_margin_row' => $net_margin_row,'considered_sales_revenue_row' => $considered_sales_revenue_row,'considered_net_profit_row' => $considered_net_profit_row,'considered_net_margint_row' =>$considered_net_margint_row); + return array('ai_table_header_row' => $ai_table_header_row,'sale_revenue_row' => $sale_revenue_row,'purchase_row' => $purchase_row,'gross_profit_loss_row' => $gross_profit_loss_row,'business_expense_row' => $business_expense_row,'gross_profit_loss_per_row' => $gross_profit_loss_per_row,'net_profit_loss_row' => $net_profit_loss_row,'house_hold_expense_row' => $house_hold_expense_row,'disposable_income_row'=>$disposable_income_row,'net_margin_row' => $net_margin_row,'considered_sales_revenue_row' => $considered_sales_revenue_row,'considered_net_profit_row' => $considered_net_profit_row,'considered_net_margint_row' =>$considered_net_margint_row); diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php index 3ed7d009..f3a3ad0e 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -405,7 +405,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - +