mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Fix duplicate branch Spree::Calculator
This commit is contained in:
@@ -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'
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user