Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
VENKATESHWARAN 2025-02-11 17:33:19 +05:30
commit 39a7770cbb
4 changed files with 22 additions and 2 deletions

View File

@ -98,7 +98,7 @@ class ChatbotControllerNew extends BaseController
});
// Start the Main Menu when user says "hi" or "start"
$this->botman->hears('start|hi|hello', function (BotMan $bot) {
$bot->reply('Hi how can i assit?');
$bot->reply('Hi how can i assist?');
$bot->startConversation(new MainMenuConversation());
});

View File

@ -300,6 +300,7 @@
<?php if(get_role_id() == 5 && isset($ticket_data) && $ticket_data['claim_status_id'] == 8) { ?>
<a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Approve Claim Rejection</a>
<?php } ?>
<!-- <button type="button" class="btn btn-primary waves-effect waves-light mr-1" id="btnApprove" >Approve</button> -->
</div>
</div>
@ -308,6 +309,20 @@
</div>
</div>
<script>
// $(document).ready(function() {
// var calim_status = $('#claim_status_id').val();
// if (calim_status == 8){
// $('#btnApprove').show();
// }else{
// $('#btnApprove').hide();
// }
// });
</script>
<script>
$(document).ready(function() {

View File

@ -29,6 +29,8 @@
<div class="form-row">
<input type="hidden" id="ticket_master_id" name="ticket_master_id" value="<?= isset($ticket_data['id']) ? $ticket_data['id'] : '' ?>">
<input type="hidden" id="is_head_approved" name="is_head_approved" value="<?= isset($ticket_data['is_head_approved']) ? $ticket_data['is_head_approved'] : '' ?>">
<div class="form-group col-md-3">
<label for="claim_status">Status<span class="text-danger"></span></label>
@ -236,6 +238,9 @@
<div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
<button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
id="btnSubmit">Submit</button>
<?php if(get_role_id() == 5 && isset($ticket_data) && in_array($ticket_data['claim_status_id'],[23,33,43])) { ?>
<a class="btn btn-secondary waves-effect waves-light mr-1" onclick="showConfirmationModal(event)">Rejected Approve</a>
<?php } ?>
</div>
</div>
</form>

View File

@ -90,7 +90,7 @@ table.dataTable tbody td {
<span class="status-tooltip">
<?php
if ($row['claim_status_id'] == 8) {
if (in_array($row['claim_status_id'],[8,23,33,43])) {
if ($row['is_head_approved'] == 0) {
echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:#cece00;" aria-hidden="true"></i>';
} elseif ($row['is_head_approved'] == 1) {