Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/api_arrahn into finadev
This commit is contained in:
@@ -71,7 +71,7 @@ class KomuditiController extends Controller
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$komuditi_asal = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->first();
|
||||
$komuditi_asal = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->latest()->first();
|
||||
|
||||
$komuditi_purchase = KomuditiPurchase::on('mysql7')->where('no_sijil','=',$request->nosijil)->update(['unit_komuditi' => 0]);
|
||||
|
||||
@@ -89,8 +89,12 @@ class KomuditiController extends Controller
|
||||
return response()->json('berjaya');
|
||||
}
|
||||
|
||||
public function rekodKomuditi(){
|
||||
$rekodkomuditi = Komuditi::on('mysql7')->orderBy('date_purchase','desc')->orderBy('time_purchase','desc')->get();
|
||||
public function rekodKomuditi(Request $request){
|
||||
if(isset($request->limit_view)) {
|
||||
$rekodkomuditi = Komuditi::on('mysql7')->orderBy('date_purchase','desc')->orderBy('time_purchase','desc')->limit($request->limit_view)->get();
|
||||
} else {
|
||||
$rekodkomuditi = Komuditi::on('mysql7')->orderBy('date_purchase','desc')->orderBy('time_purchase','desc')->get();
|
||||
}
|
||||
|
||||
return response()->json($rekodkomuditi);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user