ASSESSED CALC MODE

This commit is contained in:
velz 2018-11-30 19:23:53 +05:30
parent 15fa08625f
commit 061959f19c
3 changed files with 83 additions and 42 deletions

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
//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', 'getFullPDDetails'); // no errors
defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getAssessedIncome'); // no errors
/*********************AWS resources Constants*************************************************/
defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');

View File

@ -161,6 +161,7 @@ $route['saveAssessedIncomeBusinessExpenses'] = 'PD_Controller/saveAssessedIncome
$route['saveAssessedIncomeHouseholdExpenses'] = 'PD_Controller/saveAssessedIncomeHouseholdExpenses';
$route['saveAssessedIncomeMonthwiseItems'] = 'PD_Controller/saveAssessedIncomeMonthwiseItems';
$route['calculateAssessedIncome'] = 'PD_Controller/calculateAssessedIncome';
$route['saveAssessedIncomeCalculateMode'] = 'PD_Controller/saveAssessedIncomeCalculateMode';
//PD Form Related
$route['getPDFormDetails'] = 'PD_Controller/getPDFormDetails';

View File

@ -2167,6 +2167,40 @@ class PD_Controller extends REST_Controller {
}
public function saveAssessedIncomeCalculateMode_post()
{
$records = $this->post('records');
$id = 0;
if($records['calc_type_id'] != "" || $records['calc_type_id'] != null)
{
$where_condition_array = array("calc_type_id" => $records['calc_type_id']);
$id = $this->PD_Model->updateRecords($records,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE,$where_condition_array);
}
else
{
$id = $this->PD_Model->saveRecords($records,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE);
}
if($id != 0)
{
$data['dataStatus'] = true;
$data['status'] = REST_Controller::HTTP_OK;
$data['records'] = $id;
$this->response($data,REST_Controller::HTTP_OK);
}
else
{
$data['dataStatus'] = false;
$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
$data['msg'] = 'Something went wrong! Try Later';
$this->response($data,REST_Controller::HTTP_OK);
}
}
public function calculateAssessedIncome($pd_id)
{
@ -2326,6 +2360,8 @@ class PD_Controller extends REST_Controller {
/**************************Gross Profit calculation start***************/
//print_r($gross_profit_calculation_type);
$estimation_of_gross_profit = 0;
if(isset($gross_profit_calculation_type[0]))
{
if($gross_profit_calculation_type[0]['mode'] == 1)
{
$estimation_of_gross_profit = $final_purchase_avg_value - $overall_purchase_total;
@ -2373,9 +2409,12 @@ class PD_Controller extends REST_Controller {
$overall_purchase_total = $final_purchase_avg_value - ($overall_business_total+$net_profit);
}
}
}
/**************************Gross Profit calculation end***************/
$calculated_data['sales_revenue'] = $final_purchase_avg_value;
$calculated_data['purchase'] = $overall_purchase_total;
if(isset($gross_profit_calculation_type[0]))
{
if($gross_profit_calculation_type[0]['mode'] == 1 || $gross_profit_calculation_type[0]['margin'] == 1)
{
$calculated_data['gross_profit'] = $estimation_of_gross_profit;
@ -2384,6 +2423,7 @@ class PD_Controller extends REST_Controller {
{
$calculated_data['gross_profit'] =( $net_profit + $overall_business_total);
}
}
$calculated_data['business_expense'] = $overall_business_total;
$calculated_data['net_profit_loss'] = $net_profit;
$calculated_data['net_margin'] = $calculated_data['net_profit_loss'] / $calculated_data['sales_revenue'];