diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index b84a36e7..9cabd431 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -133,6 +133,24 @@ class BookingController extends Controller $booking->timeout = $difference_in_seconds; + if (!$booking){ + return response()->json(['success'=>false, 'message'=>'not found'], 404); + } + return $booking; + } + } + + public function adminShow($id) + { + $booking = Booking::where('id', $id)->first(); + + if($booking){ + $date1 = new DateTime($booking->created_at); + $date2 = new DateTime(); + $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); + + $booking->timeout = $difference_in_seconds; + if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); } @@ -298,12 +316,6 @@ class BookingController extends Controller $user_bankslip->transfer_amount = $request->input('transfer_amount'); $user_bankslip->save(); - // update booking status - $booking->admin_status = 2; // admin approving or rejecting bankslip - $booking->status = 3; // user waiting admin to approve - $booking->save(); - - return response()->json(['message'=>"Success"],200); } @@ -313,7 +325,14 @@ class BookingController extends Controller if(!$user_bankslip){ return response()->json(["message"=> "not found"],400); - } + } + + + // update booking status + $booking->admin_status = 2; // admin approving or rejecting bankslip + $booking->status = 3; // user waiting admin to approve + $booking->save(); + $user_bankslip->transfer_amount = $request->input('transfer_amount'); $user_bankslip->save(); return response()->json(["message"=> "Success"],200); diff --git a/database/migrations/2018_06_25_075341_change_adminstatus_default_to1_on_booking_table.php b/database/migrations/2018_06_25_075341_change_adminstatus_default_to1_on_booking_table.php new file mode 100644 index 00000000..ef50d656 --- /dev/null +++ b/database/migrations/2018_06_25_075341_change_adminstatus_default_to1_on_booking_table.php @@ -0,0 +1,30 @@ +integer('admin_status')->default(1)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 88843e9a..20bac84b 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -1,6 +1,6 @@ @@ -55,20 +220,61 @@ } + \ No newline at end of file diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index f33477ca..7fe842c0 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -84,46 +84,45 @@ export default { this.status = status console.log(this.status) switch (this.status) { - case 0: + case 1: this.$router.push({ - name: 'booking.admin.order', + name: 'booking.admin.pending', params: {id: booking_id } }) break - case 1: + case 2: this.$router.push({ name: 'booking.admin.verification', params: {id: booking_id } }) break - - case 2: + case 3: this.$router.push({ name: 'booking.admin.supplier', params: {id: booking_id } }) break - case 3: + case 4: this.$router.push({ name: 'booking.admin.supplier.report', params: {id: booking_id } }) break - case 4: + case 5: this.$router.push({ name: 'booking.admin.cnslip', params: {id: booking_id } }) break - case 5: + case 6: this.$router.push({ name: 'booking.admin.invoice', params: {id: booking_id } }) break - case 6: + case 7: this.$router.push({ name: 'booking.complete', params: {id: booking_id } diff --git a/routes/api.php b/routes/api.php index d2bc21f9..86fe8e53 100644 --- a/routes/api.php +++ b/routes/api.php @@ -62,6 +62,7 @@ Route::group(['middleware' => 'guest:api'], function () { Route::group(['middleware' => ['role:admin']], function() { Route::get('admin/booking/', 'BookingController@adminIndex'); + Route::get('admin/booking/{id}', 'BookingController@adminShow'); Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('update-rate', 'RateController@store');