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

fix ambigous jenistebus and batalGadai wrong filename

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-17 11:56:57 +08:00
parent 37ef71975e
commit 041480c4ea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+2 -2
View File
@@ -8,7 +8,7 @@ use App\Cawangan;
use App\Transaction;
use App\TransaksiKeuntungan;
use App\TransactionOnline;
use App\batalGadai;
use App\BatalGadai;
use App\TuntutBaki;
use App\AnsRugi;
use App\Lelong;
@@ -579,7 +579,7 @@ class GadaiController extends Controller
public function getLaporanBatalGadai($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = batalGadai::on($cawangan['mysql'])
$gadai = BatalGadai::on($cawangan['mysql'])
->where('tarikh','=',$tarikh)
->orderBy('tarikh','desc')
->get();
app/Http/Controllers/LaporanController.php
+1 -1
View File
@@ -785,7 +785,7 @@ class LaporanController extends Controller
$tebus = Tebus::on($cawangan['mysql'])
->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['jenistebus','=','T']]);
->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['tebus.jenistebus','=','T']]);
$ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]);
$bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw);