fixed conflict
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user