translations
This commit is contained in:
@@ -32,6 +32,7 @@ gem 'devise_simply_stored'
|
|||||||
|
|
||||||
gem 'rqrcode'
|
gem 'rqrcode'
|
||||||
gem 'mini_magick'
|
gem 'mini_magick'
|
||||||
|
gem 'kaminari-bootstrap'
|
||||||
#gem "less-rails-bootstrap-devise", :git => 'git://github.com/bigbento/less-rails-bootstrap-devise.git'
|
#gem "less-rails-bootstrap-devise", :git => 'git://github.com/bigbento/less-rails-bootstrap-devise.git'
|
||||||
|
|
||||||
# To use ActiveModel has_secure_password
|
# To use ActiveModel has_secure_password
|
||||||
|
|||||||
@@ -105,6 +105,13 @@ GEM
|
|||||||
railties (>= 3.1.0, < 5.0)
|
railties (>= 3.1.0, < 5.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
json (1.6.7)
|
json (1.6.7)
|
||||||
|
kaminari (0.13.0)
|
||||||
|
actionpack (>= 3.0.0)
|
||||||
|
activesupport (>= 3.0.0)
|
||||||
|
railties (>= 3.0.0)
|
||||||
|
kaminari-bootstrap (0.1.2)
|
||||||
|
kaminari
|
||||||
|
rails
|
||||||
less (2.2.1)
|
less (2.2.1)
|
||||||
commonjs (~> 0.2.6)
|
commonjs (~> 0.2.6)
|
||||||
less-rails (2.2.3)
|
less-rails (2.2.3)
|
||||||
@@ -235,6 +242,7 @@ DEPENDENCIES
|
|||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
haml-rails
|
haml-rails
|
||||||
jquery-rails
|
jquery-rails
|
||||||
|
kaminari-bootstrap
|
||||||
mini_magick
|
mini_magick
|
||||||
pry
|
pry
|
||||||
rails (= 3.2.8)
|
rails (= 3.2.8)
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
@@ -34,6 +34,10 @@ class List
|
|||||||
list
|
list
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.of_user(user, options = {})
|
||||||
|
database.view(association_list_has_and_belongs_to_many_users({startkey: [user.id], endkey: ["#{user.id}\u9999"], include_docs: true, reduce: false}.merge(options)))
|
||||||
|
end
|
||||||
|
|
||||||
def close!
|
def close!
|
||||||
orders.map(&:close!)
|
orders.map(&:close!)
|
||||||
self.state = 'closed'
|
self.state = 'closed'
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
ul.nav.nav-tabs.nav-stacked
|
ul.nav.nav-tabs.nav-stacked
|
||||||
li
|
li
|
||||||
button.btn.btn-primary onClick="QMobile.scanQr()" Scan Qr
|
button.btn.btn-primary onClick="QMobile.scanQr()" = t('user.home.scan_qr')
|
||||||
- if list_open?
|
- if list_open?
|
||||||
li= link_to 'Place order', user_list_products_path
|
li= link_to t('user.home.show_active_list_products'), user_list_products_path
|
||||||
li= link_to 'Show active list', user_active_list_path
|
li= link_to t('user.home.show_active_list'), user_active_list_path
|
||||||
li= link_to 'Subscribe to list', '#'
|
|
||||||
|
|||||||
@@ -79,5 +79,9 @@ en:
|
|||||||
title: This table is occupied
|
title: This table is occupied
|
||||||
join_this_table: Join this table
|
join_this_table: Join this table
|
||||||
show_the_products: Show me the menu
|
show_the_products: Show me the menu
|
||||||
|
home:
|
||||||
|
scan_qr: Scan qr code
|
||||||
|
show_active_list: Show my orders
|
||||||
|
show_active_list_products: Go to the menu
|
||||||
section:
|
section:
|
||||||
first_section_title: Room
|
first_section_title: Room
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ Person actions:
|
|||||||
Alleen restaurant kan rekening afsluiten, als dit nog niet is gebeurd voor een tafel kan een nieuwe persoon geen lijst openen. Alert melding bij restaurant als iemand dit probeert
|
Alleen restaurant kan rekening afsluiten, als dit nog niet is gebeurd voor een tafel kan een nieuwe persoon geen lijst openen. Alert melding bij restaurant als iemand dit probeert
|
||||||
|
|
||||||
Eén lijst tegelijk actief? (wel handig en duidelijk!!!)
|
Eén lijst tegelijk actief? (wel handig en duidelijk!!!)
|
||||||
|
paginated history
|
||||||
|
|
||||||
|
|
||||||
/user/list_products_for_table
|
/user/list_products_for_table
|
||||||
if occupied
|
if occupied
|
||||||
@@ -76,4 +78,6 @@ Scan qr button (see mindmap Qr code.mm for actual version of this schema):
|
|||||||
* If table is occupied:
|
* If table is occupied:
|
||||||
** Offer to Join
|
** Offer to Join
|
||||||
|
|
||||||
|
Nadelen:
|
||||||
|
* Systeem ligt plat als er geen internet is
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user