From cbfc81102e7473eb478abebda157769ff46e15b0 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Mon, 24 Jan 2022 21:01:21 +0530 Subject: [PATCH] form order key added --- .../controllers/Template_Management_Controller.php | 10 ++++++++-- .../controllers/User_Management_Controller.php | 3 ++- api/application/models/Template_Management_Model.php | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index be86dbf1..3f00cf47 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -946,8 +946,11 @@ class Template_Management_Controller extends REST_Controller { }else{ $result_array[$inx]["forms"] = array(); } - $buiness_arr = array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1"); - array_push($result_array[$inx]["forms"],$buiness_arr); + array_push($result_array[$inx]["forms"],array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1","pd_form_order"=>"5")); + array_push($result_array[$inx]["forms"],array("form_id"=> "18","form_name"=> "General Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"2")); + array_push($result_array[$inx]["forms"],array("form_id"=> "26","form_name"=> "Photograph","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"24")); + // $buiness_arr = array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1"); + // array_push($result_array[$inx]["forms"],$buiness_arr); } if(count($result_array)>0) { @@ -1413,6 +1416,7 @@ class Template_Management_Controller extends REST_Controller { $count = isset($onchange_properties) ? count($onchange_properties) : 0 ; if($count>0 && !empty($onchange_properties)){ foreach ($onchange_properties as $key1 => $value1) { + // echo $value1['expression']; // if($value1['question_key'] == 'Payment_Terms'){ // echo "I have step 1"; // echo($value['question_key']); @@ -1433,6 +1437,8 @@ class Template_Management_Controller extends REST_Controller { // print_r($this->call_arr2($value1['questions'][$j]['question'])); // echo "
parent ".$value['question_key']; $latest_quest = isset($value1['questions'][$j]['question_key']) ? $value1['questions'] : $value1['questions'][$j]['question']; + // $latest_quest = $value1['expression'] ? $latest_quest.$value1['expression'] : $latest_quest; + // echo " Key ".$value1['insert_index']; $temp[$i] = $this->call_arr1($latest_quest); $arr2 = $this->call_arr2($latest_quest); $return_arr[$i] = $this->merged_arr($temp[$i],$arr2); diff --git a/api/application/controllers/User_Management_Controller.php b/api/application/controllers/User_Management_Controller.php index ddf08957..65717bef 100644 --- a/api/application/controllers/User_Management_Controller.php +++ b/api/application/controllers/User_Management_Controller.php @@ -566,7 +566,8 @@ else { // $msg = "Your OTP for forgot password is ".$OTP."."; // SMS_GUPSHUP::sendSMS($msg,$mobile); // $msg = "OTP for starting your personal discussions with the verification officer is ".$OTP.".Pls share this only when the officer has reached your place"; - $msg = "PD for Loan Applicant ".$OTP." ID - ".$OTP." has been triggered."; + // $msg = "PD for Loan Applicant ".$OTP." ID - ".$OTP." has been triggered."; + $msg = "PDGenie OTP is : ".$OTP; SMS_GUPSHUP::sendSMS($msg,$mobile,array('id'=>$userid,'msg'=>"Your OTP is ".$OTP." from User Management Controller")); $this->User_Management_Model->updateRecords(array('OTP'=>$OTP),USERPROFILE,array('userid'=>$userid)); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 7ade995c..9de859a5 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -314,12 +314,13 @@ class Template_Management_Model extends SPARQ_Model { } public function getTemplateFormsV2($value){ - $this->db->SELECT('TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form'); + $this->db->SELECT('TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,PDFORMS.pd_form_order'); $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$value); $this->db->WHERE('PDFORMS.is_business_form',0); + $this->db->ORDER_BY('PDFORMS.pd_form_order'); $result = $this->db->GET()->result_array(); return $result; }