From 02b36363775d4ca2ae8a4de32a76107f7e62a4f1 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 24 Feb 2021 12:34:45 +0000 Subject: [PATCH] Extract relevant adjustments to comment-method --- app/services/paypal_items_builder.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/services/paypal_items_builder.rb b/app/services/paypal_items_builder.rb index 771e21dac8..dadfb04283 100644 --- a/app/services/paypal_items_builder.rb +++ b/app/services/paypal_items_builder.rb @@ -8,11 +8,7 @@ class PaypalItemsBuilder def call items = order.line_items.map(&method(:line_item_data)) - shipping_and_tax_adjustments = order.all_adjustments.shipping + order.all_adjustments.tax - - order.all_adjustments.eligible.each do |adjustment| - next if shipping_and_tax_adjustments.include?(adjustment) - + relevant_adjustments.each do |adjustment| items << adjustment_data(adjustment) end @@ -30,6 +26,11 @@ class PaypalItemsBuilder attr_reader :order + def relevant_adjustments + # Tax total and shipping costs are added separately, so they're not included here. + order.all_adjustments.eligible - order.all_adjustments.tax - order.all_adjustments.shipping + end + def line_item_data(item) { Name: item.product.name,