Merge pull request #52 from friendlycart/return-order-for-shipped-orders

FriendlyPromotionDiscounter: Always return @order

app/models/solidus_friendly_promotions/friendly_promotion_discounter.rb

@@ -10,7 +10,7 @@ def initialize(order)
     end
 
     def call
-      return nil if order.shipped?
+      return order if order.shipped?
 
       order.reset_current_discounts
 

spec/models/solidus_friendly_promotions/friendly_promotion_discounter_spec.rb

@@ -8,8 +8,9 @@
 
     subject { described_class.new(order).call }
 
-    it "returns nil" do
-      expect(subject).to be nil
+    it "returns the order unmodified" do
+      expect(order).not_to receive(:reset_current_discounts)
+      expect(subject).to eq(order)
     end
   end
 end