From 3e796da8ff62de7b851c9477c4de7dae29a0b61a Mon Sep 17 00:00:00 2001 From: Ana Nunes da Silva Date: Thu, 28 Mar 2024 19:47:10 +0000 Subject: [PATCH] Fix duplicate branch Spree::Calculator --- .rubocop_todo.yml | 2 +- app/models/spree/calculator.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 9d3737f407..af5d895a2b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -29,7 +29,7 @@ Lint/DuplicateBranch: Exclude: # - 'app/helpers/spree/admin/base_helper.rb' # - 'app/models/enterprise.rb' - - 'app/models/spree/calculator.rb' + # - 'app/models/spree/calculator.rb' - 'app/models/spree/preference.rb' - 'app/models/spree/preferences/preferable.rb' diff --git a/app/models/spree/calculator.rb b/app/models/spree/calculator.rb index 9ff0e53651..7c1f11c274 100644 --- a/app/models/spree/calculator.rb +++ b/app/models/spree/calculator.rb @@ -44,9 +44,9 @@ module Spree # Given an object which might be an Order or a LineItem (amongst # others), return a collection of line items. def line_items_for(object) - if object.is_a?(Spree::LineItem) - [object] - elsif object.respond_to? :line_items + return [object] if object.is_a?(Spree::LineItem) + + if object.respond_to? :line_items object.line_items elsif object.respond_to?(:order) && object.order.present? object.order.line_items