Merge foodcoop1040:order_message into master

Conflicts:
	plugins/messages/app/models/message.rb

app/models/order.rb

@@ -8,6 +8,7 @@ class Order < ActiveRecord::Base
   has_many :articles, :through => :order_articles
   has_many :group_orders, :dependent => :destroy
   has_many :ordergroups, :through => :group_orders
+  has_many :users_ordered, :through => :ordergroups, :source => :users
   has_one :invoice
   has_many :comments, -> { order('created_at') }, :class_name => "OrderComment"
   has_many :stock_changes

app/views/orders/_show_js.html.haml

@@ -0,0 +1,20 @@
+-# this needs to be in a separate file from show.html.erb to allow deface overrides
+- content_for :javascript do
+  :javascript
+    function activate_search(view, placeholder) {
+      new List(document.body, {
+        valueNames: ['name'],
+        engine: 'unlist',
+        plugins: [
+          ['reset', {highlightClass: 'btn-primary'}],
+          ['delay', {delayedSearchTime: 500}],
+        ],
+        // make large pages work too (as we don't have paging)
+        page: 10000,
+        indexAsync: true
+      });
+      $('#query').attr('placeholder', placeholder);
+    }
+    $(function() {
+      activate_search('#{j @view}', '#{j t(".search_placeholder.#{@view}")}');
+    });

app/views/orders/show.html.haml

@@ -79,25 +79,5 @@
 #new_comment= render partial: 'order_comments/form', locals: { order_comment: @order.comments.build(user: current_user)}
 = link_to_top
 
-
-- content_for :javascript do
-  :javascript
-    function activate_search(view, placeholder) {
-      new List(document.body, {
-        valueNames: ['name'],
-        engine: 'unlist',
-        plugins: [
-          ['reset', {highlightClass: 'btn-primary'}],
-          ['delay', {delayedSearchTime: 500}],
-        ],
-        // make large pages work too (as we don't have paging)
-        page: 10000,
-        indexAsync: true
-      });
-      $('#query').attr('placeholder', placeholder);
-    }
-    $(function() {
-      activate_search('#{j @view}', '#{j t(".search_placeholder.#{@view}")}');
-    });
-
+= render 'show_js'
 = render 'shared/articles_by/common', order: @order

plugins/messages/app/models/message.rb

@@ -38,6 +38,16 @@ class Message < ActiveRecord::Base
     self.recipients_ids += users.collect(&:id) unless users.blank?
   end
 
+  def group_id=(group_id)
+    @group_id = group_id
+    add_recipients Group.find(group_id).users unless group_id.blank?
+  end
+
+  def order_id=(order_id)
+    @order_id = order_id
+    add_recipients Order.find(order_id).users_ordered unless order_id.blank?
+  end
+
   def recipient_tokens=(ids)
     @recipient_tokens = ids
     add_recipients ids.split(",").collect { |id| User.find(id) }

plugins/messages/app/overrides/orders/show/add_message_button.html.haml.deface

@@ -0,0 +1,4 @@
+/ insert_after 'erb:contains("title t(\'.title\'")'
+- content_for :actionbar do
+  - if FoodsoftMessages.enabled?
+    = link_to_new_message message_params: {order_id: @order.id}