Implement product variant display for suppliers

This commit is contained in:
2015-04-15 12:58:00 +02:00
parent 2b036368cf
commit 9d5e3f684c
2 changed files with 8 additions and 3 deletions
@@ -34,9 +34,8 @@ App.Order = DS.Model.extend
@get('product_orders').getEach('total').reduce(((sum, total) -> sum + total), 0) @get('product_orders').getEach('total').reduce(((sum, total) -> sum + total), 0)
).property('product_orders.@each.total') ).property('product_orders.@each.total')
display: (-> display: Ember.computed 'product_orders.@each.display', ->
@get('product_orders').map((po) -> "#{po.get('quantity')} x #{po.get('product.name')}").join(', ') @get('product_orders').map((po) -> po.get('display')).join(', ')
).property('product_orders.@each.quantity', 'product_orders.@each.product.@each.name')
display_with_table: (-> display_with_table: (->
table = t('models.table').toLowerCase() table = t('models.table').toLowerCase()
@@ -2,8 +2,14 @@ attr = DS.attr
App.ProductOrder = DS.Model.extend App.ProductOrder = DS.Model.extend
quantity: attr 'number', defaultValue: 1 quantity: attr 'number', defaultValue: 1
price: attr 'number' price: attr 'number'
product_variant: attr('string')
product: DS.belongsTo('product', async: true) product: DS.belongsTo('product', async: true)
order: DS.belongsTo('order') order: DS.belongsTo('order')
increment: -> increment: ->
@set('quantity', @get('quantity') + 1) @set('quantity', @get('quantity') + 1)
total: (-> @get('quantity') * @get('price')).property('quantity', 'price') total: (-> @get('quantity') * @get('price')).property('quantity', 'price')
display: Ember.computed 'quantity', 'product_variant', 'product.name', ->
disp = "#{@get('quantity')} x #{@get('product.name')}"
if variant = @get('product_variant')
disp = "#{disp} (#{variant})"
disp.htmlSafe()