diff --git a/Http/Controllers/ApprovalController.php b/Http/Controllers/ApprovalController.php index a0cfcd6..3d2d911 100644 --- a/Http/Controllers/ApprovalController.php +++ b/Http/Controllers/ApprovalController.php @@ -88,83 +88,48 @@ */ public function update(Request $request, $id) { + $_model = [ + 'Parameter Cabang' => 'Branch', + ]; try { $approval = Approval::findOrFail($id); $approval->approved_by = $this->user->id; $approval->approved_at = date('Y-m-d H:i:s'); $approval->status = $request->status; - $model = "Modules\\Cetaklabel\\Entities\\$approval->menu"; + $model = "Modules\\Writeoff\\Entities\\".$_model[$approval->menu]; $model = new $model(); //20555012,18 if ($approval->status == 1) { if ($approval->method == 'create') { - if ($approval->menu == 'CardboardDetail') { - $data = json_decode($approval->new_request, true); + $data = json_decode($approval->new_request, true); - $document_id = $data['document_id']; + $data['authorized_status'] = 1; + $data['authorized_by'] = $this->user->id; + $data['authorized_at'] = date('Y-m-d H:i:s'); - foreach ($document_id as $key => $value) { - $model = new $model(); - $_data['status'] = 1; - $_data['approved_by'] = $this->user->id; - $_data['approved_at'] = date('Y-m-d H:i:s'); - $_data['cardboard_id'] = $data['cardboard_id']; - $_data['document_id'] = $value; - - $model->fill($_data); - $model->save(); - } - } else { - $data = json_decode($approval->new_request, true); - - $data['status'] = 1; - $data['approved_by'] = $this->user->id; - $data['approved_at'] = date('Y-m-d H:i:s'); - - $model->fill($data); - $model->save(); - } + $model->fill($data); + $model->save(); } else if ($approval->method == 'update') { $old = json_decode($approval->old_request, true); $data = json_decode($approval->new_request, true); - $data['status'] = 1; - $data['approved_by'] = $this->user->id; - $data['approved_at'] = date('Y-m-d H:i:s'); + $data['authorized_status'] = 1; + $data['authorized_by'] = $this->user->id; + $data['authorized_at'] = date('Y-m-d H:i:s'); $model = $model::findOrFail($old['id']); - if ($approval->menu == 'CardboardDetail') { - $data = json_decode($approval->new_request, true); - - $document_id = $data['document_id']; - - foreach ($document_id as $key => $value) { - $model = new $model(); - $model = $model::findOrFail($data['cardboard_id']); - - $_data['status'] = 1; - $_data['approved_by'] = $this->user->id; - $_data['approved_at'] = date('Y-m-d H:i:s'); - $_data['cardboard_id'] = $data['cardboard_id']; - $_data['document_id'] = $value; - - $model->fill($_data); - $model->save(); - } - } else { - $model->fill($data); - $model->save(); - } + $model->fill($data); + $model->save(); } else if ($approval->method == 'delete') { $data = json_decode($approval->old_request, true); $model = $model::findOrFail($data['id']); $data_ = []; - $data_['status'] = 1; - $data_['approved_by'] = $this->user->id; - $data_['approved_at'] = date('Y-m-d H:i:s'); + $data_['authorized_status'] = 1; + $data_['authorized_by'] = $this->user->id; + $data_['authorized_at'] = date('Y-m-d H:i:s'); $model = $model::findOrFail($data['id']); $model->fill($data_); $model->save(); diff --git a/Livewire/Branch/BranchModal.php b/Livewire/Branch/BranchModal.php index 5ee0650..657c2ea 100644 --- a/Livewire/Branch/BranchModal.php +++ b/Livewire/Branch/BranchModal.php @@ -21,7 +21,7 @@ protected $listeners = [ 'delete' => 'delete', 'update' => 'update', - 'reload' => 'reload', + 'reload' => 'reload', ]; public function render() @@ -46,6 +46,10 @@ // Emit a success event with a message $branch = Branch::find($this->id); + $data['updated_by'] = auth()->user()->id; + $data['updated_at'] = now(); + + $approval = [ 'method' => 'update', 'menu' => 'Parameter Cabang', @@ -71,6 +75,10 @@ } } else { // Emit a success event with a message + + $data['created_by'] = auth()->user()->id; + $data['created_at'] = now(); + $approval = [ 'method' => 'create', 'menu' => 'Parameter Cabang', @@ -122,16 +130,20 @@ public function delete($id) { - $branch = Branch::find($id); - $old = $branch; - $branch->delete_by = auth()->user()->id; - $branch->deleted_at = now(); + $branch = Branch::find($id); + $old = $branch; + unset($old->deleted_at); + unset($old->deleted_by); + + $new = Branch::find($id); + $new->deleted_by = auth()->user()->id; + $new->deleted_at = now(); $approval = [ 'method' => 'delete', 'menu' => 'Parameter Cabang', 'old_request' => json_encode($old), - 'new_request' => json_encode($branch), + 'new_request' => json_encode($new), 'description' => 'Delete Parameter Cabang', 'status' => '0', 'ref' => $branch->kode diff --git a/Resources/views/approval/_form.blade.php b/Resources/views/approval/_form.blade.php index dbc40a4..a7d9a5f 100644 --- a/Resources/views/approval/_form.blade.php +++ b/Resources/views/approval/_form.blade.php @@ -23,15 +23,12 @@ @switch($value) @case (0) - Waiting Approval - @break + Tidak Aktif + @break @case (1) - Approved - @break - @case (3) - Rejected - @break - @endswitch + Aktif + @break + @endswitch @else @@ -43,8 +40,8 @@ {{ $v }} @endforeach @else - @if($key=='created_by' || $key=='updated_by' || $key=='deleted_by') - {{ get_user($authorization->created_by)->email.' ['.$value.']' }} + @if($key=='created_by' || $key=='updated_by' || $key=='deleted_by'|| $key=='authorized_by') + {{ get_user($authorization->created_by)->email.' ['.get_user($authorization->created_by)->name.']' }} @else {{ $value }} @endif @@ -78,13 +75,10 @@ @switch($value) @case (0) - Waiting Approval + Tidak Aktif @break @case (1) - Approved - @break - @case (3) - Rejected + Aktif @break @endswitch @@ -98,8 +92,8 @@ {{ $v }} @endforeach @else - @if($key=='created_by' || $key=='updated_by' || $key=='deleted_by') - {{ get_user($authorization->created_by)->email.' ['.$value.']' }} + @if($key=='created_by' || $key=='updated_by' || $key=='deleted_by'|| $key=='authorized_by') + {{ get_user($authorization->created_by)->email.' ['.get_user($authorization->created_by)->name.']' }} @else {{ $value }} @endif @@ -164,13 +158,21 @@ } }).then((result) => { if (result.isConfirmed) { - swal.fire({ - title: "Success!", - text: "{{ $authorization->description }} Berhasil Ditolak.", - icon: "success", - confirmButtonClass: 'btn btn-primary', - buttonsStyling: false, - }) + $.ajax({ + type: "POST", + url: form.attr('action'), + data: form.serialize(), // serializes the form's elements. + success: function (data) { + swal.fire({ + title: "Success!", + text: "{{ $authorization->description }} Berhasil Ditolak.", + icon: "success", + confirmButtonClass: 'btn btn-primary', + buttonsStyling: false, + }); + window.location.href = "{{ route('authorization.index') }}" + } + }); } }) @@ -191,13 +193,24 @@ confirmButtonText: 'Yes, Approve It!' }).then((result) => { if (result.isConfirmed) { - swal.fire({ - title: "Success!", - text: "{{ $authorization->description }} Berhasil Di Approve.", - icon: "success", - confirmButtonClass: 'btn btn-primary', - buttonsStyling: false, - }) + $.ajax({ + type: "POST", + url: form.attr('action'), + data: form.serialize(), // serializes the form's elements. + success: function (data) { + swal.fire({ + title: "Success!", + text: "{{ $authorization->description }} Berhasil Di Approve.", + icon: "success", + confirmButtonClass: 'btn btn-primary', + buttonsStyling: false, + }).then(function (result) { + if (result.value) { + window.location.href = "{{ route('authorization.index') }}" + } + }); + } + }); } }) })