Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage

# Conflicts:
#	package-lock.json
#	package.json
#	vendor/composer/autoload_static.php
#	yarn.lock

app/Http/Controllers/BookingController.php

@@ -22,6 +22,7 @@ class BookingController extends Controller
 		$user = Auth::user();
         $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
                                     ->where('user_id', $user->id)
+                                    ->orderby('updated_at','desc')
                                     ->paginate(10);
 
 
@@ -77,7 +78,8 @@ class BookingController extends Controller
 	public function adminIndex(){
 		$user = Auth::user(); 
 		$bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-		->get();
+        ->orderby('updated_at','desc')
+        ->get();
 
 			// reformat to fit frontend structure 
 			foreach ($bookings as $booking) {
@@ -522,6 +524,16 @@ class BookingController extends Controller
         $term = $request->input('term');
         $china_beneficiary = $request->input('china_beneficiary');
         $rates = Rate::orderby('updated_at','desc')->first();
+
+        $creditLimit = SettingCredit::orderby('updated_at','desc')->first();
+
+		if (!$creditLimit){
+			return response()->json("Credit limit not set, please contact admin", 405);
+		}
+
+        if($amount > $creditLimit->rmb_credit_limit){
+            return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400);
+        }
  
         // TODO : get marking 
         $marking = "123X";

app/Http/Controllers/BookingSupplierController.php

@@ -29,20 +29,24 @@ class BookingSupplierController extends Controller
 
     public function show($id)
     {
-        $bookingsupplier = SupplierBooking::has('supplier-booking')->findOrFail($id);
+        $booking = Booking::where('id', $id)->first();
 
-        $response = [
-            'supplier-booking' => $bookingsupplier
-        ];
+        if (!$booking){
+            return response()->json(['message' => 'Booking not found'], 404);
+        }
 
-        return response()->json($response, 200);
+        $supplier_booking = $booking->supplierBooking()->first();
+        $dt = new \DateTime($supplier_booking->created_at); 
+        $supplier_booking->date = $dt->format('j F Y'); 
+        
+
+        return response()->json($supplier_booking ,200);
     }
 
     // Only for single booking 
     // TODO : Multiple booking
     public function store(Request $request)
     {
-
         $transfer_amount = $request->input("transfer_amount");
         $supplier_id = $request->input("supplier_id");
         $booking_id = $request->input("booking_id");
@@ -62,7 +66,7 @@ class BookingSupplierController extends Controller
         $booking = Booking::find($booking_id);
 
         // update existing booking supplier if exist 
-        $bookingsupplier = SupplierBooking::where('book_id', $booking_id)->first();
+        $bookingsupplier = SupplierBooking::where('booking_id', $booking_id)->first();
 
         if (!$bookingsupplier){
             $bookingsupplier = new SupplierBooking();
@@ -73,19 +77,19 @@ class BookingSupplierController extends Controller
         $bookingsupplier->payment_method = $request->input('payment_method');
         $bookingsupplier->transfer_amount = $transfer_amount;
         $bookingsupplier->rate = $rate;
+        $bookingsupplier->billing_amount = $billing; 
+        $bookingsupplier->salestax_amount = $sales_tax;
         $bookingsupplier->rebate = $rebate;       
         $bookingsupplier->amountInRMB = $amountInRMB;
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
-        $bookingsupplier->book_id = $booking->id;
+        $bookingsupplier->booking_id = $booking->id;
         $bookingsupplier->save();
 
         // update booking status 
 		$booking->status = 4;
 		$booking->admin_status = 4; 
         $booking->save();
-        
-        // TODO : generate a jpg version of report and save the path 
-
+    
         return response()->json($bookingsupplier, 201);
     }
 
@@ -111,6 +115,7 @@ class BookingSupplierController extends Controller
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
         $bookingsupplier->save();
 
+        /* For multiple booking */
         // $supplierbookingitems = $request->input("supplierbookingitem");      
         // foreach ($bookings as $booking)
         //  {

app/Http/Controllers/RateController.php

@@ -35,7 +35,7 @@ class RateController extends Controller
 
     public function show()
     {
-        $rate = DB::table('rates')->latest()->first();
+        $rate = Rate::latest()->first();
 
         return response()->json($rate, 200);
     }