diff --git a/.gitignore b/.gitignore index a599a01e..e0e9251f 100755 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ build/ composer.lock .env .phpunit* +phpqueue.sh + diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php index 22e45e9c..b43669b2 100644 --- a/app/Models/PolicyTransactionModel.php +++ b/app/Models/PolicyTransactionModel.php @@ -784,6 +784,19 @@ class PolicyTransactionModel extends Model ->join('user_profiles AS service_user', 'policy_transaction.serviced_by = service_user.id', 'left') ->where('policy_transaction.is_active', 1) ->where('pt_co_share_details.is_active', 1); + + 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()); + } + } // Check if the start date and end date are provided if ($start_date != 0 && $end_date != 0 && $date_type != 0 && $date_type != 'statement_month') { diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8db290b2..3491cacb 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -732,9 +732,9 @@ - + - +
  • @@ -745,68 +745,76 @@
  • BDS
  • + +
  • + Variance +
  • +
  • + Outstanding +
  • +
  • + IRDA Reports +
  • +
  • + Renewal Reports +
  • + + + + + + + +
  • + + + Policy Pending Actions + +
    + +
    +
  • + + + +
  • + + + Masters + +
    +
  • -
  • - - - Policy Pending Actions - -
    - -
    -
  • - -
  • - - - Masters - -
    - -
    -
  • - -
  • - - - Documents - -
  • + +
  • + + + Documents + +
  • + diff --git a/app/Views/notification.php b/app/Views/notification.php index 1b4c7072..6e1e0cbd 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -10,9 +10,9 @@ overflow-y: auto !important; } #editor-container { - width: 100%; - min-height: 600px; -} + width: 100%; + min-height: 600px; + } .modal-dialog { max-width: 90% !important; @@ -264,7 +264,7 @@
    -
    +
    @@ -360,7 +360,7 @@
    -
    +
    @@ -440,7 +440,7 @@
    -
    +
    @@ -542,7 +542,7 @@
    -
    +
    @@ -615,7 +615,7 @@
    -
    +
    @@ -702,7 +702,7 @@
    -
    +
    diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php index bf0121b7..eaa5543a 100644 --- a/app/Views/policy_transaction_endorsement_form.php +++ b/app/Views/policy_transaction_endorsement_form.php @@ -1808,7 +1808,7 @@ function addInsurerColumn() { break; } - }else if(team_id.includes('3')){ + }else if(team_id.includes('3') || team_id.includes('8')){ switch(index) { case 0: // Insurer selection @@ -2194,7 +2194,7 @@ function populateTable(dataArray, status = false) { cell.find('input[type="hidden"]').val(status ? data.id : ''); break; } - }else if(team_id.includes('3')){ + }else if(team_id.includes('3') || team_id.includes('8')){ switch (rowIndex) { case 0: // Insurer selection cell.find('select').val(insurer); diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php index 67c84cf0..0469a9d4 100644 --- a/app/Views/policy_transaction_inception_form.php +++ b/app/Views/policy_transaction_inception_form.php @@ -3950,7 +3950,7 @@ function addInsurerColumn() { } - }else if(team_id.includes('3')){ + }else if(team_id.includes('3') || team_id.includes('8')){ switch(index) { case 0: // Insurer selection @@ -4345,7 +4345,7 @@ function populateTable(dataArray, cd_ac_pk) { cell.find('input[type="hidden"]').val(data.id); break; } - }else if(team_id.includes('3')){ + }else if(team_id.includes('3') || team_id.includes('8')){ switch (rowIndex) { case 0: // Insurer selection