Broken end of day commit

This commit is contained in:
2014-08-06 18:46:36 +02:00
parent 1d4fdc42d9
commit e61767fe78
11 changed files with 25 additions and 24 deletions
@@ -4,7 +4,7 @@ Qsupplier.App.List = DS.Model.extend
needs_help: attr 'boolean'
needs_payment: attr 'boolean'
user_requests_closing: attr('boolean')
users: DS.hasMany('user')
users: DS.hasMany('user', async: true)
is_paid: attr 'boolean'
#has_active_orders: attr 'boolean'
@@ -1,7 +1,7 @@
# For more information see: http://emberjs.com/guides/routing/
# and for queryParams: https://github.com/alexspeller/website/blob/a96d9afe4506454b155cc64299e86e558ce3c9f1/source/guides/routing/query-params.md
Qsupplier.App.Router.reopen
location: 'history'
# location: 'history'
rootURL: '/supplier'
Qsupplier.App.Router.map ->
@@ -1,5 +1,5 @@
Qsupplier.App.SectionsRoute = Ember.Route.extend
model: -> @store.all 'section'
model: -> @store.all 'section'
setupController: (controller, collection) ->
controller.set 'content', collection
# setupController: (controller, collection) ->
# controller.set 'content', collection
@@ -8,7 +8,7 @@ td.status-icons
|
span.icon.needs-payment
td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content"
td.section_title {{view.content.section.title}}
td.section_title: link-to 'section' view.content.section.id: span=view.content.section.title
td.currency.total_list_amount {{currency view.content.total}}
td.actions
/ if view.content.needs_help
@@ -5,7 +5,7 @@ td.status-icons
span.active-order.fa.fa-check.fa-lg
td= view.content.display
td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content.list"
td.section_title= view.content.list.section.title
td.section_title: link-to 'section' view.content.list.section.id: span=view.content.list.section.title
td.currency=currency view.content.total
td.actions
if view.content.placed
@@ -16,7 +16,6 @@ module Suppliers
end
end
respond_to do |format|
format.html # index.html.erb
format.json { render json: @sections, each_serializer: SupplierExtendedSectionSerializer }
+2 -2
View File
@@ -47,7 +47,7 @@ module ApplicationHelper
end
def application_title
'Qwaiter'
'mozo.bar'
end
# Helper for displaying HTML currency values
@@ -62,7 +62,7 @@ module ApplicationHelper
prefix = '€ '
return (prefix + ("%.2f" % amount)).html_safe
# Rails native is ambiguous since is uses translation hashes
# Rails native is ambiguous since is uses translation hashes
options = {:unit => '€'}.merge(opts)
number_to_currency(amount, options)
end