diff --git a/EuroTran/WebApp/Controllers/BookingController.cs b/EuroTran/WebApp/Controllers/BookingController.cs index d9db17c..e1211dd 100644 --- a/EuroTran/WebApp/Controllers/BookingController.cs +++ b/EuroTran/WebApp/Controllers/BookingController.cs @@ -56,8 +56,8 @@ namespace WebApp.Controllers /// [HttpGet] [SEApiSecurityFilter] - public HttpResponseMessage Bookings( - string Lang, + public HttpResponseMessage Bookings( + string Lang, string SubCategoryIDs, string BookingStatuses, string PaymentStatuses) @@ -69,41 +69,6 @@ namespace WebApp.Controllers var SEToken = SETokenUtil.GetToken(this.Request); - if (!string.IsNullOrEmpty(SubCategoryIDs)) { - rsSubCategoryIDs = JsonConvert.DeserializeObject>(SubCategoryIDs); - } - - if (!string.IsNullOrEmpty(BookingStatuses)) - { - rsBookingStatuses = JsonConvert.DeserializeObject>(BookingStatuses); - } - - if (!string.IsNullOrEmpty(PaymentStatuses)) - { - rsPaymentStatuses = JsonConvert.DeserializeObject>(PaymentStatuses); - } - - return new BookingService().GetBookings(SEToken.Account, Lang, rsSubCategoryIDs, rsBookingStatuses, rsPaymentStatuses); - } - - /// - /// - /// - /// - /// - [HttpGet] - public HttpResponseMessage TestBookings( - string Account, - string Lang, - string SubCategoryIDs, - string BookingStatuses, - string PaymentStatuses) - { - - List rsSubCategoryIDs = new List(); - List rsBookingStatuses = new List(); - List rsPaymentStatuses = new List(); - if (!string.IsNullOrEmpty(SubCategoryIDs)) { rsSubCategoryIDs = JsonConvert.DeserializeObject>(SubCategoryIDs); @@ -119,9 +84,8 @@ namespace WebApp.Controllers rsPaymentStatuses = JsonConvert.DeserializeObject>(PaymentStatuses); } - return new BookingService().GetBookings(Account, Lang, rsSubCategoryIDs, rsBookingStatuses, rsPaymentStatuses); + return new BookingService().GetBookings(SEToken.Account, Lang, rsSubCategoryIDs, rsBookingStatuses, rsPaymentStatuses); } - } }