Fix two things noted by houndci-bot

solidusio · Apr 27, 2020 · df21004 · df21004
1 parent 776cfdb
commit df21004
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/app/models/spree/promotion_handler/coupon.rb b/core/app/models/spree/promotion_handler/coupon.rb
@@ -15,7 +15,7 @@ def apply
         if coupon_code.present?
           if promotion.present? && promotion.active? && promotion.actions.exists?
             handle_present_promotion(promotion)
-          elsif promotion_code && promotion_code.promotion.expired?
+          elsif promotion_code&.promotion&.expired?
             set_error_code :coupon_code_expired
           else
             set_error_code :coupon_code_not_found

diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
@@ -63,14 +63,14 @@ class Engine < ::Rails::Engine
             'Spree::LineItem::CurrencyMismatch will not be raised anymore.',
             caller
           )
-          if Spree::Config.actionless_promotion_inactive == true
-            Spree::Deprecation.warn(
-                'Spree::Config.actionless_promotion_inactive set to false is ' \
+        end
+        if Spree::Config.actionless_promotion_inactive == true
+          Spree::Deprecation.warn(
+            'Spree::Config.actionless_promotion_inactive set to false is ' \
             'deprecated. Please note that by switching this value, ' \
             'promotions with no actions will be active.',
-                caller
-            )
-          end
+            caller
+          )
         end
       end