From 63d01d90a23f2219d5a37ae572ca283ca488fdbb Mon Sep 17 00:00:00 2001 From: myuqinurrohman Date: Wed, 9 Apr 2025 15:15:02 +0700 Subject: [PATCH] feat: process edit and accept account company chore: show company --- app/Exports/CompanyExport.php | 133 ++++++++ app/Helpers/CustomHelper.php | 45 ++- .../Dashboard/CompanyController.php | 299 +++++++++++++++- .../Dashboard/DatatableController.php | 83 ++++- .../Controllers/Dashboard/UserController.php | 73 ++-- app/Http/Requests/CompanyRequest.php | 120 +++++++ app/Models/Company.php | 1 + ...25_02_25_024741_create_companies_table.php | 1 + database/seeders/CompanySeeder.php | 2 +- public/assets/dashboard/css/custom.css | 8 +- .../dashboard/companies/admin/index.blade.php | 210 ++++++++++++ .../companies/edit-request.blade.php | 65 ++++ .../views/dashboard/companies/edit.blade.php | 318 ++++++++++++++++++ .../views/dashboard/companies/index.blade.php | 268 ++++++++++++--- .../views/dashboard/companies/show.blade.php | 220 ------------ .../users/profiles/account.blade.php | 4 + .../dashboard/users/profiles/action.blade.php | 48 ++- .../users/profiles/company.blade.php | 5 + .../users/profiles/heading.blade.php | 13 + .../users/profiles/journalists.blade.php | 4 + .../users/profiles/login-activity.blade.php | 4 + .../dashboard/users/profiles/media.blade.php | 4 + .../request-edit-description.blade.php | 28 ++ .../dashboard/users/profiles/tabs.blade.php | 39 +++ .../views/partials/app/datatable.blade.php | 17 +- routes/web.php | 15 +- 26 files changed, 1682 insertions(+), 345 deletions(-) create mode 100644 app/Exports/CompanyExport.php create mode 100644 app/Http/Requests/CompanyRequest.php create mode 100644 resources/views/dashboard/companies/admin/index.blade.php create mode 100644 resources/views/dashboard/companies/edit-request.blade.php create mode 100644 resources/views/dashboard/companies/edit.blade.php delete mode 100644 resources/views/dashboard/companies/show.blade.php create mode 100644 resources/views/dashboard/users/profiles/request-edit-description.blade.php diff --git a/app/Exports/CompanyExport.php b/app/Exports/CompanyExport.php new file mode 100644 index 0000000..d6bc18a --- /dev/null +++ b/app/Exports/CompanyExport.php @@ -0,0 +1,133 @@ +status = $status; + $this->edit_status = $edit_status; + $this->address = $address; + $this->register_year = $register_year; + $this->register_month = $register_month; + $this->register_date = $register_date; + } + public function collection() + { + $query = Company::with(['user']); + + if($this->status !== 'all'){ + if($this->status === 'waiting'){ + $query->whereHas('user', function ($q){ + $q->where('status', '0'); + }); + }else if($this->status === 'accepted'){ + $query->whereHas('user', function ($q){ + $q->where('status', '1'); + }); + }else if($this->status === 'rejected'){ + $query->whereHas('user', function ($q){ + $q->where('status', '2'); + }); + } + } + + if($this->edit_status !== 'all'){ + if($this->edit_status === 'no-edit'){ + $query->where('edit_status', '0'); + }elseif($this->edit_status === 'waiting'){ + $query->where('edit_status', '1'); + }else if($this->edit_status === 'accepted'){ + $query->where('edit_status', '2'); + }else if($this->edit_status === 'rejected'){ + $query->where('edit_status', '3'); + } + } + + if ($this->address) { + $query->where('address', 'LIKE', '%'.$this->address.'%'); + } + + if ($this->register_year) { + $query->whereYear('created_at', $this->register_year); + } + + if ($this->register_month) { + $monthYear = Carbon::parse($this->register_month); + $query->whereYear('created_at', $monthYear->year) + ->whereMonth('created_at', $monthYear->month); + } + + if ($this->register_date) { + $query->whereDate('created_at', $this->register_date); + } + + return $query->get(); + } + + public function map($company): array + { + return [ + $this->no++, + $company->name, + $company->email, + $company->director_name, + get_user_status($company->user->status), + $company->address, + get_edit_status($company->edit_status), + Carbon::parse($company->created_at)->locale('id')->translatedFormat('l, d F Y'), + Carbon::parse($company->validated_at)->locale('id')->translatedFormat('l, d F Y') + ]; + } + + public function headings(): array + { + return [ + ['Data Perusahaan', '', '', '', '', '', '', '', '', ''], + ['NO', 'Nama Perusahaan', 'Email', 'Direktur', 'Status Akun', 'Alamat', 'Status Edit', 'Tanggal Daftar', 'Tanggal Validasi'] + ]; + } + + public function styles(Worksheet $sheet) + { + $sheet->mergeCells('A1:I1'); // A1 sampai D1 digabung + + // Set alignment untuk pusat horizontal dan vertikal + $sheet->getStyle('A1:I1')->getAlignment()->setHorizontal('center'); + $sheet->getStyle('A1:I1')->getAlignment()->setVertical('center'); + + $sheet->getColumnDimension('A')->setWidth(7); // Set column A width + $sheet->getColumnDimension('B')->setAutoSize(true); + $sheet->getColumnDimension('C')->setAutoSize(true); + $sheet->getColumnDimension('D')->setAutoSize(true); + $sheet->getColumnDimension('E')->setAutoSize(true); + $sheet->getColumnDimension('F')->setAutoSize(true); + $sheet->getColumnDimension('G')->setAutoSize(true); + $sheet->getColumnDimension('H')->setAutoSize(true); + $sheet->getColumnDimension('I')->setAutoSize(true); + + // Menambahkan gaya lain jika diperlukan + $sheet->getStyle('A1:I1')->getFont()->setBold(true); + $sheet->getStyle('A1:I1')->getFont()->setSize(14); + } +} diff --git a/app/Helpers/CustomHelper.php b/app/Helpers/CustomHelper.php index aaa11ae..c5d3ee8 100644 --- a/app/Helpers/CustomHelper.php +++ b/app/Helpers/CustomHelper.php @@ -19,7 +19,7 @@ if (! function_exists('store_file')) { function store_file($file = null, $path, $disk = 'public') { - if ($file && $file instanceof \Illuminate\Http\UploadedFile) { + if (filled($file) && $file && $file instanceof \Illuminate\Http\UploadedFile) { $randomFilename = Str::random(35).time().'.'.$file->getClientOriginalExtension(); $originalFileName = Str::slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)).'.'.$file->getClientOriginalExtension(); @@ -132,9 +132,29 @@ function get_user_status($status) case '0': return 'Menunggu'; case '1': - return 'Aktif'; + return 'Diterima'; case '2': - return 'Nonaktif'; + return 'Ditolak'; + default: + return "Tidak Diketahui"; + } + } +} + +if (!function_exists('get_edit_status')) { + function get_edit_status($status) + { + switch($status){ + case '0': + return 'Tidak Ada'; + case '1': + return 'Menunggu'; + case '2': + return 'Diterima'; + case '3': + return 'Ditolak'; + default: + return "Tidak Diketahui"; } } } @@ -263,7 +283,7 @@ function display_file($dir, $filename) } $mimeType = mime_content_type($path); - $fileUrl = asset("storage/{$filename}"); + $fileUrl = asset("storage/uploads/{$dir}/{$filename}"); if (str_contains($mimeType, 'image')) { return "File Image"; @@ -274,3 +294,20 @@ function display_file($dir, $filename) return '

Format file tidak didukung

'; } } + +if (! function_exists('change_status')) { + function change_status($status, $category) { + if($category === 'company_edit'){ + switch($status){ + case '0': + return '1'; + case '1': + return '2'; + case '2': + return '3'; + default: + return '0'; + } + } + } +} diff --git a/app/Http/Controllers/Dashboard/CompanyController.php b/app/Http/Controllers/Dashboard/CompanyController.php index b6f28c9..855a819 100644 --- a/app/Http/Controllers/Dashboard/CompanyController.php +++ b/app/Http/Controllers/Dashboard/CompanyController.php @@ -2,34 +2,301 @@ namespace App\Http\Controllers\Dashboard; +use App\Exports\CompanyExport; use App\Http\Controllers\Controller; +use App\Http\Requests\CompanyRequest; use App\Models\Company; +use App\Models\LoginHistory; +use App\Models\Role; +use App\Models\User; +use Carbon\Carbon; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Maatwebsite\Excel\Facades\Excel; class CompanyController extends Controller { - public function index(){ - return view('dashboard.companies.index',[ - 'title' => 'Perusahaan' + public function index(Request $request){ + if(is_role(['1'])){ + return view('dashboard.companies.admin.index',[ + 'title' => 'Perusahaan', + 'status' => $request->input('status', null), + 'edit_status' => $request->input('edit_status', null), + 'address' => $request->input('address', null), + 'register_year' => $request->input('register_year', null), + 'register_month' => $request->input('register_month', null), + 'register_date' => $request->input('register_date', null), + ]); + }else if(is_role(['3'])){ + $user = User::with(['role', 'company.media.journalists'])->findOrFail(Auth::id()); + + $data = [ + 'title' => 'Data Perusahaan', + 'user' => $user, + ]; + + return view('dashboard.companies.index', $data); + } + } + + public function editRequest(){ + if(!in_array(Auth::user()->company->edit_status, ['0', '2', '3'])){ + abort(404); + } + + return view('dashboard.companies.edit-request', [ + 'title' => 'Permohonan Ubah Data Perusahaan' ]); } - public function create(){} + public function editRequestAction(Request $request){ + if(!in_array(Auth::user()->company->edit_status, ['0', '2', '3'])){ + abort(404); + } - public function store(){} - - public function edit(){} - - public function update(){} - - public function show($id){ - $company = Company::findOrFail(decrypt_id($id)); - - return view('dashboard.companies.show', [ - 'title' => 'Detail Perusahaan', - 'company' => $company + $validatedData = $request->validate([ + 'edit_description' => ['required'], + ], [ + 'edit_description.required' => 'Deskripsi wajib diisi.', ]); + + if(!Auth::check()){ + abort(404); + } + + $user = User::with(['company'])->findOrFail(Auth::id()); + $updatedCompany = $user->company->update([ + 'edit_status' => '1', + 'edit_description' => $validatedData['edit_description'] + ]); + + if($updatedCompany){ + return redirect()->route('dashboard.companies.index')->with('success-status', 'Berhasil melakukan permohonan edit data perusahaan.'); + }else{ + return redirect()->route('dashboard.companies.index')->with('failed-status', 'Gagal melakukan permohonan edit data perusahaan.'); + } + } + + public function edit(){ + if(!in_array(Auth::user()->company->edit_status, ['2'])){ + abort(404); + } + + $user = User::with(['role', 'company.media.journalists'])->findOrFail(Auth::id()); + + return view('dashboard.companies.edit', [ + 'title' => 'Ubah Data Perusahaan', + 'user' => $user + ]); + } + + public function update(CompanyRequest $request){ + if(!in_array(Auth::user()->company->edit_status, ['2'])){ + abort(404); + } + + $validatedData = $request->validated(); + + $company = User::with(['company'])->findOrFail(Auth::id())->company; + + $fileFieldMap = [ + 'company_director_nik_doc' => 'director_nik_doc', + 'company_deed_incorporation_doc' => 'deed_incorporation_doc', + 'company_trade_license_doc' => 'trade_license_doc', + 'company_tax_id_number_doc' => 'tax_id_number_doc', + 'company_taxable_enterprise_doc' => 'taxable_enterprise_doc', + 'company_annual_tax_return_doc' => 'annual_tax_return_doc', + 'company_domicile_certificate_doc' => 'domicile_certificate_doc', + 'company_profile_doc' => 'profile_doc', + ]; + + $companyFileNames = []; + + foreach ($fileFieldMap as $requestKey => $dbField) { + if ($request->hasFile($requestKey) && filled($validatedData[$requestKey])) { + $companyFileNames[$requestKey] = store_file($validatedData[$requestKey], '/uploads/companies', 'public')['randomFileName']; + } else { + $companyFileNames[$requestKey] = $company->{$dbField}; + } + } + + $updatedCompany = $company->update([ + 'name' => $validatedData['company_name'], + 'email' => $validatedData['company_email'], + 'address' => $validatedData['company_address'], + 'director_name' => $validatedData['company_director_name'], + 'director_nik' => $validatedData['company_director_nik'], + 'director_nik_doc' => $companyFileNames['company_director_nik_doc'], + 'deed_incorporation' => $validatedData['company_deed_incorporation'], + 'deed_incorporation_doc' => $companyFileNames['company_deed_incorporation_doc'], + 'trade_license' => $validatedData['company_trade_license'], + 'trade_license_doc' => $companyFileNames['company_trade_license_doc'], + 'tax_id_number' => $validatedData['company_tax_id_number'], + 'tax_id_number_doc' => $companyFileNames['company_tax_id_number_doc'], + 'taxable_enterprise' => $validatedData['company_taxable_enterprise'], + 'taxable_enterprise_doc' => $companyFileNames['company_taxable_enterprise_doc'], + 'annual_tax_return' => $validatedData['company_annual_tax_return'], + 'annual_tax_return_doc' => $companyFileNames['company_annual_tax_return_doc'], + 'domicile_certificate' => $validatedData['company_domicile_certificate'], + 'domicile_certificate_doc' => $companyFileNames['company_domicile_certificate_doc'], + 'profile' => $validatedData['company_profile'], + 'profile_doc' => $companyFileNames['company_profile_doc'], + 'edit_description' => null, + 'edit_status' => '0', + ]); + + if($updatedCompany){ + return redirect()->route('dashboard.companies.index')->with('success-status', 'Berhasil mengubah data perusahaan.'); + }else{ + return redirect()->route('dashboard.companies.index')->with('failed-status', 'Gagal mengubah data perusahaan.'); + } + } + + public function show($id, $type){ + $user = User::with(['role', 'company.media.journalists'])->findOrFail(decrypt_id($id)); + + $data = [ + 'title' => 'Data Perusahaan', + 'user' => $user, + 'roles' => Role::all(), + 'page' => 'company', + 'purpose' => 'show', + 'idnPage' => 'perusahaan', + 'route' => 'companies', + 'type' => $type + ]; + + if($type === 'account'){ + return view('dashboard.users.profiles.account', $data); + }elseif($type === 'login-activities'){ + $data['loginActivities'] = LoginHistory::where('user_id', $user->id)->orderByDesc('id')->simplePaginate(20); + return view('dashboard.users.profiles.login-activity', $data); + }elseif($type === 'company'){ + return view('dashboard.users.profiles.company', $data); + }elseif($type === 'media'){ + return view('dashboard.users.profiles.media', $data); + }elseif($type === 'journalists'){ + return view('dashboard.users.profiles.journalists', $data); + } } public function destroy(){} + + public function process(Request $request, $id, $type){ + $user = User::with(['role', 'company.media.journalists'])->findOrFail(decrypt_id($id)); + + if($request->query('category') && !in_array($request->query('category'), ['account-status', 'edit-request'])){ + abort(404); + } + + $data = [ + 'title' => 'Data Perusahaan', + 'user' => $user, + 'roles' => Role::all(), + 'page' => 'company', + 'purpose' => 'process', + 'idnPage' => 'perusahaan', + 'route' => 'companies', + 'type' => $type, + 'category' => $request->query('category', null) + ]; + + if($type === 'account'){ + return view('dashboard.users.profiles.account', $data); + }elseif($type === 'login-activities'){ + $data['loginActivities'] = LoginHistory::where('user_id', $user->id)->orderByDesc('id')->simplePaginate(20); + return view('dashboard.users.profiles.login-activity', $data); + }elseif($type === 'company'){ + return view('dashboard.users.profiles.company', $data); + }elseif($type === 'media'){ + return view('dashboard.users.profiles.media', $data); + }elseif($type === 'journalists'){ + return view('dashboard.users.profiles.journalists', $data); + } + } + + public function processAcceptAction(Request $request, $id, $type, $category){ + $user = User::with(['company'])->findOrFail(decrypt_id($id)); + + if(!in_array($category, ['account-status', 'edit-request'])){ + abort(404); + } + + if(is_role(['1']) && in_array($category, ['account-status', 'edit-request'])){ + if($category === 'account-status' && $user->status === '0'){ + $user->update([ + 'status' => '1' + ]); + }else if($category === 'edit-request' && $user->company->edit_status === '1'){ + $user->company->update([ + 'edit_status' => '2' + ]); + } + } + + return response()->json([ + 'message' => 'Berhasil menyetujui'.($category === 'edit-request' ? ' permohonan edit' : '').' perusahaan.' + ]); + + // return redirect()->back()->with('success-status', 'Berhasil menyetujui'.($category === 'edit-request' ? 'permohonan edit' : '').'perusahaan.'); + } + + public function processRejectAction(Request $request, $id, $type, $category){ + $user = User::with(['company'])->findOrFail(decrypt_id($id)); + + if(!in_array($category, ['account-status', 'edit-request'])){ + abort(404); + } + + if(is_role(['1']) && in_array($category, ['account-status', 'edit-request'])){ + + $validatedData = $request->validate([ + 'rejection_reason' => ['required'], + ], [ + 'rejection_reason.required' => 'Alasan penolakan wajib diisi.', + ]); + + if($category === 'account-status' && $user->status === '0'){ + $user->update([ + 'status' => '2' + ]); + + $user->company->update([ + 'rejection_reason' => $validatedData['rejection_reason'] + ]); + }else if($category === 'edit-request' && $user->company->edit_status === '1'){ + $user->company->update([ + 'edit_status' => '3', + 'edit_rejection_reason' => $validatedData['rejection_reason'] + ]); + } + } + + return redirect()->route('dashboard.companies.index')->with('success-status', 'Berhasil menolak'.($category === 'edit-request' ? ' permohonan edit' : '').' perusahaan.'); + } + + public function export(Request $request) + { + $status = $request->input('status', null); + $edit_status = $request->input('edit_status', null); + $address = $request->input('address', null); + $register_year = $request->input('register_year', null); + $register_month = $request->input('register_month', null); + $register_date = $request->input('register_date', null); + + $formattedNow = Carbon::parse(now())->locale('id')->translatedFormat('d-m-Y'); + + return Excel::download(new CompanyExport($status, $edit_status, $address, $register_year, $register_month, $register_date), 'companies-'.$formattedNow.'.xlsx'); + } + + public function filter(Request $request){ + + $filteredRequest = $request->except('_token'); + + $filterField = array_filter($filteredRequest, function ($value) { + return filled($value); + }); + + return redirect()->route('dashboard.companies.index', $filterField); + } } diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php index a93a65a..d3613b0 100644 --- a/app/Http/Controllers/Dashboard/DatatableController.php +++ b/app/Http/Controllers/Dashboard/DatatableController.php @@ -683,9 +683,62 @@ public function airingProofTheme(Request $request){ public function company(Request $request){ if ($request->ajax()) { + $status = $request->input('status', null); + $edit_status = $request->input('edit_status', null); + $address = $request->input('address', null); + $register_year = $request->input('register_year', null); + $register_month = $request->input('register_month', null); + $register_date = $request->input('register_date', null); + $query = Company::with(['user']); - $data = Company::with(['user'])->get(); + if($status !== 'all'){ + if($status === 'waiting'){ + $query->whereHas('user', function ($q){ + $q->where('status', '0'); + }); + }else if($status === 'accepted'){ + $query->whereHas('user', function ($q){ + $q->where('status', '1'); + }); + }else if($status === 'rejected'){ + $query->whereHas('user', function ($q){ + $q->where('status', '2'); + }); + } + } + + if($edit_status !== 'all'){ + if($edit_status === 'no-edit'){ + $query->where('edit_status', '0'); + }elseif($edit_status === 'waiting'){ + $query->where('edit_status', '1'); + }else if($edit_status === 'accepted'){ + $query->where('edit_status', '2'); + }else if($edit_status === 'rejected'){ + $query->where('edit_status', '3'); + } + } + + if ($address) { + $query->where('address', 'LIKE', '%'.$address.'%'); + } + + if ($register_year) { + $query->whereYear('created_at', $register_year); + } + + if ($register_month) { + $monthYear = Carbon::parse($register_month); + $query->whereYear('created_at', $monthYear->year) + ->whereMonth('created_at', $monthYear->month); + } + + if ($register_date) { + $query->whereDate('created_at', $register_date); + } + + $data = $query->get(); return DataTables::of($data) ->addIndexColumn() @@ -696,8 +749,8 @@ public function company(Request $request){ case 1: return 'Diterima'; case 2: - return 'Ditolak'; - case 3: + return 'Ditolak'; + default: return 'Tidak Diketahui'; } }) @@ -707,12 +760,14 @@ public function company(Request $request){ ->addColumn('status_edit', function ($data) { switch($data->edit_status){ case 0: - return 'Menunggu'; + return 'Tidak Ada'; case 1: - return 'Diterima'; + return 'Menunggu'; case 2: - return 'Ditolak'; + return 'Diterima'; case 3: + return 'Ditolak'; + default: return 'Tidak Diketahui'; } }) @@ -723,20 +778,26 @@ public function company(Request $request){ return idn_date($data->validated_at, 'd F Y'); }) ->addColumn('action', function ($data) { - $showUrl = route('dashboard.companies.show', ['id' => encrypt_id($data->id)]); - - $editUrl = route('dashboard.companies.edit', ['id' => encrypt_id($data->id)]); + $showUrl = route('dashboard.companies.show', ['id' => encrypt_id($data->user->id), 'type' => 'company']); $deleteUrl = route('dashboard.companies.destroy', ['id' => encrypt_id($data->id)]); + $processAccountCompanyUrl = route('dashboard.companies.process', ['id' => encrypt_id($data->user->id), 'type' => 'company', 'category' => 'account-status']); + + $processEditRequestCompanyUrl = route('dashboard.companies.process', ['id' => encrypt_id($data->user->id), 'type' => 'company', 'category' => 'edit-request']); + $dropdown = '
  • Detail
    • '; - if (is_role([1])) { - $dropdown .= '
  • Ubah
    • '; + if (is_role([1]) && $data->user->status === '0') { + $dropdown .= '
  • Proses Perusahaan
    • '; + } + + if (is_role([1]) && $data->edit_status === '1' && $data->user->status === '1') { + $dropdown .= '
  • Proses Permohonan Edit
    • '; } if (is_role([1])) { diff --git a/app/Http/Controllers/Dashboard/UserController.php b/app/Http/Controllers/Dashboard/UserController.php index c5e8f8b..13d779b 100644 --- a/app/Http/Controllers/Dashboard/UserController.php +++ b/app/Http/Controllers/Dashboard/UserController.php @@ -122,42 +122,6 @@ public function resetPasswordAction(ResetPasswordRequest $request, $id){ } } - public function statusAction(Request $request, $id, $action){ - $user = User::findOrFail(decrypt_id($id)); - - if($user->status === '0' && Auth::check() && is_role(['1'])){ - if($action == 'accept'){ - $user->update([ - 'status' => '1' - ]); - - return response()->json(['message' => 'Berhasil menyetujui pengguna.']); - }else if($action == 'reject'){ - - $validatedData = $request->validate([ - 'rejection_reason' => ['required'], - ], [ - 'rejection_reason.required' => 'Alasan penolakan wajib diisi.', - ]); - - $user->update([ - 'status' => '3' - ]); - - $user->company->update([ - 'rejection_reason' => $validatedData['rejection_reason'] - ]); - - return redirect()->back()->with('success-status', 'Berhasil menolak pengguna.'); - } - - } - - // return redirect()->route('dashboard.users.index')->with('success-status', 'Berhasil menyetujui pengguna.'); - - - } - public function destroy($id) { try { @@ -249,6 +213,43 @@ public function process($id, $type, $process){ return view('dashboard.users.profiles.journalists', $data); } } + + public function statusAction(Request $request, $id, $action){ + $user = User::findOrFail(decrypt_id($id)); + + if($user->status === '0' && Auth::check() && is_role(['1'])){ + if($action == 'accept'){ + $user->update([ + 'status' => '1' + ]); + + return response()->json(['message' => 'Berhasil menyetujui pengguna.']); + }else if($action == 'reject'){ + + $validatedData = $request->validate([ + 'rejection_reason' => ['required'], + ], [ + 'rejection_reason.required' => 'Alasan penolakan wajib diisi.', + ]); + + $user->update([ + 'status' => '3' + ]); + + $user->company->update([ + 'rejection_reason' => $validatedData['rejection_reason'] + ]); + + return redirect()->back()->with('success-status', 'Berhasil menolak pengguna.'); + } + + } + + // return redirect()->route('dashboard.users.index')->with('success-status', 'Berhasil menyetujui pengguna.'); + + + } + public function setting(){ $user = Auth::user(); diff --git a/app/Http/Requests/CompanyRequest.php b/app/Http/Requests/CompanyRequest.php new file mode 100644 index 0000000..5647343 --- /dev/null +++ b/app/Http/Requests/CompanyRequest.php @@ -0,0 +1,120 @@ +|string> + */ + public function rules(): array + { + return [ + 'company_name' => ['required', 'max:100'], + 'company_email' => ['required', 'max:100', 'email'], + 'company_address' => ['required'], + 'company_director_name' => ['required', 'max:100'], + 'company_director_nik' => ['required', 'max:100'], + 'company_director_nik_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_deed_incorporation' => ['nullable', 'max:100'], + 'company_deed_incorporation_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_trade_license' => ['nullable', 'max:100'], + 'company_trade_license_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_tax_id_number' => ['nullable', 'max:100'], + 'company_tax_id_number_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_taxable_enterprise' => ['nullable', 'max:100'], + 'company_taxable_enterprise_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_annual_tax_return' => ['nullable', 'max:100'], + 'company_annual_tax_return_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_domicile_certificate' => ['nullable', 'max:100'], + 'company_domicile_certificate_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_profile' => ['nullable', 'max:100'], + 'company_profile_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + ]; + } + + public function messages(): array + { + return [ + + // Company + 'company_name.required' => 'Nama perusahaan wajib diisi.', + 'company_name.max' => 'Nama perusahaan maksimal 100 karakter.', + 'company_email.required' => 'Email perusahaan wajib diisi.', + 'company_email.email' => 'Email perusahaan tidak valid.', + 'company_email.max' => 'Email perusahaan maksimal 100 karakter.', + 'company_address.required' => 'Alamat perusahaan wajib diisi.', + 'company_director_name.required' => 'Nama direktur perusahaan wajib diisi.', + 'company_director_name.max' => 'Nama direktur perusahaan maksimal 100 karakter.', + 'company_director_nik.required' => 'NIK direktur perusahaan wajib diisi.', + 'company_director_nik.max' => 'NIK direktur perusahaan maksimal 100 karakter.', + 'company_director_nik_doc.required' => 'Dokumen NIK direktur perusahaan wajib diunggah.', + 'company_director_nik_doc.file' => 'Dokumen NIK direktur perusahaan harus berupa file.', + 'company_director_nik_doc.mimes' => 'Dokumen NIK direktur perusahaan harus dalam format PDF.', + 'company_director_nik_doc.max' => 'Ukuran dokumen NIK direktur perusahaan maksimal 2 MB.', + + // Documents + 'company_deed_incorporation.max' => 'Akta pendirian perusahaan maksimal 100 karakter.', + 'company_deed_incorporation_doc.file' => 'Dokumen akta pendirian perusahaan harus berupa file.', + 'company_deed_incorporation_doc.mimes' => 'Dokumen akta pendirian perusahaan harus dalam format PDF.', + 'company_deed_incorporation_doc.max' => 'Ukuran dokumen akta pendirian perusahaan maksimal 2 MB.', + 'company_trade_license.max' => 'Lisensi perdagangan perusahaan maksimal 100 karakter.', + 'company_trade_license_doc.file' => 'Dokumen lisensi perdagangan perusahaan harus berupa file.', + 'company_trade_license_doc.mimes' => 'Dokumen lisensi perdagangan perusahaan harus dalam format PDF.', + 'company_trade_license_doc.max' => 'Ukuran dokumen lisensi perdagangan perusahaan maksimal 2 MB.', + 'company_tax_id_number.max' => 'Nomor NPWP perusahaan maksimal 100 karakter.', + 'company_tax_id_number_doc.file' => 'Dokumen NPWP perusahaan harus berupa file.', + 'company_tax_id_number_doc.mimes' => 'Dokumen NPWP perusahaan harus dalam format PDF.', + 'company_tax_id_number_doc.max' => 'Ukuran dokumen NPWP perusahaan maksimal 2 MB.', + 'company_taxable_enterprise.max' => 'Nomor PKP perusahaan maksimal 100 karakter.', + 'company_taxable_enterprise_doc.file' => 'Dokumen PKP perusahaan harus berupa file.', + 'company_taxable_enterprise_doc.mimes' => 'Dokumen PKP perusahaan harus dalam format PDF.', + 'company_taxable_enterprise_doc.max' => 'Ukuran dokumen PKP perusahaan maksimal 2 MB.', + 'company_annual_tax_return.max' => 'Laporan SPT tahunan perusahaan maksimal 100 karakter.', + 'company_annual_tax_return_doc.file' => 'Dokumen SPT tahunan perusahaan harus berupa file.', + 'company_annual_tax_return_doc.mimes' => 'Dokumen SPT tahunan perusahaan harus dalam format PDF.', + 'company_annual_tax_return_doc.max' => 'Ukuran dokumen SPT tahunan perusahaan maksimal 2 MB.', + 'company_domicile_certificate.max' => 'Sertifikat domisili perusahaan maksimal 100 karakter.', + 'company_domicile_certificate_doc.file' => 'Dokumen sertifikat domisili perusahaan harus berupa file.', + 'company_domicile_certificate_doc.mimes' => 'Dokumen sertifikat domisili perusahaan harus dalam format PDF.', + 'company_domicile_certificate_doc.max' => 'Ukuran dokumen sertifikat domisili perusahaan maksimal 2 MB.', + 'company_profile.max' => 'Profil perusahaan maksimal 100 karakter.', + 'company_profile_doc.file' => 'Dokumen profil perusahaan harus berupa file.', + 'company_profile_doc.mimes' => 'Dokumen profil perusahaan harus dalam format PDF.', + 'company_profile_doc.max' => 'Ukuran dokumen profil perusahaan maksimal 2 MB.', + ]; + } + + protected function prepareForValidation() + { + $this->merge([ + 'company_deed_incorporation' => filled($this->company_deed_incorporation) ? $this->company_deed_incorporation : null, + 'company_deed_incorporation_doc' => filled($this->company_deed_incorporation_doc) ? $this->company_deed_incorporation_doc : null, + 'company_trade_license' => filled($this->company_trade_license) ? $this->company_trade_license : null, + 'company_trade_license_doc' => filled($this->company_trade_license_doc) ? $this->company_trade_license_doc : null, + 'company_tax_id_number' => filled($this->company_tax_id_number) ? $this->company_tax_id_number : null, + 'company_tax_id_number_doc' => filled($this->company_tax_id_number_doc) ? $this->company_tax_id_number_doc : null, + 'company_taxable_enterprise' => filled($this->company_taxable_enterprise) ? $this->company_taxable_enterprise : null, + 'company_taxable_enterprise_doc' => filled($this->company_taxable_enterprise_doc) ? $this->company_taxable_enterprise_doc : null, + 'company_annual_tax_return' => filled($this->company_annual_tax_return) ? $this->company_annual_tax_return : null, + 'company_annual_tax_return_doc' => filled($this->company_annual_tax_return_doc) ? $this->company_annual_tax_return_doc : null, + 'company_domicile_certificate' => filled($this->company_domicile_certificate) ? $this->company_domicile_certificate : null, + 'company_domicile_certificate_doc' => filled($this->company_domicile_certificate_doc) ? $this->company_domicile_certificate_doc : null, + 'company_profile' => filled($this->company_profile) ? $this->company_profile : null, + 'company_profile_doc' => filled($this->company_profile_doc) ? $this->company_profile_doc : null, + ]); + } +} diff --git a/app/Models/Company.php b/app/Models/Company.php index 2ef453b..32cec96 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -35,6 +35,7 @@ class Company extends Model 'cooperation_request_doc', 'edit_description', 'edit_status', + 'edit_rejection_reason', 'validated_at', 'rejection_reason', 'user_id' diff --git a/database/migrations/2025_02_25_024741_create_companies_table.php b/database/migrations/2025_02_25_024741_create_companies_table.php index 67c64ac..ba04f1a 100644 --- a/database/migrations/2025_02_25_024741_create_companies_table.php +++ b/database/migrations/2025_02_25_024741_create_companies_table.php @@ -37,6 +37,7 @@ public function up(): void $table->string('cooperation_request_doc')->nullable(); $table->text('edit_description')->nullable(); $table->enum('edit_status', ['0', '1', '2', '3'])->default('0'); + $table->text('edit_rejection_reason')->nullable(); $table->date('validated_at')->nullable(); $table->text('rejection_reason')->nullable(); $table->unsignedBigInteger('user_id'); diff --git a/database/seeders/CompanySeeder.php b/database/seeders/CompanySeeder.php index 84b66bb..04559f4 100644 --- a/database/seeders/CompanySeeder.php +++ b/database/seeders/CompanySeeder.php @@ -43,7 +43,7 @@ public function run(): void 'cooperation_request' => $legacyCompany->cooperation, 'cooperation_request_doc' => $legacyCompany->doc_of_cooperation, 'edit_description' => $legacyCompany->description_edit, - 'edit_status' => $legacyCompany->status_edit ?? '0', + 'edit_status' => change_status($legacyCompany->status_edit, 'company_edit') ?? '0', 'validated_at' => $legacyCompany->validation_date, 'rejection_reason' => $legacyCompany->reject_message, 'user_id' => $legacyCompany->enhancer, diff --git a/public/assets/dashboard/css/custom.css b/public/assets/dashboard/css/custom.css index 1128aa5..cb21b1c 100644 --- a/public/assets/dashboard/css/custom.css +++ b/public/assets/dashboard/css/custom.css @@ -121,7 +121,8 @@ .dataTables_wrapper { } */ .dropdown-menu-datatable-custom { - position: fixed !important; + /* position: fixed !important; */ + position: absolute !important; z-index: 1050 !important; } @@ -161,3 +162,8 @@ .captcha-error { border: 2px dotted red; padding: 0.5rem 0rem !important; } + +.file-not-filled{ + border: 1px solid red !important; + background-color: red !important; +} diff --git a/resources/views/dashboard/companies/admin/index.blade.php b/resources/views/dashboard/companies/admin/index.blade.php new file mode 100644 index 0000000..08179fa --- /dev/null +++ b/resources/views/dashboard/companies/admin/index.blade.php @@ -0,0 +1,210 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'companies']) +@include('partials.dashboard.header') + +
    +
    +
    +
    +
    +
    +
    +

    {{$title}}

    +
    +
    +
    + +
    +
      +
    • + @if (filled(value: $status) || filled($edit_status) || filled($address) || filled($register_year) || filled($register_month) || filled($register_date)) + + + + + + @endif +
      + Filter +
      +
      • +
    • +
      + Export +
      +
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + +
    NoNama PerusahaanEmailDirekturAlamatTanggal DaftarTanggal ValidasiStatusStatus Edit
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +@include('partials.dashboard.footer' ,['datatable' => 'company']) diff --git a/resources/views/dashboard/companies/edit-request.blade.php b/resources/views/dashboard/companies/edit-request.blade.php new file mode 100644 index 0000000..a5e3f64 --- /dev/null +++ b/resources/views/dashboard/companies/edit-request.blade.php @@ -0,0 +1,65 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'companies']) +@include('partials.dashboard.header') + +
    +
    +
    +
    +
    +
    +
    +

    Ubah Data Perusahaan

    +
    +
      +
    • Buat permohonan untuk mengubah data perusahaan Anda di sini.
      • +
    +
    +
    +
    + Kembali + +
    +
    +
    +
    +
    +
    + Mohon berikan deskripsi permohonan yang jelas dan informatif untuk menjelaskan alasan perubahan data perusahaan serta data apa saja yang ingin diubah. Hal ini akan mempercepat proses validasi oleh tim kami. +
    +
    +
    +
    +
    +
    + {{--
    --}} +
    + @csrf + @method('put') +
    +
    + Deskripsi Permohonan* +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/companies/edit.blade.php b/resources/views/dashboard/companies/edit.blade.php new file mode 100644 index 0000000..ee27603 --- /dev/null +++ b/resources/views/dashboard/companies/edit.blade.php @@ -0,0 +1,318 @@ +@include('partials.dashboard.head') +@include('partials.dashboard.sidebar', ['page' => 'companies']) +@include('partials.dashboard.header') + +
    +
    +
    +
    +
    +
    +
    +

    Ubah Data Perusahaan

    +
    +
      +
    • Ubah data perusahaan Anda di sini.
      • +
    +
    +
    +
    + Kembali + +
    +
    +
    +
    +
    +
    + Mohon lakukan pembaruan data perusahaan sesuai dengan informasi yang telah diajukan sebelumnya. Pastikan seluruh data telah diisi dengan lengkap dan benar. +
    +
    +
    +
    +
    +
    + {{--
    --}} +
    + @csrf +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + Reset Perubahan + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/companies/index.blade.php b/resources/views/dashboard/companies/index.blade.php index 72f309b..995ca69 100644 --- a/resources/views/dashboard/companies/index.blade.php +++ b/resources/views/dashboard/companies/index.blade.php @@ -7,56 +7,228 @@
    -
    +
    -

    {{$title}}

    -
    - {{--
    -
    - -
    - -
    -
    -
    --}} -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - -
    NoNama PerusahaanEmailDirekturStatusAlamatStatus EditTanggal DaftarTanggal Validasi
    +

    Data Perusahaan

    +
    +
      +
    • Lihat informasi perusahaan Anda di sini.
      • +
    +
    + @if (in_array($user->company->edit_status,['1']) ) + Ubah Data + + @elseif(in_array($user->company->edit_status, ['0', '3'])) + Ubah Data + + @elseif(in_array($user->company->edit_status, ['2'])) + Ubah Data + + @endif +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    Informasi Perusahaan
    +

    Informasi umum terkait perusahaan Anda

    +
    +
    +
    +
    + Nama Perusahaan + {{$user->company->name ?? '-'}} +
    +
    +
    +
    + Email Perusahaan + {{$user->company->email ?? '-'}} +
    +
    +
    +
    + Direktur + {{$user->company->director_name ?? '-'}} +
    +
    +
    +
    + NIK Direktur + {{$user->company->director_nik ?? '-'}} +
    +
    +
    +
    + Alamat + {{$user->company->address ?? '-'}} +
    +
    +
    +
    + Akta Pendirian + {{$user->company->deed_incorporation ?? '-'}} +
    +
    +
    +
    + SPT Tahunan + {{$user->company->annual_tax_return ?? '-'}} +
    +
    +
    +
    + NPWP + {{$user->company->tax_id_number ?? '-'}} +
    +
    +
    +
    + PKP + {{$user->company->taxable_enterprise ?? '-'}} +
    +
    +
    +
    + Suket Domisili + {{$user->company->domicile_certificate ?? '-'}} +
    +
    +
    +
    + SIUP + {{$user->company->trade_license ?? '-'}} +
    +
    +
    +
    + Profile + {{$user->company->profile ?? '-'}} +
    +
    +
    +
    + {{--
    --}} +
    + {{--
    +
    Admin Note
    +
    --}} +
    +
    + +
    +
    + {!! display_file('companies', $user->company->director_nik_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->deed_incorporation_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->annual_tax_return_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->tax_id_number_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->taxable_enterprise_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->domicile_certificate) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->trade_license_doc) !!} +
    +
    +
    +
    + +
    +
    + {!! display_file('companies', $user->company->profile_doc) !!} +
    +
    +
    +
    +
    + {{--
    --}} + @if (filled($user->company->rejection_reason)) +
    +
    + Alasan Penolakan +
    +
    +
    +
    + {!!$company->rejection_reason ?? '-' !!} +
    +
    +
    +
    + @endif +
    +
    +
    @@ -64,4 +236,4 @@
    -@include('partials.dashboard.footer' ,['datatable' => 'company']) +@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/companies/show.blade.php b/resources/views/dashboard/companies/show.blade.php deleted file mode 100644 index 4ef77e9..0000000 --- a/resources/views/dashboard/companies/show.blade.php +++ /dev/null @@ -1,220 +0,0 @@ -@include('partials.dashboard.head') -@include('partials.dashboard.sidebar', ['page' => 'companies']) -@include('partials.dashboard.header') - -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - {{--
    -
    Personal Information
    -

    Basic info, like your name and address, that you use on Nio Platform.

    -
    --}} -
    -
    -
    - Nama perusahaan - {{$company->name}} -
    -
    -
    -
    - Email Perusahaan - {{$company->email}} -
    -
    -
    -
    - Direktur - {{$company->director_name}} -
    -
    -
    -
    - NIK Direktur - - @if ($company->director_nik_doc) - {{$company->director_nik}} - @else - {{$company->director_nik ?? '-'}} - @endif - -
    -
    -
    -
    - Alamat - {{$company->address}} -
    -
    -
    -
    - Akta Pendirian - - @if ($company->deed_incorporation_doc) - {{$company->deed_incorporation}} - @else - {{$company->deed_incorporation ?? '-'}} - @endif - -
    -
    -
    -
    - SPT Tahunan - - @if ($company->annual_tax_return_doc) - {{$company->annual_tax_return}} - @else - {{$company->annual_tax_return ?? '-'}} - @endif - -
    -
    -
    -
    - NPWP - - @if ($company->tax_id_number_doc) - {{$company->tax_id_number}} - @else - {{$company->tax_id_number ?? '-'}} - @endif - -
    -
    -
    -
    - PKP - - @if ($company->taxable_enterprise_doc) - {{$company->taxable_enterprise}} - @else - {{$company->taxable_enterprise ?? '-'}} - @endif - -
    -
    -
    -
    - Suket Domisili - - @if ($company->domicile_certificate_doc) - {{$company->domicile_certificate}} - @else - {{$company->domicile_certificate ?? '-'}} - @endif - -
    -
    -
    -
    - SIUP - - @if ($company->trade_license_doc) - {{$company->trade_license}} - @else - {{$company->trade_license ?? '-'}} - @endif - -
    -
    -
    -
    - Profile - - @if ($company->profile_doc) - {{$company->profile}} - @else - {{$company->profile ?? '-'}} - @endif - -
    -
    -
    -
    - Penawaran Kerja - - @if ($company->cooperation_request_doc) - {{$company->cooperation_request}} - @else - {{$company->cooperation_request ?? '-'}} - @endif - -
    -
    -
    -
    - Status - @switch($company->user->status) - @case(0) - Menunggu - @break - @case(1) - Diterima - @break - @case(2) - Ditolak - @break - @default - Tidak Diketahui - @endswitch -
    - -
    -
    -
    - {{--
    --}} - @if (filled($company->rejection_reason)) -
    -
    - Alasan Penolakan -
    -
    -
    -
    - {!!$company->rejection_reason ?? '-' !!} -
    -
    -
    -
    - @endif - {{--
    -
    - Konten -
    -
    -
    -
    - {!!$mediaMonitoring->content!!} -
    -
    -
    -
    --}} -
    -
    - Kembali - {{-- Ubah --}} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -@include('partials.dashboard.footer', ['rich_editor' => false]) diff --git a/resources/views/dashboard/users/profiles/account.blade.php b/resources/views/dashboard/users/profiles/account.blade.php index 4637786..5cb9983 100644 --- a/resources/views/dashboard/users/profiles/account.blade.php +++ b/resources/views/dashboard/users/profiles/account.blade.php @@ -1,5 +1,9 @@ @include('partials.dashboard.head') +@if (in_array($page, ['company', 'media'])) +@include('partials.dashboard.sidebar', ['page' => $route]) +@else @include('partials.dashboard.sidebar', ['page' => ($page === 'profile' ? 'profile' : 'users')]) +@endif @include('partials.dashboard.header')
    diff --git a/resources/views/dashboard/users/profiles/action.blade.php b/resources/views/dashboard/users/profiles/action.blade.php index 127f9a2..5938587 100644 --- a/resources/views/dashboard/users/profiles/action.blade.php +++ b/resources/views/dashboard/users/profiles/action.blade.php @@ -1,6 +1,6 @@ @if ($user->status === '0' && isset($process) && $process === 'accept') -
    - Tolak +
    + Tolak Terima @@ -46,3 +46,47 @@
    @endif + +@if (isset($purpose) && $purpose === 'process' && $page === 'company' && filled($category)) +@if ($category === 'account-status' && $user->status === '0') +
    + Tolak + + Terima + +
    + @elseif($category === 'edit-request' && $user->company->edit_status === '1') +
    + Tolak + + Terima + +
    + @endif + +@endif diff --git a/resources/views/dashboard/users/profiles/company.blade.php b/resources/views/dashboard/users/profiles/company.blade.php index beff99f..e63eeac 100644 --- a/resources/views/dashboard/users/profiles/company.blade.php +++ b/resources/views/dashboard/users/profiles/company.blade.php @@ -1,5 +1,9 @@ @include('partials.dashboard.head') +@if (in_array($page, ['company', 'media'])) +@include('partials.dashboard.sidebar', ['page' => $route]) +@else @include('partials.dashboard.sidebar', ['page' => ($page === 'profile' ? 'profile' : 'users')]) +@endif @include('partials.dashboard.header')
    @@ -11,6 +15,7 @@ @include('dashboard.users.profiles.heading')
    + @include('dashboard.users.profiles.request-edit-description')
    diff --git a/resources/views/dashboard/users/profiles/heading.blade.php b/resources/views/dashboard/users/profiles/heading.blade.php index c27231d..b5f0dac 100644 --- a/resources/views/dashboard/users/profiles/heading.blade.php +++ b/resources/views/dashboard/users/profiles/heading.blade.php @@ -24,4 +24,17 @@ Kembali
    +@elseif (in_array($page, ['company', 'media'])) +
    +

    Data {{ucfirst($idnPage)}}

    +
    +
      +
    • Lihat informasi terkait {{$idnPage}} di sini.
      • +
    +
    +
    +
    + Kembali + +
    @endif diff --git a/resources/views/dashboard/users/profiles/journalists.blade.php b/resources/views/dashboard/users/profiles/journalists.blade.php index f366bae..273dcfe 100644 --- a/resources/views/dashboard/users/profiles/journalists.blade.php +++ b/resources/views/dashboard/users/profiles/journalists.blade.php @@ -1,5 +1,9 @@ @include('partials.dashboard.head') +@if (in_array($page, ['company', 'media'])) +@include('partials.dashboard.sidebar', ['page' => $route]) +@else @include('partials.dashboard.sidebar', ['page' => ($page === 'profile' ? 'profile' : 'users')]) +@endif @include('partials.dashboard.header')
    diff --git a/resources/views/dashboard/users/profiles/login-activity.blade.php b/resources/views/dashboard/users/profiles/login-activity.blade.php index e18dec1..7c599dd 100644 --- a/resources/views/dashboard/users/profiles/login-activity.blade.php +++ b/resources/views/dashboard/users/profiles/login-activity.blade.php @@ -1,5 +1,9 @@ @include('partials.dashboard.head') +@if (in_array($page, ['company', 'media'])) +@include('partials.dashboard.sidebar', ['page' => $route]) +@else @include('partials.dashboard.sidebar', ['page' => ($page === 'profile' ? 'profile' : 'users')]) +@endif @include('partials.dashboard.header')
    diff --git a/resources/views/dashboard/users/profiles/media.blade.php b/resources/views/dashboard/users/profiles/media.blade.php index 0ced3d5..feb4469 100644 --- a/resources/views/dashboard/users/profiles/media.blade.php +++ b/resources/views/dashboard/users/profiles/media.blade.php @@ -1,5 +1,9 @@ @include('partials.dashboard.head') +@if (in_array($page, ['company', 'media'])) +@include('partials.dashboard.sidebar', ['page' => $route]) +@else @include('partials.dashboard.sidebar', ['page' => ($page === 'profile' ? 'profile' : 'users')]) +@endif @include('partials.dashboard.header')
    diff --git a/resources/views/dashboard/users/profiles/request-edit-description.blade.php b/resources/views/dashboard/users/profiles/request-edit-description.blade.php new file mode 100644 index 0000000..1d63a64 --- /dev/null +++ b/resources/views/dashboard/users/profiles/request-edit-description.blade.php @@ -0,0 +1,28 @@ +@if (isset($purpose) && $purpose === 'process' && isset($category) && $category === 'edit-request' && $user->company->edit_status === '1') +
    + +
    +
    + +
    +
    +
    + @if (filled($user->company->edit_description)) + {{ $user->company->edit_description }} + @else +
    + Tidak ada deskripsi atau alasan +
    + @endif +
    +
    +
    +
    +
    +
    + +@endif diff --git a/resources/views/dashboard/users/profiles/tabs.blade.php b/resources/views/dashboard/users/profiles/tabs.blade.php index 53d1577..8e48fe1 100644 --- a/resources/views/dashboard/users/profiles/tabs.blade.php +++ b/resources/views/dashboard/users/profiles/tabs.blade.php @@ -55,4 +55,43 @@ @endif
+@elseif (in_array($page, ['company', 'media', 'journalist'])) +
    + @if (request()->query('category') && in_array(request()->query('category'), ['account-status', 'edit-request'])) +
  • + Akun +
    • + @if ($user->role_id === 3) +
  • + Perusahaan +
    • +
  • + Media +
    • +
  • + Jurnalis +
    • + @endif + @else +
  • + Akun +
    • + @if ($user->role_id === 3) +
  • + Perusahaan +
    • +
  • + Media +
    • +
  • + Jurnalis +
    • + @endif + @if ($purpose !== 'process') +
  • + Aktivitas Login +
    • + @endif + @endif +
@endif diff --git a/resources/views/partials/app/datatable.blade.php b/resources/views/partials/app/datatable.blade.php index 46a5d3d..ee6207a 100644 --- a/resources/views/partials/app/datatable.blade.php +++ b/resources/views/partials/app/datatable.blade.php @@ -430,17 +430,28 @@ $('#companiesTable').DataTable({ processing: true, serverSide: true, - ajax: '{{ route('dashboard.companies.data') }}', + ajax: { + url: '{{ route('dashboard.companies.data') }}', + type: 'GET', + data: function(d) { + d.status = '{{ $status }}'; + d.edit_status = '{{ $edit_status }}'; + d.address = '{{ $address }}'; + d.register_year = '{{ $register_year }}'; + d.register_month = '{{ $register_month }}'; + d.register_date = '{{ $register_date }}'; + } + }, columns: [ { data: 'DT_RowIndex', name: 'DT_RowIndex', orderable: false, searchable: false }, { data: 'name', name: 'name' }, { data: 'email', name: 'email' }, { data: 'director_name', name: 'director_name' }, - { data: 'status', name: 'status' }, { data: 'address', name: 'address' }, - { data: 'status_edit', name: 'status_edit' }, { data: 'register_at', name: 'register_at' }, { data: 'validated_at', name: 'validated_at' }, + { data: 'status', name: 'status' }, + { data: 'status_edit', name: 'status_edit' }, { data: 'action', name: 'action', orderable: false, searchable: false }, { data: 'created_at', name: 'created_at', visible: false }, { data: 'id', name: 'id', orderable: true, searchable: false, visible: false }, diff --git a/routes/web.php b/routes/web.php index f9a73b3..d37d2f0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -237,12 +237,21 @@ Route::prefix('companies')->name('companies.')->group(function(){ Route::controller(CompanyController::class)->group(function(){ Route::get('/', 'index')->name('index'); - Route::get('/{id}/show', 'show')->name('show'); + Route::get('/{id}/{type}/show', 'show')->name('show'); Route::get('/create', 'create')->name('create'); Route::post('/', 'store')->name('store'); - Route::get('/{id}/edit', 'edit')->name('edit'); - Route::put('/{id}', 'update')->name('update'); + Route::get('/edit/request', 'editRequest')->name('edit.request'); + Route::put('/edit/request', 'editRequestAction')->name('edit.request.action'); + Route::get('/edit', 'edit')->name('edit'); + Route::post('/edit', 'update')->name('update'); Route::delete('/{id}', 'destroy')->name('destroy'); + + Route::get('/{id}/{type}/process', 'process')->name('process'); + Route::put('/{id}/{type}/process/{category}', 'processAcceptAction')->name('process.action.accept'); + Route::post('/{id}/{type}/process/{category}', 'processRejectAction')->name('process.action.reject'); + + Route::post('/export', 'export')->name('export'); + Route::post('/filter', 'filter')->name('filter'); }); Route::get('/data', [DatatableController::class, 'company'])->name('data');