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

Merge branch 'amirah_wtd' into 'master'

Browse Source 
update t_jual (WTD)

See merge request online-sistem1/api_arrahn!177
This commit is contained in:
hafifie rahman
2023-02-19 05:45:53 +00:00
parent 480fc03259 11fcf0511c
commit fec87c46c0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+9 -9
View File
@@ -2377,7 +2377,7 @@ class AdminPageController extends Controller
$wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan');
$lelong = Lelong::on($cawangan['mysql'])
->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki')
->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki','lelong.t_jual')
->whereIn('lelong.norujukan',$wtdnorujukan)
->join('gadai','lelong.norujukan','=','gadai.norujukan')
->get();
@@ -2401,10 +2401,10 @@ class AdminPageController extends Controller
$lelong = Lelong::on($cawangan['mysql'])
->where([['baki','>',0],['trkhtuntut',null]])
->whereMonth('t_lelong','>=',$mula[0])
->whereMonth('t_lelong','<=',$hingga[0])
->whereYear('t_lelong','>=',$mula[1])
->whereYear('t_lelong','<=',$hingga[1]);
->whereMonth('t_jual','>=',$mula[0])
->whereMonth('t_jual','<=',$hingga[0])
->whereYear('t_jual','>=',$mula[1])
->whereYear('t_jual','<=',$hingga[1]);
$lelongdetails = $lelong->get()->toArray();
$lelongcount = $lelong->count();
@@ -2413,10 +2413,10 @@ class AdminPageController extends Controller
$draft = WTDDraft::on('mysql7')
->whereIn('norujukan',$lelongpluck)
->where('kodcaw',$kodcaw)
->whereMonth('t_lelong','>=',$mula[0])
->whereMonth('t_lelong','<=',$hingga[0])
->whereYear('t_lelong','>=',$mula[1])
->whereYear('t_lelong','<=',$hingga[1]);
->whereMonth('t_jual','>=',$mula[0])
->whereMonth('t_jual','<=',$hingga[0])
->whereYear('t_jual','>=',$mula[1])
->whereYear('t_jual','<=',$hingga[1]);
$draftcount = $draft->count();
$draftpluck = $draft->pluck('norujukan');