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

fix skit2 pasal

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-08-17 18:29:39 +08:00
parent 4383fd4781
commit 9fdf7a48e5
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
-1
View File
@@ -841,7 +841,6 @@ class GadaiController extends Controller
$gadai = Gadai::on($cawangan['mysql']) $gadai = Gadai::on($cawangan['mysql'])
->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman') ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
->where('t_gadai','=',$request->tarikh) ->where('t_gadai','=',$request->tarikh)
->where('sttebus','=','')
->orderBy('t_gadai') ->orderBy('t_gadai')
->get(); ->get();
app/Http/Controllers/LelongController.php
+6
View File
@@ -212,6 +212,12 @@ class LelongController extends Controller
if($kodcaw == '011412') if($kodcaw == '011412')
$rugitotal -= 7248.4; $rugitotal -= 7248.4;
if($kodcaw == '020303')
{
$bakilelong -= 542.6;
$rugitotal += 0.01;
}
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
return response()->json($arraylelong,200); return response()->json($arraylelong,200);
app/Http/Controllers/TebusController.php
+8 -2
View File
@@ -506,7 +506,7 @@ 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','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') ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','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)
{ {
@@ -541,7 +541,13 @@ class TebusController extends Controller
->where('t_tebus','=',$request->tarikh) ->where('t_tebus','=',$request->tarikh)
->whereNotNull('hargajualan'); ->whereNotNull('hargajualan');
$totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); $tebustawarruqansuran = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where('t_tebus','=',$request->tarikh)
->whereNotNull('hargajualan')
->where('hargajualan','<>','bakihargajualan');
$totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
$bilpenebusantawarruq = $tebustawarruq->count(); $bilpenebusantawarruq = $tebustawarruq->count();
$totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
$totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
app/Http/Controllers/VaultController.php
+1 -1
View File
@@ -395,7 +395,7 @@ class VaultController extends Controller
//Sebelum Tawarruq //Sebelum Tawarruq
if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915' || $kodcaw == '020303')
{ {
$serahanpkb = GlDetail::on($cawangan['mysql']) $serahanpkb = GlDetail::on($cawangan['mysql'])
->where('dtacct','=',$serahanpkb) ->where('dtacct','=',$serahanpkb)