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

Merge branch 'master' of https://bitbucket.org/venbaittech/sparqapi

Browse Source
This commit is contained in:
Sanjeev 2021-04-13 19:03:27 +05:30
commit 2801535a9e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1058,7 +1058,7 @@ class SMC_Credit_PD_Controller extends REST_Controller {
$this->db->JOIN(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS','PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id and and PDAPPLICANTSDETAILS.applicant_type = 1','LEFT'); $this->db->JOIN(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS','PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id and and PDAPPLICANTSDETAILS.applicant_type = 1','LEFT');
//$this->db->JOIN(COMMONMASTER.' as COMMONMASTER','PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id and and PDAPPLICANTSDETAILS.applicant_type = 1 and COMMONMASTER.primary_key and COMMONMASTER.table_name = "t_pd_triggered" and COMMONMASTER.field_name = "pd_status" and COMMONMASTER.new_value = "COMPLETED"'); //$this->db->JOIN(COMMONMASTER.' as COMMONMASTER','PDTRIGGER.pd_id = PDAPPLICANTSDETAILS.fk_pd_id and and PDAPPLICANTSDETAILS.applicant_type = 1 and COMMONMASTER.primary_key and COMMONMASTER.table_name = "t_pd_triggered" and COMMONMASTER.field_name = "pd_status" and COMMONMASTER.new_value = "COMPLETED"');
$this->db->WHERE('PDTRIGGER.pd_status','COMPLETED'); //$this->db->WHERE('PDTRIGGER.pd_status','COMPLETED');
$this->db->WHERE('PDTRIGGER.fk_lender_id',(ENVIRONMENT == 'production' ? 7 : 35)); $this->db->WHERE('PDTRIGGER.fk_lender_id',(ENVIRONMENT == 'production' ? 7 : 35));
if($from_date) if($from_date)

4
api/application/controllers/Sales_PD_Controller.php
View File

@ -553,7 +553,7 @@ class Sales_PD_Controller extends REST_Controller {
$id = $this->Sales_PD_Model->saveRecords($records,SALES_PD_DATA); $id = $this->Sales_PD_Model->saveRecords($records,SALES_PD_DATA);
//start camunda process //start camunda process
CAMUNDA::startSalesPDInstance($id); //CAMUNDA::startSalesPDInstance($id);
} }
else else
{ {
@ -664,7 +664,7 @@ class Sales_PD_Controller extends REST_Controller {
//echo 'final';die(); //echo 'final';die();
$id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id'])); $id = $this->Sales_PD_Model->updateRecords($records,SALES_PD_DATA,array('sales_pd_id' => $records['sales_pd_id']));
CAMUNDA::completeSalesPDTask($records['sales_pd_id']); //CAMUNDA::completeSalesPDTask($records['sales_pd_id']);
$this->prepareSalesPDReport($records['sales_pd_id'],false); $this->prepareSalesPDReport($records['sales_pd_id'],false);
sleep(10); sleep(10);

2
api/application/models/User_Management_Model.php
View File

@ -165,7 +165,7 @@ class User_Management_Model extends SPARQ_Model {
} }
public function deactivateDataOnRcmStateMapping($userid,$data_arr) { public function deactivateDataOnRcmStateMapping($userid,$data_arr) {
echo "inside function"; // echo "inside function";
foreach($data_arr as $key => $value) { foreach($data_arr as $key => $value) {
$this->db->set(array('isactive' => 0)); $this->db->set(array('isactive' => 0));
$this->db->where('fk_user_id',$userid); $this->db->where('fk_user_id',$userid);