From 0948ce47ed73b568b61d70c237de9a4d0a9f560e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bellet <jb.bellet@gmail.com>
Date: Wed, 16 Mar 2022 09:53:08 +0100
Subject: [PATCH] Use EnterprisesHelper to retrieve shipping methods

that apply tag filtering on shipping methods
---
 app/controllers/concerns/checkout_callbacks.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb
index af87da469f..acc168251e 100644
--- a/app/controllers/concerns/checkout_callbacks.rb
+++ b/app/controllers/concerns/checkout_callbacks.rb
@@ -2,6 +2,7 @@
 
 module CheckoutCallbacks
   extend ActiveSupport::Concern
+  include EnterprisesHelper
 
   included do
     # We need pessimistic locking to avoid race conditions.
@@ -46,10 +47,7 @@ module CheckoutCallbacks
   end
 
   def load_shipping_methods
-    @shipping_methods = Spree::ShippingMethod.
-      for_distributor(@order.distributor).
-      display_on_checkout.
-      order(:name)
+    @shipping_methods = available_shipping_methods
   end
 
   def redirect_to_shop?