From 55bce9f1b288346ebcca5e6f986bbcfa10cf17d4 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 2 Jun 2023 21:31:20 +0100 Subject: [PATCH] Remove @voucher_adjustment instance variable --- app/controllers/concerns/checkout_callbacks.rb | 2 -- app/views/split_checkout/_payment.html.haml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb index 18f413d0e2..7da81a592b 100644 --- a/app/controllers/concerns/checkout_callbacks.rb +++ b/app/controllers/concerns/checkout_callbacks.rb @@ -30,8 +30,6 @@ module CheckoutCallbacks @order.manual_shipping_selection = true @order.checkout_processing = true - @voucher_adjustment = @order.voucher_adjustments.first - redirect_to(main_app.shop_path) && return if redirect_to_shop? redirect_to_cart_path && return unless valid_order_line_items? end diff --git a/app/views/split_checkout/_payment.html.haml b/app/views/split_checkout/_payment.html.haml index 12a94405ee..e142b894e6 100644 --- a/app/views/split_checkout/_payment.html.haml +++ b/app/views/split_checkout/_payment.html.haml @@ -1,7 +1,7 @@ .medium-6 - if @order.distributor.vouchers.present? %div.checkout-substep - = render partial: "split_checkout/voucher_section", locals: { order: @order, voucher_adjustment: @voucher_adjustment } + = 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| %div.checkout-substep{"data-controller": "paymentmethod"}