diff --git a/api/application/controllers/Data_Dump_Controller.php b/api/application/controllers/Data_Dump_Controller.php index 2567fc8b..bb1e3a0b 100644 --- a/api/application/controllers/Data_Dump_Controller.php +++ b/api/application/controllers/Data_Dump_Controller.php @@ -88,7 +88,7 @@ class Data_Dump_Controller extends REST_Controller { // $logger = MYLOG::logFunction(null,"Gsheet"); log_message('ERROR','#/# G-Sheet Fns Entered - '.date('Y-m-d H:i:s A')); $sheetData = $this->post(); - log_message('ERROR','#/# Params Are - '.$this->post()); + // log_message('ERROR','#/# Params Are - '.$sheetData); if(count($sheetData) > 0){ $pd_id = $this->modificationGsheetData($sheetData); if($pd_id != null || $pd_id != '') diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 8e605ddd..de7aff24 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -952,7 +952,8 @@ class Template_Management_Controller extends REST_Controller { }else{ $result_array[$inx]["forms"] = array(); } - 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","is_form_status"=>null,"template_id"=>null)); + $buinessFormAvailable =$this->Template_Management_Model->checkBuinessFormsAvailablity($records); + if($buinessFormAvailable){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","is_form_status"=>null,"template_id"=>null));} 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","is_form_status"=>null,"template_id"=>null)); 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","is_form_status"=>null,"template_id"=>null)); // $buiness_arr = array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1"); diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index b40e7ec8..8d1afde5 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -344,6 +344,32 @@ class Template_Management_Model extends SPARQ_Model { ORDER BY `PDFORMS`.`pd_form_order`"; return $this->db->query($sql_query)->result_array(); } + + public function checkBuinessFormsAvailablity($records){ + $Availablity = false; + if(!empty($records['customer_segment_id'])){ + $cs_id = $cs_id; + }else{ + $this->db->select('customer_segment_id'); + $this->db->from(TEMPLATE_MAP_V2); + $this->db->where('id',$records['map_id']); + $this->db->where('isactive',1); + $query = $this->db->get(); + if ($query->num_rows() > 0) { + $cs_id = $query->row()->customer_segment_id; + } + } + if($cs_id){ + $arr = $this->getFormTemplate($cs_id); + for($i=0; $idb->insert($table, $records); @@ -391,9 +417,9 @@ class Template_Management_Model extends SPARQ_Model { WHERE `TEMPLATE_JSON_V2`.`map_id` = ".$map_id." AND `PDFORMS`.`is_business_form` = 1 AND `TEMPLATE_JSON_V2`.`isactive` = 1 - AND `TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' + AND (`TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' OR `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' - OR `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT'"; + OR `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT')"; $result = $this->db->query($sql_query)->result_array(); }else{ $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,TEMPLATE_JSON_V2.is_form_status');