diff --git a/app/controllers/voucher_adjustments_controller.rb b/app/controllers/voucher_adjustments_controller.rb index b9f5c0524e..4ee0c3d3fe 100644 --- a/app/controllers/voucher_adjustments_controller.rb +++ b/app/controllers/voucher_adjustments_controller.rb @@ -6,8 +6,9 @@ class VoucherAdjustmentsController < BaseController def create if add_voucher VoucherAdjustmentsService.calculate(@order) + @order.update_totals_and_states - render_voucher_section + update_payment_section elsif @order.errors.present? render_error end @@ -16,7 +17,7 @@ class VoucherAdjustmentsController < BaseController def destroy @order.voucher_adjustments.find_by(id: params[:id])&.destroy - render_voucher_section + update_payment_section end private @@ -49,13 +50,10 @@ class VoucherAdjustmentsController < BaseController true end - def render_voucher_section + def update_payment_section render cable_ready: cable_car.replace( - selector: "#voucher-section", - html: render_to_string( - partial: "split_checkout/voucher_section", - locals: { order: @order,voucher_adjustment: @order.voucher_adjustments.first } - ) + selector: "#checkout-payment-methods", + html: render_to_string(partial: "split_checkout/payment", locals: { step: "payment" }) ) end diff --git a/app/views/split_checkout/_payment.html.haml b/app/views/split_checkout/_payment.html.haml index e142b894e6..e32e65b245 100644 --- a/app/views/split_checkout/_payment.html.haml +++ b/app/views/split_checkout/_payment.html.haml @@ -1,9 +1,9 @@ -.medium-6 +.medium-6#checkout-payment-methods - if @order.distributor.vouchers.present? %div.checkout-substep = render partial: "split_checkout/voucher_section", locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first } - = form_with url: checkout_update_path(checkout_step), model: @order, method: :put, data: { remote: "true" } do |f| + = form_with url: checkout_update_path(local_assigns[:step] || checkout_step), model: @order, method: :put, data: { remote: "true" } do |f| %div.checkout-substep{"data-controller": "paymentmethod"} %div.checkout-title = t("split_checkout.step2.payment_method.title")