bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix product ordering pricing and improve acceptance user product ordering coverage

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-15 11:01:39 +02:00
parent 0e605828bd
commit 9c570fdbcd
7 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/user/app/controllers/table_controller.js.coffee
+1 -1
View File
@@ -21,7 +21,7 @@ App.TableController = Ember.ObjectController.extend
if existing = @store.all('product_order').find((po)-> po.get('product') == product and not po.get('order'))
existing.increment()
else
@store.createRecord 'product_order', product: product
@store.createRecord 'product_order', product: product, price: product.get('price')
joinOccupiedTable: ->
#@secured =>
Ember.$.post('/user/join_occupied_table.json', table_id: @get('model.id'))
app/assets/javascripts/user/app/templates/product_orders.emblem
+5 -5
View File
@@ -1,15 +1,15 @@
hr.hide-for-medium-up
if modelDisabled
a.tiny.button.right{action clearProductOrders} href="#" ×
a.tiny.button.right{action "clearProductOrders"} href="#" ×
.clearfix
.panel
ul.product-orders
each product_order in product_orders
li.product_order
li.product-order
= product_order.quantity
| x
| x
= product_order.product.name
button.product_order-remove.right{action removeProductOrder product_order}
button.product-order-remove.right{action "removeProductOrder" product_order}
span.icon
span.currency=currency product_order.total
else
@@ -19,4 +19,4 @@ if modelDisabled
= t 'product_orders.total'
span.right.currency=currency orderTotal
if product_orders
a.order-selected-products-button{action orderProducts} href="#"= t 'product_orders.order_button'
a.order-selected-products-button{action "orderProducts"} href="#"= t 'product_orders.order_button'