git pull origin master

This commit is contained in:
weiweitoo
2018-07-20 22:12:48 +08:00
45 changed files with 34425 additions and 1991 deletions
@@ -785,4 +785,23 @@ class BookingController extends Controller
}
}
public function adminShowCompletedOrders()
{
$bookings = Booking::select('id','created_at','user_id','rate','amount', 'bia', 'admin_status')
->where('admin_status', 7)
->orderBy('id', 'desc')
->get();
foreach ($bookings as $booking) {
$booking->id;
$booking->created_at;
$booking->marking = $booking->user->marking;
$booking->rate;
$booking->amount;
$booking->bia;
$booking->admin_status = "(". $booking->admin_status ."/7)";;
}
return $bookings;
}
}
@@ -10,7 +10,7 @@ class SettingActiveBankController extends Controller
public function index()
{
$active_bank_setting = SettingActiveBank::latest()->first();
return response()->json($active_bank_setting, 201);
return response()->json($active_bank_setting, 200);
}
public function update(Request $request)