From 71576fd7db18bb3dd10a5352fab3ec3f71ed1fe4 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Sat, 14 Mar 2020 11:04:16 +0100 Subject: [PATCH] Refactor PerItem calculator to ease readability --- app/models/spree/calculator/per_item_decorator.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/spree/calculator/per_item_decorator.rb b/app/models/spree/calculator/per_item_decorator.rb index 1c5369b48a..e385ad8bf8 100644 --- a/app/models/spree/calculator/per_item_decorator.rb +++ b/app/models/spree/calculator/per_item_decorator.rb @@ -13,14 +13,15 @@ module Spree def compute(object = nil) return 0 if object.nil? - preferred_amount * line_items_for(object).reduce(0) do |sum, value| - value_to_add = if matching_products.blank? || matching_products.include?(value.product) - value.quantity + number_of_line_items = line_items_for(object).reduce(0) do |sum, line_item| + value_to_add = if matching_products.blank? || matching_products.include?(line_item.product) + line_item.quantity else 0 end sum + value_to_add end + preferred_amount * number_of_line_items end end end