From 5cbc1774025cbbf08c9ec6f4ce1a54d0eb97f34f Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Tue, 28 Jan 2025 10:31:35 +0530 Subject: [PATCH 1/2] CHANGE_TICKET_MASTER_MODEL_SRI --- app/Models/TicketMasterModel.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php index ab41a1fe..51896dbc 100644 --- a/app/Models/TicketMasterModel.php +++ b/app/Models/TicketMasterModel.php @@ -12,15 +12,6 @@ class TicketMasterModel extends Model protected $returnType = 'array'; protected $useSoftDeletes = false; protected $protectFields = true; -<<<<<<< HEAD - protected $allowedFields = ['id', 'ticket_type_id', 'claim_status_id', 'acm_id', 'insurer_id', - 'tpa_id', 'client_id', 'priority', 'policy_no', 'emp_code', 'tpa_no', 'emp_name', 'insured_name', - 'relationship', 'emp_mobile', 'emp_mail', 'mode_of_intimation', 'claim_type', 'hospital_name', - 'doa', 'dod', 'claim_amount', 'pod_no', 'created_by', 'updated_by', 'created_at', 'updated_at', - 'date_of_join', 'date_of_incep', 'dob', 'date_of_accident', 'date_of_death', 'date_of_intimat', - 'si_amt','claim_number,is_active' - ]; -======= protected $allowedFields = [ 'id', 'ticket_type_id', @@ -60,7 +51,6 @@ class TicketMasterModel extends Model 'claim_number' ]; ->>>>>>> 3a4f7b1e836fc71f477cb6ad32a635dcae0192d0 // Callbacks protected $allowCallbacks = true; From 060a41b6ac5cd591d3cdaa24b4d7921955bca5c7 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 28 Jan 2025 11:24:39 +0530 Subject: [PATCH 2/2] FIX_STMT_PRE_VARIANCE_ISSUE --- app/Models/PolicyTransactionModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php index 36fc097e..300a0eaa 100644 --- a/app/Models/PolicyTransactionModel.php +++ b/app/Models/PolicyTransactionModel.php @@ -758,7 +758,7 @@ class PolicyTransactionModel extends Model ( SELECT ( - SUM(co_share_stmt_details.actual_bp_amt) + SUM(co_share_stmt_details.actual_tp_amt) + SUM(co_share_stmt_details.actual_bp_per) + SUM(co_share_stmt_details.actual_bp_amt) + SUM(co_share_stmt_details.actual_tp_amt) + SUM(co_share_stmt_details.actual_tep_amt) ) AS total_stmt_amt FROM co_share_stmt_details @@ -778,7 +778,7 @@ class PolicyTransactionModel extends Model SELECT SUM(co_share_stmt_details.actual_bp_amt) + SUM(co_share_stmt_details.actual_tp_amt) + - SUM(co_share_stmt_details.actual_bp_per) + SUM(co_share_stmt_details.actual_tep_amt) FROM co_share_stmt_details JOIN