fixed conflic

This commit is contained in:
Aung Myo
2017-10-31 12:13:19 +06:30
69 changed files with 618 additions and 506 deletions

View File

@@ -84,7 +84,8 @@ class HomeController < ApplicationController
# clear in employee session
Employee.logout(session[:session_token])
session[:session_token] = nil
redirect_to root_path
# redirect_to root_path
render :json => {:status=> "Success", :url => root_path }.to_json
end
private

View File

@@ -19,13 +19,14 @@ class Origami::VoidController < BaseOrigamiController
sale.sale_status = 'void'
sale.save
bookings = sale.bookings
bookings.each do |booking|
orders = booking.orders
orders.each do |order|
# order.status = 'void'
end
end
# No Need
# bookings = sale.bookings
# bookings.each do |booking|
# orders = booking.orders
# orders.each do |order|
# # order.status = 'void'
# end
# end
table_avaliable = true
table = sale.bookings[0].dining_facility