Merge branch 'bug#ringkasanterkumpul' into 'master'
fix lejeram pinjaman diberi tagpalsu sepatutnya 1 See merge request online-sistem1/api_arrahn!194
This commit is contained in:
@@ -2879,7 +2879,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
$tebus = Gadai::on($cawangan['mysql'])
|
$tebus = Gadai::on($cawangan['mysql'])
|
||||||
->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
|
->join('tebus as teb','teb.norujukan','=','gadai.norujukan')
|
||||||
->where('gadai.tagpalsu','=',0)
|
//->where('gadai.tagpalsu','=',0)
|
||||||
->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
|
->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']])
|
||||||
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
|
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
|
||||||
->sum('teb.pinjaman');
|
->sum('teb.pinjaman');
|
||||||
|
|||||||
Reference in New Issue
Block a user