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

fi report feedback2 : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-11-01 21:07:54 +05:30
parent f0285773d2
commit 5bc3edf4a2
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/application/helpers/getprocessedjson_helper.php
View File

@ -2901,17 +2901,17 @@ class GETPROCESSEDJSON
$raw_json[$raw_json_key]['uom_master'] = $uom[0][$master_tables_field_names['UOM']]; $raw_json[$raw_json_key]['uom_master'] = $uom[0][$master_tables_field_names['UOM']];
} }
} }
} if(isset($address['is_pd_done_on_initiated_address']) && (strtoupper($address['is_pd_done_on_initiated_address']) == "NO") )
if(isset($raw_json['is_pd_done_on_initiated_address']) && (strtoupper($raw_json['is_pd_done_on_initiated_address']) == "NO") ) {
{
// if(array_key_exists('State_list',$address)) // if(array_key_exists('State_list',$address))
if(isset($address['State_list'])) if(isset($address['state2']))
{ {
//print_r($address); //print_r($address);
$CI->db->SELECT( $master_tables_field_names['STATE'] ); $CI->db->SELECT( $master_tables_field_names['STATE'] );
$CI->db->FROM(STATE); $CI->db->FROM(STATE);
$CI->db->WHERE('isactive',1); $CI->db->WHERE('isactive',1);
$CI->db->WHERE($master_tables_pkid['STATE'] ,$address['State_list']); $CI->db->WHERE($master_tables_pkid['STATE'] ,$address['state2']);
$adress_type_name= $CI->db->GET()->result_array(); $adress_type_name= $CI->db->GET()->result_array();
//print_r($CI->db->last_query()); //print_r($CI->db->last_query());
if(count($adress_type_name)) if(count($adress_type_name))
@ -2951,7 +2951,7 @@ class GETPROCESSEDJSON
$raw_json[$raw_json_key]['pincode2_master'] = $pincode[0][$master_tables_field_names['PINCODE']]; $raw_json[$raw_json_key]['pincode2_master'] = $pincode[0][$master_tables_field_names['PINCODE']];
} }
} }
} }}
return ($raw_json); return ($raw_json);
} }
/*****************########## END OF FI-ADDRESS FORM DETAILS ##########**************/ /*****************########## END OF FI-ADDRESS FORM DETAILS ##########**************/

2
api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php
View File

@ -298,6 +298,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<!-- ####################### general information ############################--> <!-- ####################### general information ############################-->
<div id="page_break"></div>
<?php <?php
echo '<br>'; echo '<br>';
echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>'; echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>';
@ -320,6 +321,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
echo '<br>'; echo '<br>';
$address_form = json_decode($pd_processed_forms[28][0]['processed_json'], true); $address_form = json_decode($pd_processed_forms[28][0]['processed_json'], true);
$address_value = $address_form['json']; $address_value = $address_form['json'];
// print_r($address_value);
if (!empty($address_value)) { if (!empty($address_value)) {
echo '<h3 contenteditable="true"><u>ADDRESS DETAILS</u>: </h3>'; echo '<h3 contenteditable="true"><u>ADDRESS DETAILS</u>: </h3>';
if (strtoupper($address_value['is_pd_done_on_initiated_address']) == 'YES') { if (strtoupper($address_value['is_pd_done_on_initiated_address']) == 'YES') {

1
api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php
View File

@ -298,6 +298,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<!-- ####################### general information ############################--> <!-- ####################### general information ############################-->
<div id="page_break"></div>
<?php <?php
echo '<br>'; echo '<br>';
echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>'; echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>';

1
api/application/views/report_templates/JSONTOREPORT_FI_RV.php
View File

@ -298,6 +298,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<!-- ####################### general information ############################--> <!-- ####################### general information ############################-->
<div id="page_break"></div>
<?php <?php
echo '<br>'; echo '<br>';
echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>'; echo '<h3 contenteditable="true"><u>GENERAL INFORMATION</u>: </h3>';