diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index ddd242e71e..b618aba67e 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -50,7 +50,7 @@ module Admin if params[:stimulus] @enterprise.is_primary_producer = params[:is_primary_producer] @enterprise.sells = params[:enterprise_sells] - render operations: cable_car.morph("#side_menu", partial("admin/shared/side_menu")) + render cable_ready: cable_car.morph("#side_menu", partial("admin/shared/side_menu")) .morph("#permalink", partial("admin/enterprises/form/permalink")) end end diff --git a/app/controllers/concerns/order_stock_check.rb b/app/controllers/concerns/order_stock_check.rb index acc37529fc..7ada12ab73 100644 --- a/app/controllers/concerns/order_stock_check.rb +++ b/app/controllers/concerns/order_stock_check.rb @@ -31,7 +31,7 @@ module OrderStockCheck flash[:info] = I18n.t('order_cycle_closed') respond_to do |format| format.cable_ready { - render status: :see_other, operations: cable_car.redirect_to(url: main_app.shop_path) + render status: :see_other, cable_ready: cable_car.redirect_to(url: main_app.shop_path) } format.json { render json: { path: main_app.shop_path }, status: :see_other } format.html { redirect_to main_app.shop_path, status: :see_other } diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb index c1a63c2c44..d65a661f32 100644 --- a/app/controllers/split_checkout_controller.rb +++ b/app/controllers/split_checkout_controller.rb @@ -43,7 +43,7 @@ class SplitCheckoutController < ::BaseController rescue Spree::Core::GatewayError => e flash[:error] = I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message) @order.update_column(:state, "payment") - render operations: cable_car.redirect_to(url: checkout_step_path(:payment)) + render cable_ready: cable_car.redirect_to(url: checkout_step_path(:payment)) end private @@ -54,7 +54,7 @@ class SplitCheckoutController < ::BaseController messages: order_error_messages ) - render status: :unprocessable_entity, operations: cable_car. + render status: :unprocessable_entity, cable_ready: cable_car. replace("#checkout", partial("split_checkout/checkout")). replace("#flashes", partial("shared/flashes", locals: { flashes: flash })) end @@ -132,7 +132,7 @@ class SplitCheckoutController < ::BaseController return unless selected_payment_method&.external_gateway? return unless (redirect_url = selected_payment_method.external_payment_url(order: @order)) - render operations: cable_car.redirect_to(url: redirect_url) + render cable_ready: cable_car.redirect_to(url: redirect_url) true end diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index e0a8d2281b..026590c494 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -104,7 +104,7 @@ module Spree flash[:error] = I18n.t(:orders_could_not_cancel) end render status: :found, - operations: cable_car.redirect_to(url: request.referer || main_app.order_path(@order)) + cable_ready: cable_car.redirect_to(url: request.referer || main_app.order_path(@order)) end private diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index c7b4d9bde9..c22c6162fd 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -24,11 +24,11 @@ module Spree if spree_user_signed_in? flash[:success] = t('devise.success.logged_in_succesfully') - render operations: cable_car.redirect_to( + render cable_ready: cable_car.redirect_to( url: return_url_or_default(after_sign_in_path_for(spree_current_user)) ) else - render status: :unauthorized, operations: cable_car.inner_html( + render status: :unauthorized, cable_ready: cable_car.inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t('devise.failure.invalid') }) ) @@ -60,7 +60,7 @@ module Spree end def render_unconfirmed_response - render status: :unprocessable_entity, operations: cable_car.inner_html( + render status: :unprocessable_entity, cable_ready: cable_car.inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_unconfirmed), unconfirmed: true, tab: "login" }) diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb index dc5629612a..c457d7ce5e 100644 --- a/app/controllers/spree/users_controller.rb +++ b/app/controllers/spree/users_controller.rb @@ -30,7 +30,7 @@ module Spree registered = Spree::User.find_by(email: params[:email]).present? if registered - render status: :ok, operations: cable_car. + render status: :ok, cable_ready: cable_car. inner_html( "#login-feedback", partial("layouts/alert", locals: { type: "alert", message: t('devise.failure.already_registered') }) @@ -45,12 +45,12 @@ module Spree @user = Spree::User.new(user_params) if @user.save - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "#signup-feedback", partial("layouts/alert", locals: { type: "success", message: t('devise.user_registrations.spree_user.signed_up_but_unconfirmed') }) ) else - render status: :unprocessable_entity, operations: cable_car.morph( + render status: :unprocessable_entity, cable_ready: cable_car.morph( "#signup-tab", partial("layouts/signup_tab", locals: { signup_form_user: @user }) ) diff --git a/app/controllers/user_confirmations_controller.rb b/app/controllers/user_confirmations_controller.rb index 312b5b7a2a..c7bc9e3ce2 100644 --- a/app/controllers/user_confirmations_controller.rb +++ b/app/controllers/user_confirmations_controller.rb @@ -22,7 +22,7 @@ class UserConfirmationsController < DeviseController set_flash_message(:error, :confirmation_not_sent) end else - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "##{params[:tab] || 'forgot'}-feedback", partial("layouts/alert", locals: { type: "success", message: t("devise.confirmations.send_instructions") }) ) diff --git a/app/controllers/user_passwords_controller.rb b/app/controllers/user_passwords_controller.rb index b125d26011..b0ad3970d1 100644 --- a/app/controllers/user_passwords_controller.rb +++ b/app/controllers/user_passwords_controller.rb @@ -11,12 +11,12 @@ class UserPasswordsController < Spree::UserPasswordsController self.resource = resource_class.send_reset_password_instructions(raw_params[resource_name]) if resource.errors.empty? - render operations: cable_car.inner_html( + render cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "success", message: t(:password_reset_sent) }) ) else - render status: :not_found, operations: cable_car.inner_html( + render status: :not_found, cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_not_found) }) ) @@ -26,7 +26,7 @@ class UserPasswordsController < Spree::UserPasswordsController private def render_unconfirmed_response - render status: :unprocessable_entity, operations: cable_car.inner_html( + render status: :unprocessable_entity, cable_ready: cable_car.inner_html( "#forgot-feedback", partial("layouts/alert", locals: { type: "alert", message: t(:email_unconfirmed),