diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php
index 188a795..8cae9dc 100644
--- a/app/Http/Controllers/RealisasiPendapatanController.php
+++ b/app/Http/Controllers/RealisasiPendapatanController.php
@@ -55,6 +55,9 @@ class RealisasiPendapatanController extends Controller
         $data["retur"] = replaceMoney($req["txt_retur"]);
         $data["bersih"] = replaceMoney($req["txt_bersih"]);
 
+        $data["tw"] = $req["tw"];
+        $data["gelombang"] = $req["gelombang"];
+
         return $data;
     }
 
diff --git a/app/Models/PendapatanRealisasi.php b/app/Models/PendapatanRealisasi.php
index 4e62922..458a192 100644
--- a/app/Models/PendapatanRealisasi.php
+++ b/app/Models/PendapatanRealisasi.php
@@ -15,7 +15,7 @@ class PendapatanRealisasi extends Eloquent
     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',
-        'retur','bersih'
+        'retur','bersih','tw','gelombang'
     ];
 
 }
diff --git a/public/js/app.js b/public/js/app.js
index 4cdb70c..7817a29 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -509,4 +509,28 @@ $('body').on('expanded.pushMenu collapsed.pushMenu', function() {
  
      // Time depends on your settings
      }, 350);
- } );
\ No newline at end of file
+ } );
+
+ $(document).on("click", ".btn-save", function(e){
+    e.preventDefault();
+    let FormId = $(this).closest("form").prop("id");
+    Form = $("#"+FormId)[0];
+    if (Form.checkValidity()){
+        Swal.fire({
+            title: 'Data akan disimpan ?!',
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: 'Ya',
+            denyButtonText: "Tidak",
+            icon: "warning",
+        }).then((result) => {
+            if (result.isConfirmed) {
+                $("body").append("<div class='loading'></div>")
+                $("#"+FormId+ " input, select").prop("disabled", false);
+                Form.submit();
+            }
+        })
+    }else{
+        Swal.fire("Info","Input masih ada yang kosong, harap periksa kembali!","error");
+    }
+  });
\ No newline at end of file
diff --git a/resources/views/realisasi_pendapatan/edit.blade.php b/resources/views/realisasi_pendapatan/edit.blade.php
index 7707616..1d7d598 100644
--- a/resources/views/realisasi_pendapatan/edit.blade.php
+++ b/resources/views/realisasi_pendapatan/edit.blade.php
@@ -39,6 +39,8 @@
             $("#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) }}");
+            $("#tw").val("{{ $realisasi_pendapatan->tw }}");
+            $("#gelombang").val("{{ $realisasi_pendapatan->gelombang }}");
             showRinciDBH("{{ $realisasi_pendapatan->kode_rekening_sps }}");
         });
     </script>
diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php
index afb5ffc..1de9ba4 100644
--- a/resources/views/realisasi_pendapatan/form.blade.php
+++ b/resources/views/realisasi_pendapatan/form.blade.php
@@ -96,21 +96,47 @@
             <label class="col-form-label label-align" for="txt_simtrad4_uraian">Uraian</label>
             <textarea id="txt_simtrad4_uraian" name="txt_simtrad4_uraian" class="form-control" required></textarea>
         </div>
-        <div class="form-group">
-            <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">SP2D Bendahara Umum Negara</label>
-            <input id="txt_simtrad4_sp2d_bun" name="txt_simtrad4_sp2d_bun" class="form-control" required value="">
+        <div class="row">
+            <div class="col-6">
+                <div class="form-group">
+                    <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">SP2D Bendahara Umum Negara</label>
+                    <input id="txt_simtrad4_sp2d_bun" name="txt_simtrad4_sp2d_bun" class="form-control" required value="">
+                </div>
+            </div>
+            <div class="col-6">
+                <div class="form-group">
+                    <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">Tgl SP2D Bendahara Umum Negara</label>
+                    <input id="txt_simtrad4_tgl_sp2d_bun" name="txt_simtrad4_tgl_sp2d_bun" class="form-control indo_date" required value="">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-6">
+                <div class="form-group">
+                    <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TW</label>
+                    <select id="tw" name="tw" class="form-control">
+                        <option value="">Pilih TW</option>
+                        <option value="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-6">
+                <div class="form-group">
+                    <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">Gelombang</label>
+                    <input type="number" id="gelombang" name="gelombang" class="form-control" placeholder="Input Gelombang">
+                </div>
+            </div>
         </div>
         <div class="form-group">
-            <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TGL SP2D Bendahara Umum Negara</label>
-            <input id="txt_simtrad4_tgl_sp2d_bun" name="txt_simtrad4_tgl_sp2d_bun" class="form-control indo_date" required value="">
-        </div>
-        <div class="form-group">
-            <label class="col-form-label label-align" for="txt_simtrad4_kotor">Kotor</label>
+            <label class="col-form-label label-align" for="txt_simtrad4_kotor">Jumlah Kotor</label>
             <input id="txt_simtrad4_kotor" name="txt_simtrad4_kotor" class="form-control number-separator-indo" value="0">
         </div>
         <div class="row">
             <div class="col-6 form-group">
-                <label class="col-form-label label-align" for="txt_simtrad4_potongan">Potongan</label>
+                <label class="col-form-label label-align" for="txt_simtrad4_potongan">Jumlah Potongan</label>
                 <input id="txt_simtrad4_potongan" name="txt_simtrad4_potongan" class="form-control number-separator-indo" value="0">
             </div>
             <div class="col-6 form-group">
@@ -120,7 +146,7 @@
         </div>
         <div class="row">
             <div class="col-6 form-group">
-                <label class="col-form-label label-align" for="txt_simtrad4_potongan">Retur</label>
+                <label class="col-form-label label-align" for="txt_simtrad4_potongan">Jumlah Retur</label>
                 <input id="txt_retur" name="txt_retur" class="form-control number-separator-indo" value="0">
             </div>
             <div class="col-6 form-group">
@@ -131,7 +157,8 @@
     </div>
 </div>
 
-<button id="btn_save_realisasi_pendapatan" type="submit" class="btn btn-sm btn-success"><i class="fa fa-save"></i> Simpan</button>
+<button id="btn_save_realisasi_pendapatan" type="submit" class="btn btn-sm btn-success btn-save"><i class="fa fa-save"></i> Simpan</button>
+<button id="btn_cancel" type="button" class="btn btn-sm btn-danger ml-1" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-times"></i> Batal</button>
 
 @section('scripts')
     <script type="text/javascript">
@@ -142,7 +169,7 @@
                 success: function (data) {
                     for(let x=0;x<=11;x++){
                         let bulan=x+1;
-                        $($(".rinci_dbh")[x]).val(separateNumberIndo(data["spsbulan"+bulan]));
+                        $($(".rinci_dbh")[x]).val(data["spsbulan"+bulan] == null ? 0 : separateNumberIndo(data["spsbulan"+bulan]));
                     }
                 }
             });
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php
index 332482b..6f503a8 100644
--- a/resources/views/realisasi_pendapatan/index.blade.php
+++ b/resources/views/realisasi_pendapatan/index.blade.php
@@ -157,7 +157,7 @@
                     { "data": "simtrad4_bersih", "className":"text-right", "defaultContent":"0" },  
                     { "data": "retur", "className":"text-right", "defaultContent":"0" },  
                     { "data": "bersih", "className":"text-right", "defaultContent":"0" },
-                    { "data": "simtrad4_sp2d_bun", "className":"text-left", "defaultContent":"-" },
+                    { "data": "simtrad4_sp2d_bun", "className":"text-center", "defaultContent":"-" },
                     { "data": "simtrad4_tgl_sp2d_bun", "className":"text-center", "defaultContent":"-" },  
                     { "data": "rkud_no_sts", "className":"text-center", "defaultContent":"-"},
                     { "data": "rkud_tgl", "className":"text-center", "defaultContent":"-"},