MERGE_TEST_BDS&ROLE_ACCESS

app/Config/Constants.php

@@ -103,6 +103,8 @@ define('BUSINESS_TEAM_ID', '3');
 define('FINANCE_TEAM_ID', '4');
 define('SALES_TEAM_ID', '5');
 define('MANAGEMENT_TEAM_ID', '6');
+define('BUSINESS_SUPPORT_TEAM_ID', '7');
+define('POS_TEAM_ID', '8');
 
 /**
  * @User Teams Constant

app/Controllers/DashboardController.php

@@ -100,6 +100,8 @@ class DashboardController extends AdminController
 
         $data = [];
 
+        if (in_array(get_role_id(), [1,2,3,5]) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) {
+            
             $db = db_connect();
             $sql = "SELECT 
                     clients.id AS client_id, 
@@ -169,6 +171,8 @@ class DashboardController extends AdminController
             $data['colorShades'] =  $this->colorShades;
             // print_r($data);die;
 
+        }
+
         $data['page_name'] = 'Dashboard';
 
         echo view('layout/header',  $data);

app/Controllers/PolicyTransactionController.php

@@ -791,11 +791,22 @@ class PolicyTransactionController extends BaseController
                 ->where('client_policy.is_active', 1)
                 ->findAll();
 
-        $data['pt_files'] = $this->PTFileModel
+
+        $ptFileQuery = $this->PTFileModel
             ->join('policy_transaction', 'pt_files.pt_id = policy_transaction.id')
             ->where('pt_files.pt_id', $id)
-                ->where('pt_files.is_active', 1)
+            ->where('pt_files.is_active', 1);
-                ->findAll();
+
+        if (!in_array(get_role_id(), [1, 5]) && empty(array_intersect(user_team(), [MANAGEMENT_TEAM_ID, FINANCE_TEAM_ID, BUSINESS_TEAM_ID]))) {
+            
+            if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                $ptFileQuery->where('pt_files.created_by', get_session_userid());
+            }
+        }
+
+        $data['pt_files'] = $ptFileQuery->findAll();
+
+
 
         $data['pt_co_share_details'] = $this->PTCOShareDetailsModel
                 ->select("
@@ -1501,11 +1512,19 @@ class PolicyTransactionController extends BaseController
         
         if (!empty($uploadData)) {
 
-            $data['pt_files'] = $this->PTFileModel
+        $ptFileQuery = $this->PTFileModel
             ->join('policy_transaction', 'pt_files.pt_id = policy_transaction.id')
             ->where('pt_files.pt_id', $pt_id)
-                ->where('pt_files.is_active', 1)
+            ->where('pt_files.is_active', 1);
-                ->findAll();           
+
+        if (!in_array(get_role_id(), [1, 5]) && empty(array_intersect(user_team(), [MANAGEMENT_TEAM_ID, FINANCE_TEAM_ID, BUSINESS_TEAM_ID]))) {
+            
+            if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                $ptFileQuery->where('pt_files.created_by', get_session_userid());
+            }
+        }
+
+        $data['pt_files'] = $ptFileQuery->findAll();        
                  
             return $this->respond(['status' => true, 'message' => 'File uploaded successfully in G-Drive', 'data' => $data]);
         } else {

app/Models/PolicyTransactionModel.php

@@ -973,6 +973,19 @@ class PolicyTransactionModel extends Model
             ->where('policy_transaction.is_active', 1)
             ->where('policy_transaction.action_type', 'inception');
 
+        if (
+            (!in_array(get_role_id(), [1, 5])) &&
+            !(
+                in_array(MANAGEMENT_TEAM_ID, user_team()) ||
+                in_array(FINANCE_TEAM_ID, user_team()) ||
+                in_array(BUSINESS_TEAM_ID, user_team())
+            )
+        ) {
+            if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                $builder->where('policy_transaction.created_by', get_session_userid());
+            }
+        }
+
         // Optimize Date Filtering
         if (!empty($start_date) && !empty($end_date) && !empty($date_type)) {
             $builder->where("policy_transaction.$date_type >=", date('Y-m-d 00:00:00', strtotime($start_date)))
@@ -1034,6 +1047,19 @@ class PolicyTransactionModel extends Model
             ->where('policy_transaction.is_active', 1)
             ->where('policy_transaction.action_type !=', 'inception');
 
+        if (
+            (!in_array(get_role_id(), [1, 5])) &&
+            !(
+                in_array(MANAGEMENT_TEAM_ID, user_team()) ||
+                in_array(FINANCE_TEAM_ID, user_team()) ||
+                in_array(BUSINESS_TEAM_ID, user_team())
+            )
+        ) {
+            if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                $builder->where('policy_transaction.created_by', get_session_userid());
+            }
+        }
+            
 
         if ($start_date != 0 && $end_date != 0 && $date_type != 0) {
 

app/Views/DashBoard.php

@@ -140,6 +140,7 @@
 <style>
 
     body {
+
         .multiselect-native-select {
             position: relative;
             /* bottom: 32px; */
@@ -164,7 +165,6 @@ body {
         .multiselect-selected-text{
             float: left !important;
         }
-
     }
 
     .navtab-bg .nav-link {
@@ -173,6 +173,7 @@ body {
 
 </style>
 
+<?php if(in_array(get_role_id(), [1,2,3,5]) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
 <div class="row" id="client_add" style="margin-top: -32px;">
     <div class="col-12">
@@ -188,6 +189,9 @@ body {
                 <br>
 
                 <ul class="nav nav-pills navtab-bg">
+                    
+                    <?php if(in_array(get_role_id(), [1,2,3,5])) { ?>
+
                         <li class="nav-item">
                             <a href="#pending-actions-dash-tab" data-toggle="tab" aria-expanded="false"
                                 class="nav-link px-3 py-2 active" id="pending_actions_tab">
@@ -201,8 +205,9 @@ body {
                                 <span class="d-none d-sm-inline-block">Enrolment</span>
                             </a>
                         </li>
+                    <?php } ?>
 
-                    <?php if(get_role_id() == 1 || get_role_id() == 5 && (in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()))) { ?>
+                    <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
                         <li class="nav-item">
                             <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="bds_tab">
@@ -215,15 +220,23 @@ body {
 
                 </ul>
                 <div class="tab-content">
+
+                    <?php if(in_array(get_role_id(), [1,2,3,5])) { ?>
                         <?php include('endorsement_dash.php'); ?>
-                    <?php include('bds_dash.php'); ?>
                         <?php include('enrollment_dash.php'); ?>
+                    <?php } ?>
+
+                    <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+                        <?php include('bds_dash.php'); ?>
+                    <?php } ?>
+                    
                 </div>
             </div>
         <!-- </div> -->
     </div>
 </div>
 
+<?php } ?>
 
 
 

app/Views/bds_dash.php

@@ -125,7 +125,12 @@ body{
 }
 </style>
 
-<div class="tab-pane fade" id="bds-dash-tab" style="padding-right: 35px;">
+<?php if((get_role_id() == 4 ) && (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+    <?php $add_active_calss = "active show" ?>
+<?php } ?>
+
+
+<div class="tab-pane <?= isset($add_active_calss) ? $add_active_calss : 'fade' ?>" id="bds-dash-tab" style="padding-right: 35px;">
 
     <div class="StatusTileHide" style="display: none; position: relative; bottom: 15px;">
         <a href="#" onclick="hide_status_show_pending_tile()" >show all pending Tile</a>

app/Views/layout/header.php

@@ -517,7 +517,6 @@
 <!-- ========== Left Sidebar Start ========== -->
     <div class="left-side-menu">
 
-
         <!-- LOGO -->
         <div class="logo-box">
             <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-dark text-center">
@@ -542,7 +541,6 @@
         </div>
 
         <div class="h-100" data-simplebar>
-
             <!--- Sidemenu -->
             <div id="sidebar-menu">
                 <ul id="side-menu">
@@ -554,13 +552,18 @@
                         </a>
                     </li>
 
+                    <!-- client -->
+                    <?php if (in_array(get_role_id(), [1,2,3,5])) { ?>
                         <li>
                             <a href="<?= base_url('/client/list') ?>">
                                 <i class="mdi mdi-domain"></i>
                                 <span> Clients </span>
                             </a>
                         </li>
+                    <?php } ?>
 
+                    <!-- Enrollment process -->
+                    <?php if (in_array(get_role_id(), [1,2,3,5])) { ?>
                         <li>
                             <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
                                 <i class="fas fa-user-tie"></i>
@@ -588,7 +591,9 @@
                                 </ul>
                             </div>
                         </li>
+                    <?php } ?>
 
+                    <!-- Masters -->
                     <?php if (get_role_id() == 1 || get_role_id() == 5) { ?>
 
                         <li>
@@ -625,8 +630,8 @@
                         </li>
 
                     <?php } ?>
-<!-- 
+
-                    <li>
+                    <!-- <li>
                         <?php
                         $sessionData = get_session_userdata();
                         $currentUrl = base_url();
@@ -641,6 +646,8 @@
                         </a>
                     </li> -->
 
+                    <!-- Claims -->
+                    <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
                         <li>
                             <a href="#sidebarDashboardsTicket" data-toggle="collapse" class="waves-effect">
                                 <i class="mdi mdi-lifebuoy"></i>
@@ -664,35 +671,20 @@
                                 </ul>
                             </div>
                         </li>
-
+                    <?php } ?>
-                    <li>
-                        <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect" style="color: grey;">
-                            <i class="fa fa-info-circle" aria-hidden="true"></i>
-                            <span class="badge badge-success badge-pill float-right">2</span>
-                            <span> App Content Management </span>
-                        </a>
-                        <div class="collapse" id="sidebarDashboardsmenu">
-                            <ul class="nav-second-level">
-                                <li>
-                                    <a href="<?= base_url('/add_image_index') ?>"> Advertisement Images </a>
-                                </li>
-                                <li>
-                                    <a href="<?= base_url('/frontend_content') ?>">Front-end Content</a>
-                                </li>
-                            </ul>
-                        </div>
-                    </li>
 
                     <!-- leads -->
+                    <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(BUSINESS_SUPPORT_TEAM_ID, user_team())) { ?>
                         <li>
                             <a href="<?= base_url('/leads/list') ?>">
                                 <i class="mdi mdi-chart-bar"></i>
                                 <span> Leads </span>
                             </a>
                         </li>
+                    <?php } ?>
 
-                    <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()))) { ?>
+                    <!-- BDS -->
-
+                    <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
                         <li>
                             <a href="#policyTransactions" data-toggle="collapse" class="waves-effect">
                                 <i class="mdi mdi-format-list-bulleted"></i>
@@ -708,14 +700,17 @@
                                         </a>
                                         <div class="collapse" id="policyTransactionsSub">
                                             <ul>
+
+                                                <?php if (in_array(get_role_id(), [1,5]) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
                                                     <li>
                                                         <a href="<?= base_url('/policy_tranction/inception/list') ?>">Policy</a>
                                                     </li>
                                                     <li>
                                                         <a href="<?= base_url('/policy_tranction/endorsement/list') ?>">Endorsement</a>
                                                     </li>
+                                                <?php } ?>
 
-                                            <?php if (in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+                                                <?php if (in_array(get_role_id(), [1,5]) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
                                                 <li>
                                                     <a href="<?= base_url('/policy_tranction/statement/list') ?>">Statement Upload</a>
                                                 </li>
@@ -724,7 +719,9 @@
                                         </div>
                                     </li>
                                     
-                                <?php if (in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+                                    <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
+
+                                        <?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
                                             <li>
                                                 <a href="#policyReports" data-toggle="collapse" class="waves-effect">
                                                     <i class="ri-file-chart-fill"></i>
@@ -759,13 +756,13 @@
                                             </a>
                                             <div class="collapse" id="policyPendingActions">
                                                 <ul class="nav-third-level">
-                                            <?php if (in_array(FINANCE_TEAM_ID, user_team())) { ?>
+                                                    <?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team())) { ?>
                                                     <li>
                                                         <a href="<?= base_url('/policy_tranction/report/report-finance-list') ?>">Finance Team</a>
                                                     </li>
                                                     <?php } ?>
 
-                                            <?php if (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
+                                                    <?php if (in_array(get_role_id(), [1,5])  || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team())) { ?>
                                                     <li>
                                                         <a href="<?= base_url('/policy_tranction/report/report-business-list') ?>">Business Team</a>
                                                     </li>
@@ -798,19 +795,36 @@
                                             </a>
                                         </li>
 
+                                    <?php } ?>
                                 </ul>
                             </div>
                         </li>
+                    <?php } ?>
+
+                    <!-- Ad -->
+                    <?php if (in_array(get_role_id(), [1,2,3,5])) { ?>
+                        <li>
+                            <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect" style="color: grey;">
+                                <i class="fa fa-info-circle" aria-hidden="true"></i>
+                                <span class="badge badge-success badge-pill float-right">2</span>
+                                <span> App Content Management </span>
+                            </a>
+                            <div class="collapse" id="sidebarDashboardsmenu">
+                                <ul class="nav-second-level">
+                                    <li>
+                                        <a href="<?= base_url('/add_image_index') ?>"> Advertisement Images </a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= base_url('/frontend_content') ?>">Front-end Content</a>
+                                    </li>
+                                </ul>
                             </div>
                         </li>
-
-
                     <?php } ?>
 
                 </ul>
              </div>
             <!-- End Sidebar -->
-
         </div>
         <!-- Sidebar -left -->