diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index 5fece73..0731f73 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -51,6 +51,8 @@ class RealisasiPendapatanController extends Controller $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); $data["simtrad4_tgl_sp2d_bun"] = ConvertIndoDate($req["txt_simtrad4_tgl_sp2d_bun"]); $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; + $data["retur"] = replaceMoney($req["txt_retur"]); + $data["bersih"] = replaceMoney($req["txt_bersih"]); return $data; } @@ -244,13 +246,15 @@ class RealisasiPendapatanController extends Controller $sheet->setCellValue(getAlphabetCell(1).'1', 'Kotor'); $sheet->setCellValue(getAlphabetCell(2).'1', 'Potongan'); $sheet->setCellValue(getAlphabetCell(3).'1', 'Bersih'); - $sheet->setCellValue(getAlphabetCell(4).'1', 'SP2D BUN'); - $sheet->setCellValue(getAlphabetCell(5).'1', 'TGL SP2D BUN'); - $sheet->setCellValue(getAlphabetCell(6).'1', 'TGL STS'); - $sheet->setCellValue(getAlphabetCell(7).'1', 'NO STS'); - $sheet->setCellValue(getAlphabetCell(8).'1', 'Kode Akun'); - $sheet->setCellValue(getAlphabetCell(9).'1', 'Nama Akun'); - $sheet->setCellValue(getAlphabetCell(10).'1', 'Jumlah'); + $sheet->setCellValue(getAlphabetCell(4).'1', 'Retur'); + $sheet->setCellValue(getAlphabetCell(5).'1', 'Jumlah Bersih'); + $sheet->setCellValue(getAlphabetCell(6).'1', 'SP2D BUN'); + $sheet->setCellValue(getAlphabetCell(7).'1', 'TGL SP2D BUN'); + $sheet->setCellValue(getAlphabetCell(8).'1', 'TGL STS'); + $sheet->setCellValue(getAlphabetCell(9).'1', 'NO STS'); + $sheet->setCellValue(getAlphabetCell(10).'1', 'Kode Akun'); + $sheet->setCellValue(getAlphabetCell(11).'1', 'Nama Akun'); + $sheet->setCellValue(getAlphabetCell(12).'1', 'Jumlah'); $rows = 2; foreach ($data->get() as $val){ @@ -258,13 +262,15 @@ class RealisasiPendapatanController extends Controller $sheet->setCellValue(getAlphabetCell(1) . $rows, $val["simtrad4_kotor"]); $sheet->setCellValue(getAlphabetCell(2) . $rows, $val["simtrad4_potongan"]); $sheet->setCellValue(getAlphabetCell(3) . $rows, $val["simtrad4_bersih"]); - $sheet->setCellValue(getAlphabetCell(4) . $rows, $val["simtrad4_sp2d_bun"]); - $sheet->setCellValue(getAlphabetCell(5) . $rows, $val["simtrad4_tgl_sp2d_bun"]); - $sheet->setCellValue(getAlphabetCell(6) . $rows, $val["rkud_tgl"]); - $sheet->setCellValue(getAlphabetCell(7) . $rows, $val["rkud_no_sts"]); - $sheet->setCellValue(getAlphabetCell(8) . $rows, $val["rkud_kode_akun"]); - $sheet->setCellValue(getAlphabetCell(9) . $rows, $val["rkud_nama_akun"]); - $sheet->setCellValue(getAlphabetCell(10) . $rows, $val["rkud_jumlah"]); + $sheet->setCellValue(getAlphabetCell(4) . $rows, $val["retur"]); + $sheet->setCellValue(getAlphabetCell(5) . $rows, $val["bersih"]); + $sheet->setCellValue(getAlphabetCell(6) . $rows, $val["simtrad4_sp2d_bun"]); + $sheet->setCellValue(getAlphabetCell(7) . $rows, $val["simtrad4_tgl_sp2d_bun"]); + $sheet->setCellValue(getAlphabetCell(8) . $rows, $val["rkud_tgl"]); + $sheet->setCellValue(getAlphabetCell(9) . $rows, $val["rkud_no_sts"]); + $sheet->setCellValue(getAlphabetCell(10) . $rows, $val["kode_rekening_sps"]); + $sheet->setCellValue(getAlphabetCell(11) . $rows, $val["nama_rekening_sps"]); + $sheet->setCellValue(getAlphabetCell(12) . $rows, $val["rkud_jumlah"]); $rows++; } diff --git a/app/Models/PendapatanRealisasi.php b/app/Models/PendapatanRealisasi.php index 0a41a4e..26e04f6 100644 --- a/app/Models/PendapatanRealisasi.php +++ b/app/Models/PendapatanRealisasi.php @@ -14,7 +14,8 @@ class PendapatanRealisasi extends Eloquent protected $table = 'SAMASA.pendapatan_realisasi'; protected $fillable = [ 'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_tgl_sp2d_bun','simtrad4_sp2d_bun', - 'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps','file_sts' + 'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps','file_sts', + 'retur','bersih' ]; } diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 14864fa..f07fe03 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -86,7 +86,7 @@
  • -

    Realisasi Belanja

    +

    Belanja
    • diff --git a/resources/views/realisasi_pendapatan/edit.blade.php b/resources/views/realisasi_pendapatan/edit.blade.php index 96b9a5d..ca77ef4 100644 --- a/resources/views/realisasi_pendapatan/edit.blade.php +++ b/resources/views/realisasi_pendapatan/edit.blade.php @@ -36,6 +36,9 @@ $("#txt_simtrad4_kotor").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_kotor) }}"); $("#txt_simtrad4_potongan").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_potongan) }}"); $("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}"); + $("#txt_simtrad4_tgl_sp2d_bun").val("{{ date('d/m/Y',strtotime($realisasi_pendapatan->simtrad4_tgl_sp2d_bun)) }}"); + $("#txt_retur").val("{{ separateNumberIndo($realisasi_pendapatan->retur) }}"); + $("#txt_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->bersih) }}"); showRinciDBH({{ $realisasi_pendapatan->id_sps }}); }); diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 13c62ea..1ec3269 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -108,13 +108,25 @@ -
    - - +
    +
    + + +
    +
    + + +
    -
    - - +
    +
    + + +
    +
    + + +
    @@ -139,9 +151,12 @@ let hitung_bersih = ()=> { let bersih = replaceValue($("#txt_simtrad4_kotor").val()) - replaceValue($("#txt_simtrad4_potongan").val()); $("#txt_simtrad4_bersih").val(separateNumberIndo(bersih)); + + let Totalbersih = replaceValue($("#txt_simtrad4_kotor").val()) - replaceValue($("#txt_simtrad4_potongan").val()) - replaceValue($("#txt_retur").val()); + $("#txt_bersih").val(separateNumberIndo(Totalbersih)); } - $("#txt_simtrad4_kotor, #txt_simtrad4_potongan").on("keyup",function(){ + $("#txt_simtrad4_kotor, #txt_simtrad4_potongan, #txt_retur").on("keyup",function(){ hitung_bersih(); }) diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index cb8c2a1..01f6067 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -142,8 +142,8 @@ ], "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-5 text-right\"f><\"col-md-1 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">", "lengthMenu": [ - [ 10, 25, 50 ], - [ "10", "25", "50" ] + [ 10, 25, 50, -1 ], + [ "10", "25", "50", "All" ] ], "paging": true, // Table pagination "columns": [ diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php index 6b8f285..c3e4097 100644 --- a/resources/views/realisasi_pendapatan/show.blade.php +++ b/resources/views/realisasi_pendapatan/show.blade.php @@ -90,6 +90,8 @@ $("#txt_simtrad4_kotor").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_kotor) }}"); $("#txt_simtrad4_potongan").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_potongan) }}"); $("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}"); + $("#txt_retur").val("{{ separateNumberIndo($realisasi_pendapatan->retur) }}"); + $("#txt_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->bersih) }}"); showRinciDBH({{ $realisasi_pendapatan->id_sps }}); let validasi = ()=>{