remove load_shipping_methods

This commit is contained in:
Mohamed ABDELLANI
2023-03-01 10:41:57 +01:00
parent 89037e160c
commit 348f806bbe
3 changed files with 6 additions and 11 deletions

View File

@@ -15,10 +15,9 @@ module CheckoutCallbacks
prepend_before_action :require_distributor_chosen
before_action :load_order, :associate_user, :load_saved_addresses, :load_saved_credit_cards
before_action :load_shipping_methods,
:load_allowed_shipping_methods, if: -> {
params[:step] == "details"
}
before_action :allowed_shipping_methods, if: -> {
params[:step] == "details"
}
before_action :ensure_order_not_completed
before_action :ensure_checkout_allowed
@@ -49,11 +48,7 @@ module CheckoutCallbacks
@selected_card = nil
end
def load_shipping_methods
@shipping_methods = sorted_available_shipping_methods
end
def load_allowed_shipping_methods
def allowed_shipping_methods
@allowed_shipping_methods ||= sorted_available_shipping_methods.filter(
&method(:supports_all_products_shipping_categories?)
)

View File

@@ -24,7 +24,7 @@ class SplitCheckoutController < ::BaseController
check_step if params[:step]
recalculate_tax if params[:step] == "summary"
flash_error_when_no_shipping_method_available if load_allowed_shipping_methods.none?
flash_error_when_no_shipping_method_available if allowed_shipping_methods.none?
end
def update

View File

@@ -76,7 +76,7 @@
- display_ship_address = false
- ship_method_description = nil
- selected_shipping_method ||= @shipping_methods[0].id if @shipping_methods.length == 1
- selected_shipping_method ||= @allowed_shipping_methods[0].id if @allowed_shipping_methods.length == 1
- @allowed_shipping_methods.each do |shipping_method|
- ship_method_is_selected = shipping_method.id == selected_shipping_method.to_i
%div.checkout-input.checkout-input-radio