Maintenance dan bugs Fix

app/Http/Controllers/RealisasiBelanjaController.php

@@ -12,6 +12,7 @@ use App\Models\DbhBelanjaRealisasiDetail;
 use App\Models\TempRealisasiBelanja;
 use App\Models\VwAkbSpdRealRsk;
 use App\Models\UnitSatuan;
+use App\Models\Sp2d;
 use App\Imports\RealisasiBelanjaImport;
 
 class RealisasiBelanjaController extends Controller
@@ -63,8 +64,19 @@ class RealisasiBelanjaController extends Controller
                     GROUP BY x.I_SPDNO_DOK,x.D_SPDNO 
                     ORDER BY x.D_SPDNO '
                 ));
-        //var_dump($vwSPD); exit;
+        $vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,
-        return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD"));
+                    TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP 
+                    FROM NEWSIPKD.TMSP2D x 
+                    LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
+                    ON x.I_IDSPP = y.I_IDSPP 
+                    WHERE y.I_IDRSK='.$DbhBelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
+                );
+
+        // foreach($vwSP2D as $key=>$sp2d){
+        //     var_dump($sp2d->i_sp2dno_dok);
+        // }
+        // exit;
+        return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
     }
 
     public function datatable(Request $request)
@@ -75,13 +87,14 @@ class RealisasiBelanjaController extends Controller
         $src = isset($post["search"])?$post["search"]["value"]:"";
 
         $dataFilter=0;
-        $data = DB::select(DB::raw('SELECT * FROM DBH_BELANJA_REALISASI x 
+        $data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM DBH_BELANJA_REALISASI x 
                     LEFT JOIN (
-                        SELECT DBH_BELANJA_REALISASI_ID,SUM(JUMLAH_REALISASI) AS jml_realisasi,
+                        SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D 
-                        sum(VOLUME_SATUAN_REALISASI) AS vol_realisasi, unit_satuan_realisasi  
+                        FROM NEWSIPKD.TMSP2D x 
-                        FROM SAMASA.DBH_BELANJA_REALISASI_DETAIL 
+                        LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
-                        GROUP BY DBH_BELANJA_REALISASI_ID,UNIT_SATUAN_REALISASI 
+                        ON x.I_IDSPP = y.I_IDSPP 
-                    ) y ON x.ID = y.DBH_BELANJA_REALISASI_ID'));
+                        GROUP BY I_IDRSK
+                    ) y ON x.KODE_RSK = y.I_IDRSK'));
 
         if (!empty($src)){
             $data->whereRaw("(LOWER(jenis_belanja) LIKE '%".strtolower($src)."%'
@@ -243,29 +256,67 @@ class RealisasiBelanjaController extends Controller
         return view('realisasi_belanja.upload');
     }
 
+    // public function inputRealisasi(Request $request, $id)
+    // {
+    //     $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); 
+    //     $req = $request->all();
+    //     $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
+    //     if ($request->isMethod('post')) {
+    //         try{
+    //             DB::beginTransaction();
+
+    //             $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
+    //             $data["dbh_belanja_realisasi_id"] = $id;
+    //             $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
+    //             $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
+    //             $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
+    //             $data["no_sp2d"] = $req["no_sp2d"];
+    //             $data["created_by"] = Auth::user()->id;
+    //             // var_dump($DbhBelanjaRealisasiDetail->count()); exit;
+    //             if ($DbhBelanjaRealisasiDetail->count()==0){
+    //                 DbhBelanjaRealisasiDetail::create($data);
+    //             }else{
+    //                 $DbhBelanjaRealisasiDetail->firstorNew()->update($data);
+    //             }
+
+    //             DB::commit();
+    
+    //             return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
+    //         }catch(\Exception $e){
+    //             throw new \Exception($e->getMessage());
+    //             DB::rollBack();
+    //             return redirect($redirect)->with('error',$e->getMessage());
+    //         }
+    //     }
+
+    //     $DbhBelanjaRealisasiDetail = DB::select(
+    //         DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
+    //                         a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID  
+    //                         FROM NEWSIPKD.TMSP2D x 
+    //                         LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
+    //                         ON x.I_IDSPP = y.I_IDSPP 
+    //                         LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a 
+    //                         ON x.I_SP2DNO_DOK = a.NO_SP2D 
+    //                         WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
+    //     );
+    //     $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
+    //     $unitSatuan = UnitSatuan::orderBy("id")->get();
+
+    //     return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
+    // }
+
     public function inputRealisasi(Request $request, $id)
     {
         $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); 
         $req = $request->all();
-        $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
+        $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja";
         if ($request->isMethod('post')) {
             try{
                 DB::beginTransaction();
-
-                $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
-                $data["dbh_belanja_realisasi_id"] = $id;
                 $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
                 $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
-                $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
+                $data["realisasi_by"] = Auth::user()->id;
-                $data["no_sp2d"] = $req["no_sp2d"];
+                $DbhBelanjaRealisasi->update($data);
-                $data["created_by"] = Auth::user()->id;
-                // var_dump($DbhBelanjaRealisasiDetail->count()); exit;
-                if ($DbhBelanjaRealisasiDetail->count()==0){
-                    DbhBelanjaRealisasiDetail::create($data);
-                }else{
-                    $DbhBelanjaRealisasiDetail->firstorNew()->update($data);
-                }
-
                 DB::commit();
     
                 return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
@@ -276,20 +327,8 @@ class RealisasiBelanjaController extends Controller
             }
         }
 
-        $DbhBelanjaRealisasiDetail = DB::select(
-            DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
-                            a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID  
-                            FROM NEWSIPKD.TMSP2D x 
-                            LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
-                            ON x.I_IDSPP = y.I_IDSPP 
-                            LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a 
-                            ON x.I_SP2DNO_DOK = a.NO_SP2D 
-                            WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
-        );
-        $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
         $unitSatuan = UnitSatuan::orderBy("id")->get();
-
+        return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect"));
-        return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
     }
 
     public function datatableInputRealisasi(Request $request)

app/Http/Controllers/RealisasiPendapatanController.php

@@ -33,13 +33,8 @@ class RealisasiPendapatanController extends Controller
         return view('realisasi_pendapatan.create');
     }
 
-    public function store(Request $request)
+    protected function dataPendapatan($req= [])
     {
-        try{
-            $date = date("Ymd");
-            DB::beginTransaction();
-
-            $req = $request->all();
         $data["tahun"] = $req["txt_ta"];
         $data["id_sps"] = $req["txt_id_sps"];
         $txt_rek_sps = explode("|",$req["txt_rek_sps"]);
@@ -49,7 +44,20 @@ class RealisasiPendapatanController extends Controller
         $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]);
         $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]);
         $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"];
+
+        return $data;
+    }
+
+    public function store(Request $request)
+    {
+        try{
+            $date = date("Ymd");
+            DB::beginTransaction();
+
+            $req = $request->all();
+            $data = $this->dataPendapatan($req);
             $data["created_by"] = Auth::user()->id;
 
             $DbhPendapatanRealisasi = DbhPendapatanRealisasi::create($data);
@@ -84,16 +92,7 @@ class RealisasiPendapatanController extends Controller
             DB::beginTransaction();
 
             $req = $request->all();
-            $data["tahun"] = $req["txt_ta"];
+            $data = $this->dataPendapatan($req);
-            $data["id_sps"] = $req["txt_id_sps"];
-            $txt_rek_sps = explode("|",$req["txt_rek_sps"]);
-            $data["kode_rekening_sps"] = $txt_rek_sps[0];
-            $data["nama_rekening_sps"] = $txt_rek_sps[1];
-            $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"];
-            $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]);
-            $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]);
-            $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]);
-            $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"];
             $data["updated_by"] = Auth::user()->id;
             $realisasi_pendapatan->update($data);
 
@@ -184,6 +183,10 @@ class RealisasiPendapatanController extends Controller
             DB::beginTransaction();
 
             $data = DbhPendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
+            
+            if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){
+                return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
+            }
             $data["rkud_tgl"] = $req["rkud_tgl"];
             $data["rkud_no_sts"] = $req["rkud_no_sts"];
             $data["rkud_kode_akun"] = $req["rkud_kode_akun"];

app/Models/DbhPendapatanRealisasi.php

@@ -13,7 +13,7 @@ class DbhPendapatanRealisasi extends Eloquent
     protected $connection = 'Samasa';
     protected $table = 'SAMASA.dbh_pendapatan_realisasi';
     protected $fillable = [
-        'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_sp2d_bun',
+        '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'
     ];
 

database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php

@@ -23,6 +23,7 @@ class CreateDbhPendapatanRealisasiTable extends Migration
             $table->decimal('simtrad4_kotor', 19, 2);
             $table->decimal('simtrad4_potongan', 19, 2);
             $table->decimal('simtrad4_bersih', 19, 2);
+            $table->date('simtrad4_tgl_sp2d_bun')->nullable();
             $table->string('simtrad4_sp2d_bun',50);
             $table->date('rkud_tgl')->nullable();
             $table->string('rkud_no_sts',20)->nullable();

public/js/app.js

@@ -29,6 +29,16 @@ function setIndoDate(n){
   }
 }
 
+function setIndoDateOracle(n){
+  if (n){
+    arrDateSpace = n.split(" ");
+    arrDate = arrDateSpace[0].split("-");
+    return arrDate[2] + "/" + arrDate[1] + "/" + arrDate[0];
+  }else{
+    return "-";
+  }
+}
+
 // Set Currency Separator to input fields
 $(document).on('keypress , paste', '.number-separator', function (e) {
     if (/^-?\d*[,.]?(\d{0,3},)*(\d{3},)?\d{0,3}$/.test(e.key)) {

resources/views/partials/menu.blade.php

@@ -27,6 +27,12 @@
             <i class="nav-icon fas fa-th-large"></i>
             <p>Dana Bagi Hasil<i class="right fas fa-angle-left"></i></p>
           </a>
+          <ul class="nav nav-treeview">
+            <li class="nav-item">
+              <a href="#" class="nav-link">
+                <i class="fas fa-table nav-icon"></i>
+                <p>All <i class="right fas fa-angle-left"></i></p>
+              </a>
               <ul class="nav nav-treeview">
                 <?php if (Auth::user()->can("Read DBH Realisasi Pendapatan")){ ?>
                   <li class="nav-item">
@@ -54,6 +60,24 @@
                 <?php } ?>                
               </ul>
             </li>
+            <li class="nav-item">
+              <a href="#" class="nav-link">
+                <i class="fas fa-table nav-icon"></i>
+                <p>CHT <i class="right fas fa-angle-left"></i></p>
+              </a>
+              <ul class="nav nav-treeview">
+                <?php if (Auth::user()->can("Read DBH Jadwal")){ ?>
+                  <li class="nav-item">
+                    <a href="{{ url('/cht/jadwal-salurdana') }}" class="nav-link">
+                      <i class="nav-icon fa fa-minus"></i>
+                      <p>Jadwal CHT</p>
+                    </a>
+                  </li>
+                <?php } ?>
+              </ul>
+            </li>
+          </ul>
+        </li>
         {{-- <li class="nav-item">
           <a href="#" class="nav-link">
             <i class="nav-icon fas fa-th-large"></i>

resources/views/realisasi_belanja/form_input_realisasi.blade.php

@@ -9,21 +9,9 @@
                 <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $DbhBelanjaRealisasi->nama_rsk }}</textarea>
             </div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-12">
-            <div class="form-group">
-                <label>No. SP2D</label>
-                <input type="text" id="no_sp2d" required class="form-control" name="no_sp2d" value="{{ $DbhBelanjaRealisasiDetail->i_sp2dno_dok }}" disabled>
-            </div>
-        </div>
-        <div class="col-xs-12 col-sm-12 col-md-12">
-            <div class="form-group">
-                <label>Jumlah Realisasi</label>
-                <input type="text" id="jml_realisasi" required class="form-control" name="jml_realisasi" placeholder="Jumlah Realisasi" value="{{ separateNumberIndo($DbhBelanjaRealisasiDetail->v_spp) }}" disabled>
-            </div>
-        </div>
         <div class="col-xs-6 col-sm-6 col-md-6">
             <div class="form-group">
-                <?php $volSatuan = empty($DbhBelanjaRealisasiDetail->volume_satuan_realisasi) ? 0: $DbhBelanjaRealisasiDetail->volume_satuan_realisasi; ?>
+                <?php $volSatuan = empty($DbhBelanjaRealisasi->volume_satuan_realisasi) ? $DbhBelanjaRealisasi->volume_satuan: $DbhBelanjaRealisasi->volume_satuan_realisasi; ?>
                 <label>Volume Realisasi</label>
                 <input type="number" id="vol_realisasi" required class="form-control" name="vol_realisasi" value="{{ $volSatuan }}" placeholder="Volume Realisasi">
             </div>
@@ -32,8 +20,7 @@
             <div class="form-group">
                 <label>Unit Realisasi</label>
                 <select id="unit_realisasi" name="unit_realisasi" class="form-control" required placeholder="Unit Realisasi">
-                    <option></option>
+                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasi->unit_satuan_realisasi) ? $DbhBelanjaRealisasi->unit_satuan: $DbhBelanjaRealisasi->unit_satuan_realisasi; ?>
-                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasiDetail->unit_satuan_realisasi) ? "": $DbhBelanjaRealisasiDetail->unit_satuan_realisasi; ?>
                     <?php foreach($unitSatuan as $satuan){ ?>
                         <option {{ $unitSatuanVal == $satuan->nama_satuan ? "selected":"" }}>{{ $satuan->nama_satuan }}</option>    
                     <?php } ?>
@@ -41,66 +28,9 @@
             </div>
         </div>
         <div class="col-xs-12 col-sm-12 col-md-12">
-            <button id="btnSubmit" type="button" class="btn btn-success"><i class="fa fa-paper-plane"></i> Simpan</button>
+            <button type="submit" class="btn btn-success"><i class="fa fa-paper-plane"></i> Simpan</button>
         </div>
     </div>
 </form>
 <script type="text/javascript">
-    $(document).ready(function(){
-        detailSP2D = (noSP2D)=>{
-            $.ajax({
-                url: '/item-search-sp2d?no_sp2d='+noSP2D,
-                dataType: 'json',
-                success: function (data) {
-                    $("#vol_realisasi").prop("disabled", true);
-                    $("#unit_realisasi").prop("disabled", true);
-                    if (Object.keys(data).length == 0){
-                        Swal.fire('Data SP2D tidak ditemukan!!', '', 'error');
-                    }else{
-                        let jml = parseFloat(data.v_sp2d);
-                        $("#jml_realisasi").val(separateNumberIndo(jml));
-                        $("#vol_realisasi").prop("disabled", false);
-                        $("#unit_realisasi").prop("disabled", false);
-                    }
-                }
-            });
-        }
-
-        $("#no_sp2d").on("keypress",function(e){
-            if (e.keyCode == 13){
-                e.preventDefault();
-                detailSP2D($(this).val());
-            }
-        });
-
-        let cekValidasi=()=>{
-            if ($("#no_sp2d").val() == ""){
-                Swal.fire('No SP2D blm diisi!!', '', 'error');
-                return false;
-            }
-
-            if ($("#jml_realisasi").val() == ""){
-                Swal.fire('Jumlah Realisasi kosong!!', '', 'error');
-                return false;
-            }
-
-            if ($("#vol_realisasi").val() == 0){
-                Swal.fire('Volume Realisasi kosong!!', '', 'error');
-                return false;
-            }
-
-            if ($("#unit_realisasi").val() == ""){
-                Swal.fire('Unit Realisasi kosong!!', '', 'error');
-                return false;
-            }
-            return true;
-        }
-
-        $("#btnSubmit").on("click",function(e){
-            if (cekValidasi()){
-                $("#frmInputRealisasi input").prop("disabled", false);
-                $("#frmInputRealisasi").submit();
-            }
-        })
-    });
 </script>

resources/views/realisasi_belanja/form_input_realisasi.blade_SP2D.php

@@ -0,0 +1,106 @@
+<form id="frmInputRealisasi" action="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
+    @csrf
+    <div class="row">
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <div class="form-group">
+                <label>Rinci Sub Kegiatan</label>
+                <input type="hidden" value="{{ $redirect }}" name="redirect_link">
+                <input type="hidden" value="{{ $DbhBelanjaRealisasi->nama_rsk }}" name="id_rsk">
+                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $DbhBelanjaRealisasi->nama_rsk }}</textarea>
+            </div>
+        </div>
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <div class="form-group">
+                <label>No. SP2D</label>
+                <input type="text" id="no_sp2d" required class="form-control" name="no_sp2d" value="{{ $DbhBelanjaRealisasiDetail->i_sp2dno_dok }}" disabled>
+            </div>
+        </div>
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <div class="form-group">
+                <label>Jumlah Realisasi</label>
+                <input type="text" id="jml_realisasi" required class="form-control" name="jml_realisasi" placeholder="Jumlah Realisasi" value="{{ separateNumberIndo($DbhBelanjaRealisasiDetail->v_spp) }}" disabled>
+            </div>
+        </div>
+        <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="form-group">
+                <?php $volSatuan = empty($DbhBelanjaRealisasiDetail->volume_satuan_realisasi) ? 0: $DbhBelanjaRealisasiDetail->volume_satuan_realisasi; ?>
+                <label>Volume Realisasi</label>
+                <input type="number" id="vol_realisasi" required class="form-control" name="vol_realisasi" value="{{ $volSatuan }}" placeholder="Volume Realisasi">
+            </div>
+        </div>
+        <div class="col-xs-6 col-sm-6 col-md-6">
+            <div class="form-group">
+                <label>Unit Realisasi</label>
+                <select id="unit_realisasi" name="unit_realisasi" class="form-control" required placeholder="Unit Realisasi">
+                    <option></option>
+                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasiDetail->unit_satuan_realisasi) ? "": $DbhBelanjaRealisasiDetail->unit_satuan_realisasi; ?>
+                    <?php foreach($unitSatuan as $satuan){ ?>
+                        <option {{ $unitSatuanVal == $satuan->nama_satuan ? "selected":"" }}>{{ $satuan->nama_satuan }}</option>    
+                    <?php } ?>
+                </select>    
+            </div>
+        </div>
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <button id="btnSubmit" type="button" class="btn btn-success"><i class="fa fa-paper-plane"></i> Simpan</button>
+        </div>
+    </div>
+</form>
+<script type="text/javascript">
+    $(document).ready(function(){
+        detailSP2D = (noSP2D)=>{
+            $.ajax({
+                url: '/item-search-sp2d?no_sp2d='+noSP2D,
+                dataType: 'json',
+                success: function (data) {
+                    $("#vol_realisasi").prop("disabled", true);
+                    $("#unit_realisasi").prop("disabled", true);
+                    if (Object.keys(data).length == 0){
+                        Swal.fire('Data SP2D tidak ditemukan!!', '', 'error');
+                    }else{
+                        let jml = parseFloat(data.v_sp2d);
+                        $("#jml_realisasi").val(separateNumberIndo(jml));
+                        $("#vol_realisasi").prop("disabled", false);
+                        $("#unit_realisasi").prop("disabled", false);
+                    }
+                }
+            });
+        }
+
+        $("#no_sp2d").on("keypress",function(e){
+            if (e.keyCode == 13){
+                e.preventDefault();
+                detailSP2D($(this).val());
+            }
+        });
+
+        let cekValidasi=()=>{
+            if ($("#no_sp2d").val() == ""){
+                Swal.fire('No SP2D blm diisi!!', '', 'error');
+                return false;
+            }
+
+            if ($("#jml_realisasi").val() == ""){
+                Swal.fire('Jumlah Realisasi kosong!!', '', 'error');
+                return false;
+            }
+
+            if ($("#vol_realisasi").val() == 0){
+                Swal.fire('Volume Realisasi kosong!!', '', 'error');
+                return false;
+            }
+
+            if ($("#unit_realisasi").val() == ""){
+                Swal.fire('Unit Realisasi kosong!!', '', 'error');
+                return false;
+            }
+            return true;
+        }
+
+        $("#btnSubmit").on("click",function(e){
+            if (cekValidasi()){
+                $("#frmInputRealisasi input").prop("disabled", false);
+                $("#frmInputRealisasi").submit();
+            }
+        })
+    });
+</script>

resources/views/realisasi_belanja/index.blade.php

@@ -53,16 +53,17 @@
                         // "Jenis", 
                         // "Sub Jenis", 
                         // "Kode Program", 
-                        // "Nama Program", 
+
                         // "Kode SKPD", 
-                        // "Nama SKPD", 
                         // "Kode Kegiatan", 
                         // "Nama Kegiatan", 
                         // "Kode Sub Kegiatan", 
-                        // "Nama Sub Kegiatan", 
                         // "Kode RSK", 
-                        "Nama RSK", 
                         // "Kode Rek", "Nama Rek", 
+                        "Nama SKPD", 
+                        "Nama Program", 
+                        "Nama Sub Kegiatan", 
+                        "Nama RSK", 
                         "Anggaran", 
                         "Volume", 
                         "Unit",
@@ -144,22 +145,22 @@
                     // { "data": "jenis_belanja", "className":"text-left","defaultContent":"-" },                    
                     // { "data": "sub_jenis_belanja", "className":"text-left", "defaultContent":"-" },  
                     // { "data": "kode_program", "className":"text-center", "defaultContent":"-" },  
-                    // { "data": "nama_program", "className":"text-left", "defaultContent":"-" },  
                     // { "data": "kode_skpd", "className":"text-center", "defaultContent":"-" },  
-                    // { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" },  
                     // { "data": "kode_kegiatan", "className":"text-center", "defaultContent":"-" },  
                     // { "data": "nama_kegiatan", "className":"text-left", "defaultContent":"-" },  
                     // { "data": "kode_sub_kegiatan", "className":"text-center", "defaultContent":"-" },  
-                    // { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"-" },  
                     // { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" },  
-                    { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":"50%" },  
                     // { "data": "kode_rekening", "className":"text-center", "defaultContent":"-" },  
                     // { "data": "nama_rekening", "className":"text-left", "defaultContent":"-" },  
+                    { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" },  
+                    { "data": "nama_program", "className":"text-left", "defaultContent":"-" },  
+                    { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"20%" },  
+                    { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":"20%" },  
                     { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" },  
                     { "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 },  
                     { "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 },  
                     { "data": null},
-                    { "data": "vol_realisasi", "className":"text-center", "defaultContent":"0", "width":50 },  
+                    { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0", "width":50 },  
                     { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-", "width":50 },
                     { "data": null}  
                 ],
@@ -170,9 +171,9 @@
                     //let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'<a class="btn btn-sm btn-success modalButton" title="Input Realisasi" href="/dbh/realisasi-belanja/'+aData["id"]+'/inputRealisasi"><i class="fa fa-paper-plane"></i> Input Realisasi</a>':''; 
                     let btnInput = "";
                     $("td:eq(0)", nRow).html(index);
-                    $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
+                    $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
-                    $("td:eq(5)", nRow).html(separateNumberIndo(aData["jml_realisasi"]));
+                    $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"]));
-                    $("td:eq(8)", nRow).html('<a href="/dbh/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
+                    $("td:eq(11)", nRow).html('<a href="/dbh/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
                     
                     return nRow;
                 },

resources/views/realisasi_belanja/submit.blade.php

@@ -36,27 +36,36 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-6">
-                    <strong><i class="fa fa-th-list mr-2"></i> AKB</strong><hr style="margin-bottom: 0 !important;">
+                    <strong><i class="fa fa-th-list mr-2"></i> AKB vs Realisasi</strong><hr style="margin-bottom: 0 !important;">
                     <div class="row">
+                        <div class='col-12'>
+                            <table class="table table-striped table-bordered">
+                                <thead>
+                                    <th>Bulan</th>
+                                    <th class="text-right">AKB</th>
+                                    <th class="text-right">Realisasi</th>
+                                </thead>
+                                <tbody>
                                     <?php 
-                            $totalAKB = 0;
+                                        $totalAKB = 0; $totalBKU = 0;
                                         foreach(GetBulan() as $key=>$bulan){ ?>
-                            <?= $key == 0 || $key == 6 ? "<div class='col-6'>":"" ?> 
+                                            <tr>
-                            <div class="form-group row">
+                                                <td>{{ $bulan }}</td>
-                                <label class="col-form-label col-md-5 col-sm-5 label-align" style="{{ $key%2==0?"background: #f2f2f2":"" }}">{{ $bulan }}</label>
+                                                <td class="text-right">{{ separateNumberIndo($vwAKB["v_akb_".substr("00".($key+1),-2)]) }} </td>
-                                <div class="col-md-7 col-sm-7 ">
+                                                <td class="text-right">{{ separateNumberIndo($vwAKB["v_bku_".substr("00".($key+1),-2)]) }} </td>
-                                    <input class="form-control-sm form-control-plaintext text-right" style="{{ $key%2==0?"background: #f2f2f2":"" }}" value={{ separateNumberIndo($vwAKB["v_akb_".substr("00".($key+1),-2)]) }} readonly>
+                                            </tr>
-                                </div>
-                            </div>
-                            <?= $key == 5 || $key == 11 ? "</div>":"" ?>
                                     <?php 
                                         $totalAKB+=floatVal($vwAKB["v_akb_".substr("00".($key+1),-2)]); 
+                                        $totalBKU+=floatVal($vwAKB["v_bku_".substr("00".($key+1),-2)]); 
                                     } ?>
+                                    <tr>
+                                        <td><strong>TOTAL</strong></td>
+                                        <td class="text-right"><strong>{{ separateNumberIndo($totalAKB) }}</strong></td>
+                                        <td class="text-right"><strong>{{ separateNumberIndo($totalBKU) }}</strong></td>
+                                    </tr>
+                                </tbody>
+                            </table>
                         </div>
-                    <div class="row" style="font-size:1.0em; font-weight:bold;">
-                        <div class="col-12"><hr></div>
-                        <div class="col-6">TOTAL AKB</div>
-                        <div class="col-6 text-right">{{ separateNumberIndo($totalAKB) }}</div>
                     </div>
                 </div>
                 <div class="col-6">
@@ -64,8 +73,8 @@
                     <table class="table table-striped table-bordered">
                         <thead>
                             <th>Nomor</th>
-                            <th>Tanggal</th>
+                            <th class="text-center">Tanggal</th>
-                            <th>Jumlah</th>
+                            <th class="text-right">Jumlah</th>
                         </thead>
                         <tbody>
                             <?php 
@@ -73,7 +82,7 @@
                                 foreach($vwSPD as $key=>$spd){ ?>
                                     <tr>
                                         <td>{{ $spd->i_spdno_dok }}</td>
-                                        <td>{{ date("d-m-Y",strtotime($spd->d_spdno)) }}</td>
+                                        <td class="text-center">{{ date("d-m-Y",strtotime($spd->d_spdno)) }}</td>
                                         <td class="text-right">{{ separateNumberIndo($spd->jml) }}</td>
                                     </tr>
                             <?php $totalSPD+=floatVal($spd->jml); } ?>
@@ -83,47 +92,51 @@
                             </tr>
                         </tbody>
                     </table>
+                    <strong><i class="fa fa-th-list mr-2 mt-4"></i> SP2D</strong><hr style="margin-bottom: 0 !important;">
+                    <table class="table table-striped table-bordered">
+                        <thead>
+                            <th>Nomor</th>
+                            <th class="text-center">Tanggal</th>
+                            <th class="text-right">Jumlah</th>
+                        </thead>
+                        <tbody>
+                            <?php 
+                                $totalSP2D = 0;    
+                                foreach($vwSP2D as $key=>$sp2d){ ?>
+                                    <tr>
+                                        <td>{{ $sp2d->i_sp2dno_dok }}</td>
+                                        <td class="text-center">{{ date("d-m-Y",strtotime($sp2d->d_sp2d_sah)) }}</td>
+                                        <td class="text-right">{{ separateNumberIndo($sp2d->v_spp) }}</td>
+                                    </tr>
+                            <?php $totalSP2D+=floatVal($sp2d->v_spp); } ?>
+                            <tr >
+                                <td colspan="2"><strong>TOTAL SP2D</strong></td>
+                                <td class="text-right"><strong>{{ separateNumberIndo($totalSP2D) }}</strong></td>
+                            </tr>
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
     <div class="card">
-        {{-- <div class="card-header">
-            <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Realisasi</h2>
-            <div class="card-tools">
-                <?php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
-                    <a class="btn btn-sm btn-success modalButton" title="Input Realisasi" href="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi?redirect_link=/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
-                <?php } ?>
-            </div>
-        </div> --}}
         <div class="card-body">
             <strong><i class="fa fa-th-list mr-2"></i> REALISASI</strong><hr style="margin-bottom: 0 !important;">
-            <table id="tblInputRealisasi" class="table table-striped jambo_table tblClickRow" style="width:100%; margin-top:0 !important;">
+            <div class="form-group">
-                <thead> 
+                <label class="col-form-label label-align" for="sk">Jumlah Realisasi</label>
-                    <tr class="headings">
+                <input type="text" class="form-control" name="jml_realisasi" disabled value="{{ separateNumberIndo($totalSP2D) }}">
-                        <th>No</th>
+            </div>
-                        <?php 
+            <div class="form-group">
-                            $arrCol = array(
+                <label class="col-form-label label-align" for="sk">Volume Realisasi</label>
-                                "No. SP2D",
+                <input type="text" class="form-control" name="vol_realisasi" disabled>
-                                "Tanggal", 
+            </div>
-                                "Jumlah Realisasi",
+            <div class="form-group">
-                                "Volume Realisasi", 
+                <label class="col-form-label label-align" for="sk">Unit Realisasi</label>
-                                "Unit Realisasi",
+                <input type="text" class="form-control" name="unit_realisasi" disabled>
-                                "Aksi"
+            </div>
-                            );
+            <?php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
-                            
+                <a class="btn btn-success modalButton" title="Input Realisasi" href="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi?redirect_link=/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
-                            if (!Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){
+            <?php } ?>
-                                unset($arrCol[5]);
-                            }
-                            
-                            foreach($arrCol as $rowCol){
-                                echo "<th>$rowCol</th>";
-                            }
-                        ?>
-                    </tr>
-                </thead>
-                <tbody></tbody>
-            </table>
         </div>
     </div>
 @endsection
@@ -186,93 +199,6 @@
             $("input[name=vol_realisasi]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan_realisasi)?$DbhBelanjaRealisasi->volume_satuan_realisasi:0 }}");
             $("input[name=unit_realisasi]").val("{{ isset($DbhBelanjaRealisasi->unit_satuan_realisasi)?$DbhBelanjaRealisasi->unit_satuan_realisasi:0 }}");
 
-            var dtTable = $('#tblInputRealisasi').DataTable( {
-                "processing": true,
-                "serverSide": true,
-                "ordering": false,
-                "autoWidth": false,
-                "ajax": {
-                    url: "/dbh/realisasi-belanja/{{ $DbhBelanjaRealisasi->kode_rsk }}/inputrealisasi-datatable",
-                    type: "POST",
-                    headers: {
-                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                    },
-                    data: function (d) {
-                    }
-                },
-                "columnDefs": [
-                    //{ className: "td-nowrap", "targets": [ 1 ] }
-                ],
-                "dom": "<\"top\" <\"row\"<\"col-md-6\"><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"><\"col-md-6\">> ><\"clear\">",
-                "lengthMenu": [
-                    [ 10, 25, 50 ],
-                    [ "10", "25", "50" ]
-                ],
-                "paging": true, // Table pagination
-                "columns": [
-                    { "data": null},
-                    { "data": "i_sp2dno_dok", "className":"text-center", "defaultContent":"-"},  
-                    { "data": "d_sp2d_sah", "className":"text-center", "defaultContent":"-"},
-                    { "data": "v_spp", "className":"text-right", "defaultContent":"0" },  
-                    { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0" },  
-                    { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-" },  
-                    { "data": null}  
-                ],
-                "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
-                    let info = dtTable.page.info();
-                    let numStart = info.page;
-                    let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
-                    let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'<a class="btn btn-sm btn-default modalButton" title="Input Realisasi" href="/dbh/realisasi-belanja/{{ $DbhBelanjaRealisasi->id }}/inputRealisasi?id_sp2d='+aData["idsp2d"]+'&redirect_link=/dbh/realisasi-belanja/{{ $DbhBelanjaRealisasi->id }}/submit"><i class="fa fa-edit"></i></a>':''; 
-                    //let btnDelete = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'<a href="/dbh/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-trash"></i></a>':'';
-                    //let btnDelete = {{ !empty(auth()->user()->can('Input Realisasi DBH Realisasi Belanja'))?auth()->user()->can('Input Realisasi DBH Realisasi Belanja'):"false" }} ?"<button type='submit' class='btn btn-default btn-sm ml-1' title='Hapus'><i class='fa fa-trash'></i></button>":"";
-                    
-                    $("td:eq(0)", nRow).html(index);
-                    $("td:eq(3)", nRow).html(separateNumberIndo(aData["v_spp"]));
-                    $("td:eq(6)", nRow).html(btnInput);
-                    
-                    return nRow;
-                },
-                "language": {
-                    "lengthMenu": "Tampil _MENU_ data per Halaman",
-                    "zeroRecords": "Data tidak ditemukan!",
-                    "info": "Halaman _PAGE_ dari _PAGES_ Halaman",
-                    "infoEmpty": "Data tidak tersedia",
-                    "infoFiltered": "(Disaring dari _MAX_ Data)",
-                    "paginate": {
-                        "previous": "<i class='fas fa-angle-double-left'></i>",
-                        "next": "<i class='fas fa-angle-double-right'></i>",
-                    },
-                    "processing": "<div class='loading'></div>",
-                },
-                scrollX:true,
-                rowGroup: {
-                    endRender: function ( rows, group, index ) {
-                        let sumRealisasi = rows.data().pluck("jumlah_realisasi").reduce( function (a, b) {
-                            return a + b * 1;
-                        }, 0);
-
-                        let sumVolume = rows.data().pluck("volume_satuan_realisasi").reduce( function (a, b) {
-                            return a + b * 1;
-                        }, 0);
-
-                        let satuan = rows.data().pluck("unit_satuan_realisasi").reduce( function (a) {
-                            return a;
-                        });
-                        
-                        let textmuted = index == 1 ? "text-muted":"";
-                        let labelGroup = index == 1 ?"JUMLAH | " + group : "TOTAL";
-                        return $("<tr/>") 
-                            .append( "<td colspan='3'>TOTAL</td>")   
-                            .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sumRealisasi) +"</strong></td>")
-                            .append( "<td class=\'text-center " + textmuted +"\'><strong>"+ separateNumberIndo(sumVolume) +"</strong></td>" )
-                            .append( "<td class=\'text-center " + textmuted +"\'><strong>"+satuan+"</td><td></td>")
-                    },
-                    startRender: function ( rows, group, index ) {
-                    },
-                    dataSrc: ["i_idopd"]
-                },
-            });
-
         });
     </script>
 @endsection

resources/views/realisasi_pendapatan/form.blade.php

@@ -107,6 +107,10 @@
             <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">SP2D BUN</label>
             <input id="txt_simtrad4_sp2d_bun" name="txt_simtrad4_sp2d_bun" class="form-control" required value="">
         </div>
+        <div class="form-group">
+            <label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TGL SP2D BUN</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>
             <input id="txt_simtrad4_kotor" name="txt_simtrad4_kotor" class="form-control number-separator-indo" value="0">

resources/views/realisasi_pendapatan/index.blade.php

@@ -56,7 +56,9 @@
                 <th>Potongan</th>
                 <th>Bersih</th>
                 <th>SP2D BUN</th>
+                <th>TGL SP2D BUN</th>
                 <th>NO. STS</th>
+                <th>TGL STS</th>
                 <th>Aksi</th>
             </tr>
         </thead>
@@ -125,7 +127,9 @@
                     { "data": "simtrad4_potongan", "className":"text-right" },  
                     { "data": "simtrad4_bersih", "className":"text-right", "defaultContent":"0" },  
                     { "data": "simtrad4_sp2d_bun", "className":"text-left", "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":"-"},
                     { "data": null},
                 ],
                 "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
@@ -138,7 +142,9 @@
                     $("td:eq(2)", nRow).html(separateNumberIndo(aData["simtrad4_kotor"]));
                     $("td:eq(3)", nRow).html(separateNumberIndo(aData["simtrad4_potongan"]));
                     $("td:eq(4)", nRow).html(separateNumberIndo(aData["simtrad4_bersih"]));
-                    $("td:eq(7)", nRow).html(
+                    $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"]));
+                    $("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"]));
+                    $("td:eq(9)", nRow).html(
                         "<form class='form-delete' action='/dbh/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
                             "<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+
                             "<a class='btn btn-default btn-sm' href='/dbh/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-bullseye'></i></a>"+    

resources/views/realisasi_pendapatan/show.blade.php

@@ -66,6 +66,7 @@
         </form>
     </div>
 </div>
+<div class="loading" style="display: none;"></div>
 @stop
 @section('scripts2')
     <script type="text/javascript">
@@ -78,6 +79,7 @@
             $("#txt_ta").val("{{ $realisasi_pendapatan->tahun }}");
             $("#txt_simtrad4_uraian").val("{{ $realisasi_pendapatan->simtrad4_uraian }}");
             $("#txt_simtrad4_sp2d_bun").val("{{ $realisasi_pendapatan->simtrad4_sp2d_bun }}");
+            $("#txt_simtrad4_tgl_sp2d_bun").val("{{ date('d/m/Y',strtotime($realisasi_pendapatan->simtrad4_tgl_sp2d_bun)) }}");
             $("#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) }}");
@@ -86,6 +88,10 @@
             $("#rkud_no_sts").on("keypress", function(e){
                 if (e.keyCode == 13){
                     e.preventDefault();
+                    if ($(this).val()==""){
+                        Swal.fire("Harap isi nomor STS!", '', 'error');
+                    }else{
+                        $(".loading").show();
                         $.ajax({
                             url: '/item-search-sts?no_skprd='+$(this).val(),
                             dataType: 'json',
@@ -94,9 +100,13 @@
                                 $("#rkud_kode_akun").val(data.kode_bas);
                                 $("#rkud_nama_akun").val(data.n_akun);
                                 $("#rkud_jumlah").val(data.nilai_bayar);
+                            },
+                            complete: function(){
+                                $('.loading').hide();
                             }
                         });
                     }
+                }
             });
 
             $("#frmrealisasipendapatan").on("submit",function(e){
@@ -104,7 +114,7 @@
                 if ($("#rkud_jumlah").val()==$("#txt_simtrad4_bersih").val()){
                     return e.currentTarget.submit();
                 }else{
-                    Swal.fire("Jumlah pada STS tidak sama!", '', 'error');
+                    Swal.fire("Jumlah pada STS harus sama dengan Rencana !", '', 'error');
                 }
             });