fix laporan

2021-05-04 16:34:00 +08:00
parent 992b3ea2ea
commit fd8e1d504d
4 changed files with 73 additions and 11 deletions
@@ -892,16 +892,15 @@ class GadaiController extends Controller
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

        $dateans = new Carbon($request->tarikh);
-        $dateans->addDays(1);
-
-        $date = new Carbon($request->tarikh);
-

        $gadai = Transaction::on('mysql7')
-                ->join('transaksi_keuntungan', 'transaction.norujukan', '=', 'transaksi_keuntungan.norujukan')
+                ->leftJoin('transaksi_keuntungan as trans', function($join)
+                {
+                    $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                    $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                })
                ->where('transaction.trans_type','=','A')
-                ->where('transaction.created_at','>=',$date)
-                ->where('transaction.created_at','<=',$dateans)
+                ->whereDate('transaction.created_at','=',$dateans)
                ->get();
        
        return response()->json($gadai);