diff --git a/DataTables/DebiturDataTable.php b/DataTables/DebiturDataTable.php
index 06f45dc..d382707 100644
--- a/DataTables/DebiturDataTable.php
+++ b/DataTables/DebiturDataTable.php
@@ -11,6 +11,7 @@
use Yajra\DataTables\Html\Builder as HtmlBuilder;
use Yajra\DataTables\Html\Column;
use Yajra\DataTables\Services\DataTable;
+ use Yajra\DataTables\WithExportQueue;
class DebiturDataTable extends DataTable
{
@@ -32,11 +33,15 @@
$date = Carbon::create($row->registered_at);
return $date->locale('id')->translatedFormat('d F Y');
})->editColumn('cabang', function ($row) {
- return $row->branch_id ? Branch::find($row->branch_id)->name : '-';
+ $branch = Branch::find($row->branch_id);
+ if (isset($branch->id)) {
+ return $row->branch_id ? Branch::find($row->branch_id)->name : '-';
+ }
+ return '-';
})->editColumn('status', function ($row) {
$status = $row->status ? 'Aktif' : 'Tidak Aktif';
- $oto = $row->authorized_at !== null ? 'Authorised' : 'Not Authorised';
- return $status.' '.$oto;
+ $oto = $row->authorized_at !== null ? 'Authorised' : 'Not Authorised';
+ return $status . ' ' . $oto;
})->rawColumns(['status'])->setRowId('id');
}
@@ -65,10 +70,10 @@
->orderBy(1)
->parameters([
'scrollX' => false,
- 'drawCallback' => 'function() { KTMenu.createInstances(); }',
+ 'drawCallback' => 'function() { KTMenu.createInstances(); }'
])
->addTableClass('align-middle table-row-dashed fs-6 gy-5')
- ->drawCallback("function() {" . file_get_contents(Module::getModulePath('writeoff').'Resources/views/parameter/debitur/_draw-scripts.js') . "}");
+ ->drawCallback("function() {" . file_get_contents(Module::getModulePath('writeoff') . 'Resources/views/parameter/debitur/_draw-scripts.js') . "}");
}
/**
@@ -87,6 +92,7 @@
];
}
+
/**
* Get the filename for export.
*/
diff --git a/DataTables/KlaimJamkrindoDataTable.php b/DataTables/KlaimJamkrindoDataTable.php
index e40fe09..62dd53d 100644
--- a/DataTables/KlaimJamkrindoDataTable.php
+++ b/DataTables/KlaimJamkrindoDataTable.php
@@ -4,6 +4,7 @@
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder as QueryBuilder;
+ use Illuminate\Support\Number;
use Modules\Writeoff\Entities\KlaimJamkrindo;
use Nwidart\Modules\Facades\Module;
use Yajra\DataTables\EloquentDataTable;
@@ -37,32 +38,26 @@
->orWhere('keterangan', 'like', "%" . $search['value'] . "%")
->orWhere('status', 'like', "%" . $search['value'] . "%");
}
- })->addIndexColumn()
- ->editColumn('tanggal_rtgs_masuk', function ($row) {
+ })->addIndexColumn()->editColumn('tanggal_rtgs_masuk', function ($row) {
$date = Carbon::create($row->tanggal_rtgs_masuk);
return $date->locale('id')->translatedFormat('d F Y');
- })
- ->editColumn('jumlah_debitur', function ($row) {
- return $row->jumlah_debitur_surat.'/'.$row->jumlah_debitur_excel;
- })
- ->editColumn('dana_hasil_klaim', function ($row) {
- return Number::currency($row->dana_hasil_klaim,'IDR','id_ID');
- })
- ->editColumn('nilai_penyelesaian', function ($row) {
- return Number::currency($row->nilai_penyelesaian,'IDR','id_ID').' / '.$row->jumlah_debitur_penyelesaian;
- })
- ->editColumn('sisa_dana_ksl', function ($row) {
- return Number::currency($row->sisa_dana_ksl,'IDR','id_ID').' / '.$row->jumlah_debitur_sisa_ksl;
- })
- ->editColumn('is_detail_debitur', function ($row) {
+ })->editColumn('jumlah_debitur', function ($row) {
+ return $row->jumlah_debitur_surat . '/' . $row->jumlah_debitur_excel;
+ })->editColumn('dana_hasil_klaim', function ($row) {
+ return Number::currency($row->dana_hasil_klaim, 'IDR', 'id_ID');
+ })->editColumn('nilai_penyelesaian', function ($row) {
+ return Number::currency($row->nilai_penyelesaian, 'IDR', 'id_ID'); //.' / '.$row->jumlah_debitur_penyelesaian;
+ })->editColumn('sisa_dana_ksl', function ($row) {
+ return Number::currency($row->sisa_dana_ksl, 'IDR', 'id_ID');//.' / '.$row->jumlah_debitur_sisa_ksl;
+ })->editColumn('is_detail_debitur', function ($row) {
return $row->is_detail_debitur ? 'Ada' : 'Tidak Ada';
- })
- ->editColumn('updated_at', function ($row) {
- return $row->updated_at->locale('id')->translatedFormat('d F Y H:i:s');
- })->rawColumns(['action'])->addColumn('action', function ($klaim_jamkrindo) {
- return view('writeoff::pencatatan.klaim_jamkrindo._actions', compact('klaim_jamkrindo'));
- })->setRowId('id');
+ })->editColumn('updated_at', function ($row) {
+ return $row->updated_at->locale('id')->translatedFormat('d F Y H:i:s');
+ })->rawColumns(['action'])->addColumn('action', function ($klaim_jamkrindo) {
+ return view('writeoff::pencatatan.klaim_jamkrindo._actions', compact('klaim_jamkrindo'));
+ })->setRowId('id');
}
+
/**
* Get the query source of dataTable.
*/
@@ -103,12 +98,29 @@
return [
Column::make('DT_RowIndex')->title('No')->orderable(false)->searchable(false),
Column::make('tanggal_rtgs_masuk')->title('Tanggal RTGS Masuk')->addClass('align-top'),
- Column::make('jumlah_debitur')->title('Jumlah Debitur
(Surat / Excel)')->addClass('align-top'),
+ Column::make('jumlah_debitur')
+ ->title('Jumlah Debitur
(Surat / Excel)')
+ ->addClass('align-top')
+ ->addClass('text-center'),
Column::make('dana_hasil_klaim')->title('Data Hasil Klaim')->addClass('align-top'),
- Column::make('nilai_penyelesaian')->title('Nilai Penyelesaian / Jumlah Debitur')->addClass('align-top'),
- Column::make('sisa_dana_ksl')->title('Sisa Dana KSL / Jumlah Debitur')->addClass('align-top'),
+ Column::make('nilai_penyelesaian')->title('Nilai Penyelesaian')->addClass('align-top'),
+ Column::make('jumlah_debitur_penyelesaian')
+ ->title('Jumlah Debitur
Penyelesaiain')
+ ->addClass('align-top')
+ ->addClass('text-center'),
+ Column::make('sisa_dana_ksl')->title('Sisa Dana KSL')->addClass('align-top'),
+ Column::make('jumlah_debitur_sisa_ksl')
+ ->title('Jumlah Debitur
Sisa KSL')
+ ->addClass('align-top')
+ ->addClass('text-center'),
+
Column::make('is_detail_debitur')->title('Detail Debitur')->addClass('align-top'),
- Column::computed('action')->exportable(false)->printable(false)->width(60)->addClass('text-center')->addClass('align-top')
+ Column::computed('action')
+ ->exportable(false)
+ ->printable(false)
+ ->width(60)
+ ->addClass('text-center')
+ ->addClass('align-top')
];
}
diff --git a/DataTables/RekeningDataTable.php b/DataTables/RekeningDataTable.php
index 1d65df3..b62a33f 100644
--- a/DataTables/RekeningDataTable.php
+++ b/DataTables/RekeningDataTable.php
@@ -44,23 +44,24 @@
return $date->locale('id')->translatedFormat('d F Y');
})->editColumn('debitur', function ($row) {
$debitur = null;
- if($row->debitur_id){
+ if ($row->debitur_id) {
$debitur = Debitur::find($row->debitur_id);
}
- return $debitur->id ? $debitur->kode.' - '.$debitur->name : '-';
+ return $debitur->id ? $debitur->kode . ' - ' . $debitur->name : '-';
})->editColumn('branch', function ($row) {
$branch = null;
- if($row->branch_id){
- $branch = Branch::find($row->branch_id);
+
+ if (isset($branch->id)) {
+ return $branch->id ? $branch->kode . ' - ' . $branch->name : '-';
}
- return $branch->id ? $branch->kode.' - '.$branch->name : '-';
+ return "-";
})->editColumn('product', function ($row) {
$product = null;
- if($row->loan_type_id){
+ if ($row->loan_type_id) {
$product = LoanType::find($row->loan_type_id);
}
- return $product->id ? $product->kode.' - '.$product->name : '-';
+ return $product->id ? $product->kode . ' - ' . $product->name : '-';
})->editColumn('currency', function ($row) {
return $row->currency_id ? Currency::find($row->currency_id)->name : '-';
})->editColumn('status', function ($row) {
diff --git a/Http/Controllers/DetailSubrogasiJamkrindoController.php b/Http/Controllers/DetailSubrogasiJamkrindoController.php
index b930085..0287b70 100644
--- a/Http/Controllers/DetailSubrogasiJamkrindoController.php
+++ b/Http/Controllers/DetailSubrogasiJamkrindoController.php
@@ -8,6 +8,7 @@
use Modules\Writeoff\DataTables\DetailSubrogasiJamkrindoDataTable;
use Modules\Writeoff\Entities\Branch;
use Modules\Writeoff\Entities\HapusBuku;
+ use Modules\Writeoff\Entities\SubrogasiJamkrindo;
class DetailSubrogasiJamkrindoController extends Controller
{
@@ -49,7 +50,7 @@
session_start();
$_SESSION['nomor_pinjaman']= $nomor_pinjaman;
- $hapusbuku = HapusBuku::where('nomor_pinjaman', $nomor_pinjaman)->first();
+ $hapusbuku = SubrogasiJamkrindo::where('nomor_pinjaman', $nomor_pinjaman)->first();
if ($hapusbuku) {
$cabang = Branch::where('kode', $hapusbuku->kode_cabang)->first();
return $dataTable->render('writeoff::pencatatan.detail_subrogasi_jamkrindo.show', compact('hapusbuku', 'cabang'));
diff --git a/Http/Controllers/HapusBukuController.php b/Http/Controllers/HapusBukuController.php
index f7f6874..f0b53bb 100644
--- a/Http/Controllers/HapusBukuController.php
+++ b/Http/Controllers/HapusBukuController.php
@@ -3,6 +3,7 @@
namespace Modules\Writeoff\Http\Controllers;
use App\Http\Controllers\Controller;
+ use Carbon\Carbon;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -271,14 +272,34 @@
}
}
+ /*
+ *
+ *
+ *
+ * */
+
public function hitungBunga(){
$hapusbuku = HapusBuku::all();
+ $suku_bunga_extra = 35;
foreach($hapusbuku as $key => $value){
+ // Define your dates (replace with your actual dates)
+ $startDate = Carbon::parse($value->tanggal_hapus_buku); // Or use any date variable
+ $endDate = Carbon::today();
+
+ // Calculate the difference in days
+ $daysDiff = $startDate->diffInDays($endDate);
+
$bunga = $value->suku_bunga / 100 * $value->baki_debet;
$value->jumlah_bunga = $bunga;
$value->save();
}
-
}
+
}
+
+
+
+
+
+
diff --git a/Resources/views/livewire/hapus-buku/hapus-buku-modal.blade.php b/Resources/views/livewire/hapus-buku/hapus-buku-modal.blade.php
index 967acb3..41ebec0 100644
--- a/Resources/views/livewire/hapus-buku/hapus-buku-modal.blade.php
+++ b/Resources/views/livewire/hapus-buku/hapus-buku-modal.blade.php
@@ -22,7 +22,7 @@
-
+
@error('nomor_pinjaman')
{{ $message }} @enderror
@@ -52,7 +52,7 @@
-
+
@error('kode_debitur')
{{ $message }} @enderror
@@ -61,7 +61,7 @@
-
+
@error('nama_debitur')
{{ $message }} @enderror