Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
c244e6377b
@ -2191,6 +2191,8 @@
|
|||||||
|
|
||||||
->where('policy_transaction.is_active', 1)
|
->where('policy_transaction.is_active', 1)
|
||||||
->where('pt_co_share_details.is_active', 1)
|
->where('pt_co_share_details.is_active', 1)
|
||||||
|
->where('co_share_stmt_details.is_active', 1)
|
||||||
|
->where('insurer_statements_oq.is_active', 1)
|
||||||
->where('insurer_statements_oq.id IS NOT NULL')
|
->where('insurer_statements_oq.id IS NOT NULL')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -147,7 +147,12 @@
|
|||||||
|
|
||||||
<!-- end page title -->
|
<!-- end page title -->
|
||||||
<div id="file_list">
|
<div id="file_list">
|
||||||
<?php include('report_bds.php'); ?>
|
<?php
|
||||||
|
include('report_bds.php');
|
||||||
|
?>
|
||||||
|
<?php
|
||||||
|
// include('report_bds_new.php');
|
||||||
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -159,26 +159,14 @@
|
|||||||
$uniqueAgreedAmountPerInsurer = "$policy_no-$policy_type-$client_name-$insurer_branch_name" ;
|
$uniqueAgreedAmountPerInsurer = "$policy_no-$policy_type-$client_name-$insurer_branch_name" ;
|
||||||
|
|
||||||
|
|
||||||
$pastMonth = explode("-",$uniqueRecord )[1] ;
|
|
||||||
$currentMonth = $policy_updated_month ;
|
|
||||||
|
|
||||||
$pastStatementStatus = explode("-",$uniqueRecord )[5] ;
|
|
||||||
$currentStatementStatus = $statement_status;
|
|
||||||
|
|
||||||
if(
|
|
||||||
isset($uniquePoliciesReport[$uniqueRecord])
|
|
||||||
&& $pastStatementStatus == $currentStatementStatus
|
|
||||||
){
|
|
||||||
continue ;
|
|
||||||
}else{
|
|
||||||
|
|
||||||
if(isset($uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer]) ){
|
if(isset($uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer]) ){
|
||||||
|
|
||||||
|
|
||||||
$uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer] -= $row['billed_amt'];
|
$uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer] -= $row['billed_amt'];
|
||||||
$row['total_irda_amt'] = $pastMonth == $currentMonth ? $row['total_irda_amt'] : 0 ;
|
$row['total_irda_amt'] = 0 ;
|
||||||
$row['outstanding_amt'] = $uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer];
|
$row['outstanding_amt'] = $uniqueAgreedAmountList[$uniqueAgreedAmountPerInsurer];
|
||||||
$row['multiple_months'] = $pastMonth == $currentMonth ? false : true ;
|
$row['multiple_months'] = true ;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$row['outstanding_amt'] = $row['total_irda_amt'] - $row['billed_amt'];
|
$row['outstanding_amt'] = $row['total_irda_amt'] - $row['billed_amt'];
|
||||||
@ -189,7 +177,7 @@
|
|||||||
|
|
||||||
|
|
||||||
$uniquePoliciesReport[$uniqueRecord] = $row;
|
$uniquePoliciesReport[$uniqueRecord] = $row;
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user