client-update
changes changes1 page-changes lock color changes-2 footer page toggle-remove display-dropdown changes card-changes card changes-button chnages-article pages page-404-fix breadcrumbs-fix remove drop-down Apply fixes from StyleCI buttons fixes existing-fix changes-3 Apply fixes from StyleCI changes-4
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
<?php
|
||||
|
||||
use DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Breadcrumbs::register('logs', function ($breadcrumbs) {
|
||||
|
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
|
||||
use DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs;
|
||||
|
||||
Breadcrumbs::register('storage', function ($breadcrumbs) {
|
||||
$breadcrumbs->parent('setting');
|
||||
$breadcrumbs->push('Storage', route('storage'));
|
||||
|
@@ -447,22 +447,22 @@ class FormController extends Controller
|
||||
}
|
||||
|
||||
return '<script>
|
||||
$("#'.Str::slug($value).'").on("change", function () {
|
||||
var valueid = $("#'.Str::slug($value).'").val();
|
||||
var fieldid = $("#'.$fieldid.Str::slug($value).'").val();
|
||||
send'.$fieldid.Str::slug($value).'(valueid,fieldid);
|
||||
});
|
||||
function send'.$fieldid.Str::slug($value).'(valueid,fieldid) {
|
||||
$.ajax({
|
||||
url: "'.url('forms/render/child/').'",
|
||||
dataType: "html",
|
||||
data: {"valueid": valueid,"fieldid": fieldid},
|
||||
success: function (response) {
|
||||
$("#'.$fieldname.'").html(response);
|
||||
},
|
||||
error: function (response) {
|
||||
$("#'.$fieldname.'").html(response);
|
||||
}
|
||||
$(".'.Str::slug($fieldname).'-'.Str::slug($value).'").on("change", function () {
|
||||
var valueid = $(this).val();
|
||||
var fieldid = $("#'.$fieldid.Str::slug($value).'").val();
|
||||
send'.$fieldid.Str::slug($value).'(valueid,fieldid);
|
||||
});
|
||||
function send'.$fieldid.Str::slug($value).'(valueid,fieldid) {
|
||||
$.ajax({
|
||||
url: "'.url('forms/render/child/').'",
|
||||
dataType: "html",
|
||||
data: {"valueid": valueid,"fieldid": fieldid},
|
||||
success: function (response) {
|
||||
$("#'.$fieldname.'").html(response);
|
||||
},
|
||||
error: function (response) {
|
||||
$("#'.$fieldname.'").html(response);
|
||||
}
|
||||
});
|
||||
}
|
||||
</script>';
|
||||
@@ -541,7 +541,7 @@ class FormController extends Controller
|
||||
public static function selectForm($field_type, $field, $required, $required_class)
|
||||
{
|
||||
$session = self::getSession();
|
||||
$script = self::jqueryScript($field_value = '', $field->id, $field->name, $field_type);
|
||||
$script = self::jqueryScript($field->id, $field->name, $field_type);
|
||||
$form_hidden = Form::hidden('fieldid[]', $field->id, ['id' => 'hidden'.$session.$field->id]).Form::label($field->label, $field->label, ['class' => $required_class]);
|
||||
$select = Form::$field_type($field->name, ['' => 'Select', 'Selects' => self::removeUnderscoreFromDB($field->values()->pluck('field_value', 'field_value')->toArray())], null, ['class' => "form-control $session$field->id", 'id' => $session.$field->id, 'required' => $required]).'</br>';
|
||||
$html = $script.$form_hidden.$select;
|
||||
@@ -578,7 +578,7 @@ class FormController extends Controller
|
||||
foreach ($values as $field_value) {
|
||||
$script = self::jqueryScript($field_value, $field->id, $field->name, $field_type, $i);
|
||||
$checkbox .= Form::hidden('fieldid[]', $field->id, ['id' => 'f'.$session.$i]);
|
||||
$checkbox .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => $session.$i, 'required' => $required]);
|
||||
$checkbox .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => $session.$field->id.'_'.$i, 'required' => $required]);
|
||||
$checkbox .= '<span> '.removeUnderscore($field_value).'</span>';
|
||||
//$checkbox .="</br>";
|
||||
$checkbox .= '<div>'.$script.'<div id=div'.$session.$field_value.'></div></div>';
|
||||
|
@@ -15,6 +15,7 @@ use App\Model\helpdesk\Ticket\Ticket_source;
|
||||
use App\Model\helpdesk\Ticket\Ticket_Thread;
|
||||
use App\Model\helpdesk\Ticket\Tickets;
|
||||
// classes
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/**
|
||||
@@ -294,7 +295,7 @@ class MailController extends Controller
|
||||
}
|
||||
if ($disposition == 'INLINE' || $disposition == 'inline') {
|
||||
$id = str_replace('>', '', str_replace('<', '', $structure->id));
|
||||
//$filename = $attachment->getFileName();
|
||||
// $filename = $attachment->getFileName();
|
||||
$threads = new Ticket_Thread();
|
||||
$thread = $threads->find($thread_id);
|
||||
$body = $thread->body;
|
||||
@@ -351,8 +352,9 @@ class MailController extends Controller
|
||||
*
|
||||
* @return type file
|
||||
*/
|
||||
public function get_data($id)
|
||||
public function get_data(Request $request)
|
||||
{
|
||||
$id = $request->input('image_id');
|
||||
$attachment = \App\Model\helpdesk\Ticket\Ticket_attachments::where('id', '=', $id)->first();
|
||||
if (mime($attachment->type) == true) {
|
||||
echo "<img src=data:$attachment->type;base64,".$attachment->file.'>';
|
||||
|
@@ -250,7 +250,7 @@ class FormController extends Controller
|
||||
// }
|
||||
}
|
||||
// dd($result);
|
||||
return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is').' '.$result[0].'. '.Lang::get('lang.Please-save-this-for-future-reference'));
|
||||
return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is').' '.$result[0].'. ');
|
||||
} else {
|
||||
return Redirect::back()->withInput($request->except('password'))->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'));
|
||||
}
|
||||
|
@@ -18,6 +18,7 @@ use App\User;
|
||||
use Hash;
|
||||
// classes
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Lang;
|
||||
use Session;
|
||||
|
||||
@@ -332,11 +333,11 @@ class UnAuthController extends Controller
|
||||
*/
|
||||
public static function changeLanguage($lang)
|
||||
{
|
||||
//if(Cache::has('language'))
|
||||
//{
|
||||
// return Cache::get('language');
|
||||
//} else return 'false';
|
||||
// Cache::put('language',$)
|
||||
// if(Cache::has('language'))
|
||||
// {
|
||||
// return Cache::get('language');
|
||||
// } else return 'false';
|
||||
// Cache::put('language',$);
|
||||
$path = base_path('lang'); // Path to check available language packages
|
||||
if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) {
|
||||
// dd(array_key_exists($lang, Config::get('languages')));
|
||||
@@ -433,8 +434,8 @@ class UnAuthController extends Controller
|
||||
{
|
||||
$path = base_path('lang'); // Path to check available language packages
|
||||
if (array_key_exists($lang, \Config::get('languages')) && in_array($lang, scandir($path))) {
|
||||
if (\Auth::check()) {
|
||||
$id = \Auth::user()->id;
|
||||
if (Auth::check()) {
|
||||
$id = Auth::user()->id;
|
||||
$user = User::find($id);
|
||||
$user->user_language = $lang;
|
||||
$user->save();
|
||||
|
@@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers\Client\kb;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\kb\CommentRequest;
|
||||
use App\Http\Requests\kb\ContactRequest;
|
||||
use App\Http\Requests\kb\SearchRequest;
|
||||
use App\Model\kb\Article;
|
||||
@@ -90,9 +89,9 @@ class UserController extends Controller
|
||||
$pagination = $settings->pagination;
|
||||
$search = $request->input('s');
|
||||
$result = $article->where('name', 'LIKE', '%'.$search.'%')
|
||||
->orWhere('slug', 'LIKE', '%'.$search.'%')
|
||||
->orWhere('description', 'LIKE', '%'.$search.'%')
|
||||
->paginate($pagination);
|
||||
->orWhere('slug', 'LIKE', '%'.$search.'%')
|
||||
->orWhere('description', 'LIKE', '%'.$search.'%')
|
||||
->paginate($pagination);
|
||||
$result->setPath('search?s='.$search);
|
||||
$categorys = $category->get();
|
||||
|
||||
@@ -232,14 +231,31 @@ class UserController extends Controller
|
||||
*
|
||||
* @return type response
|
||||
*/
|
||||
public function postComment($slug, Article $article, CommentRequest $request, Comment $comment)
|
||||
public function postComment($slug, Article $article, Request $request, Comment $comment)
|
||||
{
|
||||
$request->validate([
|
||||
'comment' => 'required',
|
||||
|
||||
]);
|
||||
|
||||
$article = $article->where('slug', $slug)->first();
|
||||
if (!$article) {
|
||||
return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed'));
|
||||
return response()->json(['success' => false, 'message' => Lang::get('lang.sorry_not_processed')]);
|
||||
}
|
||||
$id = $article->id;
|
||||
$comment->article_id = $id;
|
||||
|
||||
$comment->article_id = $article->id;
|
||||
|
||||
if (Auth::check()) {
|
||||
// Associate the comment with the authenticated user
|
||||
$comment->article_id = Auth::id();
|
||||
$comment->name = Auth::user()->first_name.' '.Auth::user()->last_name;
|
||||
} else {
|
||||
// Set default values for non-authenticated user
|
||||
$comment->name = $request->input('name');
|
||||
$comment->email = $request->input('email');
|
||||
$comment->website = $request->input('website');
|
||||
}
|
||||
|
||||
if ($comment->fill($request->input())->save()) {
|
||||
return Redirect::back()->with('success', Lang::get('lang.your_comment_posted'));
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user