cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Existing bugs commits squashed

Browse Source 
validation-bugsnag-email

auto-update

datatables

adding-engine

backup

fixes

Apply fixes from StyleCI

duedate fixes

Apply fixes from StyleCI

style-changes

changes

Apply fixes from StyleCI

changes-n

Apply fixes from StyleCI

manual-update

database:sync

issues

bugfixes

mail

Apply fixes from StyleCI

Apply fixes from StyleCI
This commit is contained in:
RafficMohammed
2023-01-31 13:17:59 +05:30
committed by RafficMohammed
parent 2ae90d7fcb
commit 0654723809
10 changed files with 149 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php
View File

@@ -51,7 +51,7 @@
<div class="alert alert-dismissable" style="background: #F3F3F3">
<i class="fas fa-info-circle"></i>&nbsp;{!!Lang::get('lang.crone-url-message')!!}
<a href="https://www.support.faveohelpdesk.com/show/cron-job-scheduling" style="color:black" target="blank">{!!Lang::get('lang.click')!!}</a> {!!Lang::get('lang.check-cron-set')!!}
<a href="https://support.faveohelpdesk.com/show/how-to-configure-cron-jobs-in-faveo" style="color:black" target="blank">{!!Lang::get('lang.click')!!}</a> {!!Lang::get('lang.check-cron-set')!!}
</div>
<div class="row">

33
resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php
View File

@@ -15,12 +15,22 @@ class="nav-link active"
@section('ticket')
class="active"
@stop
<style>
.clear-input {
position: absolute;
top: 20%;
right: 5%;
bottom: 0;
width: 30px;
margin: auto;
}
</style>
@section('PageHeader')
<h1>{{Lang::get('lang.tickets')}}</h1>
@stop
@section('content')
<!-- Main content -->
{!! Form::open(['route'=>'post.newticket','method'=>'post','id'=>'form']) !!}
@if(Session::has('success'))
@@ -191,6 +201,7 @@ class="active"
<div class="form-group" id="duedate">
<label>{!! Lang::get('lang.due_date') !!}:</label>
{!! Form::text('duedate',null,['class' => 'form-control','id'=>'datemask']) !!}
<button class="btn clear-input" id="duedates" style="display: none" type="button"><i class="fas fa-times"></i></button>
</div>
</div>
<div class="col-md-3">
@@ -351,12 +362,26 @@ class="active"
});
});
$(function () {
$('#datemask').datetimepicker({
format: 'DD/MM/YYYY'
$(function () {
var picker = $('#datemask').datetimepicker({
format: 'DD/MM/YYYY',
});
picker.on('dp.change', function(e) {
if (e.date) {
$('.clear-input').show();
} else {
$('.clear-input').hide();
}
});
$('.clear-input').click(function() {
$('#datemask').val('');
$('.clear-input').hide();
});
});
</script>
@stop

14
resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
View File

@@ -222,10 +222,12 @@ if ($thread->title != "") {
<div class="col-md-3">
<b>{!! Lang::get('lang.due_date') !!}: </b>
<?php
$time = $tickets->created_at;
$time = date_create($time);
$duedate = $tickets->duedate;
$user_timezone = new DateTimeZone('Asia/Kolkata');
$time = date_create($tickets->duedate, $user_timezone);
date_add($time, date_interval_create_from_date_string($SlaPlan->grace_period));
echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
date_add($time, date_interval_create_from_date_string('30 minutes'));
echo $time->format('Y-m-d H:i:s');
?>
</div>
<div class="col-md-3">
@@ -885,6 +887,12 @@ if ($thread->title != "") {
<div id="show" style="display:none;text-align: center;">
<img src="{{asset("lb-faveo/media/images/gifloader.gif")}}">
</div>
<script>
$('#Edit').on('hidden.bs.modal', function (e) {
$(this).find('form')[0].reset();
});
</script>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis">{!! Lang::get('lang.close') !!}</button>
<input type="submit" class="btn btn-primary" value="{!! Lang::get('lang.update') !!}">

20
resources/views/themes/default1/agent/helpdesk/user/show.blade.php
View File

@@ -588,13 +588,13 @@ class="nav-link active"
<div class="col-md-6">
<div class="form-group">
<label>{!! Lang::get('lang.address') !!}</label>
<textarea name="address" class="form-control"></textarea>
<textarea name="address" id="address" class="form-control"></textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>{!! Lang::get('lang.internal_notes') !!}</label>
<textarea name="internal" class="form-control"></textarea>
<textarea name="internal" id="internal" class="form-control"></textarea>
</div>
</div>
</div>
@@ -617,6 +617,15 @@ class="nav-link active"
{!! Form::close() !!}
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
<script>
$('#create_org').on('hidden.bs.modal', function (e) {
$(this).find('form')[0].reset();
$('#address').summernote('reset');
$('#internal').summernote('reset');
});
</script>
</div><!-- /.modal -->
<script type="text/javascript">
jQuery(document).ready(function($) {
@@ -696,6 +705,13 @@ class="nav-link active"
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis4">{!! Lang::get('lang.close') !!}</button>
<button type="submit" class="btn btn-success" id="submt2">{!! Lang::get('lang.assign') !!}</button>
</div>
<script>
$('#assign').on('hidden.bs.modal', function (e) {
$(this).find('form')[0].reset();
});
</script>
{!! Form::close()!!}
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->

2
resources/views/themes/default1/agent/kb/settings/settings.blade.php
View File

@@ -60,7 +60,7 @@ class="nav-link active"
<div class="row">
<div class="col-md-3">
{!! Form::label('pagination',Lang::get('lang.numberofelementstodisplay')) !!} <span class="text-red"> *</span>
<input type="number" class="form-control" name='pagination' value="{!! $settings->pagination !!}" min="2">
<input type="number" class="form-control" name='pagination' value="{!! $settings->pagination !!}" min="2" required>
</div>
</div>
</div>