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

Fix supplier counters

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-06-26 18:09:54 +02:00
parent 6f3c22a167
commit a5e8d38882
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee
+2 -2
View File
@@ -48,9 +48,9 @@ root.Qsupplier=
$('.order-row-'+e.data.id).remove() $('.order-row-'+e.data.id).remove()
$('.section-table-list-'+e.data.list_id).removeClass('active_order') $('.section-table-list-'+e.data.list_id).removeClass('active_order')
else if e.event == 'orders_in_process_count' 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' 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' else if e.event == 'list_changed_table'
Qsupplier.App && Qsupplier.App.List.updateOrAdd(e.data.list) Qsupplier.App && Qsupplier.App.List.updateOrAdd(e.data.list)
app/assets/javascripts/user/app/controllers/application_controller.js.coffee
+5
View File
@@ -58,6 +58,11 @@ App.ApplicationController = Ember.Controller.extend
list_changed_table: -> list_changed_table: ->
@setCurrentList() @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)-> setCurrentList: (callback)->
success = (list)=> success = (list)=>
app/assets/stylesheets/supplier/foundation1/_qdashboard.css.sass
+1
View File
@@ -12,5 +12,6 @@
width: 100% width: 100%
.mark_order_active .mark_order_active
+button-icon-only +button-icon-only
margin-right: 0.6em
.mark_order_delivered .mark_order_delivered
+button-icon-only +button-icon-only
app/views/suppliers/application/_top_menu.html.slim
+3 -3
View File
@@ -17,11 +17,11 @@ header.top-menu
.table-number .table-number
.supplier-info-row .supplier-info-row
.counter.supplier-orders-placed-count .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 span.orders-placed-count-icon
.counter.supplier-orders-in-process-count .counter.supplier-orders-in-process-count
= current_supplier.orders_in_process_count span.supplier-orders-in-process-count-number= current_supplier.orders_in_process_count
span.orders-in-process-count-icon span.supplier-orders-in-process-count-icon
aside.side-menu aside.side-menu
ul ul
li li
wip.md
+4 -1
View File
@@ -23,8 +23,8 @@ Release
- Section table view - Section table view
- click on table side menu buttons - click on table side menu buttons
- Do not show side menu if there is no active list - 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 - Add border around a section
- Edit mode section is out of order and styling
- Settings - Settings
- html structure - html structure
- styling - styling
@@ -43,6 +43,8 @@ Release
General: General:
- search for class btn and replace with font awesome correct styling if - search for class btn and replace with font awesome correct styling if
needed needed
Bugs:
- New order in supplier main board has no price yet
Post release Post release
------------ ------------
@@ -52,3 +54,4 @@ Waiter app
Users can disable their own help request (maak ongedaan?) Users can disable their own help request (maak ongedaan?)
Users can disable their own bill request (maak ongedaan?) Users can disable their own bill request (maak ongedaan?)
Think about extra confirmation box for these requests Think about extra confirmation box for these requests
Supplier section 100% on ember :)