End of day commit

app/assets/javascripts/supplier/app/components/flash-message.js.coffee

@@ -3,7 +3,8 @@ App.FlashMessageComponent = Ember.Component.extend
   classNames: ['flash-message']
   classNameBindings: ['message:active']
   message: Ember.computed.alias 'globals.flash_message'
+  click: -> @set 'globals.flash_message', ''
   inactivator: (->
     if @get('message')
-      Ember.run.later((=> @set 'message', ''), 4000)
+      Ember.run.later((=> @set 'globals.flash_message', ''), 4000)
   ).observes('message')

app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee

@@ -13,13 +13,18 @@ App.IndexController = Ember.Controller.extend
     lists.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
   ).property('lists.@each.state', 'active_section.id')
 
-  active_orders: (->
+  active_orders: Ember.computed 'active_lists.[]', 'active_orders.@each.state', ->
-    if @get('active_section.id')
+    orders = Ember.A()
-      orders = @get('orders').filter (o)=>( o.get('section.id') == @get('active_section.id') && o.get('needs_supplier_attention') )
+    @get('active_lists').forEach (list)->
-    else
+      list.get('orders').filterBy('needs_supplier_attention').forEach (order)->
-      orders = @get('orders').filter (o)->( o.get('needs_supplier_attention') )
+        orders.push order
-    orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
+    return orders
-  ).property('orders.@each.state', 'active_section.id')
+    #if @get('active_section.id')
+    #   orders = @get('orders').filter (o)=>( o.get('section.id') == @get('active_section.id') && o.get('needs_supplier_attention') )
+    #else
+    #  orders = @get('orders').filter (o)->( o.get('needs_supplier_attention') )
+    #orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
+    #).property('orders.@each.state', 'active_section.id')
 
   show_lists_table: Ember.computed 'show_lists', 'active_lists.[]', ->
     @get('show_lists') and @get('active_lists.length')

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

@@ -3,13 +3,14 @@ App.ProductOrder = DS.Model.extend
   quantity: attr 'number', defaultValue: 1
   price: attr 'number'
   product_variant: attr('string')
+  product_name: attr('string')
   product: DS.belongsTo('product', async: true)
   order: DS.belongsTo('order')
   increment: ->
     @set('quantity', @get('quantity') + 1)
   total: (-> @get('quantity') * @get('price')).property('quantity', 'price')
-  display: Ember.computed 'quantity', 'product_variant', 'product.name', ->
+  display: Ember.computed 'quantity', 'product_variant', 'product_name', ->
-    disp = "#{@get('quantity')} x #{@get('product.name')}"
+    disp = "#{@get('quantity')} x #{@get('product_name')}"
     if variant = @get('product_variant')
       disp = "#{disp} (#{variant})"
     disp.htmlSafe()

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

@@ -3,9 +3,9 @@ App.Section = DS.Model.extend
   title: attr 'string'
   width: attr 'number'
   height: attr 'number'
-  tables: DS.hasMany('table')
+  tables: DS.hasMany('table', async: false)
-  section_elements: DS.hasMany('section-element')
+  section_elements: DS.hasMany('section-element', async: false)
-  section_areas: DS.hasMany('section-area')
+  section_areas: DS.hasMany('section-area', async: false)
 
   editmode: false
 

app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb

@@ -88,13 +88,13 @@ App.ApplicationRoute = Ember.Route.extend
         body: options.body
         cancel: options.cancel
         ok: options.ok
-    newOrder: (order_id)->
+    #newOrder: (order_id)->
-      if order = @store.peekRecord('order', order_id)
+    #  if order = @store.peekRecord('order', order_id)
-        return if @get('globals.active_section.id') and order.get('section.id') isnt @get('globals.active_section.id')
+    #    return if @get('globals.active_section.id') and order.get('section.id') isnt @get('globals.active_section.id')
-        $('body').addClass('new-order')
+    #    $('body').addClass('new-order')
-        @set 'globals.flash_message', order.get('display_with_table')
+    #    @set 'globals.flash_message', order.get('display_with_table')
-        setTimeout (-> $('body').removeClass('new-order')), 4000
+    #    setTimeout (-> $('body').removeClass('new-order')), 4000
-        try ion.sound.play('water_droplet')
+    #    try ion.sound.play('water_droplet')
     showDashboardOrders: (section)->
       @set('globals.active_section', section)
       @transitionTo 'index'
@@ -126,11 +126,17 @@ App.ApplicationRoute = Ember.Route.extend
         return if @get('globals.active_section.id') and list.get('section.id') isnt @get('globals.active_section.id')
         try ion.sound.play 'water_droplet_3'
     list_is_paid: (data) -> list.isPaid() if list = @store.peekRecord('list', data.id)
-    list_update: (data) ->
+    new_order: (data) ->
-      new_order_id = data.new_order_id
+      if data.payload
-      delete data.new_order_id
+        @store.pushPayload(data.payload)
-      @store.pushPayload(data)
+        if order_id = data.payload.data.id
-      @send 'newOrder', new_order_id if new_order_id
+          order = @store.peekRecord('order', order_id)
+          return if @get('globals.active_section.id') and order.get('section.id') isnt @get('globals.active_section.id')
+          @set 'globals.flash_message', order.get('display_with_table')
+      try ion.sound.play('water_droplet')
+    new_list: (data)->
+      debugger
+      try ion.sound.play('water_droplet')
     list_changed_table: (data) -> @store.pushPayload('list', lists: [data.list])
     list_closed: (data) -> list.isClosed() if list = @store.peekRecord('list', data.id)
     list_helped: (data) -> list.isHelped() if list = @store.peekRecord('list', data.id)

app/assets/stylesheets/supplier/foundation1/components/_flash_message.sass

@@ -8,6 +8,7 @@
   border-radius: 9999px
   font-weight: bold
   font-size: 1.4
+  z-index: 8976
   +animation(flashMessageInactive 0.5s)
   &.active
     +animation(flashMessageActive 0.5s)

app/controllers/suppliers/lists_controller.rb

@@ -28,8 +28,7 @@ module Suppliers
         orders.product_orders
         orders.product_orders.product
         users
-        join_requests
+        section
-        join_requests.user
         table
       ])
     end

app/models/list.rb

@@ -309,14 +309,29 @@ class List
     if first_order
       # broadcast_users 'orders_placed_count', count: orders_placed_count
       broadcast_supplier supplier.id, 'list_update', Supplier::ListSerializer.new(self).as_json.merge(new_order_id: order.id)
+      supplier_payload = JSONAPI::Serializer.serialize(self, serializer: Suppliers::ListSerializer, include: %w[
+        orders
+        orders.list
+        orders.user
+        orders.product_orders
+        orders.product_orders.product
+        users
+        section
+        table
+      ])
       # broadcast_supplier supplier.id, 'new_order', OrderSerializer.new(order)
+      broadcast_supplier supplier.id, 'new_list', supplier_orders_placed_count: orders_placed_count, payload: supplier_payload
     else
       # broadcast_users 'new_order', order: order.with_products_as_json, total_amount: price
       user_payload = JSONAPI::Serializer.serialize(order, serializer: Users::OrderSerializer, include: %w[list user product_orders product_orders.order])
+      supplier_payload = JSONAPI::Serializer.serialize(order, serializer: Suppliers::OrderSerializer, include: %w[
+        user
+        product_orders
+      ])
       broadcast_users 'new_order', user_payload
-      broadcast_supplier supplier.id, 'list_update', Supplier::ListSerializer.new(self).as_json.merge(new_order_id: order.id)
+      broadcast_supplier supplier.id, 'new_order', supplier_orders_placed_count: orders_placed_count, payload: supplier_payload
     end
-    broadcast_supplier supplier.id, 'orders_placed_count', count: orders_placed_count
+    #broadcast_supplier supplier.id, 'orders_placed_count', count: orders_placed_count # done inside new order payload
     order
   end
 

app/serializers/suppliers/list_serializer.rb

@@ -6,4 +6,5 @@ class Suppliers::ListSerializer
   has_many :join_requests, serializer: Suppliers::JoinRequestSerializer
   has_many :users, serializer: Suppliers::UserSerializer
   has_one :table, serializer: Suppliers::TableSerializer
+  has_one :section, serializer: Suppliers::SectionSerializer
 end