Fix Update Detail Pembayaran dan Detail Penagihan
This commit is contained in:
parent
d6cfdc12e8
commit
d51f85c313
@ -25,7 +25,7 @@
|
||||
return (new EloquentDataTable($query))->filter(function ($query) {
|
||||
if (request()->has('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) {
|
||||
$date = Carbon::create($row->tanggal_pembayaran);
|
||||
|
@ -25,7 +25,7 @@
|
||||
return (new EloquentDataTable($query))->filter(function ($query) {
|
||||
if (request()->has('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) {
|
||||
$date = Carbon::create($row->tanggal_penagihan);
|
||||
|
@ -5,7 +5,6 @@
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Livewire\Component;
|
||||
use Modules\Writeoff\Entities\Approval;
|
||||
use Modules\Writeoff\Entities\Debitur;
|
||||
use Modules\Writeoff\Entities\DetailJaminan;
|
||||
use Modules\Writeoff\Entities\GuaranteeType;
|
||||
use Modules\Writeoff\Http\Requests\DetailJaminan\StoreDetailJaminanRequest;
|
||||
|
@ -52,13 +52,59 @@
|
||||
if ($this->edit_mode) {
|
||||
// Emit a success event with a message
|
||||
$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 {
|
||||
// Emit a success event with a message
|
||||
DetailPembayaran::create($data);
|
||||
$this->dispatch('success', __('Data Detail Pembayaran berhasil ditambahkan'));
|
||||
$data['created_by'] = auth()->user()->id;
|
||||
$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');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -58,13 +58,59 @@
|
||||
if ($this->edit_mode) {
|
||||
// Emit a success event with a message
|
||||
$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 {
|
||||
// Emit a success event with a message
|
||||
DetailPenagihan::create($data);
|
||||
$this->dispatch('success', __('Data Detail Penagihan berhasil ditambahkan'));
|
||||
$data['created_by'] = auth()->user()->id;
|
||||
$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');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user