From bf680a0d7cef2269e9391f704e29f97c58dd57ab Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Thu, 11 Jul 2024 04:05:22 +0000
Subject: [PATCH] FIX_issues : ps

---
 app/Controllers/Business.php  |  4 ++--
 app/Views/template/header.php |  8 ++++----
 app/Views/template/topbar.php |  6 +++---
 app/Views/user_list.php       | 16 +++++++++-------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Controllers/Business.php b/app/Controllers/Business.php
index c8b39bf..acc7f0b 100644
--- a/app/Controllers/Business.php
+++ b/app/Controllers/Business.php
@@ -52,7 +52,7 @@ class Business extends BaseController
             $model->setTable('business');
     
             ## Fetch business details (particular business)
-            $edit_organzation_details = $model->where(['business_id ' => $id , 'isactive' => 1])->first();
+            $edit_organzation_details = $model->where(['business_id ' => $id])->first();
             $data['organzations'] = $edit_organzation_details;
 
             ## Fetch branch details
@@ -131,7 +131,7 @@ class Business extends BaseController
 
         ## Business Data
         $BusinessModel = new BusinessModel();
-        print_r( $this->request->getPost('currency'));
+        // print_r( $this->request->getPost('currency'));
 
         $data = [
             'title' => $this->request->getPost('bname'),
diff --git a/app/Views/template/header.php b/app/Views/template/header.php
index a23eec4..87347a0 100644
--- a/app/Views/template/header.php
+++ b/app/Views/template/header.php
@@ -55,11 +55,11 @@
                 <div class="logo-box">
                     <a href="dashboard" class="logo logo-dark text-center">
                         <span class="logo-sm">
-                            <img src="<?= $favicon;; ?>" alt="<?= $company_short_name; ?>" height="24">
+                            <img src="<?= $favicon;; ?>" alt="<?= $company_short_name; ?>" height="50">
                             <!-- <span class="logo-lg-text-light">Minton</span> -->
                         </span>
                         <span class="logo-lg">
-                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
+                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="70">
                             <!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="20"> -->
                             <!-- <span class="logo-lg-text-light">M</span> -->
                         </span>
@@ -67,11 +67,11 @@
 
                     <a href="dashboard" class="logo logo-light text-center">
                         <span class="logo-sm" style="background: white;">
-                            <img src="<?= $favicon; ?>" alt="<?= $company_short_name; ?>" height="24">
+                            <img src="<?= $favicon; ?>" alt="<?= $company_short_name; ?>" height="50">
                         </span>
                         <span class="logo-lg" style="background: white;">
                             <!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="24"> -->
-                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
+                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="70">
                         </span>
                     </a>
                 </div>
diff --git a/app/Views/template/topbar.php b/app/Views/template/topbar.php
index ac44d85..f951b64 100644
--- a/app/Views/template/topbar.php
+++ b/app/Views/template/topbar.php
@@ -177,11 +177,11 @@
             <div class="logo-box">
                     <a href="dashboard" class="logo logo-dark text-center">
                         <span class="logo-sm">
-                            <img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
+                            <img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="50">
                             <!-- <span class="logo-lg-text-light">Minton</span> -->
                         </span>
                         <span class="logo-lg">
-                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
+                            <img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="70">
                             <!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="20"> -->
                             <!-- <span class="logo-lg-text-light">M</span> -->
                         </span>
@@ -189,7 +189,7 @@
 
                     <a href="dashboard" class="logo logo-light text-center">
                         <span class="logo-sm" style="background: white;">
-                            <img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
+                            <img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="50">
                         </span>
                         <span class="logo-lg" style="background: white;">
                             <!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="24"> -->
diff --git a/app/Views/user_list.php b/app/Views/user_list.php
index a450d1d..4463d82 100644
--- a/app/Views/user_list.php
+++ b/app/Views/user_list.php
@@ -78,13 +78,15 @@
                                 </td>
                                 <td>
                                     <a href="<?= $edit_page_route; ?>" class="edit-button" title="Click to Edit User" ><i class="ri-pencil-line"></i></a>
-                                    <?php if(get_user_role() != 'auditor') {
-                                        if($row['isactive'] == 1) { ?>
-                                            <a href="#" class="delete-button" data-user-id="<?php echo $row['user_id']; ?>" title="Click to In-Active User"><i class="ri-delete-bin-line"></i></a>
-                                    <?php } else {?>
-                                            <a href="<?php echo "activate_user/".$row['user_id']; ?>" class="fe-user-check" title="Click to Active User" ></a>
-                                    <?php } 
-                                    }?>
+                                    <?php if (get_user_role() != 'auditor'): ?>
+                                        <?php if ($row['isactive'] == 1 && $row['role'] != 'sadmin'): ?>
+                                            <a href="#" class="delete-button" data-user-id="<?= $row['user_id']; ?>" title="Click to In-Active User">
+                                                <i class="ri-delete-bin-line"></i>
+                                            </a>
+                                        <?php elseif ($row['role'] != 'sadmin'): ?>
+                                            <a href="<?= "activate_user/" . $row['user_id']; ?>" class="fe-user-check" title="Click to Active User"></a>
+                                        <?php endif; ?>
+                                    <?php endif; ?>
                                 </td>
                             </tr>
                         <?php endforeach; ?>