update 1.0.7

This commit is contained in:
Sujit Prasad
2016-04-19 19:19:42 +05:30
parent 723ef47e19
commit 5327b0c0da
153 changed files with 20711 additions and 1727 deletions

View File

@@ -63,20 +63,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id','=',\Crypt:
</td>
</tr>
</form>
<form id="foo2">
<tr><th > <div class="ticketratingtitle">Reply rating &nbsp;</div></th>&nbsp
<td>
<input type="radio" class="star" id="star5" name="rating2" value="1"<?php echo ($tickets->ratingreply=='1')?'checked':'' ?> />
<input type="radio" class="star" id="star4" name="rating2" value="2"<?php echo ($tickets->ratingreply=='2')?'checked':'' ?> />
<input type="radio" class="star" id="star3" name="rating2" value="3"<?php echo ($tickets->ratingreply=='3')?'checked':'' ?> />
<input type="radio" class="star" id="star2" name="rating2" value="4"<?php echo ($tickets->ratingreply=='4')?'checked':'' ?> />
<input type="radio" class="star" id="star1" name="rating2" value="5"<?php echo ($tickets->ratingreply=='5')?'checked':'' ?> />
</td></tr>
</form> </tbody> </table>
</tbody> </table>
</div>
</div>
</div>
@@ -262,6 +249,18 @@ $data = $ConvDate[0];
<b class="fn"><a href="#" rel="external" class="url">{{$role->user_name}}</a></b>
@else
<b class="fn"><a href="#" rel="external" class="url">{{$role->first_name." ".$role->last_name}}</a></b>
<div class="ticketratings pull-right"> <table><tbody>
<form id="foo2">
<tr>
<th> <div class="ticketratingtitle">Reply rating &nbsp;</div></th>&nbsp
<td>
<input type="radio" class="star" id="star5" name="rating2" value="1"<?php echo ($conversation->reply_rating=='1')?'checked':'' ?> />
<input type="radio" class="star" id="star4" name="rating2" value="2"<?php echo ($conversation->reply_rating=='2')?'checked':'' ?> />
<input type="radio" class="star" id="star3" name="rating2" value="3"<?php echo ($conversation->reply_rating=='3')?'checked':'' ?> />
<input type="radio" class="star" id="star2" name="rating2" value="4"<?php echo ($conversation->reply_rating=='4')?'checked':'' ?> />
<input type="radio" class="star" id="star1" name="rating2" value="5"<?php echo ($conversation->reply_rating=='5')?'checked':'' ?> />
</td></tr></form></tbody></table></div>
@endif
</div><!-- .comment-author -->
<div class="comment-metadata">
@@ -429,7 +428,7 @@ $('#foo2').submit();
// process the form
$.ajax({
type : 'POST', // define the type of HTTP verb we want to use (POST for our form)
url : '../rating2/'+<?php echo $tickets->id ?>+'/'+formData, // the url where we want to POST
url : '../rating2/'+<?php echo $thread->id ?>+'/'+formData, // the url where we want to POST
data : formData, // our data object
dataType : 'json', // what type of data do we expect back from the server

View File

@@ -44,7 +44,7 @@
<i class="fa fa-check-circle"></i>
<b>Success!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('message')}}
{!! Session::get('message') !!}
</div>
@endif
@@ -62,7 +62,7 @@
$encrypted_token = $encrypter->encrypt(csrf_token());
?>
<input id="token" type="hidden" value="{{$encrypted_token}}">
{!! Form::open(['action'=>'Client\helpdesk\FormController@postedForm','method'=>'post']) !!}
{!! Form::open(['action'=>'Client\helpdesk\FormController@postedForm','method'=>'post', 'enctype'=>'multipart/form-data']) !!}
<div>
<div class="content-header">
<h4>{!! Lang::get('lang.ticket') !!} {!! Form::submit(Lang::get('lang.send'),['class'=>'form-group btn btn-info pull-right'])!!}</h4>
@@ -130,6 +130,11 @@ $helptopic = App\Model\helpdesk\Manage\Help_topic::get();
{!! Form::textarea('Details',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-12 form-group">
<div class="btn btn-default btn-file"><i class="fa fa-paperclip"> </i> {!! Lang::get('lang.attachment') !!}<input type="file" name="attachment[]" multiple/></div><br/>
{!! Lang::get('lang.max') !!}. 10MB
</div>
{{-- Event fire --}}
<?php Event::fire(new App\Events\ClientTicketForm()); ?>

View File

@@ -294,11 +294,8 @@ class="active"
</div>
</div>
</div>
</form>
</div>
</div>
</div>

View File

@@ -38,7 +38,7 @@
<i class="fa fa-check-circle"></i>
<b>Success!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('message')}}
{!! Session::get('message') !!}
</div>
@endif

View File

@@ -497,9 +497,12 @@ $data = $ConvDate[0];
{!! $body !!}
</div>
<div class="timeline-footer" >
<div class="timeline-footer" style="margin-bottom:-5px">
@if(!$conversation->is_internal)
<?php Event::fire(new App\Events\Timeline($conversation,$role,$user)); ?>
@endif
<?php
$attachments = App\Model\Ticket\Ticket_attachments::where('thread_id','=',$conversation->id)->get();
$attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$conversation->id)->get();
$i = 0;
foreach($attachments as $attachment) {
if($attachment->poster == 'ATTACHMENT') {
@@ -508,29 +511,38 @@ $data = $ConvDate[0];
}
if($i>0)
{
echo "<hr style='height:1px;color:#2D3244;background-color:#2D3244;''><h4 class='box-title'><b>".$i." </b> Attachments</h4>";
echo "<hr style='border-top: 1px dotted #FFFFFF;margin-top:0px;margin-bottom:0px;background-color:#8B8C90;'><h4 class='box-title'><b>".$i." </b> Attachments</h4>";
}
?>
<ul class='mailbox-attachments clearfix'>
<?php
foreach($attachments as $attachment)
{
$size = $attachment->size;
$units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
$power = $size > 0 ? floor(log($size, 1024)) : 0;
$value = number_format($size / pow(1024, $power), 2, '.', ',') . ' ' . $units[$power];
if($attachment->poster == 'ATTACHMENT')
{
if($attachment->type == 'jpg'||$attachment->type == 'JPG'||$attachment->type == 'jpeg'||$attachment->type == 'JPEG'||$attachment->type == 'png'||$attachment->type == 'PNG'||$attachment->type == 'gif'||$attachment->type == 'GIF')
{
$image = imagecreatefromstring($attachment->file);
$image = @imagecreatefromstring($attachment->file);
ob_start();
imagejpeg($image, null, 80);
$data = ob_get_contents();
ob_end_clean();
$var = '<a href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank"><img src="data:image/jpg;base64,' . base64_encode($data) . '"/></a>';
echo '<li><span class="mailbox-attachment-icon has-img">'.$var.'</span></li>';
$var = '<a href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank"><img style="max-width:200px;height:133px;" src="data:image/jpg;base64,' . base64_encode($data) . '"/></a>';
echo '<li style="background-color:#f4f4f4;"><span class="mailbox-attachment-icon has-img">'.$var.'</span><div class="mailbox-attachment-info"><b style="word-wrap: break-word;">'.$attachment->name.'</b><br/><p>'.$value.'</p></div></li>';
}
else
{
$var = '<a href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank">'.$attachment->name.'</a>';
echo '<li>'.$var.'</li>';
$var = '<a style="max-width:200px;height:133px;color:#666;" href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank"><span class="mailbox-attachment-icon" style="background-color:#fff;">'.strtoupper($attachment->type).'</span><div class="mailbox-attachment-info"><span ><b style="word-wrap: break-word;">'.$attachment->name.'</b><br/><p>'.$value.'</p></span></div></a>';
echo '<li style="background-color:#f4f4f4;">'.$var.'</li>';
}
}
}

View File

@@ -92,11 +92,9 @@
<ul class="dropdown-menu">
<li>
<div class="banner-wrapper user-menu text-center clearfix">
@if(Auth::user()->profile_pic)
<img src="{{asset('lb-faveo/media/profilepic')}}{{'/'}}{{Auth::user()->profile_pic}}"class="img-circle" alt="User Image" height="80" width="80"/>
@else
<img src="{{ Gravatar::src(Auth::user()->email) }}" class="img-circle" alt="User Image">
@endif
<img src="{{Auth::user()->profile_pic}}"class="img-circle" alt="User Image" height="80" width="80"/>
<h3 class="banner-title text-info h4">{{Auth::user()->first_name." ".Auth::user()->last_name}}</h3>
<div class="banner-content">
{{-- <a href="{{url('kb/client-profile')}}" class="btn btn-custom btn-xs">Edit Profile</a> --}} <a href="{{url('auth/logout')}}" class="btn btn-custom btn-xs">{!! Lang::get('lang.log_out') !!}</a>
@@ -284,7 +282,7 @@ $footer4 = App\Model\helpdesk\Theme\Widgets::where('name','=','footer4')->first(
<hr/>
<div class="row">
<div class="site-info col-md-6">
<p class="text-muted">{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!} <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>. {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a></p>
<p class="text-muted">{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!} <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>. {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a></p>
</div>
<div class="site-social text-right col-md-6">
<?php $socials = App\Model\helpdesk\Theme\Widgets::all(); ?>