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

FAMILY SEGMENT TINY ISSUES

Browse Source
This commit is contained in:
Velz2020 2019-10-10 19:39:39 +05:30
parent 93548e62ac
commit b0e16db53e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/application/helpers/otherfamilyform_helper.php
View File

@ -4,7 +4,7 @@ class Otherfamilyform
{ {
public static function getFamilyDetails($values){ public static function getFamilyDetails($values){
$mergeResult=array(); $mergeResult=array();
//print_r($values);die();
$male_gender_array = array('1','2','4','5','11','12','14','16','17','19','21','24'); $male_gender_array = array('1','2','4','5','11','12','14','16','17','19','21','24');
// $gender = 'DEFAULT'; // $gender = 'DEFAULT';
$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>"; $rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
@ -39,9 +39,9 @@ public static function getFamilyDetails($values){
if($tag['family_member_earning_status']==1){ if($tag['family_member_earning_status']==1){
$getFamilyEarning= 'Earning '; $getFamilyEarning= 'Earning ';
$getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.'<span style="font-family: DejaVu Sans; sans-serif;font-size:10px">₹</span>'.' '.MYUTIL::customIndianNumberFormat($tag['earning_gross_income_per_month']).' per month '; $getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.'<span style="font-family: DejaVu Sans; sans-serif;font-size:10px">₹</span>'.' '.MYUTIL::customIndianNumberFormat($tag['earning_gross_income_per_month']).' per month ';
$getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'. ' : ''; $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'' : '';
$getFamilyOccupation .= $tag['earning_segment_master'] ? '(' . $tag['earning_segment_master'] . ').': '.';
$getFamilyOccupation .= $gender.' has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' '.$year_to_display; $getFamilyOccupation .= ' ' . $gender.' has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' '.$year_to_display;
// ? .' years earning Rs.'. : $tag['earning_segment_master'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month '; // ? .' years earning Rs.'. : $tag['earning_segment_master'].' with '.$tag['earning_name_of_the_employer_or_business'].' since '.$tag['earning_number_of_years_in_employment_or_business'].' years earning Rs.'.$tag['earning_gross_income_per_month'].' per month ';
} }

2
api/application/models/PD_Model.php
View File

@ -512,7 +512,7 @@ class PD_Model extends SPARQ_Model {
foreach($logs as $log_key => $log) foreach($logs as $log_key => $log)
{ {
if($log_key == 0) if($log_key == 0 && $log['field_name'] == 'pd_status')
{ {
$log_string = 'PD Created with '.$log['old_value'].'" status "'; $log_string = 'PD Created with '.$log['old_value'].'" status "';
$user = $log['createdby']; $user = $log['createdby'];

4
api/application/views/report_templates/JSONTOREPORT_CLIX.php
View File

@ -3146,7 +3146,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{ {
echo '<p style="text-align:justify;">Raw material Stock not required to be maintained.</p>'; echo '<p style="text-align:justify;">Raw material Stock not required to be maintained.</p>';
} }
echo '<p style="text-align:justify;">'.$stock_remarks.'</p>'; //echo '<p style="text-align:justify;">'.$stock_remarks.'</p>';
//serivce //serivce
if(!strcasecmp($is_sufficiant_service_goods,'yes')) if(!strcasecmp($is_sufficiant_service_goods,'yes'))
@ -3596,7 +3596,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// echo '</tbody>'; // echo '</tbody>';
// echo '</table>'; // echo '</table>';
// } // }
echo "<div class='page_break'></div>"; //echo "<div class='page_break'></div>";
// //
?> ?>