diff --git a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee index 707e9dbf..b20ffd16 100644 --- a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee +++ b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee @@ -48,9 +48,9 @@ root.Qsupplier= $('.order-row-'+e.data.id).remove() $('.section-table-list-'+e.data.list_id).removeClass('active_order') else if e.event == 'orders_in_process_count' - $('.supplier-orders-in-process-count').text e.data.count + $('.supplier-orders-in-process-count-number').text e.data.count else if e.event == 'orders_placed_count' - $('.supplier-orders-placed-count').text e.data.count + $('.supplier-orders-placed-count-number').text e.data.count else if e.event == 'list_changed_table' Qsupplier.App && Qsupplier.App.List.updateOrAdd(e.data.list) 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 8d3aefb1..ef1e293a 100644 --- a/app/assets/javascripts/user/app/controllers/application_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/application_controller.js.coffee @@ -58,6 +58,11 @@ App.ApplicationController = Ember.Controller.extend list_changed_table: -> @setCurrentList() + orders_in_process_count: (data)-> + @set 'list.supplier.orders_in_process_count', data.count + orders_placed_count: (data)-> + @set 'list.supplier.orders_placed_count', data.count + setCurrentList: (callback)-> success = (list)=> diff --git a/app/assets/stylesheets/supplier/foundation1/_qdashboard.css.sass b/app/assets/stylesheets/supplier/foundation1/_qdashboard.css.sass index bc1c9c16..c66ccf21 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qdashboard.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qdashboard.css.sass @@ -12,5 +12,6 @@ width: 100% .mark_order_active +button-icon-only + margin-right: 0.6em .mark_order_delivered +button-icon-only diff --git a/app/views/suppliers/application/_top_menu.html.slim b/app/views/suppliers/application/_top_menu.html.slim index 8d877d17..10dcdd1f 100644 --- a/app/views/suppliers/application/_top_menu.html.slim +++ b/app/views/suppliers/application/_top_menu.html.slim @@ -17,11 +17,11 @@ header.top-menu .table-number .supplier-info-row .counter.supplier-orders-placed-count - = current_supplier.orders_placed_count + span.orders-placed-count-number= current_supplier.orders_placed_count span.orders-placed-count-icon .counter.supplier-orders-in-process-count - = current_supplier.orders_in_process_count - span.orders-in-process-count-icon + span.supplier-orders-in-process-count-number= current_supplier.orders_in_process_count + span.supplier-orders-in-process-count-icon aside.side-menu ul li diff --git a/wip.md b/wip.md index 983534f9..558bb8f7 100644 --- a/wip.md +++ b/wip.md @@ -23,8 +23,8 @@ Release - Section table view - click on table side menu buttons - Do not show side menu if there is no active list - - Edit mode section is out of order and styling - Add border around a section + - Edit mode section is out of order and styling - Settings - html structure - styling @@ -43,6 +43,8 @@ Release General: - search for class btn and replace with font awesome correct styling if needed +Bugs: + - New order in supplier main board has no price yet Post release ------------ @@ -52,3 +54,4 @@ Waiter app Users can disable their own help request (maak ongedaan?) Users can disable their own bill request (maak ongedaan?) Think about extra confirmation box for these requests +Supplier section 100% on ember :)