end of day commit

This commit is contained in:
2012-08-29 17:42:04 +02:00
parent 89700f36e9
commit 8213bae2c6
57 changed files with 1109 additions and 128 deletions
+4 -7
View File
@@ -1,10 +1,7 @@
ul.nav.nav-tabs.nav-stacked
li
button.btn.btn-primary onClick="QMobile.scanQr()" Scan Qr
- if list_open?
li= link_to 'Place order', user_list_products_path(supplier_id: active_list.supplier.id)
li= link_to 'Active list', user_active_list_path
- else
li= link_to 'Join table with Qr scan', '/select_qrcode'
li
button.btn.btn-primary onClick="QMobile.scanQr()" Scan Qr
li= link_to 'Place order', user_list_products_path
li= link_to 'Show active list', user_active_list_path
li= link_to 'Subscribe to list', '#'
li= link_to 'Check out menu', '#'
+3 -1
View File
@@ -1,2 +1,4 @@
.page-header= title 'User list history'
p Todo
ul
- for list in @lists
li= link_to l(list.created_at, format: :short), user_history_list_path(list_id: list.id)
-1
View File
@@ -4,7 +4,6 @@
span#list-needs-help-button
table#products-table.table.table-striped.table-hover
tbody
-# content_for :sidebar do
table#active-order-table.table.table-striped.hide
thead
tr
@@ -0,0 +1,27 @@
.page-header
h4= t('user.show_products.title', products: Product.model_name.human_plural)
table#products-table.table.table-striped.table-hover
tbody
table#active-order-table.table.table-striped.hide
thead
tr
th Product
th #
th.currency Total
th
tbody
tfoot
tr
td colspan=2
button class="btn btn-primary" onClick="Quser.order_selected_products({table_id: '#{@table.id}'})" Bestellen
| 
button class="btn btn btn-warning" onClick="Qrammer.clear_active_list()" Clear
td.currency
strong#active-order-total
td
- content_for :footer do
javascript:
jQuery(function(){
Quser.load_table_products('#{@table.id}', #{@table.occupied? ? 'true' : 'false'});
})