Fix Update Detail Pembayaran dan Detail Penagihan

This commit is contained in:
daengdeni 2024-03-21 13:56:31 +07:00
parent d6cfdc12e8
commit d51f85c313
6 changed files with 108 additions and 17 deletions

View File

@ -25,7 +25,7 @@
return (new EloquentDataTable($query))->filter(function ($query) { return (new EloquentDataTable($query))->filter(function ($query) {
if (request()->has('search')) { if (request()->has('search')) {
$search = request()->get('search'); $search = request()->get('search');
$query->where('nomor_pinjaman', 'like', "%" . $search['value'] . "%"); $query->where('nomor_pinjaman', 'like', "%" . request()->segment(3) . "%");
} }
})->addIndexColumn()->editColumn('tanggal_pembayaran', function ($row) { })->addIndexColumn()->editColumn('tanggal_pembayaran', function ($row) {
$date = Carbon::create($row->tanggal_pembayaran); $date = Carbon::create($row->tanggal_pembayaran);

View File

@ -25,7 +25,7 @@
return (new EloquentDataTable($query))->filter(function ($query) { return (new EloquentDataTable($query))->filter(function ($query) {
if (request()->has('search')) { if (request()->has('search')) {
$search = request()->get('search'); $search = request()->get('search');
$query->where('nomor_pinjaman', 'like', "%" . $search['value'] . "%"); $query->where('nomor_pinjaman', 'like', "%" . request()->segment(3) . "%");
} }
})->addIndexColumn()->editColumn('tanggal_penagihan', function ($row) { })->addIndexColumn()->editColumn('tanggal_penagihan', function ($row) {
$date = Carbon::create($row->tanggal_penagihan); $date = Carbon::create($row->tanggal_penagihan);

View File

@ -99,8 +99,8 @@
'Subrogasi Jamkrindo' => 'SubrogasiJamkrindo', 'Subrogasi Jamkrindo' => 'SubrogasiJamkrindo',
'Klaim Jamkrindo' => 'KlaimJamkrindo', 'Klaim Jamkrindo' => 'KlaimJamkrindo',
'Hapus Buku' => 'HapusBuku', 'Hapus Buku' => 'HapusBuku',
'Detail Pembayaran' => 'DetailPembayaran', 'Detail Pembayaran' => 'DetailPembayaran',
'Detail Penagihan' => 'DetailPenagihan', 'Detail Penagihan' => 'DetailPenagihan',
]; ];
try { try {

View File

@ -5,7 +5,6 @@
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Livewire\Component; use Livewire\Component;
use Modules\Writeoff\Entities\Approval; use Modules\Writeoff\Entities\Approval;
use Modules\Writeoff\Entities\Debitur;
use Modules\Writeoff\Entities\DetailJaminan; use Modules\Writeoff\Entities\DetailJaminan;
use Modules\Writeoff\Entities\GuaranteeType; use Modules\Writeoff\Entities\GuaranteeType;
use Modules\Writeoff\Http\Requests\DetailJaminan\StoreDetailJaminanRequest; use Modules\Writeoff\Http\Requests\DetailJaminan\StoreDetailJaminanRequest;
@ -133,8 +132,8 @@
public function delete($id) public function delete($id)
{ {
$detailjaminan = DetailJaminan::find($id); $detailjaminan = DetailJaminan::find($id);
$detailjaminan->delete_by = auth()->user()->id; $detailjaminan->delete_by = auth()->user()->id;
$detailjaminan->deleted_at = now(); $detailjaminan->deleted_at = now();
$approval = [ $approval = [

View File

@ -52,13 +52,59 @@
if ($this->edit_mode) { if ($this->edit_mode) {
// Emit a success event with a message // Emit a success event with a message
$detail_pembayaran = DetailPembayaran::find($this->id); $detail_pembayaran = DetailPembayaran::find($this->id);
$detail_pembayaran->update($data);
$this->dispatch('success', __('Data Detail Pembayaran berhasil diupdate')); $data['updated_by'] = auth()->user()->id;
$data['updated_at'] = now();
$approval = [
'method' => 'update',
'menu' => 'Detail Pembayaran',
'old_request' => json_encode($detail_pembayaran),
'new_request' => json_encode($data),
'description' => 'Update Detail Pembayaran',
'status' => '0',
'ref' => $this->kode
];
$is_approval = Approval::where('menu', 'Detail Pembayaran')
->where('ref', $this->kode)
->where('status', '0')
->get()
->first();
if ($is_approval) {
$this->dispatch('error', 'Data Detail Jaminan Sedang Menunggu Approval');
} else {
Approval::create($approval);
$this->dispatch('success', 'Data Detail Jaminan Berhasil Di Update, Menunggu Approval');
}
} else { } else {
// Emit a success event with a message // Emit a success event with a message
DetailPembayaran::create($data); $data['created_by'] = auth()->user()->id;
$this->dispatch('success', __('Data Detail Pembayaran berhasil ditambahkan')); $data['created_at'] = now();
$approval = [
'method' => 'create',
'menu' => 'Detail Pembayaran',
'new_request' => json_encode($data),
'description' => 'Create Detail Pembayaran',
'status' => '0',
'ref' => $this->kode
];
$is_approval = Approval::where('menu', 'Detail Pembayaran')
->where('ref', $this->kode)
->where('status', '0')
->get()
->first();
if ($is_approval) {
$this->dispatch('error', 'Data Detail Pembayaran Sedang Menunggu Approval');
$this->reset();
} else {
Approval::create($approval);
$this->dispatch('success', 'Data Detail Pembayaran Berhasil Di Input, Menunggu Approval');
}
} }
}); });
@ -84,8 +130,8 @@
public function delete($id) public function delete($id)
{ {
$detailpembayaran = DetailPembayaran::find($id); $detailpembayaran = DetailPembayaran::find($id);
$detailpembayaran->delete_by = auth()->user()->id; $detailpembayaran->delete_by = auth()->user()->id;
$detailpembayaran->deleted_at = now(); $detailpembayaran->deleted_at = now();
$approval = [ $approval = [

View File

@ -58,13 +58,59 @@
if ($this->edit_mode) { if ($this->edit_mode) {
// Emit a success event with a message // Emit a success event with a message
$detail_penagihan = DetailPenagihan::find($this->id); $detail_penagihan = DetailPenagihan::find($this->id);
$detail_penagihan->update($data);
$this->dispatch('success', __('Data Detail Penagihan berhasil diupdate')); $data['updated_by'] = auth()->user()->id;
$data['updated_at'] = now();
$approval = [
'method' => 'update',
'menu' => 'Detail Penagihan',
'old_request' => json_encode($detail_penagihan),
'new_request' => json_encode($data),
'description' => 'Update Detail Penagihan',
'status' => '0',
'ref' => $this->kode
];
$is_approval = Approval::where('menu', 'Detail Penagihan')
->where('ref', $this->kode)
->where('status', '0')
->get()
->first();
if ($is_approval) {
$this->dispatch('error', 'Data Detail Penagihan Sedang Menunggu Approval');
} else {
Approval::create($approval);
$this->dispatch('success', 'Data Detail Penagihan Berhasil Di Update, Menunggu Approval');
}
} else { } else {
// Emit a success event with a message // Emit a success event with a message
DetailPenagihan::create($data); $data['created_by'] = auth()->user()->id;
$this->dispatch('success', __('Data Detail Penagihan berhasil ditambahkan')); $data['created_at'] = now();
$approval = [
'method' => 'create',
'menu' => 'Detail Penagihan',
'new_request' => json_encode($data),
'description' => 'Create Detail Penagihan',
'status' => '0',
'ref' => $this->kode
];
$is_approval = Approval::where('menu', 'Detail Penagihan')
->where('ref', $this->kode)
->where('status', '0')
->get()
->first();
if ($is_approval) {
$this->dispatch('error', 'Data Detail Penagihan Sedang Menunggu Approval');
$this->reset();
} else {
Approval::create($approval);
$this->dispatch('success', 'Data Detail Penagihan Berhasil Di Input, Menunggu Approval');
}
} }
}); });