Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI CHNAGES

Browse Source
This commit is contained in:
velz 2019-03-08 20:43:31 +05:30
parent 4876288c77
commit b81561e85b
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/application/controllers/PD_Controller.php
View File

@ -3325,15 +3325,15 @@ class PD_Controller extends REST_Controller {
if($purchases_flag != 0) if($purchases_flag != 0)
{ {
$temp_purchases = $overall_purchase_total; $temp_purchases = $overall_purchase_total;
$temp_grossprofit = $temp_purchases - $total_sales_itemwise; $temp_grossprofit = $total_sales_itemwise - $temp_purchases;
$temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total;
$temp_netmargin = $total_sales_itemwise/$temp_netprofit; $temp_netmargin = ($temp_netprofit/$total_sales_itemwise) * 100;
} }
else else
{ {
$temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total;
$temp_purchases = $temp_grossprofit - $total_sales_itemwise; $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; $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']['business_expenses'] = $overall_business_expenses_total;
$overall_summary_report['sales_calculated_by_itemwise']['netprofit'] = $temp_netprofit; $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']['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; $overall_summary_report['sales_calculated_by_itemwise']['netmargin'] = $temp_netmargin;
} }
@ -3384,15 +3384,15 @@ class PD_Controller extends REST_Controller {
if($purchases_flag != 0) if($purchases_flag != 0)
{ {
$temp_purchases = $overall_purchase_total; $temp_purchases = $overall_purchase_total;
$temp_grossprofit = $temp_purchases - $total_sales_monthwise; $temp_grossprofit = $total_sales_monthwise - $temp_purchases;
$temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total;
$temp_netmargin = $total_sales_monthwise/$temp_netprofit; $temp_netmargin = ($temp_netprofit/$total_sales_monthwise) * 100;
} }
else else
{ {
$temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total;
$temp_purchases = $temp_grossprofit - $total_sales_monthwise; $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; $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']['business_expenses'] = $overall_business_expenses_total;
$overall_summary_report['sales_calculated_by_monthwise']['netprofit'] = $temp_netprofit; $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']['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; $overall_summary_report['sales_calculated_by_monthwise']['netmargin'] = $temp_netmargin;
@ -3421,24 +3421,25 @@ class PD_Controller extends REST_Controller {
if($purchases_flag != 0) if($purchases_flag != 0)
{ {
$temp_purchases = $overall_purchase_total; $temp_purchases = $overall_purchase_total;
$temp_grossprofit = $temp_purchases - $total_sales_declared_by_customer; $temp_grossprofit = $total_sales_declared_by_customer - $temp_purchases;
$temp_netprofit = $overall_business_expenses_total - $temp_grossprofit; $temp_netprofit = $temp_grossprofit - $overall_business_expenses_total;
$temp_netmargin = $total_sales_declared_by_customer/$temp_netprofit; $temp_netmargin = ($temp_netprofit/$total_sales_declared_by_customer) * 100;
} }
else else
{ {
$temp_grossprofit = $temp_netprofit - $overall_business_expenses_total; $temp_grossprofit = $temp_netprofit - $overall_business_expenses_total;
$temp_purchases = $temp_grossprofit - $total_sales_declared_by_customer; $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; $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; $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']['grossprofit'] = $temp_grossprofit;
$overall_summary_report['sales_declared_by_customer']['business_expenses'] = $overall_business_expenses_total; $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']['netprofit'] = $temp_netprofit;
$overall_summary_report['sales_declared_by_customer']['house_hold_expenses'] = $overall_household_total; $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; $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_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'])); } 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_sales_revenue'] = round(array_sum($temp_sales_array) / count($temp_sales_array),2);
$overall_summary_report['consolidated_report']['consolidated_nermagin'] = (array_sum($temp_netmargin_array) / count($temp_netmargin_array)); $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'] = ($overall_summary_report['consolidated_report']['consolidated_sales_revenue'] / $overall_summary_report['consolidated_report']['consolidated_nermagin'] ); $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 else
{ {