end of day commit

This commit is contained in:
2012-08-23 18:50:06 +02:00
parent 13dd2bf335
commit 0bae1bcbed
37 changed files with 1157 additions and 83 deletions
+2 -2
View File
@@ -1,14 +1,14 @@
.page-header= title 'Home'
ul.nav.nav-tabs.nav-stacked
- if list_open?
li.active= link_to '€ 23,45'.html_safe, '#'
li= link_to 'Place order', '/show_products?supplier_id=' + active_list.supplier.id
li= link_to 'Active list', '#'
li= link_to 'Active list', view_active_list_path
li= link_to 'Request bill', '#'
li= link_to 'I have a question', '#'
- else
li= link_to 'Place order', '/select_qrcode'
li= link_to 'Subscribe to list', '#'
li= link_to 'Check out menu', '#'
ul.nav.nav-tabs.nav-stacked
li= link_to 'View history', '#'
+20 -2
View File
@@ -1,6 +1,24 @@
button onClick='Qrammer.build_product_list()' class='btn btn-inverse'Lijst
table#products-table.table.table-striped.table-hover
tbody
- content_for :sidebar do
table#active-order-table.table.hide
thead
tr
th Product
th #
th.currency Total
th
tbody
tfoot
tr
td colspan=2
button class="btn btn-primary" onClick="Qrammer.order_active_list('/order_active_list')" 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(){
@@ -8,12 +26,12 @@ table#products-table.table.table-striped.table-hover
window.products = res
body = $('#products-table tbody')
for(var category in window.products){
body.append('<tr><td colspan="3"><h3>'+category+'<h3></td></tr>');
body.append('<tr><td colspan="3"><h4>'+category+'<h4></td></tr>');
var category_ref = window.products[category];
for(var iproduct = 0; iproduct < window.products[category].length; iproduct++){
var product_index = iproduct;
row = $('<tr></tr>');
button = $('<button class="btn btn-primary">Add</button>');
button = $('<button class="btn btn-mini btn-primary">Add</button>');
var callback = (function(ref){
return function(){ Qrammer.add_product(ref[product_index]) }
})(category_ref)
@@ -0,0 +1,37 @@
.page-header
h1 List overview
table#active-list-table.table
thead
tr
th Order
th.currency Price
tbody
tfoot
- content_for :footer do
javascript:
jQuery(function(){
$.get('#{current_list_path(session[:active_list_id], format: :json).html_safe}', function(res){
var body = $('#active-list-table tbody');
var foot = $('#active-list-table tfoot');
if(!res.orders && !res.orders.length){
alert('No orders in list');
return;
}
for(var iorder = 0; iorder < res.orders.length; iorder++){
var order_txts = [];
var order = res.orders[iorder];
var row = $('<tr></tr>').appendTo(body);
row.addClass(order.state);
//if(order.state == 'placed') row.addClass('info');
//if(order.state == 'delivered') row.addClass('success');
if(order.state == 'cancelled') row.addClass('error');
for(var iproduct = 0; iproduct < order.products.length; iproduct++){
var product = order.products[iproduct];
order_txts.push(product.name + ' (' + product['number'] + ')')
}
row.append($('<td></td>').text(order_txts.join(', ')));
row.append($('<td class="currency"></td>').html(Qrammer.currency(res.orders[iorder].total_amount)))
}
foot.append('<tr><td></td><td class="currency"><strong>'+Qrammer.currency(res.total_amount)+'</strong></td></tr>');
})
})