From 0b2d688b6d9ea56fd2d57a1c417dc35b65af27fe Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sat, 30 Mar 2024 09:10:03 +0530
Subject: [PATCH 1/9] UI_IN_CLIENT_POLICY : RV

---
 app/Views/client_basic_info.php | 4 ++--
 app/Views/client_kyc.php        | 2 +-
 app/Views/client_policy.php     | 2 +-
 app/Views/policy_gpa_terms.php  | 8 --------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php
index d2034521..9d562f2b 100644
--- a/app/Views/client_basic_info.php
+++ b/app/Views/client_basic_info.php
@@ -2,7 +2,7 @@
 .switch {
   position: relative;
   display: inline-block;
-  width: 60px;
+  width: 54px;
   height: 34px;
 }
 
@@ -181,7 +181,7 @@ input:checked + .slider:before {
                             <input id="is_download_btn" type="checkbox" name="is_download_btn" <?= (isset($client['is_download_btn']) && $client['is_download_btn'] == 1) ? 'checked' : '' ?>>
                             <span class="slider round" style="height: 27px;"></span>
                         </label>
-                        <label for="is_download_btn">Enable Client Export Option</label>
+                        <label for="is_download_btn" style=" position: relative;bottom: 5px;">Enable Client Export Option</label>
                     </div>
 
 
diff --git a/app/Views/client_kyc.php b/app/Views/client_kyc.php
index af301c6c..d842b1f4 100644
--- a/app/Views/client_kyc.php
+++ b/app/Views/client_kyc.php
@@ -129,7 +129,7 @@
                         var fileExtension = fileName.split('.').pop().toLowerCase();
                         if (allowedExtensions.indexOf(fileExtension) === -1) {
                             form.trigger('reset')
-                            toastr.warning('File type not allowed: ' + fileName, 'Warning');
+                            toastr.warning('File type not allowed: ' + fileName, 'Only Allowed pdf, png, jpg and jpeg');
                             return; 
                         }
                     }
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 187a8ea1..0237392b 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -90,7 +90,7 @@
                                 <input id="is_addon" type="checkbox" name="is_addon" <?= (isset($client['is_addon']) && $client['is_addon'] == 1) ? 'checked' : '' ?>>
                                 <span class="slider round" style="height: 27px;"></span>
                             </label>
-                            <label for="is_addon">Is AddOn Policy</label>
+                            <label for="is_addon" style=" position: relative;bottom: 5px;">Is AddOn Policy</label>
                             </div>
                         </div>
 
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index c448e10e..0fcaeb85 100644
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -52,14 +52,6 @@
     .jodit-status-bar{
         display:none;
     }
-    .jodit-container{
-        /* width: 690px !important; */
-        /* margin-top: 3px; */
-        /* margin-bottom: 3px; */
-        /* margin-left: 30px; */
-        /* height: 0px !important; */
-        /* min-height: 100px !important; */
-    }
     .input-group {
         width: 64.5% !important;
     }

From b43aaa6d5dbd127fffb16743083c0d79d52948a5 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 30 Mar 2024 09:13:39 +0530
Subject: [PATCH 2/9] CHANGE_CLIENT_POLICY_GMC_GPA_FORM : AADHAVAN

---
 app/Views/policy_gmc_terms.php | 6 +++++-
 app/Views/policy_gpa_terms.php | 6 +++++-
 app/Views/tpa_basic_info.php   | 6 ++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index 25f21abe..0f556978 100644
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -596,7 +596,8 @@ var grid_html = '';
             processData: false,
             contentType: false,
             success: function(res) {
-                
+                $('#policyJsonForm')[0].reset();
+                $('.text-danger-2').html('');
                 if (res.status === false) {
                     toastr.error('Policy Dose Not Create', 'Error');
                     return;
@@ -871,6 +872,9 @@ var grid_html = '';
         $('#police-tab').css('display', '');
         $('.nav.nav-pills.navtab-bg').css('display','');
         $('.nav.nav-pills.navtab-bg').prev().css('display','');
+
+        $('#policyJsonForm')[0].reset();
+        $('.text-danger-2').html('');
     });
 
     // function formatNumber(input) {
diff --git a/app/Views/policy_gpa_terms.php b/app/Views/policy_gpa_terms.php
index c448e10e..1cd03797 100644
--- a/app/Views/policy_gpa_terms.php
+++ b/app/Views/policy_gpa_terms.php
@@ -409,7 +409,8 @@
             processData: false,
             contentType: false,
             success: function(res) {
-
+                $('#policyGPATerms')[0].reset();
+                $('.text-danger-2').html('');
                 console.log(res);
                 
                 if (res.status === false) {
@@ -569,6 +570,9 @@
             $('#police-tab').css('display', '');
             $('.nav.nav-pills.navtab-bg').css('display','');
             $('.nav.nav-pills.navtab-bg').prev().css('display','');
+            $('#policyGPATerms')[0].reset();
+            $('.text-danger-2').html('');
+
     });
 
 
diff --git a/app/Views/tpa_basic_info.php b/app/Views/tpa_basic_info.php
index 86db92e2..32487206 100644
--- a/app/Views/tpa_basic_info.php
+++ b/app/Views/tpa_basic_info.php
@@ -9,10 +9,8 @@
                     <div class="form-group">
                         <div class="form-row">
                             <div class="form-group col-md-4">
-                                <label for="tpa_name">TPA Name<span
-                                        class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="name"
-                                    placeholder="Enter TPA Name" value="<?= isset($tpa['name']) ? $tpa['name'] : '' ?>" name="name" required>
+                                <label for="tpa_name">TPA Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="tpa_name"  placeholder="Enter TPA Name" value="<?= isset($tpa['name']) ? $tpa['name'] : '' ?>" name="name" required>
                             </div>
                             <div class="form-group col-md-4">
                                 <label for="short_name">TPA Short Name<span class="text-danger">*</span></label>

From 2b29730e166b669c41a5dc1f9e672dd92cd4d68f Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 30 Mar 2024 10:10:30 +0530
Subject: [PATCH 3/9] FIX_HIDE_SHOW_BUTTON_MASTER_AND_CLIENT_MODEL : AADHAVAN

---
 app/Views/client_branch.php          | 2 +-
 app/Views/client_onboarding.php      | 8 ++++++--
 app/Views/client_policy.php          | 2 +-
 app/Views/insurer_branch.php         | 2 +-
 app/Views/insurer_onboarding.php     | 4 +++-
 app/Views/kyc_docs.php               | 2 +-
 app/Views/kyc_onboarding.php         | 4 +++-
 app/Views/policies.php               | 2 +-
 app/Views/policy_type_onboarding.php | 4 +++-
 app/Views/tpa_branch.php             | 2 +-
 app/Views/tpa_onboarding.php         | 6 ++++--
 11 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index aab529c9..f56d9d42 100644
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 116003ea..da2344f3 100644
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -158,7 +158,9 @@ body {
             $('#BtnAdd').hide();
             toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
         }else{
-            $('#BtnAdd').show();
+            if ($('#btnPolicyBack')[0].style.display == 'none') {
+                $('#BtnAdd').show();
+            }
         }
         
     }
@@ -171,7 +173,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 0237392b..9018586c 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -28,7 +28,7 @@
             <div class="card-body">
                 
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnPolicyBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index e2739700..8170f321 100644
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/insurer_onboarding.php b/app/Views/insurer_onboarding.php
index 53c2f080..f7520d25 100644
--- a/app/Views/insurer_onboarding.php
+++ b/app/Views/insurer_onboarding.php
@@ -79,7 +79,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the Insurer!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
     }
 
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index d27ae100..0ec33c05 100644
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -22,7 +22,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php
index 531f86e7..0db36ce1 100644
--- a/app/Views/kyc_onboarding.php
+++ b/app/Views/kyc_onboarding.php
@@ -77,7 +77,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the KYC Entity Type!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 59a7eba9..83560c37 100644
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/policy_type_onboarding.php b/app/Views/policy_type_onboarding.php
index 4d6d9c39..f1c3075d 100644
--- a/app/Views/policy_type_onboarding.php
+++ b/app/Views/policy_type_onboarding.php
@@ -76,7 +76,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the Policy Type!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index f098fe6c..5104ae67 100644
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/tpa_onboarding.php b/app/Views/tpa_onboarding.php
index ce73876c..1e14dabe 100644
--- a/app/Views/tpa_onboarding.php
+++ b/app/Views/tpa_onboarding.php
@@ -70,13 +70,15 @@ body {
 <script>
     function tpa_branch_contact() {
         var check_tpa_id = $('#tpa_General_PrimaryKey');
-        
+
 
         if(check_tpa_id[0].value == '' || check_tpa_id[0].value == null || check_tpa_id[0].value == 0){
             $('#btnBranchAdd').hide();
             toastr.warning('First Add the TPA!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }

From 00c738427d71f3a2e3f2392e4bb7e00fcbbf2890 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sat, 30 Mar 2024 10:34:55 +0530
Subject: [PATCH 4/9] FIX_CLIENT_RM_ISSUE : RV

---
 app/Controllers/ClientController.php |  5 ++++-
 app/Views/client_rm.php              | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 67bbb728..ee3da98d 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -297,7 +297,10 @@ class ClientController extends AdminController
 
         $data               = $this->request->getPost();
         $data['updated_by'] = get_session_userid();
-        $data['client_logo'] = $file_name;
+        
+        if(!empty($file_name)){
+            $data['client_logo'] = $file_name;
+        }
 
         if (!isset($data['is_download_btn'])) {
             $data['is_download_btn'] = 0;
diff --git a/app/Views/client_rm.php b/app/Views/client_rm.php
index 2cbc2be6..539a0c8f 100644
--- a/app/Views/client_rm.php
+++ b/app/Views/client_rm.php
@@ -82,6 +82,7 @@ $(document).ready(function(){
 
     var data = <?= isset($client_relation) ? json_encode($client_relation) : '[]' ?>;
     if (relation_PrimaryKey !== '') {
+        console.log('test case k212')
         $('#client_rm_edit').show()
         $('#client_rm_btnSubmit').hide();
         $.each(data, function(index, item) {
@@ -91,14 +92,13 @@ $(document).ready(function(){
                 if ($option.length > 0) {
                     $option.prop('selected', true);
                 }
-                $('#account_manager').multiselect('refresh');
-                $('#head').prop('disabled', true);
-                $('#manager').prop('disabled', true);
-                $('#account_manager').multiselect('disable');
-
-                
         });
 
+        $('#account_manager').multiselect('refresh');
+        $('#head').prop('disabled', true);
+        $('#manager').prop('disabled', true);
+        $('#account_manager').multiselect('disable');
+
     }
 
 

From 6268549d3760f2e06703a613b67eabfb9c4b2596 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 30 Mar 2024 11:40:26 +0530
Subject: [PATCH 5/9] FIX_HIDE_SHOW_BUTTON_MASTER_AND_CLIENT_MODEL : AADHAVAN

---
 app/Views/client_onboarding.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index da2344f3..668cbb35 100644
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -132,7 +132,9 @@ body {
             $('#btnBranchAdd').hide();
             toastr.warning('Please Add the Client!', 'warning',{timeOut: 2000});
         }else{
-            $('#btnBranchAdd').show();
+            if ($('#btnBranchBack')[0].style.display == 'none') {
+                $('#btnBranchAdd').show();
+            }
         }
         
     }

From 3725ac631b0e8affc6de6c151f471430f6b1adcb Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Sat, 30 Mar 2024 06:38:47 +0000
Subject: [PATCH 6/9] Initial Bitbucket Pipelines configuration

---
 bitbucket-pipelines.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 bitbucket-pipelines.yml

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
new file mode 100644
index 00000000..8288ba2e
--- /dev/null
+++ b/bitbucket-pipelines.yml
@@ -0,0 +1,20 @@
+# Template PHP Build
+
+# This template allows you to validate your PHP application.
+# The workflow allows running tests and code linting on the default branch.
+
+image: composer:2.0
+
+
+pipelines:
+  default:
+    - parallel:
+        - step:
+            name: Test
+            script:
+              - composer install
+              - apt-get update
+              - apt-get -qq install git-ftp
+              - git ftp push -u $FTP_USERNAME -p $FTP_PASSWORD $FTP_URL
+            caches:
+              - composer
\ No newline at end of file

From e69e654682017cf091de54af16669f61be8ff203 Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavanvalli@gmail.com>
Date: Sat, 30 Mar 2024 12:18:48 +0530
Subject: [PATCH 7/9] FIX_EMPLOYEE_UPLOAD_CREATED_BY_ADD_SWAGGER_TO : AADHAVAN

---
 app/Controllers/EmployeeRestController.php | 6 +++++-
 public/assets/api.yaml                     | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index b28833e2..973a5d3c 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -499,6 +499,8 @@ class EmployeeRestController extends AdminController
             $client_id = $this->request->getPost('client_id');
             // $client_id = $this->request->getJSON('client_id');
             $policy_id = $this->request->getPost('policy_id');
+
+            $employee_id = $this->request->getPost('employee_id');
             // $policy_id = $this->request->getJSON('policy_id');
 
             $client_policy = $this->clientPolicyModel->where('id', $policy_id)->where('client_id', $client_id)->first();
@@ -538,7 +540,7 @@ class EmployeeRestController extends AdminController
                 $extractData['status']= 'success';
                 $extractData['policy_id']= $policy_id;
                 $extractData['action']= 'enrollment';
-                //  $extractData['created_by']=set_session_context('Employee');
+                 $extractData['created_by']=$employee_id;
 
                 $file_data =$this->fileModel->insert($extractData);
 
@@ -696,6 +698,7 @@ class EmployeeRestController extends AdminController
                                 $emp_id =$employee['id'];
                                 $id =$emp_id;
                                 $data_after_gpa_or_gmc['id'] = $id;
+                                $data_after_gpa_or_gmc['updated_by'] = $employee_id;
                                 $data_after_gpa_or_gmc['updated_at'] = $formatted_date_time;
                                 $result = $this->employeeModel->save($data_after_gpa_or_gmc);
                                 if ($result) {
@@ -706,6 +709,7 @@ class EmployeeRestController extends AdminController
                                 if ($dataToInsert[$a]['emp_code'] != 0) {
                                     $result =false;
                                     if (count($data_after_gpa_or_gmc) != 0) {
+                                        $data_after_gpa_or_gmc['created_by'] = $employee_id;
                                         $result = $this->employeeModel->insert($data_after_gpa_or_gmc);
                                     }
                                     $emp_id =$result;
diff --git a/public/assets/api.yaml b/public/assets/api.yaml
index d8159bab..4d3e8f7e 100644
--- a/public/assets/api.yaml
+++ b/public/assets/api.yaml
@@ -175,6 +175,9 @@ paths:
                 policy_id:
                   type: integer
                   description: policy_id
+                employee_id:
+                  type: integer
+                  description: employee_id
                 file:
                   type: string
                   format: binary

From d662bdb6cac6227bbb07436525edf10fc0ca4d6e Mon Sep 17 00:00:00 2001
From: Venba <bitbucket@venbainfotech.com>
Date: Sat, 30 Mar 2024 06:55:20 +0000
Subject: [PATCH 8/9] CHANGE_PIPELINE_STEP1

---
 bitbucket-pipelines.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 8288ba2e..e905c2b3 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -12,7 +12,6 @@ pipelines:
         - step:
             name: Test
             script:
-              - composer install
               - apt-get update
               - apt-get -qq install git-ftp
               - git ftp push -u $FTP_USERNAME -p $FTP_PASSWORD $FTP_URL

From c32e2a6c135070f2e0aafa2cdbc50ad3d0729c6f Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sat, 30 Mar 2024 14:54:31 +0530
Subject: [PATCH 9/9] FIX_CLIENT_BRANCH_SHOW_MULTI : RV

---
 app/Views/client_branch.php  |  38 ++++++---
 app/Views/insurer_branch.php | 145 ++++++++++++++++++-----------------
 app/Views/layout/header.php  |   3 +
 app/Views/tpa_branch.php     |   7 +-
 4 files changed, 108 insertions(+), 85 deletions(-)

diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index f56d9d42..c788731c 100644
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -172,6 +172,11 @@ $(document).ready(function () {
         $('.ac').css('display', 'block');
         contactCount = 1
 
+        var addButton = document.getElementById('add');
+        if (addButton.style.display === 'none') {
+            addButton.style.display = 'block';
+        }
+
         var buttonIds = JSON.parse(localStorage.getItem('buttonIds')) || [];
         for (var i = 0; i < buttonIds.length; i++) {
             var firstElement = buttonIds[i].split('_')[0];
@@ -205,12 +210,7 @@ $(document).ready(function () {
         $('#branch_form')[0].reset();
         $('.ac').css('display', 'block');
         $('.parsley-errors-list').remove();
-
         $('#branch_form').parsley().reset();
-
-
-
-
         contactCount = 1
 
         var buttonIds = JSON.parse(localStorage.getItem('buttonIds')) || [];
@@ -282,14 +282,14 @@ $(document).ready(function () {
                     var branchTableInsert = ''
                     $.each(res.data, function(index, item) {
                         branchTableInsert += `
-                            <tr>
-                                <td>${item.branch_name}</td>
-                                <td>${item.branch_code}</td>
-                                <td>
+                        <tr>
+                            <td>${item.branch_name}</td>
+                            <td>${item.branch_code}</td>
+                            <td>
                                 <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
                                 <a style="color:#02a8b5" data-id="${item.id}" onclick="removeClientBranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
-                                </td>
-                            </tr>
+                            </td>
+                        </tr>
                         `;   
                     });
                     $('#branch_list').append(branchTableInsert); 
@@ -311,6 +311,22 @@ $(document).ready(function () {
 
     $('body').on('click', '.btnBranchEdit', function () {
 
+        var buttonIds = JSON.parse(localStorage.getItem('buttonIds')) || [];
+        for (var i = 0; i < buttonIds.length; i++) {
+            var firstElement = buttonIds[i].split('_')[0];
+            console.log(firstElement);
+
+            // Find the element by its ID
+            var elementToRemove = document.getElementById(firstElement);
+            console.log(elementToRemove);
+
+            if (elementToRemove) {
+                console.log(elementToRemove);
+                elementToRemove.parentNode.removeChild(elementToRemove);
+            }
+            localStorage.removeItem('buttonIds')
+        }
+
         contactCount = 1
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index 8170f321..dd2e5a6f 100644
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -132,71 +132,7 @@
         insurer_Branch_PrimaryKey = $('#insurer_id_branch').val();
             
         $('#add_branch').hide();
-        $('.btnBack').hide();
-        
-
-        $('#btnBranchAdd').click(function(){
-
-            insurer_branch_form_action = '<?= base_url("master/insurer/branch/create"); ?>';
-
-            $('#add_branch').show();
-            $('#branch_table').hide();
-            $('.btnBack').show();
-            $('#btnBranchAdd').hide();
-
-            $('#branch_name').val('');
-            $('#branch_code').val('');
-            $('#state').val('');
-            $('#district').val('');
-            $('#branch_city').val('');
-            
-            $('#name').val('');
-            $('#email').val('');
-            $('#mobile').val('');
-            $('#designation').val('');
-
-
-            contactCount = 1
-            
-
-            var buttonIds = JSON.parse(localStorage.getItem('buttonIds')) || [];
-            for (var i = 0; i < buttonIds.length; i++) {
-                var firstElement = buttonIds[i].split('_')[0];
-                console.log(firstElement);
-
-                // Find the element by its ID
-                var elementToRemove = document.getElementById(firstElement);
-                console.log(elementToRemove);
-
-                if (elementToRemove) {
-                    console.log(elementToRemove);
-                    elementToRemove.parentNode.removeChild(elementToRemove);
-                }
-                localStorage.removeItem('buttonIds')
-            }
-        })    
-
-        $('.btnBack').click(function(){
-
-            $('#add_branch').hide();
-            $('#branch_table').show();
-            $('.btnBack').hide();
-            $('#btnBranchAdd').show();
-
-            $('#branch_name').val('');
-            $('#branch_code').val('');
-            $('#state').val('');
-            $('#district').val('');
-            $('#branch_city').val('');
-            
-            $('#name').val('');
-            $('#email').val('');
-            $('#mobile').val('');
-            $('#designation').val('');
-
-
-        })
-    
+        $('.btnBack').hide();    
 
         if(insurer_Branch_PrimaryKey !== ''){
 
@@ -204,12 +140,12 @@
             var data  = <?= isset($insuer_branch) ? json_encode($insuer_branch) : '[]' ?>;
             $.each(data, function(index, item) {
                 branchTable += `
-                    <tr>
+                     <tr>
                         <td>${item.branch_name}</td>
                         <td>${item.branch_code}</td>
                         <td>
-                            <a class="btnBranchEdit" data-id="${item.id}" href="#"><i data-id="${item.id}" class="mdi mdi-lead-pencil btnBranchEdit"  style="font-size:18px;"></i></a>
-                            <a style="color:#02a8b5" data-id="${item.id}" onclick="removeInsurerBranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
+                        <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
+                        <a style="color:#02a8b5" data-id="${item.id}" onclick="removeInsurerBranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
                         </td>
                     </tr>
                 `;   
@@ -220,6 +156,73 @@
     }); 
 
 
+    $('#btnBranchAdd').click(function(){
+        
+        $("#insurer_branch_form")[0].reset();
+        contactCount = 1
+        insurer_branch_form_action = '<?= base_url("master/insurer/branch/create"); ?>';
+        $('#add_branch').show();
+        $('#branch_table').hide();
+        $('.btnBack').show();
+        $('#btnBranchAdd').hide();
+
+        $('#branch_name').val('');
+        $('#branch_code').val('');
+        $('#state').val('');
+        $('#district').val('');
+        $('#branch_city').val('');
+
+        $('#name').val('');
+        $('#email').val('');
+        $('#mobile').val('');
+        $('#designation').val('');
+        contactCount = 1
+
+        var addButton = document.getElementById('add');
+        if (addButton.style.display === 'none') {
+            addButton.style.display = 'block';
+        }
+
+        var buttonIds = JSON.parse(localStorage.getItem('buttonIds')) || [];
+        for (var i = 0; i < buttonIds.length; i++) {
+            var firstElement = buttonIds[i].split('_')[0];
+            console.log(firstElement);
+
+            // Find the element by its ID
+            var elementToRemove = document.getElementById(firstElement);
+            console.log(elementToRemove);
+
+            if (elementToRemove) {
+                console.log(elementToRemove);
+                elementToRemove.parentNode.removeChild(elementToRemove);
+            }
+            localStorage.removeItem('buttonIds')
+        }
+    })    
+
+    $('.btnBack').click(function(){
+
+        $("#insurer_branch_form")[0].reset();
+        contactCount = 1
+        $('#add_branch').hide();
+        $('#branch_table').show();
+        $('.btnBack').hide();
+        $('#btnBranchAdd').show();
+
+        $('#branch_name').val('');
+        $('#branch_code').val('');
+        $('#state').val('');
+        $('#district').val('');
+        $('#branch_city').val('');
+
+        $('#name').val('');
+        $('#email').val('');
+        $('#mobile').val('');
+        $('#designation').val('');
+        
+    })
+
+
     $("#insurer_branch_form").submit(function(events) {
         console.log(1, insurer_branch_form_action);
         events.preventDefault(); 
@@ -238,6 +241,7 @@
                 processData: false,
                 contentType: false,
                 success: function(res) {
+                    $("#insurer_branch_form")[0].reset();
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
@@ -254,7 +258,6 @@
                                 <a class="mdi mdi-lead-pencil btnBranchEdit" href="#" data-id="${item.id}" style="font-size:18px;"></a>
                                 <a style="color:#02a8b5" data-id="${item.id}" onclick="removeInsurerBranch(this)"><i data-id="${item.id}" class="mdi mdi-delete"  style="font-size:18px;"></i></a>
                                 </td>
-
                             </tr>
                         `;   
                     });
@@ -284,7 +287,7 @@
 
     $('body').on('click', '.btnBranchEdit', function () {
         $('#container').html("");
-        contactCount =1;
+        contactCount = 1;
         var branch_id = $(this).attr('data-id');
         $('#insurer_Branch_PrimaryKey').val(branch_id);
 
@@ -469,8 +472,6 @@
     }
 
 
-
-    
     function removeInsurerBranch(element) {
         var id = element.getAttribute('data-id');
         var form_action = '<?= base_url("master/insurer/branch/remove/") ?>' + id; 
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index af40c828..e3998fbe 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -554,6 +554,9 @@
                                             </li>
                                             <li>
                                                 <a href="<?= base_url('/employee/upload')?>">Upload</a>
+                                            </li>                                             
+                                            <li>
+                                                <a href="<?= base_url('/employee/endorsement-list')?>">Endorsement List</a>
                                             </li> 
                                         </ul>
                                     </div>
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index 5104ae67..1015d36e 100644
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -153,7 +153,10 @@ $(document).ready(function () {
         $('#mobile').val('');
         $('#designation').val('');
 
-
+        var addButton = document.getElementById('add');
+        if (addButton.style.display === 'none') {
+            addButton.style.display = 'block';
+        }
 
         contactCount = 1
         
@@ -407,7 +410,7 @@ var html = `
             </div>
             <div class="form-group col-md-6">
                 <label for="${uniqueId}_designation">Designation<span class="text-danger">*</span></label>
-                <input data-parsley-type="number" data-parsley-length="[10,10]" value="${contact !== undefined && contact !== false ? contact.designation : ''}" type="text" class="form-control" placeholder="Enter Designation Name" name="designation[]" id="${uniqueId}_designation" required>
+                <input  value="${contact !== undefined && contact !== false ? contact.designation : ''}" type="text" class="form-control" placeholder="Enter Designation Name" name="designation[]" id="${uniqueId}_designation" required>
             </div>
         </div>
         <div class="form-group" style="display: flex;">