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

fix lejer am

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-04 15:32:26 +08:00
parent a8dde4715f
commit 8db8f17ed8
4 changed files with 118 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+45 -24
View File
@@ -558,14 +558,15 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller')
->join('Customer as cust', function($join)
->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller')
->join('online_arrahn.customer as cust', function($join)
{
$join->on('Gadai.nokp', '=', 'cust.kpbaru');
$join->orOn('Gadai.nokp', '=', 'cust.kplama');
$join->on('gadai.nokp', '=', 'cust.kpbaru');
$join->orOn('gadai.nokp', '=', 'cust.kplama');
})
->where('Gadai.t_gadai','=',$tarikh)
->orderBy('Gadai.teller')
->where('gadai.t_gadai','=',$tarikh)
->orderBy('gadai.teller')
->orderBy('gadai.sirig')
->get();
return response()->json($gadai);
@@ -2338,7 +2339,16 @@ class GadaiController extends Controller
case '011412':
$tarikhtawarruq = '2021-06-23';
break;
}
case '011234':
$tarikhtawarruq = '2021-06-22';
break;
case '020303':
$tarikhtawarruq = '2021-06-23';
break;
case '010618':
$tarikhtawarruq = '2021-06-23';
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
@@ -2451,18 +2461,20 @@ class GadaiController extends Controller
break;
}
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']])
->sum('pinjaman');
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
$gadai = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]])
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
->sum('pinjaman');
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
$tebus = Gadai::on($cawangan['mysql'])
->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
->where('Gadai.tagpalsu','=',0)
->where([['Gadai.t_gadai','<=',$tarikhtawarruq],['Gadai.sttebus','=','T']])
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
->sum('teb.pinjaman');
$array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
return response()->json($array_rekodemas);
}
@@ -2486,12 +2498,20 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
$Gadai = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql'])
->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
->where('Gadai.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']])
->sum('teb.pinjaman');
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
return response()->json($rekod_pinjamandiberi);
}
@@ -2548,16 +2568,17 @@ class GadaiController extends Controller
->whereNotNull('upah12')
->sum('upah12');
$transaksi = TransaksiKeuntungan::on('mysql7')
->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->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->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->hingga)
// ->whereYear('tarikh_bayaran','=',$current->year)
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
$totalkeuntungan = $keuntungan - $transaksi;
// $totalkeuntungan = $keuntungan - $transaksi;
$totalkeuntungan = $keuntungan;
return response()->json($totalkeuntungan,200);
}