From 835d29a04010e7d8b714b8d958711f1c84fe5c0a Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 29 Oct 2022 13:32:23 +0530 Subject: [PATCH] Img_id Key added in cusimage api : ps --- api/application/controllers/Flyhi_Controller.php | 8 +++++--- api/application/controllers/Sales_PD_Controller.php | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php index 0e949d9d..ae77fd06 100644 --- a/api/application/controllers/Flyhi_Controller.php +++ b/api/application/controllers/Flyhi_Controller.php @@ -615,8 +615,10 @@ class Flyhi_Controller extends REST_Controller { // echo $individual_value['questions'][0]['question_key']; // echo $result[$individual_value['questions'][0]['question_key']]; // if($individual_value['questions'][0]['question_key'] == 'stock_image'){ - for($i=1;$i<=$result[$individual_value['questions'][0]['question_key']];$i++){ - $photo_questions['questions'][$key]['questions_group'][$v_key+($i)] = $photo_questions['questions'][$key]['questions_group'][0]; + if (array_key_exists($individual_value['questions'][0]['question_key'],$result)){ + for($i=1;$i<=$result[$individual_value['questions'][0]['question_key']];$i++){ + $photo_questions['questions'][$key]['questions_group'][$v_key+($i)] = $photo_questions['questions'][$key]['questions_group'][0]; + } } // } if(isset($individual_value['questions'][0]['answer_value'])) @@ -638,7 +640,7 @@ class Flyhi_Controller extends REST_Controller { } } } - // print_r($photo_questions);die; + print_r($photo_questions);die; $photo_questions = json_encode($photo_questions); $section_data[0]['section_data'] = $photo_questions; } diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 42392bd2..62bd69a4 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -1189,6 +1189,7 @@ public function filterSalesPDList_post() { $sales_pd_master_data = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('rand_string' => $rand_string),SALES_PD_DATA); $product_short_name = $this->Sales_PD_Model->selectCustomRecords(array('abbr'),array('product_id' => $sales_pd_master_data[0]['product_id']),PRODUCTS); + $is_flyhi_pd = ($sales_pd_master_data[0]['sales_pd_type'] == "3" || $sales_pd_master_data[0]['sales_pd_type'] == "4") ? 1 : 0 ; $sales_pd_img_data = $this->Sales_PD_Model->selectCustomRecords(array('doc_id', 'fk_sales_pd_id','img','img_name','isactive'),array('fk_sales_pd_id' => $sales_pd_master_data[0]['sales_pd_id'],'isactive' => 1,'img_name!=' => 'satellite'),SALEPD_DOCS); // print_r($product_short_name);die(); @@ -1211,21 +1212,22 @@ public function filterSalesPDList_post() { //echo "SEC LOOP****"; if($key == $sales_pd_img_data_value['img_name']) { + if($value['is_multiple']) { if(!array_key_exists($key,$img_data)) { - $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => [array('img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '')],'is_multiple' => 1,'section_heading' => $value['img_name']); + $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => [array('img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '','img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '')],'is_multiple' => 1,'section_heading' => $value['img_name']); } else { - $img_data[$key]['img_data'][] = array('img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : ''); + $img_data[$key]['img_data'][] = array('img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '','img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : ''); } } else { - $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '','is_multiple' => 0,'section_heading' => $value['img_name']);//$sales_pd_img_data_value['img'] + $img_data[$key] = array('img_key' => $key,'img_name' => $value['img_name'],'img_url' => $sales_pd_img_data_value['img'] ? $sales_pd_img_data_value['img'] : '','is_multiple' => 0,'section_heading' => $value['img_name'],'img_id'=>($sales_pd_img_data_value['doc_id']) ? $sales_pd_img_data_value['doc_id'] : '');//$sales_pd_img_data_value['img'] } unset($sales_pd_img_data[$sales_pd_img_data_key]); @@ -1279,12 +1281,12 @@ public function filterSalesPDList_post() { { if($value['is_multiple']) { - $img_data[] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => array(),'is_multiple' => 1,'section_heading' => $value['img_name']); + $img_data[] = array('img_key' => $key,'img_name' => $value['img_name'],'img_data' => array(),'is_multiple' => 1,'section_heading' => $value['img_name'],'img_id'=>$value['doc_id']); } else { - $img_data[] = array('img_key' => $key,'img_name' => $value['img_name'],'img_url' => '','is_multiple' => 0,'section_heading' => $value['img_name']); + $img_data[] = array('img_key' => $key,'img_name' => $value['img_name'],'img_url' => '','is_multiple' => 0,'section_heading' => $value['img_name'],'img_id'=>$value['doc_id']); } } }