foodcourt apis for app
This commit is contained in:
@@ -20,13 +20,13 @@ class Foodcourt::AddordersController < BaseFoodcourtController
|
||||
@webview = true
|
||||
end
|
||||
display_type = Lookup.find_by_lookup_type("display_type")
|
||||
if !display_type.nil? && display_type.value.to_i ==2
|
||||
@display_type = display_type.value
|
||||
else
|
||||
@display_type = nil
|
||||
end
|
||||
@menus = []
|
||||
@menu = []
|
||||
if !display_type.nil? && display_type.value.to_i ==2
|
||||
@display_type = display_type.value
|
||||
else
|
||||
@display_type = nil
|
||||
end
|
||||
@menus = []
|
||||
@menu = []
|
||||
|
||||
@table_id = params[:id]
|
||||
@table = DiningFacility.find(@table_id)
|
||||
|
||||
@@ -106,6 +106,10 @@ class Foodcourt::OrdersController < BaseFoodcourtController
|
||||
@menus = []
|
||||
@menu = []
|
||||
|
||||
@zone = Zone.all
|
||||
@tables = Table.active.order('status desc')
|
||||
@rooms = Room.active.order('status desc')
|
||||
|
||||
if params[:id].include? "BKI"
|
||||
@table_id = nil
|
||||
@table = nil
|
||||
@@ -272,7 +276,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController
|
||||
end
|
||||
else
|
||||
respond_to do |format|
|
||||
format.json {
|
||||
format.json {
|
||||
render :json => { :status => false, :error_message => "No Current Open Shift for This Employee" } }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -88,7 +88,6 @@ class Foodcourt::ShiftsController < BaseFoodcourtController
|
||||
end
|
||||
shop_details = current_shop
|
||||
#get tax
|
||||
shift_obj = ShiftSale.where('id =?',@shift.id)
|
||||
sale_items = ''
|
||||
@lookup = Lookup.shift_sale_items_lookup_value
|
||||
if @lookup.to_i == 1
|
||||
@@ -96,7 +95,7 @@ class Foodcourt::ShiftsController < BaseFoodcourtController
|
||||
other_charges = Sale.get_other_charges()
|
||||
@total_other_charges_info = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",@shift)
|
||||
end
|
||||
@sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
|
||||
@sale_taxes = Sale.get_separate_tax(@shift,from=nil,to=nil,type='')
|
||||
@total_waste = Sale.get_total_waste(shift_id).sum(:grand_total)
|
||||
@total_spoile = Sale.get_total_spoile(shift_id).sum(:grand_total)
|
||||
#other payment details for mpu or visa like card
|
||||
|
||||
Reference in New Issue
Block a user