bug-fix-patches

# removed place holders in agent profiles
# added checkbox style class in agent blade file
# added mtutators in ticket_form_data.php model
# changed priority field saving method in ticket creation form at clinet
side
# Fetched only required data in client panel form and saving ticket
#184 solevd.
This commit is contained in:
Manish Verma
2016-12-05 18:05:58 +05:30
parent ea1acea29f
commit d92ae1481d
8 changed files with 55 additions and 10 deletions

View File

@@ -734,7 +734,7 @@ class UserController extends Controller
return redirect('profile-edit')->with('success1', Lang::get('lang.password_updated_sucessfully'));
} catch (Exception $e) {
return redirect('profile-edit')->with('fails', $e->getMessage());
return redirect('profile-edit')->with('fails1', $e->getMessage());
}
} else {
return redirect('profile-edit')->with('fails1', Lang::get('lang.password_was_not_updated_incorrect_old_password'));

View File

@@ -146,7 +146,7 @@ class FormController extends Controller
*/
public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code)
{
$form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code');
$form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority');
$name = $request->input('Name');
$phone = $request->input('Phone');
if ($request->input('Email')) {
@@ -179,7 +179,7 @@ class FormController extends Controller
// $priority = $ticket_settings->first()->priority;
$default_priority = Ticket_Priority::where('is_default', '=', 1)->first();
$user_priority = CommonSettings::where('id', '=', 6)->first();
$user_priority = CommonSettings::select('status')->where('option_name', '=', 'user_priority')->first();
if (!($request->input('priority'))) {
$priority = $default_priority->priority_id;
} else {

View File

@@ -4,8 +4,39 @@ namespace App\Model\helpdesk\Ticket;
use App\BaseModel;
class Ticket_Form_Data extends BaseModel
{
class Ticket_Form_Data extends BaseModel {
protected $table = 'ticket_form_data';
protected $fillable = ['id', 'ticket_id', 'title', 'content', 'created_at', 'updated_at'];
public function getFieldKeyLabel() {
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
if ($field) {
$value = $field->label;
}
return $value;
}
public function isHidden(){
$check = false;
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
if ($field && $field->type=='hidden') {
$check = true;
}
return $check;
}
public function getHidden(){
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
if ($field && $field->type=='hidden') {
return $field->label;
}
}
}

View File

@@ -1550,4 +1550,5 @@ return [
'activate' => 'Activate',
'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.',
'assign-ticket' => 'Assign tickets',
'updated-internal-note' => 'Your note has been added successfully',
];

View File

@@ -1733,7 +1733,7 @@ alert(h+20);
{
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
// $("#t4").load("../thread/{{$tickets->id}} #t4");
var message = "{!! Lang::get('lang.you_have_successfully_replied_to_your_ticket') !!}";
var message = "{!! Lang::get('lang.updated-internal-note') !!}";
$("#alert21").show();
$('#message-success2').html(message);
setInterval(function(){$("#alert21").hide(); }, 4000);

View File

@@ -161,21 +161,21 @@ class="active"
<!-- old password -->
<div class="form-group has-feedback {{ $errors->has('old_password') ? 'has-error' : '' }}">
{!! Form::label('old_password',Lang::get('lang.old_password')) !!} <span class="text-red"> *</span>
{!! Form::password('old_password',['placeholder'=>Lang::get('lang.old_password'),'class' => 'form-control']) !!}
{!! Form::password('old_password',['class' => 'form-control']) !!}
{!! $errors->first('old_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<!-- new password -->
<div class="form-group has-feedback {{ $errors->has('new_password') ? 'has-error' : '' }}">
{!! Form::label('new_password',Lang::get('lang.new_password')) !!} <span class="text-red"> *</span>
{!! Form::password('new_password',['placeholder'=>Lang::get('lang.new_password'),'class' => 'form-control']) !!}
{!! Form::password('new_password',['class' => 'form-control']) !!}
{!! $errors->first('new_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<!-- confirm password -->
<div class="form-group has-feedback {{ $errors->has('confirm_password') ? 'has-error' : '' }}">
{!! Form::label('confirm_password',Lang::get('lang.confirm_password')) !!} <span class="text-red"> *</span>
{!! Form::password('confirm_password',['placeholder'=>Lang::get('lang.confirm_password'),'class' => 'form-control']) !!}
{!! Form::password('confirm_password',['class' => 'form-control']) !!}
{!! $errors->first('confirm_password', '<spam class="help-block">:message</spam>') !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>

View File

@@ -594,4 +594,17 @@
<?php Event::fire('load-calendar-scripts', array()); ?>
@yield('FooterInclude')
</body>
<script>
$(function() {
$('input[type="checkbox"]').iCheck({
checkboxClass: 'icheckbox_flat-blue'
});
$('input[type="radio"]').iCheck({
radioClass: 'iradio_flat-blue'
});
});
</script>
</html>

View File

@@ -172,7 +172,7 @@ class = "active"
</div>
<!-- priority -->
<?php
$Priority = App\Model\helpdesk\Settings\CommonSettings::where('id','=',6)->first();
$Priority = App\Model\helpdesk\Settings\CommonSettings::select('status')->where('option_name','=', 'user_priority')->first();
$user_Priority=$Priority->status;
?>