E41220418
/
TIF_NGANJUK_E41220418
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: E41220418:d4bb6431432661b5e0dbd03f1659a26d68c648ee
Branches Tags
E41220418:main
...
compare: E41220418:580c319c5597faf4b603b5f55c2be21c8dccd89c
Branches Tags
E41220418:main

10 Commits
d4bb643143 ... 580c319c55

Author SHA1 Message Date
LailaWulandarii 580c319c55 commit thesis project 2026-04-14 19:41:51 +07:00
Laila Wulandari 6939000238
Merge pull request #11 from LailaWulandarii/development 
Development
 2026-02-28 08:53:04 +07:00
LailaWulandarii a58121455c feat: display last modified by user in foto modal 2026-02-28 08:51:55 +07:00
LailaWulandarii 6fa0d1a1da feat: associate PaketFoto with User model and update FotoController for user ID handling 2026-02-27 08:51:26 +07:00
LailaWulandarii fcc1ab0c04 feat: add foreign key id_user to paket_fotos table for user association 2026-02-26 08:50:55 +07:00
Laila Wulandari ddaca1ab98
Merge pull request #10 from LailaWulandarii/development 
Development
 2026-02-25 05:04:51 +07:00
LailaWulandarii 24b3a4b194 fix: enhance button accessibility for non-admin users in modal buket 2026-02-25 05:02:14 +07:00
LailaWulandarii 706064056a fix: enhance button accessibility for non-admin users in modal foto 2026-02-25 05:02:06 +07:00
LailaWulandarii 8608a7f4fa fix: update user role display to use badge for better visual distinction in admin layout 2026-02-24 05:01:03 +07:00
LailaWulandarii a5f4071072 fix: update button styles to improve visual indication of disabled state in Paket Foto 2026-02-23 04:43:18 +07:00
10 changed files with 135 additions and 31 deletions
Show Stats Expand all files Collapse all files

7
app/Http/Controllers/Admin/FotoController.php
View File

@ -7,6 +7,7 @@
use App\Models\PaketFoto; use App\Models\PaketFoto;
use App\Http\Requests\Admin\FotoRequest; // Gunakan Request baru use App\Http\Requests\Admin\FotoRequest; // Gunakan Request baru
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Auth;
class FotoController extends Controller class FotoController extends Controller
{ {
@ -20,12 +21,14 @@ public function index()
public function store(FotoRequest $request) public function store(FotoRequest $request)
{ {
$data = $request->validated(); $data = $request->validated();
$data['id_user'] = Auth::id();
if ($request->hasFile('foto')) { if ($request->hasFile('foto')) {
$file = $request->file('foto'); $file = $request->file('foto');
$filename = time() . '_' . $file->getClientOriginalName(); $filename = time() . '_' . $file->getClientOriginalName();
$path = $file->storeAs('img/foto', $filename, 'public'); $path = $file->storeAs('img/foto', $filename, 'public');
$data['foto'] = $path; $data['foto'] = $path;
} }
PaketFoto::create($data); PaketFoto::create($data);
return redirect()->back()->with('success', 'Paket foto baru berhasil ditambahkan!'); return redirect()->back()->with('success', 'Paket foto baru berhasil ditambahkan!');
} }
@ -34,6 +37,7 @@ public function update(FotoRequest $request, string $id)
{ {
$paket = PaketFoto::findOrFail($id); $paket = PaketFoto::findOrFail($id);
$data = $request->validated(); $data = $request->validated();
$data['id_user'] = Auth::id();
if ($request->hasFile('foto')) { if ($request->hasFile('foto')) {
if ($paket->foto) { if ($paket->foto) {
Storage::disk('public')->delete($paket->foto); Storage::disk('public')->delete($paket->foto);
@ -49,6 +53,9 @@ public function update(FotoRequest $request, string $id)
public function destroy(string $id) public function destroy(string $id)
{ {
$paket = PaketFoto::findOrFail($id); $paket = PaketFoto::findOrFail($id);
if (Auth::user()->role !== 'admin_foto' && Auth::user()->role !== 'owner') {
return redirect()->back()->with('error', 'Anda tidak memiliki akses untuk menghapus paket ini!');
}
if ($paket->foto) { if ($paket->foto) {
Storage::disk('public')->delete($paket->foto); Storage::disk('public')->delete($paket->foto);
} }

5
app/Models/PaketFoto.php
View File

@ -18,10 +18,15 @@ class PaketFoto extends Model
'harga', 'harga',
'foto', 'foto',
'durasi', 'durasi',
'id_user',
]; ];
public function booking() public function booking()
{ {
return $this->hasMany(BookingFoto::class, 'id_paket'); return $this->hasMany(BookingFoto::class, 'id_paket');
} }
public function user()
{
return $this->belongsTo(User::class, 'id_user');
}
} }

4
app/Models/User.php
View File

@ -27,4 +27,8 @@ class User extends Authenticatable
'password', 'password',
'remember_token', 'remember_token',
]; ];
public function paketFotos()
{
return $this->hasMany(PaketFoto::class, 'id_user');
}
} }

28
database/migrations/2026_02_25_212053_add_id_user_to_paket_fotos_table.php Normal file
View File

@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('paket_fotos', function (Blueprint $table) {
$table->foreignId('id_user')->after('id_paket')->nullable()->constrained('users', 'id_user')->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('paket_fotos', function (Blueprint $table) {
//
});
}
};

8
resources/views/admin/paket-foto/index.blade.php
View File

@ -111,7 +111,7 @@
<span class="d-inline-block" data-bs-toggle="tooltip" <span class="d-inline-block" data-bs-toggle="tooltip"
title="Hanya dapat diakses oleh Admin Foto dan Pemilik"> title="Hanya dapat diakses oleh Admin Foto dan Pemilik">
<button class="btn icon btn-warning btn-action disabled" <button class="btn icon btn-warning btn-action disabled"
style="cursor: not-allowed !important; pointer-events: auto !important;" style="opacity: 0.5;cursor: not-allowed !important; pointer-events: auto !important;"
type="button" disabled> type="button" disabled>
<i class="bi bi-pencil"></i> <i class="bi bi-pencil"></i>
</button> </button>
@ -119,7 +119,7 @@
<span class="d-inline-block" data-bs-toggle="tooltip" <span class="d-inline-block" data-bs-toggle="tooltip"
title="Hanya dapat diakses oleh Admin Foto dan Pemilik"> title="Hanya dapat diakses oleh Admin Foto dan Pemilik">
<button class="btn icon btn-danger btn-action disabled" <button class="btn icon btn-danger btn-action disabled"
style="cursor: not-allowed !important; pointer-events: auto !important;" style="opacity: 0.5;cursor: not-allowed !important; pointer-events: auto !important;"
type="button" disabled> type="button" disabled>
<i class="bi bi-trash"></i> <i class="bi bi-trash"></i>
</button> </button>
@ -175,7 +175,7 @@
<span class="d-inline-block" data-bs-toggle="tooltip" <span class="d-inline-block" data-bs-toggle="tooltip"
title="Hanya dapat diakses oleh Admin Foto dan Pemilik"> title="Hanya dapat diakses oleh Admin Foto dan Pemilik">
<button class="btn icon btn-warning btn-action disabled" <button class="btn icon btn-warning btn-action disabled"
style="cursor: not-allowed !important; pointer-events: auto !important;" style="opacity: 0.5;cursor: not-allowed !important; pointer-events: auto !important;"
type="button" disabled> type="button" disabled>
<i class="bi bi-pencil"></i> <i class="bi bi-pencil"></i>
</button> </button>
@ -183,7 +183,7 @@
<span class="d-inline-block" data-bs-toggle="tooltip" <span class="d-inline-block" data-bs-toggle="tooltip"
title="Hanya dapat diakses oleh Admin Foto dan Pemilik"> title="Hanya dapat diakses oleh Admin Foto dan Pemilik">
<button class="btn icon btn-danger btn-action disabled" <button class="btn icon btn-danger btn-action disabled"
style="cursor: not-allowed !important; pointer-events: auto !important;" style="opacity: 0.5;cursor: not-allowed !important; pointer-events: auto !important;"
type="button" disabled> type="button" disabled>
<i class="bi bi-trash"></i> <i class="bi bi-trash"></i>
</button> </button>

2
resources/views/admin/paket-foto/partials/modal-show-foto.blade.php
View File

@ -61,6 +61,8 @@ class="custom-img-box-foto d-flex align-items-center justify-content-center text
</p> </p>
</div> </div>
</div> </div>
<p class="x-small text-muted mb-0">Terakhir diubah oleh:</strong>
{{ $f->user->nama ?? 'Admin' }}</p>
</div> </div>
</div> </div>
</div> </div>

51
resources/views/admin/pesanan/partials/modal-buket.blade.php
View File

@ -113,21 +113,48 @@ class="badge {{ $p->status_label->class }}">
</div> </div>
<div class="modal-footer border-top-0 pt-2 px-2"> <div class="modal-footer border-top-0 pt-2 px-2">
<div class="d-flex w-100 gap-2"> <div class="d-flex w-100 gap-2">
@php
$hasAccess = Auth::user()->role == 'admin_buket' || Auth::user()->role == 'pemilik';
@endphp
@if ($p->status_transaksi == 'menunggu_verifikasi') @if ($p->status_transaksi == 'menunggu_verifikasi')
<button type="button" class="btn btn-danger flex-fill tolak" @if ($hasAccess)
onclick="prosesBuket(this, 'tolak', '{{ $p->id_transaksi }}', 'buket')"> <button type="button" class="btn btn-danger flex-fill tolak"
Tolak Pesanan onclick="prosesBuket(this, 'tolak', '{{ $p->id_transaksi }}', 'buket')">
</button> Tolak Pesanan
</button>
@else
<button type="button" class="btn btn-danger flex-fill tolak disabled"
style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
title="Hanya Admin Buket dan Pemilik yang dapat menolak pesanan ini">
Tolak Pesanan
</button>
@endif
<button type="button" class="btn btn-success flex-fill terima" @if ($hasAccess)
onclick="prosesBuket(this, 'terima', '{{ $p->id_transaksi }}', 'buket')"> <button type="button" class="btn btn-success flex-fill terima"
Terima Pesanan onclick="prosesBuket(this, 'terima', '{{ $p->id_transaksi }}', 'buket')">
</button> Terima Pesanan
</button>
@else
<button type="button" class="btn btn-success flex-fill terima disabled"
style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
title="Hanya Admin Buket dan Pemilik yang dapat menerima pesanan ini">
Terima Pesanan
</button>
@endif
@elseif ($p->status_transaksi == 'diterima') @elseif ($p->status_transaksi == 'diterima')
<button type="button" class="btn btn-primary flex-fill terima" @if ($hasAccess)
onclick="prosesBuket(this, 'selesai', '{{ $p->id_transaksi }}', 'buket')"> <button type="button" class="btn btn-primary flex-fill terima"
Selesaikan Pesanan onclick="prosesBuket(this, 'selesai', '{{ $p->id_transaksi }}', 'buket')">
</button> Selesaikan Pesanan
</button>
@else
<button type="button" class="btn btn-primary flex-fill terima disabled"
style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
title="Hanya Admin Buket dan Pemilik yang dapat menyelesaikan pesanan ini">
Selesaikan Pesanan
</button>
@endif
@endif @endif
</div> </div>
</div> </div>

53
resources/views/admin/pesanan/partials/modal-foto.blade.php
View File

@ -108,21 +108,48 @@ class="badge {{ $p->status_label->class }}">
</div> </div>
<div class="modal-footer border-top-0 pt-2 px-2"> <div class="modal-footer border-top-0 pt-2 px-2">
<div class="d-flex w-100 gap-2"> <div class="d-flex w-100 gap-2">
@php
$hasAccess = Auth::user()->role == 'admin_foto' || Auth::user()->role == 'pemilik';
@endphp
@if ($p->status_booking == 'menunggu_verifikasi') @if ($p->status_booking == 'menunggu_verifikasi')
<button type="button" class="btn btn-danger flex-fill tolak" @if ($hasAccess)
onclick="prosesFoto(this, 'tolak', '{{ $p->id_booking }}', 'foto')"> <button type="button" class="btn btn-danger flex-fill tolak"
Tolak Pesanan onclick="prosesFoto(this, 'tolak', '{{ $p->id_booking }}', 'foto')">
</button> Tolak Pesanan
</button>
@else
<button type="button" class="btn btn-danger flex-fill tolak disabled"
style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
title="Hanya Admin Foto dan Pemilik yang dapat menolak pesanan ini">
Tolak Pesanan
</button>
@endif
<button type="button" class="btn btn-success flex-fill terima" @if ($hasAccess)
onclick="prosesFoto(this, 'terima', '{{ $p->id_booking }}', 'foto')"> <button type="button" class="btn btn-success flex-fill terima"
Terima Pesanan onclick="prosesFoto(this, 'terima', '{{ $p->id_booking }}', 'foto')">
</button> Terima Pesanan
@elseif ($p->status_booking == 'diterima') </button>
<button type="button" class="btn btn-primary flex-fill terima" @else
onclick="prosesFoto(this, 'selesai', '{{ $p->id_booking }}', 'foto')"> <button type="button" class="btn btn-success flex-fill terima disabled"
Selesaikan Pesanan style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
</button> title="Hanya Admin Foto dan Pemilik yang dapat menerima pesanan ini">
Terima Pesanan
</button>
@endif
@elseif ($p->status_transaksi == 'diterima')
@if ($hasAccess)
<button type="button" class="btn btn-primary flex-fill terima"
onclick="prosesFoto(this, 'selesai', '{{ $p->id_booking }}', 'foto')">
Selesaikan Pesanan
</button>
@else
<button type="button" class="btn btn-primary flex-fill terima disabled"
style="cursor: not-allowed !important; pointer-events: auto !important; opacity: 0.5;"
title="Hanya Admin Foto dan Pemilik yang dapat menyelesaikan pesanan ini">
Selesaikan Pesanan
</button>
@endif
@endif @endif
</div> </div>
</div> </div>

2
resources/views/admin/pesanan/partials/modal-riwayat-buket.blade.php
View File

@ -1,7 +1,7 @@
{{-- RIWAYAT BUKET --}} {{-- RIWAYAT BUKET --}}
<div class="modal fade text-left" id="riwayatBuket{{ $rb->id_transaksi }}" tabindex="-1" role="dialog" <div class="modal fade text-left" id="riwayatBuket{{ $rb->id_transaksi }}" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel1" aria-hidden="true"> aria-labelledby="myModalLabel1" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document"> <div class=" modal-xl" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

6
resources/views/layouts/admin.blade.php
View File

@ -97,7 +97,11 @@ class="sidebar-item {{ request()->is('admin/beranda', 'admin/beranda-pemilik') ?
style="min-width: 150px;"> style="min-width: 150px;">
<li class="dropdown-header text-center"> <li class="dropdown-header text-center">
<h6 class="mb-0 text-dark">{{ Auth::user()->username ?? 'Admin' }}</h6> <h6 class="mb-0 text-dark">{{ Auth::user()->username ?? 'Admin' }}</h6>
<small class="text-muted">{{ ucfirst(Auth::user()->role ?? 'Administrator') }}</small> <span
class="badge rounded-pill px-3 py-2 mt-2
{{ Auth::user()->role == 'admin_buket' ? 'bg-success-subtle' : 'bg-warning-subtle' }}">
{{ str_replace('_', ' ', Auth::user()->role) }}
</span>
</li> </li>
<li> <li>
<hr class="dropdown-divider mt-0"> <hr class="dropdown-divider mt-0">