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
@@ -119,6 +119,18 @@ class CustomerController extends Controller
return response()->json($gadai);
}
public function getLaporanCustomers($kodcaw, $tarikh)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Customer::on($cawangan['mysql'])
->where('tarikhdaftar','=',$tarikh)
->orderBy('tarikhdaftar', 'desc')
->get();
return response()->json($gadai);
}
public function create($kodcaw,Request $request){
$current = Carbon::now();
$current = new Carbon();