From 79b605b937a2006327056fc3a789b9479b18da06 Mon Sep 17 00:00:00 2001 From: daengdeni Date: Wed, 17 Jan 2024 11:34:12 +0700 Subject: [PATCH] update approval jenis fasilitas --- Http/Controllers/ApprovalController.php | 19 ++++++++++--------- Livewire/FacilityType/FacilityTypeModal.php | 11 ++++++++++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Http/Controllers/ApprovalController.php b/Http/Controllers/ApprovalController.php index 6c128c6..b0d209d 100644 --- a/Http/Controllers/ApprovalController.php +++ b/Http/Controllers/ApprovalController.php @@ -89,14 +89,15 @@ public function update(Request $request, $id) { $_model = [ - 'Parameter Cabang' => 'Branch', - 'Parameter Mata Uang' => 'Currency', - 'Parameter Jenis Jaminan' => 'GuaranteeType', + 'Parameter Cabang' => 'Branch', + 'Parameter Mata Uang' => 'Currency', + 'Parameter Jenis Jaminan' => 'GuaranteeType', + 'Parameter Jenis Fasilitas' => 'FacilityType' ]; try { $approval = Approval::findOrFail($id); $approval->approved_by = $this->user->id; - $approval->approved_at = date('Y-m-d H:i:s'); + $approval->approved_at = date('Y - m - d H:i:s'); $approval->status = $request->status; $model = "Modules\\Writeoff\\Entities\\" . $_model[$approval->menu]; @@ -108,7 +109,7 @@ $data['authorized_status'] = 1; $data['authorized_by'] = $this->user->id; - $data['authorized_at'] = date('Y-m-d H:i:s'); + $data['authorized_at'] = date('Y - m - d H:i:s'); $model->fill($data); $model->save(); @@ -119,7 +120,7 @@ $data['authorized_status'] = 1; $data['authorized_by'] = $this->user->id; - $data['authorized_at'] = date('Y-m-d H:i:s'); + $data['authorized_at'] = date('Y - m - d H:i:s'); $model = $model::findOrFail($old['id']); $model->fill($data); @@ -131,7 +132,7 @@ $data_ = []; $data_['authorized_status'] = 1; $data_['authorized_by'] = $this->user->id; - $data_['authorized_at'] = date('Y-m-d H:i:s'); + $data_['authorized_at'] = date('Y - m - d H:i:s'); $model = $model::findOrFail($data['id']); $model->fill($data_); $model->save(); @@ -143,10 +144,10 @@ echo json_encode([ 'status' => 'success', - 'message' => 'Approval ' . $approval->description . ' successfully.' + 'message' => 'Approval ' . $approval->description . ' successfully . ' ]); } catch (Exception $e) { - echo json_encode(['status' => 'error', 'message' => 'Approval ' . $approval->description . ' failed.']); + echo json_encode(['status' => 'error', 'message' => 'Approval ' . $approval->description . ' failed . ']); } } diff --git a/Livewire/FacilityType/FacilityTypeModal.php b/Livewire/FacilityType/FacilityTypeModal.php index 28efc7b..5b99d4c 100644 --- a/Livewire/FacilityType/FacilityTypeModal.php +++ b/Livewire/FacilityType/FacilityTypeModal.php @@ -21,7 +21,7 @@ protected $listeners = [ 'delete' => 'delete', 'update' => 'update', - 'reload' => 'reload', + 'reload' => 'reload', ]; public function render() @@ -46,6 +46,9 @@ // Emit a success event with a message $facility = FacilityType::find($this->id); + $data['updated_by'] = auth()->user()->id; + $data['updated_at'] = now(); + $approval = [ 'method' => 'update', 'menu' => 'Parameter Jenis Fasilitas', @@ -70,6 +73,8 @@ $this->dispatch('success', 'Data Berhasil Di Update, Menunggu Approval'); } } else { + $data['created_by'] = auth()->user()->id; + $data['created_at'] = now(); // Emit a success event with a message $approval = [ 'method' => 'create', @@ -115,6 +120,10 @@ public function delete($id) { + $old = FacilityType::find($id); + unset($old->deleted_at); + unset($old->deleted_by); + $facility = FacilityType::find($id); $facility->delete_by = auth()->user()->id; $facility->deleted_at = now();