diff --git a/app/models/spree/calculator/sysmocom_value_calculator.rb b/app/models/spree/calculator/sysmocom_value_calculator.rb index 3876762..596ac5c 100644 --- a/app/models/spree/calculator/sysmocom_value_calculator.rb +++ b/app/models/spree/calculator/sysmocom_value_calculator.rb @@ -1,7 +1,5 @@ # AGPLv3 sysmocom s.f.m.c. GmbH -puts "Fooo" - module Spree class Calculator::SysmocomValueCalculator < Calculator @@ -151,18 +149,8 @@ ZONE3 = { def total_value_no_tax(o) - value = o.line_items.inject(0) { |sum, item | - sum + (item.price * item.quantity)} - reductions = o.adjustments.eligible.inject(0) { |sum, adj| - if adj.originator_type == "Spree::ShippingMethod" - add = 0 - elsif adj.originator_type == "Spree::TaxRate" - add = 0 - else - add = adjustment.amount - end - sum + add} - value + reductions + item_total = o.line_items.map(&:amount).sum + item_total end def compute(order)