cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-26 15:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict saved

Browse Source
This commit is contained in:
Mouhamed Lamine
2018-07-03 16:53:34 +08:00
parent 27c5c14373 3aab1506c4
commit b731226f18
18 changed files with 506 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingSupplierController.php
+16 -10
View File
@@ -29,13 +29,18 @@ 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
@@ -61,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();
@@ -72,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);
}
@@ -110,6 +115,7 @@ class BookingSupplierController extends Controller
$bookingsupplier->rmbBankAmount = $rmbBankAmount;
$bookingsupplier->save();
/* For multiple booking */
// $supplierbookingitems = $request->input("supplierbookingitem");
// foreach ($bookings as $booking)
// {