From 5ef6ef74ffa669e218aaf3b39c6ddb4dae5db23b Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 5 Sep 2014 14:09:39 +0200 Subject: [PATCH] Add ember product_order display for user --- .../javascripts/user/app/models/product_order.js.coffee | 1 + .../javascripts/user/app/templates/product_orders.emblem | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/user/app/models/product_order.js.coffee b/app/assets/javascripts/user/app/models/product_order.js.coffee index fc18dafd..59947d7f 100644 --- a/app/assets/javascripts/user/app/models/product_order.js.coffee +++ b/app/assets/javascripts/user/app/models/product_order.js.coffee @@ -9,6 +9,7 @@ App.ProductOrder = DS.Model.extend increment: -> @set('quantity', @get('quantity') + 1) total: (-> @get('quantity') * @get('price')).property('quantity', 'price') + display: (-> "#{@get('quantity')} x #{@get('product.name')}").property('quantity', 'product.name') setOrder: (order)-> @set('placed', true) @set('order', order) diff --git a/app/assets/javascripts/user/app/templates/product_orders.emblem b/app/assets/javascripts/user/app/templates/product_orders.emblem index 2afad1fc..ef37d9dd 100644 --- a/app/assets/javascripts/user/app/templates/product_orders.emblem +++ b/app/assets/javascripts/user/app/templates/product_orders.emblem @@ -4,11 +4,8 @@ hr.hide-for-medium-up ul.product-orders each product_order in product_orders li.product-order - = product_order.quantity - | x - = product_order.product.name - button.product-order-remove.right{action "removeProductOrder" product_order} - span.icon + = product_order.display + button.product-order-remove.right{action "removeProductOrder" product_order}: span.icon span.currency=currency product_order.total else li= t 'product_orders.no_orders'