up new code

up new code
This commit is contained in:
2025-08-19 05:59:14 +07:00
parent 95bb93afa6
commit 794c839a95
4 changed files with 112 additions and 157 deletions

View File

@@ -23,6 +23,7 @@ use App\Model\helpdesk\Utility\CountryCode;
use App\User;
use App\Model\helpdesk\Agent\Location;
use Exception;
use App\Model\helpdesk\Agent\Department;
// classes
use Form;
use GeoIP;
@@ -66,6 +67,7 @@ class FormController extends Controller
public function getForm(Help_topic $topic, CountryCode $code)
{
$locations = Location::all();
$departments = Department::all();
if (\Config::get('database.install') == '%0%') {
return \Redirect::route('licence');
}
@@ -87,7 +89,7 @@ class FormController extends Controller
[$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', 'locations'))->with('phonecode', $phonecode);
return view('themes.default1.client.helpdesk.form', compact('topics', 'codes', 'email_mandatory', 'max_size_in_bytes', 'max_size_in_actual', 'locations', 'departments'))->with('phonecode', $phonecode);
} else {
return \Redirect::route('home');
}

View File

@@ -4,6 +4,7 @@ namespace App\Model\helpdesk\Ticket;
use App\BaseModel;
use App\Model\helpdesk\Agent\Location;
use App\Model\helpdesk\Agent\Department;
class Tickets extends BaseModel
{
@@ -38,7 +39,8 @@ class Tickets extends BaseModel
'created_at',
'updated_at',
'assigned_to',
'locationid' // <-- Thêm locationid vào đây
'locationid', // <-- Thêm locationid vào đây
'submitdep_id'
];
// Các quan hệ cũ...
@@ -71,7 +73,10 @@ class Tickets extends BaseModel
{
return $this->belongsTo(Location::class, 'locationid', 'locationid');
}
public function submitDepartment()
{
return $this->belongsTo(Department::class, 'submitdept_id');
}
public function extraFields()
{
$id = $this->attributes['id'];