diff --git a/app/controllers/api/bookings_controller.rb b/app/controllers/api/bookings_controller.rb index 03ca0b5d..ca7df569 100644 --- a/app/controllers/api/bookings_controller.rb +++ b/app/controllers/api/bookings_controller.rb @@ -11,13 +11,17 @@ class Api::BookingsController < Api::ApiController end def update_booking + booking = Booking.find(params[:booking_id]) + status = booking.update_attributes(booking_status: params[:type]) + + if status + render json: JSON.generate({:status => true ,:type => params[:type]}) + else + render json: JSON.generate({:status => false, :error_message => "Record not found"}) -booking = Booking.find_by(id: params[:booking]) -booking.update_all(booking_status: 'Dave') - - - end + end + end # private # def Bookings_params diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index 09e835c0..c9200f3e 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -3,30 +3,32 @@ <% @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 %> - -

-
-
-
-
- -
-
- + <% if booking.booking_status == "new" %> +
+
+

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

+ +

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

+
+
+
+ +
+
+ +
+
-
+ <% end %> <% end %>
@@ -39,73 +41,69 @@ $(function(){ show_details(url); }); + $('.assign').click(function(e){ + var booking_id = $('#assign').attr('data-ref'); + var type = $('#assign').attr('data-type'); + update_booking(booking_id,type) + }); + $('.cancel').click(function(e){ - var booking = $('#cancel').attr('data-booking-id'); - - $.ajax({ - type: "GET", - url: "api/update_booking", - data: {}, - dataType: "json", - success: function(data) { - - - } - - - - }); - /*$.getJSON(update_booking_url,{booking: booking, type: "cancel"}, function(data) { - if(data.status == 'ok'){ - - - showMessage('Order set has delivered!'); - } - else{ - if(data.status == false){ - clear_storage(); - window.location.href = data.url; - } - showMessage('Order record not found'); - } - });*/ + var booking_id = $('#cancel').attr('data-ref'); + var type = $('#cancel').attr('data-type'); + update_booking(booking_id,type) }); }); function show_details(url_item){ - - $.ajax({ + $.ajax({ type: "GET", url: url_item, data: {}, dataType: "json", success: function(data) { - item_data = data.order_items; - //console.log(item_data.length); - - $("#table").text(data.table_name) - $("#order_at").text(data.checkin_at) - $("#order_by").text(data.checkin_by) - - for(var field in item_data) { - if (item_data[field].item_name){ - var price = parseFloat(item_data[field].price).toFixed(2); + item_data = data.order_items; + //console.log(item_data.length); + + $("#table").text(data.table_name) + $("#order_at").text(data.checkin_at) + $("#order_by").text(data.checkin_by) + + for(var field in item_data) { + if (item_data[field].item_name){ + var price = parseFloat(item_data[field].price).toFixed(2); - row = "" - +'' + item_data[field].item_name +'' - +'' + item_data[field].qty + '' - +'' + price + '' - +''; - } - $(".summary-items tbody").append(row); - } + row = "" + +'' + item_data[field].item_name +'' + +'' + item_data[field].qty + '' + +'' + price + '' + +''; + } + $(".summary-items tbody").append(row); + } } - }); - - } + }); +} + +function update_booking(booking_id,type) { + $.ajax({ + type: "POST", + url: "api/update_booking/" , + data: {booking_id:booking_id,type:type}, + dataType: "json", + success: function(data) { + if(data.status == true && data.type == "cancel") + { + alert('Booking has canceled!'); + }else{ + alert('Booking has completed!'); + } + location.reload(); + } + }); +} \ No newline at end of file diff --git a/app/views/crm/home/_queue.html.erb b/app/views/crm/home/_queue.html.erb index 99c56f9e..45ffadda 100644 --- a/app/views/crm/home/_queue.html.erb +++ b/app/views/crm/home/_queue.html.erb @@ -1,29 +1,47 @@
-
-
-

9. Table 4 - Beef Steak [x3]

-

Well Done, Fries, Salad

-

- Order at 12:23, Kyaw Lwin | - Printed at 12:23 | - Completed at 12:43 -

+ + <% @i = 0 %> + <% @booking.each do |booking| %> + <% if booking.booking_status == "complete" %> +
+
+

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

+ +

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

+
+
+
+
+ +
+
+ +
+
+
+
+ <% end %> + <% end %> + +
+
+

9. Table 4 - Beef Steak [x3]

+

Well Done, Fries, Salad

+

+ Order at 12:23, Kyaw Lwin | + Printed at 12:23 | + Completed at 12:43 +

+
+
+ -
-
-
-
-

9. Table 4 - Beef Steak [x3]

-

Well Done, Fries, Salad

-

Order at 12:23, Kyaw Lwin

-
-
-
-
-

9. Table 4 - Beef Steak [x3]

-

Well Done, Fries, Salad

-

Order at 12:23, Kyaw Lwin

-
-
-
\ No newline at end of file +
\ 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 800ff2f9..431ef4a4 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -5,10 +5,10 @@
- - -
@@ -67,10 +64,7 @@ Table/Room - - - diff --git a/config/routes.rb b/config/routes.rb index 3692a90e..0aaa2cea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -47,7 +47,7 @@ Rails.application.routes.draw do resources :bookings, only: [:index, :show, :create, :update] resources :customers, only: [:index, :show, :create, :update] - get "update_booking" , to: "bookings#update_booking", as: "update_booking" + post "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