From 12622791d65d895fe79dfc8104c7dc96f6dba2ad Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 5 Sep 2014 14:12:58 +0200 Subject: [PATCH] use product_order display in order display --- app/assets/javascripts/user/app/models/order.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/user/app/models/order.js.coffee b/app/assets/javascripts/user/app/models/order.js.coffee index 6c4a301d..1e64bfef 100644 --- a/app/assets/javascripts/user/app/models/order.js.coffee +++ b/app/assets/javascripts/user/app/models/order.js.coffee @@ -8,7 +8,7 @@ App.Order = DS.Model.extend @get('product_orders').getEach('total').reduce(((sum, total) -> sum + total), 0) ).property('product_orders.@each.quantity') 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') markCancelled: -> @set 'state', 'cancelled'