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

ASSESST FORM ERROR RESLOVED

Browse Source
This commit is contained in:
velz 2018-11-30 10:48:49 +05:30
parent 42411c3c61
commit 27522a00c1
5 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/config/constants.php
View File

@ -87,7 +87,7 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto
// define login route name for token verification // define login route name for token verification
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllTemplates/:any)'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getScorecardDetails'); // no errors defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAssessedIncome'); // no errors
/*********************AWS resources Constants*************************************************/ /*********************AWS resources Constants*************************************************/
defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic'); defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');

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

@ -2182,6 +2182,7 @@ class PD_Controller extends REST_Controller {
$sales_by_item_monthwise = array(); $sales_by_item_monthwise = array();
$sales_by_item_monthwise_flag = 0; $sales_by_item_monthwise_flag = 0;
$margin_value_from_monthwise_data = array();
$purchases = array(); $purchases = array();
$purchases_flag = 0; $purchases_flag = 0;
@ -2196,7 +2197,7 @@ class PD_Controller extends REST_Controller {
$overall_business_total = 0; $overall_business_total = 0;
$overall_household_total = 0; $overall_household_total = 0;
$net_profit = 0; $net_profit = 0;
$final_purchase_avg_value = 0;
//Get all Master Details //Get all Master Details
$result_array = $this->PD_Model->getAssessedIncome($pd_id); $result_array = $this->PD_Model->getAssessedIncome($pd_id);
@ -2220,6 +2221,7 @@ class PD_Controller extends REST_Controller {
{ {
$total_sales_itemwise = 0; $total_sales_itemwise = 0;
$sales_monthwise = array(); $sales_monthwise = array();
$total_sales_monthwise = 0; $total_sales_monthwise = 0;
$total_sales_declared_by_customer = 0; $total_sales_declared_by_customer = 0;
@ -2234,6 +2236,7 @@ class PD_Controller extends REST_Controller {
if($sales_by_item_monthwise_flag == 1) if($sales_by_item_monthwise_flag == 1)
{ {
foreach($sales_by_item_monthwise as $monthwise_key => $sales_by_item_month) foreach($sales_by_item_monthwise as $monthwise_key => $sales_by_item_month)
{ {
$month_total = 0; $month_total = 0;
@ -2257,7 +2260,7 @@ class PD_Controller extends REST_Controller {
$annual_multuplier = 12 / $sale['no_of_months']; $annual_multuplier = 12 / $sale['no_of_months'];
$total_sales_monthwise = $total_sales_monthwise + ($sale['total'] * $annual_multuplier); $total_sales_monthwise = $total_sales_monthwise + ($sale['total'] * $annual_multuplier);
} }
//print_r($total_sales_monthwise);
} }
if($sales_declared_by_customer_flag == 1) if($sales_declared_by_customer_flag == 1)
@ -2266,7 +2269,7 @@ class PD_Controller extends REST_Controller {
} }
//print_r($sales_monthwise); //print_r($sales_monthwise);
//print_r($total_sales_monthwise); //print_r($total_sales_monthwise);
$final_revenue = 0;
foreach($business_expenses as $business_key => $business_expense) foreach($business_expenses as $business_key => $business_expense)
{ {
@ -2286,6 +2289,9 @@ class PD_Controller extends REST_Controller {
} }
} }
//case 1 - (b:ref doc) If the difference between the lowest and highest of the 3 revenue (sales) figures arrived at above in step 1, is > 50% of lowest, then the revenue considered would be 125% of the lowest revenue //case 1 - (b:ref doc) If the difference between the lowest and highest of the 3 revenue (sales) figures arrived at above in step 1, is > 50% of lowest, then the revenue considered would be 125% of the lowest revenue
$temp_array = array(); $temp_array = array();
@ -2302,25 +2308,27 @@ class PD_Controller extends REST_Controller {
$diff = $height_value - $lowest_vaule; $diff = $height_value - $lowest_vaule;
if($diff > ($lowest_vaule * 0.5)) if($diff > ($lowest_vaule * 0.5))
{ {
$final_revenue = $lowest_vaule * 1.25; $final_purchase_avg_value = $lowest_vaule * 1.25;
} }
} }
else //case 2 - (a) ref doc - Normally Average of the above 3 sales estimates is considered. There may be situations where sales information is available only from a or b or c or any else //case 2 - (a) ref doc - Normally Average of the above 3 sales estimates is considered. There may be situations where sales information is available only from a or b or c or any
{ {
$average = array_sum($temp_array)/count($temp_array); $average = array_sum($temp_array)/count($temp_array);
$final_revenue = $average; $final_purchase_avg_value = $average;
} }
// echo "\n\n".$final_revenue; // echo "\n\n".$final_revenue;
/**************End of Purchase Calculations************************/
/**************************Gross Profit calculation start***************/ /**************************Gross Profit calculation start***************/
//print_r($gross_profit_calculation_type); //print_r($gross_profit_calculation_type);
$estimation_of_gross_profit = 0; $estimation_of_gross_profit = 0;
if($gross_profit_calculation_type[0]['mode'] == 1) if($gross_profit_calculation_type[0]['mode'] == 1)
{ {
$estimation_of_gross_profit = $overall_purchase_total - $final_revenue; $estimation_of_gross_profit = $final_purchase_avg_value - $overall_purchase_total;
} }
else else
{ {
@ -2330,18 +2338,18 @@ class PD_Controller extends REST_Controller {
{ {
foreach($sales_calculated_by_itemwise as $sci_key => $sci) foreach($sales_calculated_by_itemwise as $sci_key => $sci)
{ {
$net_profit = $net_profit+$sci['margin_final_value']; $estimation_of_gross_profit = $estimation_of_gross_profit+$sci['margin_final_value'];
} }
} }
else if($sales_by_item_monthwise_flag != 0) else if($sales_by_item_monthwise_flag != 0)
{ {
foreach($sales_by_item_monthwise as $sim_key => $sim) foreach($sales_by_item_monthwise as $sim_key => $sim)
{ {
$net_profit = $net_profit+$sim['margin_final_value']; $estimation_of_gross_profit = $estimation_of_gross_profit+$sim['margin_value'];
} }
} }
$net_profit = $net_profit - $overall_business_total; $estimation_of_gross_profit = $estimation_of_gross_profit - $overall_business_total;
} }
else else
{ {
@ -2349,22 +2357,24 @@ class PD_Controller extends REST_Controller {
{ {
foreach($sales_calculated_by_itemwise as $sci_key => $sci) foreach($sales_calculated_by_itemwise as $sci_key => $sci)
{ {
$net_profit = $net_profit+$sci['margin_final_value']; $estimation_of_gross_profit = $estimation_of_gross_profit+$sci['margin_final_value'];
} }
} }
else if($sales_by_item_monthwise_flag != 0) else if($sales_by_item_monthwise_flag != 0)
{ {
foreach($sales_by_item_monthwise as $sim_key => $sim) foreach($sales_by_item_monthwise as $sim_key => $sim)
{ {
$net_profit = $net_profit+$sim['margin_final_value']; $estimation_of_gross_profit = $estimation_of_gross_profit+ $sim['margin_value'];
}
} }
$overall_purchase_total = $final_revenue - $overall_business_total; }
$overall_purchase_total = $final_purchase_avg_value - $overall_business_total;
} }
} }
/**************************Gross Profit calculation end***************/ /**************************Gross Profit calculation end***************/
$calculated_data['sales_revenue'] = $final_revenue; $calculated_data['sales_revenue'] = $final_purchase_avg_value;
$calculated_data['purchase'] = $overall_purchase_total; $calculated_data['purchase'] = $overall_purchase_total;
if($gross_profit_calculation_type[0]['mode'] == 1) if($gross_profit_calculation_type[0]['mode'] == 1)
{ {
@ -2372,11 +2382,11 @@ class PD_Controller extends REST_Controller {
} }
else else
{ {
$calculated_data['gross_profit'] = $final_value; $calculated_data['gross_profit'] = $estimation_of_gross_profit;
} }
$calculated_data['business_expense'] = $overall_business_total; $calculated_data['business_expense'] = $overall_business_total;
$calculated_data['net_profit_loss'] = $calculated_data['gross_profit'] - $overall_business_total; $calculated_data['net_profit_loss'] = $calculated_data['gross_profit'] - $overall_business_total;
$calculated_data['net_magin'] = $calculated_data['net_profit_loss'] / $final_revenue; $calculated_data['net_margin'] = $calculated_data['net_profit_loss'] / $final_purchase_avg_value;

2
api/application/controllers/Template_Management_Controller.php
View File

@ -602,7 +602,7 @@ class Template_Management_Controller extends REST_Controller {
array_push($temp_array,$res['fk_key']); array_push($temp_array,$res['fk_key']);
} }
//print_r($temp_array); //print_r($temp_array);
$this->db->SELECT('QUESTIONKEYMAPPING.question_key_mapping_id,QUESTIONKEYMAPPING.fk_form_id,QUESTIONKEYMAPPING.question,QUESTIONKEYMAPPING.key,QUESTIONKEYMAPPING.master_name,SCORECARDQUESTIONS.score_question_id,SCORECARDQUESTIONS.fk_template_id,SCORECARDQUESTIONS.fk_form_id,SCORECARDQUESTIONS.fk_key,SCORECARDQUESTIONS.weightage,SCORECARDQUESTIONS.calc_type'); $this->db->SELECT('QUESTIONKEYMAPPING.question_key_mapping_id,QUESTIONKEYMAPPING.fk_form_id,QUESTIONKEYMAPPING.question,QUESTIONKEYMAPPING.key,QUESTIONKEYMAPPING.master_name,SCORECARDQUESTIONS.score_question_id,SCORECARDQUESTIONS.fk_template_id,SCORECARDQUESTIONS.fk_key,SCORECARDQUESTIONS.weightage,SCORECARDQUESTIONS.calc_type');
$this->db->FROM(QUESTIONKEYMAPPING.' as QUESTIONKEYMAPPING'); $this->db->FROM(QUESTIONKEYMAPPING.' as QUESTIONKEYMAPPING');
$this->db->JOIN(SCORECARDQUESTIONS.' as SCORECARDQUESTIONS','QUESTIONKEYMAPPING.fk_form_id = SCORECARDQUESTIONS.fk_form_id AND QUESTIONKEYMAPPING.key = SCORECARDQUESTIONS.fk_key AND SCORECARDQUESTIONS.isactive = 1','LEFT'); $this->db->JOIN(SCORECARDQUESTIONS.' as SCORECARDQUESTIONS','QUESTIONKEYMAPPING.fk_form_id = SCORECARDQUESTIONS.fk_form_id AND QUESTIONKEYMAPPING.key = SCORECARDQUESTIONS.fk_key AND SCORECARDQUESTIONS.isactive = 1','LEFT');

4
api/application/helpers/getpdformdetails_helper.php
View File

@ -162,6 +162,8 @@ class GETPDFORMDETAILS
} }
if($pd_form_id == 4)// to merge assest form commom remarks at end of final data. if($pd_form_id == 4)// to merge assest form commom remarks at end of final data.
{
if(array_key_exists('details',$sub_group))
{ {
foreach($sub_group['details'] as $k => $value) foreach($sub_group['details'] as $k => $value)
{ {
@ -171,7 +173,7 @@ class GETPDFORMDETAILS
{ {
$final_data['assets_details'][$k] = array_merge($final_data['assets_details'][$k],array('details' => $value)); $final_data['assets_details'][$k] = array_merge($final_data['assets_details'][$k],array('details' => $value));
} }
}
} }
$final_data = array_merge($final_data,$asset_remark); $final_data = array_merge($final_data,$asset_remark);
} }

4
api/application/models/PD_Model.php
View File

@ -829,7 +829,7 @@ class PD_Model extends SPARQ_Model {
$gross_profit_calculation_type = $this->selectCustomRecords($fields,$where_condition_array,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE); $gross_profit_calculation_type = $this->selectCustomRecords($fields,$where_condition_array,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE);
//get sales_calculated_by_itemwise details //get sales_calculated_by_itemwise details
$fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value'); $fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value','margin_final_value');
$table = SALESCALCULATEDBYITEMWISE.' as SALESCALCULATEDBYITEMWISE'; $table = SALESCALCULATEDBYITEMWISE.' as SALESCALCULATEDBYITEMWISE';
$where_condition_array = array('fk_pd_id'=>$pdid,'SALESCALCULATEDBYITEMWISE.isactive'=>1); $where_condition_array = array('fk_pd_id'=>$pdid,'SALESCALCULATEDBYITEMWISE.isactive'=>1);
$joins = array( $joins = array(
@ -842,7 +842,7 @@ class PD_Model extends SPARQ_Model {
$sales_items_by_months = array(); $sales_items_by_months = array();
$this->db->SELECT('sim_id,sales_item'); $this->db->SELECT('sim_id,sales_item,margin_value');
$this->db->FROM(SALESITEMMONTHWISE.' as SALESITEMMONTHWISE'); $this->db->FROM(SALESITEMMONTHWISE.' as SALESITEMMONTHWISE');
$this->db->WHERE('SALESITEMMONTHWISE.fk_pd_id',$pdid); $this->db->WHERE('SALESITEMMONTHWISE.fk_pd_id',$pdid);
$this->db->WHERE('SALESITEMMONTHWISE.isactive',1); $this->db->WHERE('SALESITEMMONTHWISE.isactive',1);