return empty array if distributor is blank

openfoodfoundation · Sep 18, 2020 · 7f17ab5 · 7f17ab5
1 parent 0c688bb
commit 7f17ab5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/enterprises_helper.rb b/app/helpers/enterprises_helper.rb
@@ -12,8 +12,6 @@ def current_customer
   end
 
   def available_shipping_methods
-    return [] if current_distributor.blank?
-
     DistributorShippingMethods.shipping_methods(current_distributor, true, current_customer)
   end
 

diff --git a/app/services/distributor_shipping_methods.rb b/app/services/distributor_shipping_methods.rb
@@ -2,6 +2,8 @@
 
 class DistributorShippingMethods
   def self.shipping_methods(distributor, checkout = false, customer = nil)
+    return [] if distributor.blank?
+
     methods = if checkout
                 distributor.shipping_methods.display_on_checkout.to_a
               else
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,8 +12,6 @@ def current_customer @@
       end
       def available_shipping_methods
-        return [] if current_distributor.blank?
         DistributorShippingMethods.shipping_methods(current_distributor, true, current_customer)
       end
@@ Expand Down @@