Remove Promomtion#order_activatable in favour of the class method of …

…the same name

core/app/models/spree/promotion.rb

@@ -34,12 +34,16 @@ def self.active
         where('expires_at IS NULL OR expires_at > ?', Time.now)
     end
 
+    def self.order_activatable?(order)
+      order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)
+    end
+
     def expired?
       starts_at && Time.now < starts_at || expires_at && Time.now > expires_at
     end
 
     def activate(payload)
-      return unless order_activatable? payload[:order]
+      return unless self.class.order_activatable?(payload[:order])
 
       # Track results from actions to see if any action has been taken.
       # Actions should return nil/false if no action has been taken.
@@ -67,14 +71,6 @@ def rules_are_eligible?(promotable, options = {})
       end
     end
 
-    def self.order_activatable?(order)
-      order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)
-    end
-    def order_activatable?(order)
-      self.class.order_activatable?(order)
-    end
-
-
     # Products assigned to all product rules
     def products
       @products ||= self.rules.to_a.inject([]) do |products, rule|