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

Merge branch 'atie' into 'main'

Browse Source 
update fasa 2 untuk simulasi

See merge request online-sistem1/lelong!97
This commit is contained in:
Nur Izzati Zulkifli
2022-06-29 07:27:26 +00:00
parent ebd1d6eeab faacb4281b
commit 838b862fb6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SimulasiController.php
+5 -1
View File
@@ -921,7 +921,6 @@ class SimulasiController extends Controller
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
// ->where('cawangan_simulasi.kali', '!=', $kali)
->whereNotIn('cawangan.id', function($query) use ($kali) {
$query->select('caw_id')
->from('cawangan_simulasi')
@@ -975,6 +974,11 @@ class SimulasiController extends Controller
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotIn('cawangan.id', function($query) use ($kali) {
$query->select('caw_id')
->from('cawangan_simulasi')
->where('kali', '=' ,$kali);
})
->whereNotNull('gadai.upah12')
->groupBy('gadai.kodcaw','cawangan.caw_name')
->selectRaw('count(*) as bil_lelong,