From 76525bbfd4429c0ac0661e8a3354a577442ff255 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 5 Sep 2014 13:51:18 +0200 Subject: [PATCH] Add product orders menu item --- .../user/app/controllers/application_controller.js.coffee | 1 + app/assets/javascripts/user/app/router.js.coffee | 1 + .../javascripts/user/app/templates/application.emblem | 1 + .../list_needs_payment.emblem} | 0 .../user/app/templates/menu/product_orders.emblem | 1 + .../app/views/menu_item_list_needs_payment_view.js.coffee | 3 +-- .../user/app/views/menu_item_product_orders_view.js.coffee | 7 +++++++ app/assets/stylesheets/user/foundation/_structure.css.sass | 3 +++ 8 files changed, 15 insertions(+), 2 deletions(-) rename app/assets/javascripts/user/app/templates/{menu_item_list_needs_payment.emblem => menu/list_needs_payment.emblem} (100%) create mode 100644 app/assets/javascripts/user/app/templates/menu/product_orders.emblem create mode 100644 app/assets/javascripts/user/app/views/menu_item_product_orders_view.js.coffee diff --git a/app/assets/javascripts/user/app/controllers/application_controller.js.coffee b/app/assets/javascripts/user/app/controllers/application_controller.js.coffee index d978ec6d..a0912410 100644 --- a/app/assets/javascripts/user/app/controllers/application_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/application_controller.js.coffee @@ -1,4 +1,5 @@ App.ApplicationController = Ember.Controller.extend + needs: ['product_orders'] join_request_sent: false notice: '' actions: diff --git a/app/assets/javascripts/user/app/router.js.coffee b/app/assets/javascripts/user/app/router.js.coffee index 9f47943a..8722ee0b 100644 --- a/app/assets/javascripts/user/app/router.js.coffee +++ b/app/assets/javascripts/user/app/router.js.coffee @@ -13,4 +13,5 @@ App.Router.map -> @resource 'lists', -> @resource 'list', path: ':list_id' @route 'settings' + @route 'product_orders' @route 'error' diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem index e34416e9..ed29ebb7 100644 --- a/app/assets/javascripts/user/app/templates/application.emblem +++ b/app/assets/javascripts/user/app/templates/application.emblem @@ -10,6 +10,7 @@ header.top-menu App.MenuItemView route='table' route_param=list.table.id App.MenuItemListNeedsHelpView App.MenuItemListNeedsPaymentView + App.MenuItemProductOrdersView section.extra-info if list .supplier-info-row diff --git a/app/assets/javascripts/user/app/templates/menu_item_list_needs_payment.emblem b/app/assets/javascripts/user/app/templates/menu/list_needs_payment.emblem similarity index 100% rename from app/assets/javascripts/user/app/templates/menu_item_list_needs_payment.emblem rename to app/assets/javascripts/user/app/templates/menu/list_needs_payment.emblem diff --git a/app/assets/javascripts/user/app/templates/menu/product_orders.emblem b/app/assets/javascripts/user/app/templates/menu/product_orders.emblem new file mode 100644 index 00000000..6848b046 --- /dev/null +++ b/app/assets/javascripts/user/app/templates/menu/product_orders.emblem @@ -0,0 +1 @@ +span=currency controller.controllers.product_orders.orderTotal diff --git a/app/assets/javascripts/user/app/views/menu_item_list_needs_payment_view.js.coffee b/app/assets/javascripts/user/app/views/menu_item_list_needs_payment_view.js.coffee index 8cb65eae..f0742684 100644 --- a/app/assets/javascripts/user/app/views/menu_item_list_needs_payment_view.js.coffee +++ b/app/assets/javascripts/user/app/views/menu_item_list_needs_payment_view.js.coffee @@ -1,6 +1,6 @@ App.MenuItemListNeedsPaymentView = Ember.View.extend Ember.ViewTargetActionSupport, action: 'listNeedsPayment' - templateName: "menu_item_list_needs_payment" + templateName: "menu/list_needs_payment" classNames: 'menu-list-item callout' classNameBindings: ['controller.list.needs_payment:active'] click: -> @@ -8,4 +8,3 @@ App.MenuItemListNeedsPaymentView = Ember.View.extend Ember.ViewTargetActionSuppo @set 'controller.notice', t('list_needs_payment.payment_already_requested') else @triggerAction() #action: 'listNeedsPayment' - diff --git a/app/assets/javascripts/user/app/views/menu_item_product_orders_view.js.coffee b/app/assets/javascripts/user/app/views/menu_item_product_orders_view.js.coffee new file mode 100644 index 00000000..8b833d63 --- /dev/null +++ b/app/assets/javascripts/user/app/views/menu_item_product_orders_view.js.coffee @@ -0,0 +1,7 @@ +App.MenuItemProductOrdersView = Ember.View.extend + templateName: 'menu/product_orders' + classNames: ['menu-list-item', 'menu-list-item-product-orders'] + classNameBindings: ['controller.controllers.product_orders.product_orders.length:show:hide', 'currentRoute:active'] + currentRoute: (-> @get('controller.currentRouteName') is 'product_orders' ).property('controller.currentRouteName') + click: -> + @get('controller').transitionToRoute 'product_orders' diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass index df72adf5..239a9544 100644 --- a/app/assets/stylesheets/user/foundation/_structure.css.sass +++ b/app/assets/stylesheets/user/foundation/_structure.css.sass @@ -42,3 +42,6 @@ span.loading .supplier-name + .table-number padding-left: 0.3em + +.hide + display: none !important