Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
98871707c9
@ -395,7 +395,7 @@ class EmployeeController extends AdminController
|
|||||||
$query2->where('cr.user_id', $user_id);
|
$query2->where('cr.user_id', $user_id);
|
||||||
}
|
}
|
||||||
// ->where('files.created_by', get_session_userid())
|
// ->where('files.created_by', get_session_userid())
|
||||||
$data['batch_list'] = $query2->orderBy('batch_files.id', 'desc')
|
$data['batch_list'] = $query2->groupBy("clients.id")->orderBy('batch_files.id', 'desc')
|
||||||
->limit(1000)
|
->limit(1000)
|
||||||
->find();
|
->find();
|
||||||
|
|
||||||
|
|||||||
@ -1265,7 +1265,7 @@ class LeadsController extends BaseController
|
|||||||
'Period of Insurance ' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
|
'Period of Insurance ' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided",
|
||||||
'Policy Run Days' => $rfq_data['policy_run_days'],
|
'Policy Run Days' => $rfq_data['policy_run_days'],
|
||||||
'Inception Premium' => formatIndianCurrency($rfq_data['premium_at_inception']),
|
'Inception Premium' => formatIndianCurrency($rfq_data['premium_at_inception']),
|
||||||
'Premium as on ('.date('d-m-Y', strtotime($rfq_data['premium_date'])).')' => formatIndianCurrency($rfq_data['premium_amount']),
|
'Premium as on ('.date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])).')' => formatIndianCurrency($rfq_data['premium_date']),
|
||||||
'Earned Premium' => $rfq_data['earned_premium'],
|
'Earned Premium' => $rfq_data['earned_premium'],
|
||||||
'Incurred Claims as on ('.date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])).')' => formatIndianCurrency($rfq_data['incurred_claims']),
|
'Incurred Claims as on ('.date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])).')' => formatIndianCurrency($rfq_data['incurred_claims']),
|
||||||
'Annualised Claims' => formatIndianCurrency($rfq_data['annualised_claims']),
|
'Annualised Claims' => formatIndianCurrency($rfq_data['annualised_claims']),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user