From 0bca631a038ede8f655a719741b3f1e2732a1d53 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 21 Nov 2024 05:34:37 +0000 Subject: [PATCH] FIX_Revert subcription invoice details save method --- app/Controllers/Invoice.php | 22 +++++++++++----------- app/Models/InvoiceModel.php | 20 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index 1f734f94..d7f60f53 100755 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -570,17 +570,17 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_ $check_existing_customer_id = $subModel->where('invoice_id',$invoice_id)->findAll(); //dd($check_existing_customer_id); - if($check_existing_customer_id){ - unset($data['created_by']); - log_message('info',json_encode($subscription_data)); - $where = ['invoice_id'=>$invoice_id]; - $subModel->updateData($subscription_data,$where);//update the data - } - else{ - //insert the data - unset($data['updated_by']); - $model->insertSubscriptionData($subscription_data); - } + // if($check_existing_customer_id){ + // unset($data['created_by']); + // log_message('info',json_encode($subscription_data)); + // $where = ['invoice_id'=>$invoice_id]; + // $subModel->updateData($subscription_data,$where);//update the data + // } + // else{ + // //insert the data + // unset($data['updated_by']); + $model->insertupdateSubscriptionData($subscription_data,$invoice_status); + // } } } diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php index 06bf442d..5dc2a705 100755 --- a/app/Models/InvoiceModel.php +++ b/app/Models/InvoiceModel.php @@ -350,9 +350,25 @@ public function getJoinedData($where, $orderby = []) return $data; } -public function insertSubscriptionData($data) +public function insertupdateSubscriptionData($data,$invoice_status) { - return $this->db->table('subscription')->insert($data); + if (!empty($data)) { + $invoice_id = $data['invoice_id']; + $customer_id = $data['customer_id']; + $scheme_id = $data['scheme_id']; + $data['isactive'] = $invoice_status === 'Approved' ? 1 : 0 ; + $where = ['invoice_id' => $invoice_id]; // invoice id refer with srinivasan // initally invoice id, scheme id and customer id + $query = $this->db->table('subscription')->select('sub_id')->where($where)->get()->getRow(); + + if (!empty($query)) { + unset($data['created_by']); + return $this->db->table('subscription')->where('sub_id', $query->sub_id)->update($data); + } else { + unset($data['updated_by']); + return $this->db->table('subscription')->insert($data); + } + } + return false; } // ***********************REPORT**********************