From b3bd112cdb9cc12939def1b45267b430e1054cbc Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 5 Jun 2023 19:44:23 +0100 Subject: [PATCH] Remove Order #shipped_shipments method --- app/models/spree/order.rb | 4 ---- app/models/spree/return_authorization.rb | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 74a4f332d9..45d699305d 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -301,10 +301,6 @@ module Spree number end - def shipped_shipments - shipments.shipped - end - def contains?(variant) find_line_item_by_variant(variant).present? end diff --git a/app/models/spree/return_authorization.rb b/app/models/spree/return_authorization.rb index fae012a084..9f353cd2fd 100644 --- a/app/models/spree/return_authorization.rb +++ b/app/models/spree/return_authorization.rb @@ -63,7 +63,7 @@ module Spree end def returnable_inventory - order.shipped_shipments.collect{ |s| s.inventory_units.to_a }.flatten + order.shipments.shipped.collect{ |s| s.inventory_units.to_a }.flatten end # Used when Adjustment#update_adjustment! wants to update the related adjustment @@ -74,7 +74,7 @@ module Spree private def must_have_shipped_units - return unless order.nil? || order.shipped_shipments.none? + return unless order.nil? || order.shipments.shipped.none? errors.add(:order, Spree.t(:has_no_shipped_units)) end