Merge branch 'Feature#AnsuranResit' into 'master'

fix laporan controller See merge request online-sistem1/api_arrahn!184
2023-03-24 14:03:11 +00:00
parent bd84c6c133 0592f3e361
commit 3211ebdbf7
1 changed files with 7 additions and 0 deletions
@@ -92,6 +92,13 @@ class LaporanController extends Controller
        $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');

        $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
+                                            ->leftJoin('transaction as trans', function($join)
+                                            {
+                                                $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                                                $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                                            })
+                                            ->where('trans.teller','<>','Online')
+                                            ->where('trans.trans_type','=','A')
                                            ->whereIn('norujukan',$gadaiDataKaunter)
                                            ->whereDate('tarikh_bayaran','=',$request->tarikh);