KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pembetulan laporan

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-06 16:49:35 +08:00
parent b5b68d9517
commit c822c3abd3
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+13 -10
View File
@@ -920,18 +920,25 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh); $dateans = new Carbon($request->tarikh);
$gadai = Transaction::on('mysql7') $ansuran = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function($join) ->leftJoin('transaksi_keuntungan as trans', function($join)
{ {
$join->on('transaction.norujukan', '=', 'trans.norujukan'); $join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
}) })
->leftJoin('customer as cust', function($join)
{
$join->on('transaction.nokp', '=', 'cust.kpbaru');
$join->orOn('transaction.nokp', '=', 'cust.kplama');
})
->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan')
->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A') ->where('transaction.trans_type','=','A')
->whereDate('transaction.created_at','=',$dateans) ->whereDate('transaction.created_at','=',$dateans)
->orderBy('transaction.teller')
->get(); ->get();
return response()->json($gadai); return response()->json($ansuran);
} }
public function getAnsuranSummary($kodcaw,Request $request){ public function getAnsuranSummary($kodcaw,Request $request){
@@ -947,16 +954,12 @@ class GadaiController extends Controller
}) })
->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.kodcaw','=',$kodcaw)
->where('transaction.trans_type','=','A') ->where('transaction.trans_type','=','A')
->whereDate('transaction.created_at','=',$dateans) ->whereDate('transaction.created_at','=',$dateans);
->sum('trans.bayaran_keuntungan');
$transaksi = TransaksiKeuntungan::on('mysql7') $keuntungan = $ansurans->sum('trans.bayaran_keuntungan');
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan');
->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]])
->sum('bayaran_pembiayaan');
$arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans]; $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan];
return response()->json($arrayansuran,200); return response()->json($arrayansuran,200);
} }
app/Http/Controllers/TebusController.php
+2 -1
View File
@@ -494,13 +494,14 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus = Tebus::on($cawangan['mysql']) $tebus = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg') ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
->join('gadai as gad','gad.norujukan','=','tebus.norujukan') ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->join('online_arrahn.customer as cust', function($join) ->join('online_arrahn.customer as cust', function($join)
{ {
$join->on('gad.nokp', '=', 'cust.kpbaru'); $join->on('gad.nokp', '=', 'cust.kpbaru');
$join->orOn('gad.nokp', '=', 'cust.kplama'); $join->orOn('gad.nokp', '=', 'cust.kplama');
}) })
->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
->where('tebus.t_tebus','=',$tarikh) ->where('tebus.t_tebus','=',$tarikh)
->orderBy('tebus.teller') ->orderBy('tebus.teller')
->orderBy('tebus.sirit') ->orderBy('tebus.sirit')