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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
e.arrahn
2021-05-07 17:01:47 +08:00
parent 9601a2c500 3450738281
commit 2b3b39b90a
4 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+22 -8
View File
@@ -2168,6 +2168,17 @@ class GadaiController extends Controller
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$tarikhtawarruq = '';
switch ($kodcaw) {
case 'KB2':
$tarikhtawarruq = '2021-04-13';
break;
case 'WCY':
$tarikhtawarruq = '2021-05-04';
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql']) $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1) ->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
@@ -2176,8 +2187,8 @@ class GadaiController extends Controller
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) ->where('tagpalsu','=',0)
->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']]) ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]) ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
->sum('pinjaman'); ->sum('pinjaman');
// $gadaibaru = Gadai::on($cawangan['mysql']) // $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2197,15 +2208,16 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
if($request->tarikh > '2021-04-13'){ // if($request->tarikh > '2021-04-13'){
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0) ->where('tagpalsu','=',0)
// ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]]) // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=',''],['hargajualan','<>','NULL']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
->sum('pinjaman'); ->sum('pinjaman');
} // }
return response()->json($rekod_pinjamandiberi); return response()->json($rekod_pinjamandiberi);
} }
@@ -2223,7 +2235,8 @@ class GadaiController extends Controller
$keuntungan = Gadai::on($cawangan['mysql']) $keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh) ->where('t_gadai','<=',$request->tarikh)
->where('t_gadai','>=','2021-04-14') // ->where('t_gadai','>=','2021-04-14')
->where('hargajualan','<>','null')
// ->where('sttebus','=','') // ->where('sttebus','=','')
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
->whereNotNull('upah12') ->whereNotNull('upah12')
@@ -2261,7 +2274,8 @@ class GadaiController extends Controller
$transaksi = TransaksiKeuntungan::on('mysql7') $transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('db2.sttebus','=','') ->where('db2.sttebus','=','')
->where('tarikh_bayaran' ,'>=', $datetawarruq) // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan'); ->sum('bayaran_pembiayaan');
app/Http/Controllers/LelongController.php
+26 -14
View File
@@ -142,29 +142,41 @@ class LelongController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$bakilelonglama = imbangdugalama::on($cawangan['mysql']) // $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('baki_lelong'); // ->sum('baki_lelong');
$rugilelonglama = imbangdugalama::on($cawangan['mysql']) // $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
->sum('rugi_lelong'); // ->sum('rugi_lelong');
if($request->tarikh <= '2021-02-25') if($kodcaw == 'KB2')
{ {
$bakilelong = Lelong::on($cawangan['mysql']) if($request->tarikh <= '2021-02-25')
->where('t_jual','<=',$request->tarikh) {
->where(function($query) use ($tarikhbaru){ $bakilelong = Lelong::on($cawangan['mysql'])
$query->whereNull('trkhtuntut') ->where('t_jual','<=',$request->tarikh)
->orWhere('trkhtuntut','>',$tarikhbaru); ->where(function($query) use ($tarikhbaru){
}) $query->whereNull('trkhtuntut')
->where('baki','>=',0) ->orWhere('trkhtuntut','>',$tarikhbaru);
->sum('baki'); })
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
}else{ }else{
$bakilelong = Lelong::on($cawangan['mysql']) $bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','<=',$request->tarikh) ->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){ ->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut') $query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25'); ->orWhere('trkhtuntut','>',$tarikhbaru);
}) })
->where('baki','>=',0) ->where('baki','>=',0)
->sum('baki'); ->sum('baki');
app/Http/Controllers/TebusController.php
+2 -2
View File
@@ -355,7 +355,6 @@ class TebusController extends Controller
'kodcaw'=> $kodcaw 'kodcaw'=> $kodcaw
]); ]);
if($request->jenistebus == 'P'){ if($request->jenistebus == 'P'){
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah; $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah;
$transaction = Transaction::on('mysql7')->create([ $transaction = Transaction::on('mysql7')->create([
@@ -866,8 +865,9 @@ class TebusController extends Controller
$rebet = Tebus::on($cawangan['mysql']) $rebet = Tebus::on($cawangan['mysql'])
->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->where('tebus.t_tebus','>','2021-04-13') // ->where('tebus.t_tebus','>','2021-04-13')
->where('tebus.t_tebus','<=',$request->tarikh) ->where('tebus.t_tebus','<=',$request->tarikh)
->where('db2.hargajualan','>','0') // tambahan 2021-05-07
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('rebate'); ->sum('rebate');
app/Http/Controllers/TunaiController.php
+1 -1
View File
@@ -85,7 +85,7 @@ class TunaiController extends Controller
$current = new Carbon(); $current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array( update(array(
'keluar'=>$request->keluar, 'keluar'=>$request->keluar,
'masuk'=>$request->masuk, 'masuk'=>$request->masuk,