fix kelulusan

2021-01-17 08:46:07 +08:00
parent 28f00f7f39
commit 79aa543e69
4 changed files with 61 additions and 17 deletions
@@ -118,6 +118,10 @@ class MarhunController extends Controller
    }

    public function getLaporanMarhunTerkumpul($kodcaw,$tarikh){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

        $marhun = Marhun::on($cawangan['mysql'])
@@ -125,6 +129,7 @@ class MarhunController extends Controller
                ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan')
                ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') 
                ->where('Marhun.t_gadai','<=',$tarikh)
+                ->whereYear('Marhun.t_gadai','=',$current->year)
                ->where('Gadai.sttebus','=','')
                ->orderBy('Marhun.norujukan')
                ->get();