From 5d1ecd81c8a83a1f09fa0ea2e7a753ffafa3738e Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 28 Aug 2015 22:05:19 +0200 Subject: [PATCH] Fix new product orders display for users --- .../user/app/components/menu/item/product_orders.js.coffee | 2 +- ...-orders.js.coffee => new-product-orders-list.js.coffee} | 4 +++- .../user/app/controllers/table_controller.js.coffee | 2 -- app/assets/javascripts/user/app/models/product.js.coffee | 4 ++-- app/assets/javascripts/user/app/router.js.coffee | 2 +- ...t-orders-list.emblem => new-product-orders-list.emblem} | 0 .../javascripts/user/app/templates/product-orders.emblem | 1 + app/assets/javascripts/user/app/templates/table.emblem | 7 +++---- 8 files changed, 11 insertions(+), 11 deletions(-) rename app/assets/javascripts/user/app/components/{product-orders.js.coffee => new-product-orders-list.js.coffee} (90%) rename app/assets/javascripts/user/app/templates/components/{product-orders-list.emblem => new-product-orders-list.emblem} (100%) create mode 100644 app/assets/javascripts/user/app/templates/product-orders.emblem diff --git a/app/assets/javascripts/user/app/components/menu/item/product_orders.js.coffee b/app/assets/javascripts/user/app/components/menu/item/product_orders.js.coffee index 8ca1a6fd..973ade51 100644 --- a/app/assets/javascripts/user/app/components/menu/item/product_orders.js.coffee +++ b/app/assets/javascripts/user/app/components/menu/item/product_orders.js.coffee @@ -10,4 +10,4 @@ App.MenuItemProductOrdersComponent = Ember.Component.extend #orderTotal: Ember.computed 'product_orders.@each.total', -> # debugger click: -> - @get('targetObject').transitionToRoute 'product_orders' + @get('targetObject').transitionToRoute 'product-orders' diff --git a/app/assets/javascripts/user/app/components/product-orders.js.coffee b/app/assets/javascripts/user/app/components/new-product-orders-list.js.coffee similarity index 90% rename from app/assets/javascripts/user/app/components/product-orders.js.coffee rename to app/assets/javascripts/user/app/components/new-product-orders-list.js.coffee index e6b7e6df..0704e263 100644 --- a/app/assets/javascripts/user/app/components/product-orders.js.coffee +++ b/app/assets/javascripts/user/app/components/new-product-orders-list.js.coffee @@ -1,8 +1,10 @@ -App.ProductOrdersListComponent = Ember.Component.extend +App.NewProductOrdersListComponent = Ember.Component.extend orderTotal: (-> #Math.round(Math.random()*100) @get('product_orders').getEach('total').reduce(((sum, total) -> sum + total), 0) ).property('product_orders.@each.quantity') + all_product_orders: Ember.computed -> @store.peekAll('product_order') + product_orders: Ember.computed 'all_product_orders.@each.isNew', -> @get('all_product_orders').filterBy('isNew') #product_orders: (->@get('model')).property('model') #product_orders: -> @store.peekAll('product_order') showTotal: (-> if @get('product_orders.length') && @get('product_orders.length') > 1 then true else false ).property('product_orders.length') diff --git a/app/assets/javascripts/user/app/controllers/table_controller.js.coffee b/app/assets/javascripts/user/app/controllers/table_controller.js.coffee index 4f29bb1a..2ee64f50 100644 --- a/app/assets/javascripts/user/app/controllers/table_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/table_controller.js.coffee @@ -16,8 +16,6 @@ App.TableController = Ember.Controller.extend return false if @get('globals.list') # if you already have an active list, do not join another if @get('model.occupied') then true else false # no point in joining tables that are not occupied ).property('globals.list.id', 'supplier.can_take_orders', 'model.occupied', 'model.id', 'globals.list.table.id') - all_product_orders: Ember.computed -> @store.peekAll('product_order') - new_product_orders: Ember.computed 'all_product_orders.@each.isNew', -> @get('all_product_orders').filterBy('isNew') actions: joinOccupiedTable: -> Ember.$.post("#{$data_host}/user/join_occupied_table.json", table_id: @get('model.id')) diff --git a/app/assets/javascripts/user/app/models/product.js.coffee b/app/assets/javascripts/user/app/models/product.js.coffee index b70d8293..1d096d41 100644 --- a/app/assets/javascripts/user/app/models/product.js.coffee +++ b/app/assets/javascripts/user/app/models/product.js.coffee @@ -18,9 +18,9 @@ App.Product = DS.Model.extend addOrderItem: (options = {})-> #if existing = @store.all('product_order').find((po)-> po.get('product') == product and not po.get('order')) if options.product_variant - existing = @get('product_orders').find( (po)-> !po.get('isNew') and po.get('product_variant') is options.product_variant ) + existing = @get('product_orders').find( (po)-> po.get('isNew') and po.get('product_variant') is options.product_variant ) else - existing = @get('product_orders').find( (po)-> !po.get('isNew') ) + existing = @get('product_orders').find( (po)-> po.get('isNew') ) if existing existing.increment() diff --git a/app/assets/javascripts/user/app/router.js.coffee b/app/assets/javascripts/user/app/router.js.coffee index 238b0935..7e80bfab 100644 --- a/app/assets/javascripts/user/app/router.js.coffee +++ b/app/assets/javascripts/user/app/router.js.coffee @@ -13,7 +13,7 @@ App.Router.map -> @resource 'lists', -> @resource 'list', path: ':list_id' @route 'settings' - @route 'product_orders' + @route 'product-orders' @route 'error' @route 'about' @route 'scanning' diff --git a/app/assets/javascripts/user/app/templates/components/product-orders-list.emblem b/app/assets/javascripts/user/app/templates/components/new-product-orders-list.emblem similarity index 100% rename from app/assets/javascripts/user/app/templates/components/product-orders-list.emblem rename to app/assets/javascripts/user/app/templates/components/new-product-orders-list.emblem diff --git a/app/assets/javascripts/user/app/templates/product-orders.emblem b/app/assets/javascripts/user/app/templates/product-orders.emblem new file mode 100644 index 00000000..e03e9de4 --- /dev/null +++ b/app/assets/javascripts/user/app/templates/product-orders.emblem @@ -0,0 +1 @@ += new-product-orders-list diff --git a/app/assets/javascripts/user/app/templates/table.emblem b/app/assets/javascripts/user/app/templates/table.emblem index e5abc8de..5789c367 100644 --- a/app/assets/javascripts/user/app/templates/table.emblem +++ b/app/assets/javascripts/user/app/templates/table.emblem @@ -1,4 +1,4 @@ -.row +.row: .small-12.columns h3 span.supplier-name= supplier.name span.table-number @@ -11,10 +11,9 @@ span=t 'join_request.requestor.waiting_for_approval' else button.join-table-button{action "joinOccupiedTable"}=t 'join_request.requestor.join_this_table' +.row if tableCanTakeOrders .large-6.columns= menu-product-categories product_categories=supplier.product_categories orderProducts=true - .large-6.columns= product-orders-list table=model product_orders=new_product_orders + .large-6.columns= new-product-orders-list table=model else .large12= menu-product-categories product_categories=supplier.product_categories orderProducts=false - each new_product_orders as |po| - .row: b=po.display