From ef4c563141e6b071e125aaaa2f278a8a4a0179e1 Mon Sep 17 00:00:00 2001 From: Gunawan19621 Date: Tue, 21 Nov 2023 13:46:49 +0700 Subject: [PATCH] Perbaikan disposal, peminjaman dan pengembalian --- app/Http/Controllers/CustomerController.php | 2 +- app/Http/Controllers/DisposalController.php | 56 ++++++++-- .../Controllers/KondisiPetiController.php | 2 +- app/Http/Controllers/M_userController.php | 2 +- app/Http/Controllers/PeminjamanController.php | 13 ++- .../Controllers/PengembalianController.php | 6 +- app/Http/Controllers/PetiController.php | 2 +- .../Controllers/PetternLotPetiController.php | 1 + app/Http/Controllers/RoleController.php | 2 +- app/Http/Controllers/TransferController.php | 6 +- app/Http/Controllers/TypePetiController.php | 2 +- app/Http/Controllers/WarehouseController.php | 2 +- .../Disposal/ValidasiCreateDisposal.php | 6 +- .../Disposal/ValidasiUpdateDisposal.php | 17 ++- .../Requests/ValidasiUpdatePengembalian.php | 1 + app/Models/Disposal.php | 3 +- app/Models/Transfer.php | 1 + app/Models/asset_status.php | 2 + .../2023_11_06_085238_create_petis_table.php | 1 + ..._06_122033_create_asset_statuses_table.php | 3 + ...23_11_08_132316_create_transfers_table.php | 11 +- ...23_11_17_075418_create_disposals_table.php | 7 +- .../views/dashboard/Disposal/create.blade.php | 22 ++-- .../views/dashboard/Disposal/edit.blade.php | 27 +++-- .../views/dashboard/Disposal/index.blade.php | 4 +- .../dashboard/Peminjaman/index.blade.php | 30 +----- .../dashboard/Pengembalian/edit.blade.php | 2 +- .../dashboard/Pengembalian/index.blade.php | 101 +++++++++--------- .../views/dashboard/Transfer/create.blade.php | 10 +- routes/web.php | 2 +- 30 files changed, 203 insertions(+), 143 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index cbb3849..95422cd 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -18,7 +18,7 @@ class CustomerController extends Controller public function index() { $data = [ - 'customer' => Customer::all(), + 'customer' => Customer::orderBy('created_at', 'desc')->get(), 'active' => 'menu-customer', ]; return view('dashboard.Master_Data.Customer.index', $data); diff --git a/app/Http/Controllers/DisposalController.php b/app/Http/Controllers/DisposalController.php index 7cb9662..6915ba1 100644 --- a/app/Http/Controllers/DisposalController.php +++ b/app/Http/Controllers/DisposalController.php @@ -4,18 +4,20 @@ namespace App\Http\Controllers; use App\Models\Peti; use App\Models\Customer; +use App\Models\Disposal; use App\Models\m_warehouse; use Illuminate\Http\Request; +use Symfony\Component\Uid\Uuid; use Illuminate\Support\Facades\Auth; use App\Http\Requests\Disposal\ValidasiCreateDisposal; -use App\Models\Disposal; +use App\Http\Requests\Disposal\ValidasiUpdateDisposal; class DisposalController extends Controller { public function index() { $data = [ - 'disposal' => Disposal::all(), + 'disposal' => Disposal::orderBy('created_at', 'desc')->get(), 'active' => 'menu-disposal', ]; return view('dashboard.Disposal.index', $data); @@ -42,6 +44,7 @@ class DisposalController extends Controller public function store(ValidasiCreateDisposal $request) { // dd($request->all()); + // dd($request); try { // Mendapatkan informasi pengguna yang sedang login $currentUser = Auth::user(); @@ -50,11 +53,18 @@ class DisposalController extends Controller $validatedData = $request->validated(); // Menambahkan informasi pengguna ke dalam data yang akan disimpan + $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile $validatedData['created_by'] = $currentUser->fullname; $validatedData['updated_by'] = $currentUser->fullname; - // Membuat entitas Transfer - Disposal::create($validatedData); + // Membuat entitas Disposal + $disposal = Disposal::create($validatedData); + + // Mengupdate warehouse_id pada model Peti + Peti::where('id', $disposal->peti_id) + ->update([ + 'status' => $disposal->status_disposal, + ]); return redirect()->route('dashboard.disposal.index')->with('success', 'Data Disposal Peti berhasil ditambahkan'); } catch (\Throwable $th) { @@ -92,10 +102,40 @@ class DisposalController extends Controller /** * Update the specified resource in storage. */ - // public function update($request, $id) - // { - // // - // } + public function update(ValidasiUpdateDisposal $request, $id) + { + // dd("oke"); + try { + // Mendapatkan informasi pengguna yang sedang login + $currentUser = Auth::user(); + + // Validasi data dari request + $validatedData = $request->validated(); + + // Menambahkan informasi pengguna ke dalam data yang akan disimpan + $validatedData['updated_by'] = $currentUser->fullname; + + // Mencari transfer berdasarkan ID + $disposal = Disposal::find($id); + + if (!$disposal) { + return redirect()->route('dashboard.disposal.index')->with('error', 'Data Disposal Peti tidak ditemukan'); + } + + // Memperbarui data transfer + $disposal->update($validatedData); + + // Mengupdate warehouse_id pada model Peti + Peti::where('id', $disposal->peti_id) + ->update([ + 'status' => $disposal->status_disposal, + ]); + + return redirect()->route('dashboard.disposal.index')->with('success', 'Data Disposal Peti berhasil diperbaharui'); + } catch (\Throwable $th) { + return redirect()->back()->with('error', 'Data Disposal Peti gagal diperbaharui'); + } + } /** * Remove the specified resource from storage. diff --git a/app/Http/Controllers/KondisiPetiController.php b/app/Http/Controllers/KondisiPetiController.php index bb2e4ff..76a341a 100644 --- a/app/Http/Controllers/KondisiPetiController.php +++ b/app/Http/Controllers/KondisiPetiController.php @@ -13,7 +13,7 @@ class KondisiPetiController extends Controller public function index() { $data = [ - 'kondisiPeti' => Kondisi_Peti::all(), + 'kondisiPeti' => Kondisi_Peti::orderBy('created_at', 'desc')->get(), 'active' => 'menu-kondisipeti' ]; return view('dashboard.Master_Data.Manajemen_Peti.Kondisi_Peti.index', $data); diff --git a/app/Http/Controllers/M_userController.php b/app/Http/Controllers/M_userController.php index 9d39ad3..01ce030 100644 --- a/app/Http/Controllers/M_userController.php +++ b/app/Http/Controllers/M_userController.php @@ -17,9 +17,9 @@ class M_userController extends Controller public function index() { $data = [ + 'user' => User::orderBy('created_at', 'desc')->get(), 'warehouse' => m_warehouse::get(), 'role' => m_role::get(), - 'user' => User::get(), 'active' => 'menu-user', ]; return view('dashboard.Master_Data.User.index', $data); diff --git a/app/Http/Controllers/PeminjamanController.php b/app/Http/Controllers/PeminjamanController.php index c5d4e46..64871ec 100644 --- a/app/Http/Controllers/PeminjamanController.php +++ b/app/Http/Controllers/PeminjamanController.php @@ -5,12 +5,10 @@ namespace App\Http\Controllers; use App\Http\Requests\ValidasiCreatePeminjaman; use App\Http\Requests\ValidasiUpdatePeminjaman; use App\Models\Peti; -use App\Models\m_asset; use App\Models\m_warehouse; use App\Models\asset_status; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use SimpleSoftwareIO\QrCode\Facades\QrCode; +use Symfony\Component\Uid\Uuid; class PeminjamanController extends Controller { @@ -22,7 +20,7 @@ class PeminjamanController extends Controller $data = [ // 'peminjaman' => asset_status::get(), - 'peminjaman' => asset_status::get(), + 'peminjaman' => asset_status::orderBy('created_at', 'desc')->get(), 'warehouse' => m_warehouse::get(), 'active' => 'menu-peminjaman', ]; @@ -39,7 +37,10 @@ class PeminjamanController extends Controller 'peti' => Peti::all(), 'peminjaman' => asset_status::get(), 'warehouse' => m_warehouse::get(), - 'peti_block' => Peti::whereNotIn('id', asset_status::pluck('peti_id')->toArray())->get(), + 'peti_block' => Peti::whereNotIn('id', asset_status::where('status', 0)->pluck('peti_id')->toArray()) + ->where('status', 'AKTIF') // Sesuaikan dengan nama kolom yang benar + ->get(), + 'existingPeti' => asset_status::pluck('peti_id')->toArray(), 'active' => 'menu-peminjaman', ]; @@ -56,8 +57,10 @@ class PeminjamanController extends Controller $validatedData = $request->except('_token'); $validatedData['exit_pic'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai created_by + $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile $validatedData['created_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai created_by $validatedData['updated_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai updated_by + // dd($validatedData); asset_status::create($validatedData); return redirect()->route('dashboard.peminjaman.index')->with('success', 'Data peminjaman berhasil ditambah.'); diff --git a/app/Http/Controllers/PengembalianController.php b/app/Http/Controllers/PengembalianController.php index 3b8f037..0838a58 100644 --- a/app/Http/Controllers/PengembalianController.php +++ b/app/Http/Controllers/PengembalianController.php @@ -14,7 +14,7 @@ class PengembalianController extends Controller public function index() { $data = [ - 'peminjaman' => asset_status::all(), + 'peminjaman' => asset_status::orderBy('created_at', 'desc')->get(), 'active' => 'menu-pengembalian', ]; return view('dashboard.Pengembalian.index', $data); @@ -76,7 +76,9 @@ class PengembalianController extends Controller $peminjaman->enter_at = $request->input('enter_at'); $peminjaman->enter_warehouse = $request->input('enter_warehouse'); $peminjaman->kondisi_peti = $request->input('kondisi_peti'); - + // Mengatur status menjadi 0 secara otomatis + $peminjaman->status = 0; + // dd($peminjaman); $peminjaman->save(); return redirect()->route('dashboard.pengembalian.index')->with('success', 'Data peminjaman berhasil diperbaharui'); diff --git a/app/Http/Controllers/PetiController.php b/app/Http/Controllers/PetiController.php index 47775ea..8b9aaba 100644 --- a/app/Http/Controllers/PetiController.php +++ b/app/Http/Controllers/PetiController.php @@ -24,8 +24,8 @@ class PetiController extends Controller public function index() { $data = [ + 'peti' => Peti::orderBy('created_at', 'desc')->get(), 'kondisiPeti' => Kondisi_Peti::all(), - 'peti' => Peti::all(), 'active' => 'menu-peti', ]; return view('dashboard.Master_Data.Manajemen_Peti.Peti.index', $data); diff --git a/app/Http/Controllers/PetternLotPetiController.php b/app/Http/Controllers/PetternLotPetiController.php index f273592..852dc76 100644 --- a/app/Http/Controllers/PetternLotPetiController.php +++ b/app/Http/Controllers/PetternLotPetiController.php @@ -12,6 +12,7 @@ class PetternLotPetiController extends Controller public function index() { $data = [ + // 'warehouses' => m_warehouse::orderBy('created_at', 'desc')->get(), 'peti' => Peti::get(), 'active' => 'menu-Pettern_Lot_Peti' ]; diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index 6532e4a..23362b4 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -16,7 +16,7 @@ class RoleController extends Controller public function index() { $data = [ - 'role' => m_role::all(), + 'role' => m_role::orderBy('created_at', 'desc')->get(), 'active' => 'menu-role', ]; return view('dashboard.Master_Data.Role.index', $data); diff --git a/app/Http/Controllers/TransferController.php b/app/Http/Controllers/TransferController.php index 6e4b6a3..4c20870 100644 --- a/app/Http/Controllers/TransferController.php +++ b/app/Http/Controllers/TransferController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Peti; +use Symfony\Component\Uid\Uuid; use App\Models\Customer; use App\Models\Transfer; use App\Models\m_warehouse; @@ -16,7 +17,7 @@ class TransferController extends Controller public function index() { $data = [ - 'transfer' => Transfer::all(), + 'transfer' => Transfer::orderBy('created_at', 'desc')->get(), 'active' => 'menu-transfer', ]; return view('dashboard.Transfer.index', $data); @@ -50,12 +51,13 @@ class TransferController extends Controller $validatedData = $request->validated(); // Menambahkan informasi pengguna ke dalam data yang akan disimpan + $validatedData['mobile_id'] = Uuid::v4(); // Menambahkan ID Mobile $validatedData['created_by'] = $currentUser->fullname; $validatedData['updated_by'] = $currentUser->fullname; // Membuat entitas Transfer $transfer = Transfer::create($validatedData); - + // dd($transfer); // Mengupdate warehouse_id pada model Peti Peti::where('id', $transfer->peti_id) ->update([ diff --git a/app/Http/Controllers/TypePetiController.php b/app/Http/Controllers/TypePetiController.php index 9a2c492..c3045ad 100644 --- a/app/Http/Controllers/TypePetiController.php +++ b/app/Http/Controllers/TypePetiController.php @@ -16,7 +16,7 @@ class TypePetiController extends Controller public function index() { $data = [ - 'typepeti' => Type_peti::all(), + 'typepeti' => Type_peti::orderBy('created_at', 'desc')->get(), 'active' => 'menu-typepeti', ]; return view('dashboard.Master_Data.Manajemen_Peti.Type_peti.index', $data); diff --git a/app/Http/Controllers/WarehouseController.php b/app/Http/Controllers/WarehouseController.php index 580ebd3..0c2697d 100644 --- a/app/Http/Controllers/WarehouseController.php +++ b/app/Http/Controllers/WarehouseController.php @@ -16,7 +16,7 @@ class WarehouseController extends Controller public function index() { $data = [ - 'warehouses' => m_warehouse::all(), + 'warehouses' => m_warehouse::orderBy('created_at', 'desc')->get(), 'active' => 'menu-warehouse', ]; return view('dashboard.Master_Data.Warehouse.index', $data); diff --git a/app/Http/Requests/Disposal/ValidasiCreateDisposal.php b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php index 77429c6..5090760 100644 --- a/app/Http/Requests/Disposal/ValidasiCreateDisposal.php +++ b/app/Http/Requests/Disposal/ValidasiCreateDisposal.php @@ -22,12 +22,12 @@ class ValidasiCreateDisposal extends FormRequest public function rules(): array { return [ - 'peti_id' => 'nullable', + 'peti_id' => 'required', 'customer_id' => 'nullable', 'warehouse_id' => 'nullable', 'date_disposal' => 'nullable|date', 'description' => 'nullable|string', - 'jenis_disposal' => 'nullable|string|max:50', + 'status_disposal' => 'nullable', ]; } @@ -36,8 +36,6 @@ class ValidasiCreateDisposal extends FormRequest return [ 'date_disposal.date' => 'Format tanggal disposal tidak valid.', 'description.string' => 'Deskripsi harus berupa teks.', - 'jenis_disposal.string' => 'Jenis disposal harus berupa teks.', - 'jenis_disposal.max' => 'Jenis disposal tidak boleh lebih dari :max karakter.', ]; } } diff --git a/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php index 66e086d..e400920 100644 --- a/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php +++ b/app/Http/Requests/Disposal/ValidasiUpdateDisposal.php @@ -11,7 +11,7 @@ class ValidasiUpdateDisposal extends FormRequest */ public function authorize(): bool { - return false; + return true; } /** @@ -22,7 +22,20 @@ class ValidasiUpdateDisposal extends FormRequest public function rules(): array { return [ - // + 'peti_id' => 'required', + 'customer_id' => 'nullable', + 'warehouse_id' => 'nullable', + 'date_disposal' => 'nullable|date', + 'description' => 'nullable|string', + 'status_disposal' => 'nullable', + ]; + } + + public function messages(): array + { + return [ + 'date_disposal.date' => 'Format tanggal disposal tidak valid.', + 'description.string' => 'Deskripsi harus berupa teks.', ]; } } diff --git a/app/Http/Requests/ValidasiUpdatePengembalian.php b/app/Http/Requests/ValidasiUpdatePengembalian.php index aadc956..6183ba7 100644 --- a/app/Http/Requests/ValidasiUpdatePengembalian.php +++ b/app/Http/Requests/ValidasiUpdatePengembalian.php @@ -29,6 +29,7 @@ class ValidasiUpdatePengembalian extends FormRequest 'enter_at' => 'required|date', 'enter_warehouse' => 'required', 'kondisi_peti' => 'required|string', + 'status' => '', ]; } diff --git a/app/Models/Disposal.php b/app/Models/Disposal.php index bc463cd..966bf75 100644 --- a/app/Models/Disposal.php +++ b/app/Models/Disposal.php @@ -13,12 +13,13 @@ class Disposal extends Model protected $table = 'disposals'; protected $fillable = [ + 'mobile_id', 'peti_id', 'customer_id', 'date_disposal', 'warehouse_id', 'description', - 'jenis_disposal', + 'status_disposal', 'created_by', 'updated_by', ]; diff --git a/app/Models/Transfer.php b/app/Models/Transfer.php index e063ca7..2372bd2 100644 --- a/app/Models/Transfer.php +++ b/app/Models/Transfer.php @@ -14,6 +14,7 @@ class Transfer extends Model protected $table = 'transfers'; protected $fillable = [ + 'mobile_id', 'peti_id', 'source_warehouse', 'destination_warehouse', diff --git a/app/Models/asset_status.php b/app/Models/asset_status.php index 8b8f121..e5e5a66 100644 --- a/app/Models/asset_status.php +++ b/app/Models/asset_status.php @@ -15,6 +15,7 @@ class asset_status extends Model protected $table = 'asset_statuses'; protected $fillable = [ + 'mobile_id', 'peti_id', 'exit_at', 'est_pengembalian', @@ -24,6 +25,7 @@ class asset_status extends Model 'enter_pic', 'enter_warehouse', 'kondisi_peti', + 'status', 'created_by', 'updated_by', ]; diff --git a/database/migrations/2023_11_06_085238_create_petis_table.php b/database/migrations/2023_11_06_085238_create_petis_table.php index e43e795..4532dc4 100644 --- a/database/migrations/2023_11_06_085238_create_petis_table.php +++ b/database/migrations/2023_11_06_085238_create_petis_table.php @@ -23,6 +23,7 @@ return new class extends Migration $table->date('date_pembuatan', 100)->nullable(); $table->foreignUuid('warehouse_id')->nullable()->constrained('m_warehouses')->onDelete('set null'); $table->foreignUuid('kondisipeti_id')->nullable()->constrained('kondisi_petis')->onDelete('set null'); + $table->string('status', 50)->default('AKTIF'); $table->timestamps(); $table->softDeletes(); $table->string('created_by', 200)->nullable(); diff --git a/database/migrations/2023_11_06_122033_create_asset_statuses_table.php b/database/migrations/2023_11_06_122033_create_asset_statuses_table.php index 72f42ad..cade79b 100644 --- a/database/migrations/2023_11_06_122033_create_asset_statuses_table.php +++ b/database/migrations/2023_11_06_122033_create_asset_statuses_table.php @@ -13,6 +13,7 @@ return new class extends Migration { Schema::create('asset_statuses', function (Blueprint $table) { $table->uuid('id')->primary(); + $table->uuid('mobile_id')->nullable(); $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null'); $table->date('exit_at')->nullable(); $table->date('est_pengembalian')->nullable(); @@ -22,6 +23,8 @@ return new class extends Migration $table->string('enter_pic', 200)->nullable(); $table->foreignUuid('enter_warehouse')->nullable()->constrained('m_warehouses'); $table->string('kondisi_peti')->nullable(); + // $table->string('status')->default('DIPINJAM'); + $table->boolean('status')->default(1); $table->timestamps(); $table->softDeletes(); $table->string('created_by', 200)->nullable(); diff --git a/database/migrations/2023_11_08_132316_create_transfers_table.php b/database/migrations/2023_11_08_132316_create_transfers_table.php index 4cca93b..8409fbc 100644 --- a/database/migrations/2023_11_08_132316_create_transfers_table.php +++ b/database/migrations/2023_11_08_132316_create_transfers_table.php @@ -13,11 +13,12 @@ return new class extends Migration { Schema::create('transfers', function (Blueprint $table) { $table->uuid('id')->primary(); - $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null'); - $table->foreignUuid('name_customer')->nullable()->constrained('customers'); - $table->foreignUuid('source_warehouse')->nullable()->constrained('m_warehouses'); - $table->foreignUuid('destination_warehouse')->nullable()->constrained('m_warehouses'); - $table->date('date')->nullable(); + $table->uuid('mobile_id')->nullable(); + $table->foreignUuid('peti_id')->constrained('petis'); + $table->foreignUuid('name_customer')->constrained('customers'); + $table->foreignUuid('source_warehouse')->constrained('m_warehouses'); + $table->foreignUuid('destination_warehouse')->constrained('m_warehouses'); + $table->date('date'); $table->timestamps(); $table->softDeletes(); $table->string('created_by', 200)->nullable(); diff --git a/database/migrations/2023_11_17_075418_create_disposals_table.php b/database/migrations/2023_11_17_075418_create_disposals_table.php index f734f9b..a1e684c 100644 --- a/database/migrations/2023_11_17_075418_create_disposals_table.php +++ b/database/migrations/2023_11_17_075418_create_disposals_table.php @@ -13,12 +13,13 @@ return new class extends Migration { Schema::create('disposals', function (Blueprint $table) { $table->uuid('id')->primary(); - $table->foreignUuid('peti_id')->nullable()->constrained('petis')->onDelete('set null'); + $table->uuid('mobile_id')->nullable(); + $table->foreignUuid('peti_id')->constrained('petis'); $table->foreignUuid('customer_id')->nullable()->constrained('customers'); $table->foreignUuid('warehouse_id')->nullable()->constrained('m_warehouses'); - $table->date('date_disposal')->nullable(); + $table->date('date_disposal'); $table->text('description')->nullable(); - $table->string('jenis_disposal', 50)->nullable(); + $table->string('status_disposal', 50); $table->timestamps(); $table->softDeletes(); $table->string('created_by', 200)->nullable(); diff --git a/resources/views/dashboard/Disposal/create.blade.php b/resources/views/dashboard/Disposal/create.blade.php index 5bd4587..f3c63a9 100644 --- a/resources/views/dashboard/Disposal/create.blade.php +++ b/resources/views/dashboard/Disposal/create.blade.php @@ -27,7 +27,7 @@ - @foreach ($customer as $data_customer) @@ -37,27 +37,27 @@ + value="{{ old('date_disposal') }}" required> - @foreach ($warehouse as $data) @endforeach - - + - - +
Kembali diff --git a/resources/views/dashboard/Disposal/edit.blade.php b/resources/views/dashboard/Disposal/edit.blade.php index fa89605..7b8fd0f 100644 --- a/resources/views/dashboard/Disposal/edit.blade.php +++ b/resources/views/dashboard/Disposal/edit.blade.php @@ -11,9 +11,10 @@
-
@csrf + @method('PUT')
@@ -44,10 +45,6 @@ - - - - - + --}} + - + + + +
Kembali diff --git a/resources/views/dashboard/Disposal/index.blade.php b/resources/views/dashboard/Disposal/index.blade.php index 01a3b49..50686ca 100644 --- a/resources/views/dashboard/Disposal/index.blade.php +++ b/resources/views/dashboard/Disposal/index.blade.php @@ -71,7 +71,7 @@ Nama Customer Tanggal Disposal Alasan Disposal - Jenis Disposal + Status Peti Action @@ -86,7 +86,7 @@ {{ $data_disposal->customer->name }} {{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d/m/Y') }} {{ $data_disposal->description }} - {{ $data_disposal->jenis_disposal }} + {{ $data_disposal->status_disposal }} diff --git a/resources/views/dashboard/Peminjaman/index.blade.php b/resources/views/dashboard/Peminjaman/index.blade.php index ff15e53..8579a8a 100644 --- a/resources/views/dashboard/Peminjaman/index.blade.php +++ b/resources/views/dashboard/Peminjaman/index.blade.php @@ -57,6 +57,10 @@ {{ $data_peminjaman->exit_pic }} {{ $data_peminjaman->warehouse->name }} + + + @@ -75,32 +79,6 @@ @endif - {{-- - {{ $no_peminjaman++ }} - {{ $data_peminjaman->peti->fix_lot }} - {{ $data_peminjaman->peti->customer->name }} - {{ $data_peminjaman->peti->customer->code_customer }} - - {{ $data_peminjaman->peti->tipe_peti->type }} - {{ \Carbon\Carbon::parse($data_peminjaman->exit_at)->format('d/m/Y') }} - {{ $data_peminjaman->exit_pic }} - {{ $data_peminjaman->warehouse->name }} - - - - - - @csrf - @method('DELETE') - - - - --}} @empty

Data Kosong

@endforelse diff --git a/resources/views/dashboard/Pengembalian/edit.blade.php b/resources/views/dashboard/Pengembalian/edit.blade.php index 0c74c17..6f5bbed 100644 --- a/resources/views/dashboard/Pengembalian/edit.blade.php +++ b/resources/views/dashboard/Pengembalian/edit.blade.php @@ -62,7 +62,7 @@ pattern="[^0-9]+" oninput="this.value=this.value.replace(/[0-9]/g,'');" required>
- Kembali + Kembali
diff --git a/resources/views/dashboard/Pengembalian/index.blade.php b/resources/views/dashboard/Pengembalian/index.blade.php index 42f8f04..f4a7797 100644 --- a/resources/views/dashboard/Pengembalian/index.blade.php +++ b/resources/views/dashboard/Pengembalian/index.blade.php @@ -40,55 +40,58 @@ $no_peminjaman = 1; @endphp @forelse ($peminjaman as $data) - - {{ $no_peminjaman++ }} - {{ $data->peti->fix_lot }} - {{ $data->peti->customer->name }} - {{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} - {{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} - {{ $data->exit_pic }} - {{ $data->warehouse->name }} - - @if ($data->enter_at) - {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }} - @else -

-

- @endif - - - @if ($data->enter_pic) - {{ $data->enter_pic }} - @else -

-

- @endif - - - @if ($data->enter_warehouse) - {{ $data->warehouse->name }} - @else -

-

- @endif - - - @if ($data->kondisi_peti) - {{ $data->kondisi_peti }} - @else -

-

- @endif - - - @if ($data->enter_warehouse === null) - Not Return - @else - Return - @endif - - - - - - - + @if ($data->enter_warehouse !== null) + + {{ $no_peminjaman++ }} + {{ $data->peti->fix_lot }} + {{ $data->peti->customer->name }} + {{ \Carbon\Carbon::parse($data->exit_at)->format('d/m/Y') }} + {{ \Carbon\Carbon::parse($data->est_pengembalian)->format('d/m/Y') }} + {{ $data->exit_pic }} + {{ $data->warehouse->name }} + + @if ($data->enter_at) + {{ \Carbon\Carbon::parse($data->enter_at)->format('d-m-Y') }} + @else +

-

+ @endif + + + @if ($data->enter_pic) + {{ $data->enter_pic }} + @else +

-

+ @endif + + + @if ($data->enter_warehouse) + {{ $data->warehouse->name }} + @else +

-

+ @endif + + + @if ($data->kondisi_peti) + {{ $data->kondisi_peti }} + @else +

-

+ @endif + + + @if ($data->enter_warehouse === null) + Not Return + @else + Return + @endif + + + + + + + + @endif @empty

Data Kosong

@endforelse diff --git a/resources/views/dashboard/Transfer/create.blade.php b/resources/views/dashboard/Transfer/create.blade.php index b56530b..78fb6cf 100644 --- a/resources/views/dashboard/Transfer/create.blade.php +++ b/resources/views/dashboard/Transfer/create.blade.php @@ -28,10 +28,11 @@ - + - @foreach ($customer as $data_customer) @@ -40,15 +41,16 @@ - @foreach ($warehouse as $data) @endforeach + - @foreach ($warehouse as $data) diff --git a/routes/web.php b/routes/web.php index deeccf9..9c60812 100644 --- a/routes/web.php +++ b/routes/web.php @@ -87,7 +87,7 @@ Route::prefix('dashboard')->name('dashboard.')->middleware(['auth'])->group(func Route::post('disposal/store', 'store')->name('disposal.store'); // Route::get('disposal/{id}', 'show')->name('disposal.show'); Route::get('disposal/{id}/edit', 'edit')->name('disposal.edit'); - // Route::put('disposal/{id}', 'update')->name('disposal.update'); + Route::put('disposal/{id}', 'update')->name('disposal.update'); Route::delete('disposal/delete/{id}', 'destroy')->name('disposal.destroy'); });