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

Merge branch 'adminapi' into 'master'

Browse Source 
fix latest

See merge request online-sistem1/api_arrahn!134
This commit is contained in:
hafifie rahman
2022-01-04 03:34:18 +00:00
parent 3da5630115 b776924e71
commit fe2e41118d
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+3 -5
View File
@@ -1394,16 +1394,15 @@ class AdminPageController extends Controller
public function SenaraiBlacklist(Request $request) public function SenaraiBlacklist(Request $request)
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
if(isset($request->search)) if(isset($request->search))
{ {
$blacklist = Blacklist::on($cawangan['mysql']) $blacklist = Blacklist::on('mysql7')
->where('nama','LIKE',"%{$request->search}%") ->where('nama','LIKE',"%{$request->search}%")
->orderBy('tarikhdaftar','desc') ->orderBy('tarikhdaftar','desc')
->paginate(5); ->paginate(5);
}else{ }else{
$blacklist = Blacklist::on($cawangan['mysql']) $blacklist = Blacklist::on('mysql7')
->orderBy('tarikhdaftar','desc') ->orderBy('tarikhdaftar','desc')
->paginate(5); ->paginate(5);
} }
@@ -1414,14 +1413,13 @@ class AdminPageController extends Controller
public function AddSenaraiHitam(Request $request) public function AddSenaraiHitam(Request $request)
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();
$customer = Customer::on('mysql7') $customer = Customer::on('mysql7')
->where('kpbaru','=', $request->nokp) ->where('kpbaru','=', $request->nokp)
->orWhere('kplama','=', $request->nokp) ->orWhere('kplama','=', $request->nokp)
->first(); ->first();
$blacklist = Blacklist::on($cawangan['mysql'])->create([ $blacklist = Blacklist::on('mysql7')->create([
'kodcaw' => $customer['kodcaw'], 'kodcaw' => $customer['kodcaw'],
'tarikhdaftar' => $customer['tarikhdaftar'], 'tarikhdaftar' => $customer['tarikhdaftar'],
'kplama' => $customer['kplama'], 'kplama' => $customer['kplama'],
app/Http/Controllers/GadaiController.php
+14 -7
View File
@@ -2728,18 +2728,25 @@ class GadaiController extends Controller
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->sum('pinjaman'); ->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) ->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]]) ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman'); ->sum('pinjaman');
// if($kodcaw === '011232') $totalemas = 0;
// { $totalpinjaman = 0;
// $rekod_pinjamandiberi -= 282; if($kodcaw === 'GC')
// } {
$totalemas = floatval($rekod_emaspalsu) - 10000;
$totalpinjaman = floatval($rekod_pinjamandiberi) + 10000;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; }else{
$totalemas = $rekod_emaspalsu;
$totalpinjaman = $rekod_pinjamandiberi;
}
$array_rekodemas = ['pinjamankoop' => $totalpinjaman,'emaspalsu' => $totalemas];
return response()->json($array_rekodemas); return response()->json($array_rekodemas);
} }
@@ -2981,7 +2988,7 @@ class GadaiController extends Controller
->where('trans.trans_type','=','A') ->where('trans.trans_type','=','A')
->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) ->where('trans.kodcaw',$request->kodcaw)
// ->whereNotNull('db2.hargajualan') // ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
app/Http/Controllers/TebusController.php
+8 -8
View File
@@ -1090,7 +1090,7 @@ class TebusController extends Controller
// ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->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('transaksi_keuntungan.tarikh_bayaran','=',$current->year) // ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
// ->whereNull('db2.hargajualan') // ->whereNull('db2.hargajualan')
// ->sum('bayaran_keuntungan'); // ->sum('bayaran_keuntungan');
// ->get(); // ->get();
@@ -1112,18 +1112,18 @@ class TebusController extends Controller
$upahtebus = Tebus::on($cawangan['mysql']) $upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']]) ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
->whereYear('t_tebus','=',$current->year) // ->whereYear('t_tebus','=',$current->year)
->sum('upahdibayar'); ->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql']) $upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']]) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']])
->whereYear('t_jual','=',$current->year) // ->whereYear('t_jual','=',$current->year)
->sum('bakiupah'); ->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql']) $upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','>=',$request->mula) ->where('tarikh','>=',$request->mula)
->where('tarikh','<=',$request->hingga) ->where('tarikh','<=',$request->hingga)
->whereYear('tarikh','=',$current->year) // ->whereYear('tarikh','=',$current->year)
->sum('upahdibayar'); ->sum('upahdibayar');
@@ -1664,7 +1664,7 @@ class TebusController extends Controller
$keuntungan_data = TransaksiKeuntungan::on('mysql7') $keuntungan_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga) ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga)
->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) ->where('kodcaw',$request->kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
@@ -1676,13 +1676,13 @@ class TebusController extends Controller
->whereDate('tarikh_bayaran', '<=', $request->hingga) ->whereDate('tarikh_bayaran', '<=', $request->hingga)
->whereDate('tarikh_bayaran', '>=', $request->mula) ->whereDate('tarikh_bayaran', '>=', $request->mula)
->whereDate('tarikh_bayaran' ,'<', $dateSM) ->whereDate('tarikh_bayaran' ,'<', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) // ->whereYear('tarikh_bayaran','=',$current->year)
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
$keuntunganreducing_data = TransaksiKeuntungan::on('mysql7') $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $request->mula) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $request->mula)
->whereYear('tarikh_bayaran','=',$current->year) // ->whereYear('tarikh_bayaran','=',$current->year)
->where('kodcaw',$request->kodcaw) ->where('kodcaw',$request->kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
@@ -1692,7 +1692,7 @@ class TebusController extends Controller
->whereIn('norujukan',$gadaiData) ->whereIn('norujukan',$gadaiData)
->whereDate('tarikh_bayaran' ,'<=', $request->hingga) ->whereDate('tarikh_bayaran' ,'<=', $request->hingga)
->whereDate('tarikh_bayaran','>=', $request->mula) ->whereDate('tarikh_bayaran','>=', $request->mula)
->whereYear('tarikh_bayaran','=',$current->year) // ->whereYear('tarikh_bayaran','=',$current->year)
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$total = ($keuntungan + $keuntunganreducing); $total = ($keuntungan + $keuntunganreducing);