fix bug for closing lists on preloaded view and add acceptance body

This commit is contained in:
2012-12-01 13:20:39 +01:00
parent 2a09e2022d
commit a14687d568
9 changed files with 72 additions and 9 deletions
+1
View File
@@ -51,6 +51,7 @@ class SupplierController < ApplicationController
ho[:table_number] = order.table_number
ho[:section_title] = order.list.table.section.try(:title)
ho[:id] = order.id
ho[:list_id] = order.list_id
list_total += ho[:total_amount]
h[:orders] << ho
end
+2 -2
View File
@@ -25,7 +25,7 @@ html lang="en"
- unless ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
javascript:
#{Rails.env.production? ? '' : "data_host = 'http://qwaiter.dev';"}
//var data_host = 'http://localhost:3000';
var data_host = 'http://localhost:3000';
QMobile || (QMobile = {
scanQr: function(){window.location = '/select_qrcode'},
activateRotation: function(){},
@@ -76,7 +76,7 @@ html lang="en"
.span12
= yield
= javascript_include_tag "user/application"
script#alert-template[type="text/html"]= render 'alert.mustache'
script#alert-template[type="text/html"]= render 'user/alert.mustache'
= yield :footer
javascript:
jQuery(function(){#{onload_javascript}});