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

Merge branch 'lapfix' into 'master'

Browse Source 
masukkan kodcaw

See merge request online-sistem1/api_arrahn!120
This commit is contained in:
Afiq Zakwan Hamdan
2021-10-05 03:58:33 +00:00
parent 213c4f3204 de3024fd68
commit a302392e32
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+2
View File
@@ -2817,6 +2817,7 @@ class GadaiController extends Controller
$transaksi_data = TransaksiKeuntungan::on('mysql7') $transaksi_data = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
@@ -2871,6 +2872,7 @@ class GadaiController extends Controller
$transaksi_data = TransaksiKeuntungan::on('mysql7') $transaksi_data = TransaksiKeuntungan::on('mysql7')
->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
->where('kodcaw',$request->kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
app/Http/Controllers/LaporanController.php
+2
View File
@@ -50,6 +50,7 @@ class LaporanController extends Controller
->whereDate('trans.created_at','=',$request->tarikh) ->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A') ->where('trans.trans_type','=','A')
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
// ->get(); // ->get();
@@ -241,6 +242,7 @@ class LaporanController extends Controller
// ->where('db2.sttebus','=','') // ->where('db2.sttebus','=','')
// ->where('db2.hargajualan','<>','null') // ->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$request->kodcaw)
// ->sum('bayaran_pembiayaan'); // ->sum('bayaran_pembiayaan');
// ->get(); // ->get();
->pluck('norujukan'); ->pluck('norujukan');
app/Http/Controllers/TebusController.php
+8
View File
@@ -1196,6 +1196,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
->pluck('norujukan'); ->pluck('norujukan');
@@ -1224,6 +1225,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet'); // ->sum('keuntungan_rebet');
// ->get(); // ->get();
@@ -1258,6 +1260,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
// ->get(); // ->get();
@@ -1286,6 +1289,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09')
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet'); // ->sum('keuntungan_rebet');
// ->get(); // ->get();
@@ -1323,6 +1327,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet'); // ->sum('keuntungan_rebet');
// ->get(); // ->get();
@@ -1370,6 +1375,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
// ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
// ->get(); // ->get();
@@ -1436,6 +1442,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('keuntungan_rebet'); // ->sum('keuntungan_rebet');
->get(); ->get();
@@ -1461,6 +1468,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
->get(); ->get();