From 85adb9f3450211908f9ed5ff9c50564720dd5dfa Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Mon, 31 Jul 2023 15:19:04 +1000 Subject: [PATCH] Fix rubocop warning --- app/controllers/voucher_adjustments_controller.rb | 10 +++++++--- spec/requests/voucher_adjustments_spec.rb | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/voucher_adjustments_controller.rb b/app/controllers/voucher_adjustments_controller.rb index c55df05063..152097f68c 100644 --- a/app/controllers/voucher_adjustments_controller.rb +++ b/app/controllers/voucher_adjustments_controller.rb @@ -47,9 +47,7 @@ class VoucherAdjustmentsController < BaseController return false end - # Clear payments and payment_fee, to not affect voucher adjustment calculation - @order.all_adjustments.payment_fee.destroy_all - @order.payments.clear + clear_payments VoucherAdjustmentsService.new(@order).update @order.update_totals_and_states @@ -81,4 +79,10 @@ class VoucherAdjustmentsController < BaseController def voucher_params params.require(:order).permit(:voucher_code) end + + # Clear payments and payment fees, to not affect voucher adjustment calculation + def clear_payments + @order.all_adjustments.payment_fee.destroy_all + @order.payments.clear + end end diff --git a/spec/requests/voucher_adjustments_spec.rb b/spec/requests/voucher_adjustments_spec.rb index f3bcbf575b..c6eda33db4 100644 --- a/spec/requests/voucher_adjustments_spec.rb +++ b/spec/requests/voucher_adjustments_spec.rb @@ -67,9 +67,7 @@ describe VoucherAdjustmentsController, type: :request do context "when the order has a payment and payment feed" do let(:payment_method) { create(:payment_method, calculator: calculator) } - let(:calculator) do - ::Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) - end + let(:calculator) { Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) } before do create(:payment, order: order, payment_method: payment_method, amount: order.total)