From 74c8f06e800978eeb069358a38de2ec66aee9753 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 12 Oct 2023 14:17:41 +1100 Subject: [PATCH] Simplify helper with extracted method --- app/helpers/admin/orders_helper.rb | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb index 7f8bf16b5c..b3f6d7029c 100644 --- a/app/helpers/admin/orders_helper.rb +++ b/app/helpers/admin/orders_helper.rb @@ -7,17 +7,23 @@ module Admin # We exclude shipping method adjustments because they are displayed in a # separate table together with the order line items. def order_adjustments_for_display(order) - adjustments_for_display = order.adjustments + order.all_adjustments.payment_fee.eligible + order.adjustments + + voucher_included_tax_representations(order) + + order.all_adjustments.payment_fee.eligible + end - if VoucherAdjustmentsService.new(order).voucher_included_tax.negative? - adjustment = order.voucher_adjustments.first - adjustments_for_display << Spree::Adjustment.new( - label: I18n.t("admin.orders.edit.voucher_tax_included_in_price", label: adjustment.label), + def voucher_included_tax_representations(order) + return [] unless VoucherAdjustmentsService.new(order).voucher_included_tax.negative? + + adjustment = order.voucher_adjustments.first + + [ + Spree::Adjustment.new( + label: I18n.t("admin.orders.edit.voucher_tax_included_in_price", + label: adjustment.label), amount: adjustment.included_tax ) - end - - adjustments_for_display + ] end end end