From 457f0de312e3e0f4e4827d84a038411a4b4cb7c6 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 3 Jul 2018 11:32:39 +0800 Subject: [PATCH] changed booking supplier date format --- app/Http/Controllers/BookingSupplierController.php | 8 +++++--- .../assets/js/pages/admin/booking/supplierReport.vue | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 2a723f48..472f5f06 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -36,6 +36,9 @@ class BookingSupplierController extends Controller } $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); } @@ -87,9 +90,7 @@ class BookingSupplierController extends Controller $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); } @@ -115,6 +116,7 @@ class BookingSupplierController extends Controller $bookingsupplier->rmbBankAmount = $rmbBankAmount; $bookingsupplier->save(); + /* For multiple booking */ // $supplierbookingitems = $request->input("supplierbookingitem"); // foreach ($bookings as $booking) // { diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 4c125232..dcc391aa 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -386,7 +386,7 @@ ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5); //// Row 2 ctx.fillText("Date :", column1X, rowHeight[2] - 5); - ctx.fillText(binding.value.created_at, column3X, rowHeight[2] - 5); + ctx.fillText(binding.value.date, column3X, rowHeight[2] - 5); //// Row 3 ctx.fillText("Marking :", column1X, rowHeight[3] - 5); ctx.font = "bold 14px Arial";