Fix russian language for creating ticket

This commit is contained in:
maranqz
2019-07-19 13:46:54 +03:00
committed by Manish Verma
parent 500f674473
commit 4aca819f54
18 changed files with 130 additions and 41 deletions

View File

@@ -2790,7 +2790,7 @@ class TicketController extends Controller
})
->editColumn('a_uname', function ($tickets) {
if ($tickets->assigned_to == null && $tickets->name == null) {
return "<span style='color:red'>Unassigned</span>";
return "<span style='color:red'>".Lang::get('lang.Unassigned')."</span>";
} else {
$assign = $tickets->assign_user_name;
if ($tickets->assigned_to != null) {
@@ -3215,7 +3215,7 @@ class TicketController extends Controller
})
->addColumn('assign_user_name', function ($tickets) {
if ($tickets->assigned_to == null) {
return "<span style='color:red'>Unassigned</span>";
return "<span style='color:red'>".Lang::get('lang.Unassigned')."</span>";
} else {
$assign = $tickets->assign_user_name;
$url = route('user.show', $tickets->assigned_to);

13
app/Http/Controllers/Client/helpdesk/FormController.php Normal file → Executable file
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Client\helpdesk;
// controllers
use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController;
use App\Http\Controllers\Common\FileuploadController;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\ClientRequest;
@@ -35,17 +36,23 @@ use Redirect;
*/
class FormController extends Controller
{
/**
* @var FileuploadController
*/
protected $fileUploadController;
/**
* Create a new controller instance.
* Constructor to check.
*
* @return void
*/
public function __construct(TicketWorkflowController $TicketWorkflowController)
public function __construct(TicketWorkflowController $TicketWorkflowController, FileuploadController $fileUploadController)
{
$this->middleware('board');
// creating a TicketController instance
$this->TicketWorkflowController = $TicketWorkflowController;
$this->fileUploadController = $fileUploadController;
}
/**
@@ -76,7 +83,9 @@ class FormController extends Controller
$phonecode = '';
}
return view('themes.default1.client.helpdesk.form', compact('topics', 'codes', 'email_mandatory'))->with('phonecode', $phonecode);
list($max_size_in_bytes, $max_size_in_actual) = $this->fileUploadController->file_upload_max_size();
return view('themes.default1.client.helpdesk.form', compact('topics', 'codes', 'email_mandatory', 'max_size_in_bytes', 'max_size_in_actual'))->with('phonecode', $phonecode);
} else {
return \Redirect::route('home');
}

3
app/Http/Controllers/Common/ApiSettings.php Normal file → Executable file
View File

@@ -9,6 +9,7 @@ use DB;
use Exception;
use Illuminate\Http\Request;
use Input;
use Lang;
use Log;
class ApiSettings extends Controller
@@ -68,7 +69,7 @@ class ApiSettings extends Controller
$settings->create(['key' => $key, 'value' => $value]);
}
return redirect()->back()->with('success', 'Updated Successfully');
return redirect()->back()->with('success', Lang::get('lang.updated_successfully'));
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}