Better dashboard

app/assets/javascripts/supplier/app/models/list.js.coffee

@@ -7,11 +7,7 @@ Qsupplier.App.List = DS.Model.extend
   users: DS.hasMany('user')
   is_paid: attr 'boolean'
   #has_active_orders: attr 'boolean'
-  has_active_orders: (->
-    return false unless @get('state') == 'active'
-    #!!@get('orders').filterProperty('state', 'active').length
-    !!@get('orders').filter( (order) -> order.get('state') is 'active' or order.get('state') is 'placed').length
-  ).property('state', 'orders.@each.state')
+
   price: attr 'number'
   closed_at: DS.attr('date')
   #table_number: attr 'number'
@@ -40,7 +36,11 @@ Qsupplier.App.List = DS.Model.extend
   total: (->
     @get('relevant_orders').getEach('total').reduce(((sum, total) -> sum + total), 0)
   ).property('relevant_orders.@each.total')
-
+  has_active_orders: (->
+    return false unless @get('state') == 'active'
+    #!!@get('orders').filterProperty('state', 'active').length
+    !!@get('orders').filter( (order) -> order.get('state') is 'active' or order.get('state') is 'placed').length
+  ).property('state', 'orders.@each.state')
   close: ->
     @markClosed()
     $.post Routes.supplier_close_list_path(), list_id: @id

app/assets/javascripts/supplier/app/models/order.js.coffee

@@ -21,6 +21,10 @@ Qsupplier.App.Order = DS.Model.extend
     @set 'state', 'closed'
   markCancelled: ->
     @set 'state', 'cancelled'
+  markDelivered: ->
+    @set 'state', 'closed'
+  markActive: ->
+    @set 'state', 'active'
   total: (->
     @get('product_orders').getEach('total').reduce(((sum, total) -> sum + total), 0)
   ).property('product_orders.@each.total')

app/assets/javascripts/supplier/app/templates/active_list.emblem

@@ -13,6 +13,8 @@ td.actions
       span.fa-stack.fa-2x.fa-stack-sized
         i.fa.fa-bell.fa-stack-small
         i.fa.fa-ban.revoke
-      /span.button-text=t 'list.is_helped_button'
-  button.close_list{ action closeList view.content.id}: span
+  button.close_list{ action closeList view.content.id}
+    span.fa-stack.fa-2x.fa-stack-sized
+      i.fa.fa-credit-card
+      i.fa-stack-check
   button.show-list.button{action "showList" view.content.id}: span

app/assets/javascripts/supplier/app/templates/table.emblem

@@ -1,8 +1,8 @@
 .table-number {{table.number}}
 .status-icons
-  span.needs_payment.icon-flag
-  span.needs_help.icon-bell
-  span.active_order.icon-glass
+  span.needs_payment
+  span.needs_help
+  span.active_order
 div class="table-actions table-actions-#{unbound table.id}"
   .title {{table.number}}
   if table.active_list.needs_help

app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee

@@ -51,11 +51,15 @@ root.Qsupplier=
         $('#list-is-helped-button-'+list_id).addClass('hide')
         $('.section-table-list-'+list_id).removeClass('needs_help')
       else if e.event == 'order_being_processed'
-        $('#order-in-process-button-'+e.data.id).hide()
-        $('.order-row-'+e.data.id).removeClass('placed').addClass('active')
+        if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id)
+          order.markActive()
+        # $('#order-in-process-button-'+e.data.id).hide()
+        # $('.order-row-'+e.data.id).removeClass('placed').addClass('active')
       else if e.event == 'order_being_delivered'
-        $('.order-row-'+e.data.id).remove()
-        $('.section-table-list-'+e.data.list_id).removeClass('active_order')
+        if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id)
+          order.markDelivered()
+        # $('.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-number').text e.data.count
       else if e.event == 'orders_placed_count'