diff --git a/app/controllers/api/bookings_controller.rb b/app/controllers/api/bookings_controller.rb index 8f10655f..03ca0b5d 100644 --- a/app/controllers/api/bookings_controller.rb +++ b/app/controllers/api/bookings_controller.rb @@ -1,5 +1,5 @@ class Api::BookingsController < Api::ApiController - + skip_before_action :authenticate #Show customer by ID def index @@ -10,6 +10,15 @@ class Api::BookingsController < Api::ApiController @booking = Booking.find(params[:id]) end + def update_booking + + +booking = Booking.find_by(id: params[:booking]) +booking.update_all(booking_status: 'Dave') + + + end + # private # def Bookings_params # params.permit(:id, :order_id) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index d0fe2a77..0aea3cf6 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -7,7 +7,10 @@ class Api::OrdersController < Api::ApiController order = Order.find(params[:order_id]) order.order_items end - + def get_order + order = Order.find(params[:order_id]) + order.order_items + end # Description # This API allow new order creation diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index 2a7153f8..083f2bf7 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,22 +1,22 @@ class Crm::HomeController < BaseCrmController def index - # @booking = Booking.all - - @booking = Booking.select("bookings.id as booking_id, - bookings.checkin_at, - bookings.checkin_by, - bookings.dining_facility_id, - od.customer_id as customer, - od.item_count as count, - odt.id as order_item_id, - odt.item_name as item_name") - .joins("join booking_orders as bko ON bko.booking_id = bookings.id") - .joins("right join orders as od ON od.id = bko.order_id") - .joins("right join order_items as odt ON odt.order_id=od.id") - .order("bookings.id DESC") - + @booking = Booking.all @customer = Customer.all + + #@booking = Booking.select("bookings.id as booking_id, + # bookings.checkin_at, + # bookings.checkin_by, + # bookings.dining_facility_id, + # od.customer_id as customer, + # od.id as order_id, + # od.item_count as count, + # odt.id as order_item_id, + # odt.item_name as item_name") + # .joins("join booking_orders as bko ON bko.booking_id = bookings.id") + # .joins("right join orders as od ON od.id = bko.order_id") + # .joins("right join order_items as odt ON odt.order_id=od.id") + # .order("bookings.id DESC") end def show diff --git a/app/views/api/bookings/show.json.jbuilder b/app/views/api/bookings/show.json.jbuilder index d579810c..c4edb79f 100644 --- a/app/views/api/bookings/show.json.jbuilder +++ b/app/views/api/bookings/show.json.jbuilder @@ -2,6 +2,8 @@ if (@booking) json.id @booking.id json.status @booking.booking_status json.checkin_at @booking.checkin_at + json.checkin_by @booking.checkin_by + json.table_name @booking.dining_facility.name if @booking.type == "TableBooking" json.table_id @booking.dining_facility_id diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index cf983116..09e835c0 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -1,26 +1,111 @@ -
- - <% @i = 0 %> - <% @booking.each do |booking| %> -
-
-

- <%= @i += 1 %> . <%= booking.dining_facility.name %> - - <%= booking.item_name %> -

-

Medium, Fries, Salad -

-

- - Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> - -

-
-
- -
-
- <% end %> - -
\ No newline at end of file +
+ + <% @i = 0 %> + <% @booking.each do |booking| %> +
+
+

+ <%= @i += 1 %> . <%= booking.dining_facility.name %> + - <%= booking.id %> +

+ +

+ + Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> + +

+
+
+
+
+ +
+
+ +
+
+
+
+<% end %> + +
+ \ No newline at end of file diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index 07e58652..800ff2f9 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -8,7 +8,7 @@ Queue 2000
  • - Bookings <%= @count %> + Bookings <%= @booking.count %>
  • Customers @@ -47,51 +47,47 @@
    ORDER DETAILS - Table 4
    +
    - +
    - - - - - + + + + - + - + + + +
    Order ByOrder At + Order At Customer
    Kyaw Lwin20/04/17 9:30PMJohn Smith
    Table/RoomTable 4
    - - + +
    ItemsQTY + ItemsQtyPrice
    +
    - +
    - - - - - - +
    - Menu Items Name
    - Less Sweet, No MSG -     		- 5 -
    diff --git a/config/routes.rb b/config/routes.rb index ed2cdab0..3692a90e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,14 +35,20 @@ Rails.application.routes.draw do post "bill/:booking_id" => "bill#create" post "move" => "move#create" + #Order Controller resources :orders, only: [:create, :show, :update] do + post "bill" => "bill#create" + end + #Current active bookings resources :bookings, only: [:index, :show, :create, :update] resources :customers, only: [:index, :show, :create, :update] + get "update_booking" , to: "bookings#update_booking", as: "update_booking" + #Generating Invoice and making payments - output render @sale resources :invoices, only: [:index, :show, :create, :update, :destroy ] do resources :sale_items, only:[:create, :update, :destroy]