fixes for communication moving tables and joining them
This commit is contained in:
@@ -358,7 +358,7 @@ class Quser
|
||||
else
|
||||
## Offer to move table
|
||||
Qwaiter.confirm(
|
||||
ok: ->
|
||||
ok: =>
|
||||
$.post(data_host + '/user/move_table', $.extend({table_id: table.table_id}, @authentication_object), (res2)->
|
||||
if res2.occupied
|
||||
redirect_to 'user_root', {message: 'move_table.cannot_move_to_occupied_tabe'}
|
||||
@@ -393,6 +393,7 @@ class Quser
|
||||
cont.html('')
|
||||
cont.append $($('<img />').attr('src', "#{$asset_path}spinner.gif"))
|
||||
cont.append $($('<p>').html(t('join_request.waiting_for_confirmation')))
|
||||
@ensure_token =>
|
||||
$.post(data_host + '/user/join_occupied_table', $.extend({table_id: table_id}, @authentication_object))
|
||||
#setInterval('Quser.check_if_can_join_occupied_table("'+table_id+'")', 7500)
|
||||
add_product: (product_id, count) ->
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
= top_bar title: 'active_list.title' do
|
||||
.pull-right
|
||||
.table-number
|
||||
.supplier-name
|
||||
.action-buttons
|
||||
= link_to content_tag(:span, t('helpers.links.place_order')), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list'
|
||||
span#list-needs-payment-button.user-top-button
|
||||
span
|
||||
span#list-needs-help-button.user-top-button
|
||||
span
|
||||
.pull-right
|
||||
.table-number
|
||||
.supplier-name
|
||||
.well
|
||||
table#active-list-table.table
|
||||
thead
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
= top_bar title: 'show_products.title' do
|
||||
.pull-right
|
||||
.table-number
|
||||
.supplier-name
|
||||
.action-buttons
|
||||
= link_to content_tag(:span, t('helpers.links.show_active_list'), list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list'
|
||||
span#list-needs-payment-button.user-top-button
|
||||
span
|
||||
span#list-needs-help-button.user-top-button
|
||||
span
|
||||
.pull-right
|
||||
.table-number
|
||||
.supplier-name
|
||||
|
||||
.well
|
||||
table#products-table.table
|
||||
tbody
|
||||
|
||||
Reference in New Issue
Block a user