From b81561e85b8b9ea629c0b8bfefc14921460152f7 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 8 Mar 2019 20:43:31 +0530 Subject: [PATCH] AI CHNAGES --- api/application/controllers/PD_Controller.php | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 82648dc4..7b015298 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -3325,15 +3325,15 @@ class PD_Controller extends REST_Controller { if($purchases_flag != 0) { $temp_purchases = $overall_purchase_total; - $temp_grossprofit = $temp_purchases - $total_sales_itemwise; - $temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; - $temp_netmargin = $total_sales_itemwise/$temp_netprofit; + $temp_grossprofit = $total_sales_itemwise - $temp_purchases; + $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total; + $temp_netmargin = ($temp_netprofit/$total_sales_itemwise) * 100; } else { $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_purchases = $temp_grossprofit - $total_sales_itemwise; - $temp_netmargin = $total_sales_itemwise/$temp_netprofit; + $temp_netmargin = ($temp_netprofit/$total_sales_itemwise) * 100; } $overall_summary_report['sales_calculated_by_itemwise']['sales_revenue'] = $total_sales_itemwise; @@ -3342,7 +3342,7 @@ class PD_Controller extends REST_Controller { $overall_summary_report['sales_calculated_by_itemwise']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_calculated_by_itemwise']['netprofit'] = $temp_netprofit; $overall_summary_report['sales_calculated_by_itemwise']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_calculated_by_itemwise']['disposable_income'] = $overall_other_business_income_total; + $overall_summary_report['sales_calculated_by_itemwise']['disposable_income'] = $temp_netprofit - $overall_household_total; $overall_summary_report['sales_calculated_by_itemwise']['netmargin'] = $temp_netmargin; } @@ -3384,15 +3384,15 @@ class PD_Controller extends REST_Controller { if($purchases_flag != 0) { $temp_purchases = $overall_purchase_total; - $temp_grossprofit = $temp_purchases - $total_sales_monthwise; - $temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; - $temp_netmargin = $total_sales_monthwise/$temp_netprofit; + $temp_grossprofit = $total_sales_monthwise - $temp_purchases; + $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total; + $temp_netmargin = ($temp_netprofit/$total_sales_monthwise) * 100; } else { $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_purchases = $temp_grossprofit - $total_sales_monthwise; - $temp_netmargin = $total_sales_monthwise/$temp_netprofit; + $temp_netmargin = ($temp_netprofit/$total_sales_monthwise) * 100; } $overall_summary_report['sales_calculated_by_monthwise']['sales_revenue'] = $total_sales_monthwise; @@ -3401,7 +3401,7 @@ class PD_Controller extends REST_Controller { $overall_summary_report['sales_calculated_by_monthwise']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_calculated_by_monthwise']['netprofit'] = $temp_netprofit; $overall_summary_report['sales_calculated_by_monthwise']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_calculated_by_monthwise']['disposable_income'] = $overall_other_business_income_total; + $overall_summary_report['sales_calculated_by_monthwise']['disposable_income'] = $temp_netprofit - $overall_household_total; $overall_summary_report['sales_calculated_by_monthwise']['netmargin'] = $temp_netmargin; @@ -3421,16 +3421,17 @@ class PD_Controller extends REST_Controller { if($purchases_flag != 0) { $temp_purchases = $overall_purchase_total; - $temp_grossprofit = $temp_purchases - $total_sales_declared_by_customer; - $temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; - $temp_netmargin = $total_sales_declared_by_customer/$temp_netprofit; + $temp_grossprofit = $total_sales_declared_by_customer - $temp_purchases; + $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total; + $temp_netmargin = ($temp_netprofit/$total_sales_declared_by_customer) * 100; } else { $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_purchases = $temp_grossprofit - $total_sales_declared_by_customer; - $temp_netmargin = $total_sales_declared_by_customer/$temp_netprofit; + $temp_netmargin = ($temp_netprofit/$total_sales_declared_by_customer) * 100; } + $overall_summary_report['sales_declared_by_customer']['sales_revenue'] = $total_sales_declared_by_customer; $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; @@ -3438,7 +3439,7 @@ class PD_Controller extends REST_Controller { $overall_summary_report['sales_declared_by_customer']['business_expenses'] = $overall_business_expenses_total; $overall_summary_report['sales_declared_by_customer']['netprofit'] = $temp_netprofit; $overall_summary_report['sales_declared_by_customer']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_declared_by_customer']['disposable_income'] = $overall_other_business_income_total; + $overall_summary_report['sales_declared_by_customer']['disposable_income'] = $temp_netprofit - $overall_household_total; $overall_summary_report['sales_declared_by_customer']['netmargin'] = $temp_netmargin; } @@ -3456,12 +3457,12 @@ class PD_Controller extends REST_Controller { if(isset($overall_summary_report['sales_calculated_by_monthwise']['netmargin'])){ $temp_netmargin_array = array_merge($temp_netmargin_array,array($overall_summary_report['sales_calculated_by_monthwise']['netmargin'])); } if(isset($overall_summary_report['sales_calculated_by_itemwise']['netmargin'])){ $temp_netmargin_array = array_merge($temp_netmargin_array,array($overall_summary_report['sales_calculated_by_itemwise']['netmargin'])); } - $overall_summary_report['consolidated_report']['consolidated_sales_revenue'] = (array_sum($temp_sales_array) / count($temp_sales_array)); - $overall_summary_report['consolidated_report']['consolidated_nermagin'] = (array_sum($temp_netmargin_array) / count($temp_netmargin_array)); - $overall_summary_report['consolidated_report']['consolidated_nerprofit'] = ($overall_summary_report['consolidated_report']['consolidated_sales_revenue'] / $overall_summary_report['consolidated_report']['consolidated_nermagin'] ); + $overall_summary_report['consolidated_report']['consolidated_sales_revenue'] = round(array_sum($temp_sales_array) / count($temp_sales_array),2); + $overall_summary_report['consolidated_report']['consolidated_nermagin'] = round(array_sum($temp_netmargin_array) / count($temp_netmargin_array),2); + $overall_summary_report['consolidated_report']['consolidated_nerprofit'] = round($overall_summary_report['consolidated_report']['consolidated_sales_revenue'] * ($overall_summary_report['consolidated_report']['consolidated_nermagin'] / 100 ),2); - return $overall_summary_report; + return ($overall_summary_report); } else {