Git Fix Conflict

2026-06-19 14:48:06 +07:00
parent 5bbf6008ed cae2b02010
commit b6dd0b04bc
6 changed files with 163 additions and 96 deletions
@@ -58,6 +58,7 @@ class RealisasiPendapatanController extends Controller

        $data["tw"] = $req["tw"];
        $data["gelombang"] = $req["gelombang"];
+        $data["bulan"] = $req["bulan"];
        $data["potongan_pph"] = replaceMoney($req["potongan_pph"]);
        $data["potongan_jkn"] = replaceMoney($req["potongan_jkn"]);

@@ -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','tw','gelombang','potongan_pph','potongan_jkn'
+        'retur','bersih','tw','gelombang','potongan_pph','potongan_jkn','bulan'
    ];

    public function hasSts() {