diff --git a/app/Controllers/EnquiryController.php b/app/Controllers/EnquiryController.php
index 2134e57..dc71bc2 100644
--- a/app/Controllers/EnquiryController.php
+++ b/app/Controllers/EnquiryController.php
@@ -241,7 +241,7 @@ class EnquiryController extends ResourceController
 
             $enquiryId = $this->enquiryModel->insert($insertData , true);
 
-            trigger_email('enquiry_created', ['enquiry_id' => $enquiryId]);
+            // trigger_email('enquiry_created', ['enquiry_id' => $enquiryId]);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'message' => 'Enquiry created successfully'], 200);
 
@@ -361,7 +361,7 @@ class EnquiryController extends ResourceController
 
             $this->enquiryModel->update($id, $updateData);
 
-            trigger_email('enquiry_assigned', ['enquiry_id' => $id]);
+            // trigger_email('enquiry_assigned', ['enquiry_id' => $id]);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'message' => 'Enquiry updated successfully'], 200);
 
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 4953f40..cb6371e 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -147,6 +147,19 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Value is required']);
         }
 
+        // Duplicate check (case-insensitive)
+        $exists = $this->PartnerBrokerModel
+            ->where('LOWER(name)', strtolower($input['name']))
+            ->where('is_active', 1)
+            ->first();
+
+        if ($exists) {
+            return $this->response->setJSON([
+                'status' => 404,
+                'message' => 'Broker name already exists'
+            ]);
+        }
+
         $data = [
             'name'      => $input['name'],
             'is_active'  => 1,
@@ -169,6 +182,20 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Record not found']);
         }
 
+        // Duplicate name check (excluding current record)
+        $checkDuplicate = $this->PartnerBrokerModel
+            ->where('LOWER(name)', strtolower($input['name']))
+            ->where('id !=', $id)
+            ->where('is_active', 1)
+            ->first();
+
+        if ($checkDuplicate) {
+            return $this->response->setJSON([
+                'status' => 404,
+                'message' => 'Broker name already exists'
+            ]);
+        }
+
         $data = [
             'name'      => $input['name'] ?? null,
             'updated_by' => $input['updated_by'] ?? null,
@@ -198,8 +225,10 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Record not found']);
         }
 
+        $status = ($input['is_active'] == 1) ? 0 : 1;
+
         $this->PartnerBrokerModel->update($id, [
-            'is_active'  => $input['is_active'], // 1 or 0
+            'is_active'  => $status, 
             'updated_by' => $input['updated_by'] ?? null,
         ]);
 
@@ -227,6 +256,19 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Value is required']);
         }
 
+        // Duplicate check (case-insensitive)
+        $exists = $this->PaymentModeModel
+            ->where('LOWER(value)', strtolower($input['value']))
+            ->where('is_active', 1)
+            ->first();
+
+        if ($exists) {
+            return $this->response->setJSON([
+                'status' => 404,
+                'message' => 'Payment Mode already exists'
+            ]);
+        }
+
         $data = [
             'value'      => $input['value'],
             'is_active'  => 1,
@@ -249,6 +291,20 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Record not found']);
         }
 
+        // Duplicate name check (excluding current record)
+        $checkDuplicate = $this->PaymentModeModel
+            ->where('LOWER(value)', strtolower($input['value']))
+            ->where('id !=', $id)
+            ->where('is_active', 1)
+            ->first();
+
+        if ($checkDuplicate) {
+            return $this->response->setJSON([
+                'status' => 404,
+                'message' => 'Payment Mode already exists'
+            ]);
+        }
+
         $data = [
             'value'      => $input['value'] ?? null,
             'updated_by' => $input['updated_by'] ?? null,
@@ -278,8 +334,10 @@ class MasterController extends ResourceController
             return $this->response->setJSON(['status' => 404, 'message' => 'Record not found']);
         }
 
+        $status = ($input['is_active'] == 1) ? 0 : 1;
+
         $this->PaymentModeModel->update($id, [
-            'is_active'  => $input['is_active'], // 1 or 0
+            'is_active'  => $status,
             'updated_by' => $input['updated_by'] ?? null,
         ]);
 
diff --git a/app/Controllers/PolicyController.php b/app/Controllers/PolicyController.php
index fa32007..8a8a6dd 100644
--- a/app/Controllers/PolicyController.php
+++ b/app/Controllers/PolicyController.php
@@ -155,7 +155,7 @@ class PolicyController extends ResourceController
                 }
             }
 
-            trigger_email('policy_created', ['policy_id' => $policyId]);
+            // trigger_email('policy_created', ['policy_id' => $policyId]);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
 
@@ -240,7 +240,7 @@ class PolicyController extends ResourceController
             $this->PolicyModel->update($id, $updateData);
 
 
-            trigger_email('policy_created', ['policy_id' => $id]);
+            // trigger_email('policy_created', ['policy_id' => $id]);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
 
diff --git a/app/Controllers/QuotationController.php b/app/Controllers/QuotationController.php
index 37d6e99..d83826e 100644
--- a/app/Controllers/QuotationController.php
+++ b/app/Controllers/QuotationController.php
@@ -99,7 +99,7 @@ class QuotationController extends ResourceController
 
             $id = $this->QuotationModel->insert($insertData, true);
 
-            trigger_email('quotation_created', ['quotation_id' => $id]);
+            // trigger_email('quotation_created', ['quotation_id' => $id]);
 
             //update enquiry status
             $enquiryData = $this->EnquiryModel->where('id',$data['enquiry_id'])->where('status','Awaiting Proposal')->first();
@@ -205,9 +205,9 @@ class QuotationController extends ResourceController
 
             if( $newStatus == 'Accepted')
             {
-                trigger_email('quotation_accepted', ['quotation_id' => $id]);
+                // trigger_email('quotation_accepted', ['quotation_id' => $id]);
             }else{
-                trigger_email('quotation_rejected', ['quotation_id' => $id]);
+                // trigger_email('quotation_rejected', ['quotation_id' => $id]);
             }