diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 3762a14e..29485c7d 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -666,6 +666,7 @@ defined('SALESVENDORLIST') OR define('SALESVENDORLIST','m_smcvendorlist'); defined('SALESEQUIPMENTLIST') OR define('SALESEQUIPMENTLIST','m_smc_equipmentlist'); defined('USERCONFIG') OR define('USERCONFIG','m_user_config'); defined('SMC_TEMP_ADDRESS') OR define('SMC_TEMP_ADDRESS','t_smc_temp_address'); +defined('SMC_PRODUCT_WISE_FORM_MAPPING') OR define('SMC_PRODUCT_WISE_FORM_MAPPING','t_smc_credit_pd_product_form_mapping'); diff --git a/api/application/models/SMC_Credit_PD_Model.php b/api/application/models/SMC_Credit_PD_Model.php index b7f86b73..20f9b63e 100644 --- a/api/application/models/SMC_Credit_PD_Model.php +++ b/api/application/models/SMC_Credit_PD_Model.php @@ -53,7 +53,7 @@ class SMC_Credit_PD_Model extends SPARQ_Model { } - function getSMCTemplateForPD($pd_id,$product_id,$client,$random_string,$api) + function getSMCTemplateForPD_old($pd_id,$product_id,$client,$random_string,$api) { //echo $product_id;die(); // $master_forms = $this->SMC_Credit_PD_Model->selectCustomRecords(array('*'),array('isactive' => 1),SMC_CREDIT_PD_FORMS); @@ -73,6 +73,25 @@ class SMC_Credit_PD_Model extends SPARQ_Model { } + function getSMCTemplateForPD($pd_id,$product_id,$client,$random_string,$api) + { + $table = SMC_PRODUCT_WISE_FORM_MAPPING.' as SMC_PRODUCT_WISE_FORM_MAPPING'; + + $fields = array('SMC_CREDIT_PD_FORMS.form_name','SMC_PRODUCT_WISE_FORM_MAPPING.fk_form_id as fk_form_id','SMC_PRODUCT_WISE_FORM_MAPPING.fk_product_id','SMC_CREDIT_PD_SECTION_DATA.fk_pd_id','if(SMC_CREDIT_PD_SECTION_DATA.json is not null,true,false) as is_answered','SMC_CREDIT_PD_SECTION_DATA.is_reupload_data_fetched','SMC_PRODUCT_WISE_FORM_MAPPING.complete_check_enabled'); + if($api == 'REPORT') + { + $fields = array('SMC_CREDIT_PD_FORMS.form_name','SMC_PRODUCT_WISE_FORM_MAPPING.fk_form_id as fk_form_id','SMC_PRODUCT_WISE_FORM_MAPPING.fk_product_id','SMC_CREDIT_PD_SECTION_DATA.fk_pd_id','SMC_CREDIT_PD_SECTION_DATA.json','if(SMC_CREDIT_PD_SECTION_DATA.json is not null,true,false) as is_answered','SMC_CREDIT_PD_SECTION_DATA.is_reupload_data_fetched','SMC_PRODUCT_WISE_FORM_MAPPING.complete_check_enabled'); + } + $joins = array( + array('table'=>SMC_CREDIT_PD_SECTION_DATA." as SMC_CREDIT_PD_SECTION_DATA",'condition'=>"SMC_CREDIT_PD_SECTION_DATA.fk_form_id = SMC_PRODUCT_WISE_FORM_MAPPING.fk_form_id AND SMC_PRODUCT_WISE_FORM_MAPPING.fk_product_id = $product_id AND SMC_CREDIT_PD_SECTION_DATA.fk_pd_id = $pd_id and SMC_CREDIT_PD_SECTION_DATA.isactive = 1 " ,'jointype'=>'LEFT'), + array('table'=>SMC_CREDIT_PD_FORMS." as SMC_CREDIT_PD_FORMS",'condition'=>"SMC_PRODUCT_WISE_FORM_MAPPING.fk_form_id = SMC_CREDIT_PD_FORMS.form_id" ,'jointype'=>'INNER JOIN') + ); + $where_condition_array = array('SMC_PRODUCT_WISE_FORM_MAPPING.isactive' => 1,'SMC_PRODUCT_WISE_FORM_MAPPING.fk_product_id' => $product_id); + return + $master_forms = $this->getJoinRecords($fields,$table,$joins,$where_condition_array,'SMC_PRODUCT_WISE_FORM_MAPPING.form_order_level','ASC'); + // print_r($this->db->last_query());die(); + } + function getSMCFlowUsers($city,$role) { $fields = array('USERPROFILE.userid','USERPROFILE.first_name','USERPROFILE.last_name','USERPROFILEROLES.user_role');