From 348f806bbed8682b35bc53554ab0a79818c2ae17 Mon Sep 17 00:00:00 2001 From: Mohamed ABDELLANI Date: Wed, 1 Mar 2023 10:41:57 +0100 Subject: [PATCH] remove load_shipping_methods --- app/controllers/concerns/checkout_callbacks.rb | 13 ++++--------- app/controllers/split_checkout_controller.rb | 2 +- app/views/split_checkout/_details.html.haml | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb index 651f672940..5bb44eb9f3 100644 --- a/app/controllers/concerns/checkout_callbacks.rb +++ b/app/controllers/concerns/checkout_callbacks.rb @@ -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?) ) diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb index 57c3e148ab..1fb8649a3f 100644 --- a/app/controllers/split_checkout_controller.rb +++ b/app/controllers/split_checkout_controller.rb @@ -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 diff --git a/app/views/split_checkout/_details.html.haml b/app/views/split_checkout/_details.html.haml index a82ac1ff97..8b20be09fb 100644 --- a/app/views/split_checkout/_details.html.haml +++ b/app/views/split_checkout/_details.html.haml @@ -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