fixed conflict

This commit is contained in:
hafifierahman
2020-12-28 18:36:00 +08:00
parent 2c94b69319
commit 52e91a2050
6 changed files with 615 additions and 0 deletions
+14
View File
@@ -113,4 +113,18 @@ class LelongController extends Controller
Lelong::findOrFail($id)->delete();
return response('Deleted Successfully', 200);
}
public function getLaporanLelongan($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$lelong = Lelong::on($cawangan['mysql'])
->where('t_lelong','=',$tarikh)
->whereNotNull('t_jual')
->leftJoin('pembeli', 'pembeli.nopembeli', '=', 'Lelong.nopembeli')
->orderBy('t_lelong')
->get();
return response()->json($lelong);
}
}