update
This commit is contained in:
@@ -8,5 +8,12 @@ class List
|
||||
needs_payment: -> @attributes.needs_payment
|
||||
active: -> @attributes.state == 'active'
|
||||
products: -> @attributes.products || []
|
||||
supplier_name: -> @attributes.supplier_name
|
||||
created_at: -> @attributes.created_at
|
||||
display: ->
|
||||
txt = @supplier_name()
|
||||
txt += ' - '
|
||||
txt += Quser.format_date(@created_at())
|
||||
txt
|
||||
|
||||
@List = List
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
//= require bootstrap
|
||||
//= require qwaiter
|
||||
//= require supplier/order
|
||||
//= require supplier/list
|
||||
//= require mustache
|
||||
//= require faye
|
||||
//= require_directory .
|
||||
|
||||
@@ -95,7 +95,7 @@ class Quser
|
||||
$('.table-number').text(response.table_number) if response.table_number
|
||||
$('.supplier-name').text(response.supplier_name) if response.supplier_name
|
||||
|
||||
if response.not_present || response.list_active == false then $('.home-link').hide() else $('.home-link').show()
|
||||
if response.not_present || response.list_active == false then $('.home-link').removeClass('active') else $('.home-link').addClass('active')
|
||||
|
||||
@list_needs_payment_default_action(response)
|
||||
@list_needs_help_default_action(response)
|
||||
@@ -209,13 +209,7 @@ class Quser
|
||||
@paginate(res, @load_list_history)
|
||||
container = $('#list-history-container').html('')
|
||||
for list in res.lists
|
||||
li = $('<li></li>').appendTo(container)
|
||||
link = $('<a href="#"></a>').appendTo(li)
|
||||
link.click(-> redirect_to 'history_list', list_id: list._id)
|
||||
txt = list.supplier_name
|
||||
txt += ' - '
|
||||
txt += @format_date(list.created_at)
|
||||
link.text(txt)
|
||||
container.append @mustache('#list-history-template', new List(list) )
|
||||
)
|
||||
paginate: (wrapper, callback) ->
|
||||
container = $('nav.pagination')
|
||||
|
||||
@@ -3,3 +3,4 @@
|
||||
#products-table
|
||||
.order-product-button
|
||||
+wood-button
|
||||
color: white
|
||||
|
||||
@@ -37,14 +37,22 @@ body
|
||||
margin-left: auto
|
||||
margin-right: auto
|
||||
width: 262px
|
||||
text-align: center
|
||||
a
|
||||
+user-button
|
||||
float: none
|
||||
display: none
|
||||
width: 34px
|
||||
height: 34px
|
||||
&.active
|
||||
display: inline-block
|
||||
span
|
||||
display: block
|
||||
width: 28px
|
||||
height: 26px
|
||||
background-repeat: no-repeat
|
||||
background-position: center center
|
||||
margin: 4px auto auto auto
|
||||
&.home-list-link
|
||||
span
|
||||
background-image: image-url('icons/list.png')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
class UserController < ApplicationController
|
||||
before_filter :allow_mobile
|
||||
before_filter :user_authentication, except: :obtain_token
|
||||
before_filter :user_authentication, except: [:obtain_token, :index]
|
||||
layout 'phone'
|
||||
|
||||
def user_authentication
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
<li>
|
||||
<a href="#" onclick="redirect_to('history_list', {list_id: '{{id}}'})">{{display}}</a>
|
||||
</li>
|
||||
@@ -33,7 +33,7 @@ html lang="en"
|
||||
var $asset_path = '/assets/';
|
||||
var Qstorage = localStorage;
|
||||
#{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(){},
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
a href="#" onClick="QMobile.scanQr()" = image_tag 'scan-logo.png'
|
||||
.home-footer
|
||||
.home-footer-content
|
||||
= link_to content_tag(:span, 'P'), user_list_products_path, class: [:hide, 'home-link', 'home-menu-link']
|
||||
= link_to content_tag(:span, 'L'), user_active_list_path, class: [:hide, 'home-link', 'home-list-link']
|
||||
= link_to content_tag(:span, 'P'), user_list_products_path, class: ['home-link', 'home-menu-link']
|
||||
= link_to content_tag(:span, 'L'), user_active_list_path, class: ['home-link', 'home-list-link']
|
||||
- content_for :footer do
|
||||
javascript:
|
||||
$(function(){
|
||||
Quser.watch_events();
|
||||
Quser.home_loader();
|
||||
//setInterval("Quser.home_loader()", 7500);
|
||||
});
|
||||
|
||||
@@ -2,4 +2,5 @@
|
||||
span
|
||||
nav.pagination
|
||||
ul#list-history-container
|
||||
script#list-history-template[type="text/html"]= mustache_template 'list-history'
|
||||
- onload_javascript "Qstorage.page = 1; Quser.load_list_history()"
|
||||
|
||||
@@ -3,11 +3,15 @@
|
||||
.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'
|
||||
= link_to user_active_list_path, class: ['user-top-button'], id: 'show-active-list' do
|
||||
span= t('helpers.links.show_active_list', list: List.model_name.human)
|
||||
span#list-needs-payment-button.user-top-button
|
||||
span
|
||||
span#list-needs-help-button.user-top-button
|
||||
span
|
||||
span
|
||||
|
||||
|
||||
.well
|
||||
table#products-table.table
|
||||
tbody
|
||||
|
||||
Reference in New Issue
Block a user