Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add memoization to `Product#digital?` and `Shipment#digital?` (#13038)
Damian Legawiecf78d230a7150
diff --git a/core/app/models/spree/order/digital.rb b/core/app/models/spree/order/digital.rbindex e170da8c93..ee612e3463 100644--- a/core/app/models/spree/order/digital.rb+++ b/core/app/models/spree/order/digital.rb@@ -1,6 +1,9 @@module Spreeclass Order < Spree.base_classmodule Digital+ # Returns true if all order line items are digital+ #+ # @return [Boolean]def digital?if line_items.empty?false@@ -9,18 +12,30 @@ module Spreeendend+ # Returns true if any order line item is digital+ #+ # @return [Boolean]def some_digital?line_items.any?(&:digital?)end+ # Returns true if any order line item has digital assets+ #+ # @return [Boolean]def with_digital_assets?line_items.any?(&:with_digital_assets?)end+ # Returns all line items with digital assets+ #+ # @return [Array<Spree::LineItem>]def digital_line_itemsline_items.with_digital_assets.distinctend+ # Returns all digital links for the order+ #+ # @return [Array<Spree::DigitalLink>]def digital_linksdigital_line_items.map(&:digital_links).flattenenddiff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rbindex 87a5fe8c61..ff5ce175b4 100644--- a/core/app/models/spree/product.rb+++ b/core/app/models/spree/product.rb@@ -38,7 +38,7 @@ module SpreeMEMOIZED_METHODS = %w[total_on_hand taxonomy_ids taxon_and_ancestors categorydefault_variant_id tax_category default_variantdefault_image secondary_image- purchasable? in_stock? backorderable? has_variants?]+ purchasable? in_stock? backorderable? has_variants? digital?]STATUS_TO_WEBHOOK_EVENT = {'active' => 'activated',@@ -81,6 +81,7 @@ module Spreebelongs_to :tax_category, class_name: 'Spree::TaxCategory'belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products+ has_many :shipping_methods, through: :shipping_category, class_name: 'Spree::ShippingMethod'has_one :master,-> { where is_master: true },@@ -602,7 +603,7 @@ module Spree## @return [Boolean]def digital?- shipping_category&.shipping_methods&.any? { |method| method.calculator.is_a?(Spree::Calculator::Shipping::DigitalDelivery) }+ @digital ||= shipping_methods&.digital&.exists?enddef auto_match_taxonsdiff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rbindex 4c15354146..3ce642e74b 100644--- a/core/app/models/spree/shipment.rb+++ b/core/app/models/spree/shipment.rb@@ -64,6 +64,7 @@ module Spreedelegate :store, :currency, to: :orderdelegate :amount_in_cents, to: :display_cost+ delegate :digital?, to: :shipping_method# shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)state_machine initial: :pending, use_transactions: false do@@ -251,10 +252,6 @@ module Spreeinventory_units.includes(:line_item).map(&:line_item).uniqend- def digital?- shipping_method&.calculator&.is_a?(Spree::Calculator::Shipping::DigitalDelivery)- end-ManifestItem = Struct.new(:line_item, :variant, :quantity, :states)def manifestdiff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rbindex 72b881a835..701e9a31de 100644--- a/core/app/models/spree/shipping_method.rb+++ b/core/app/models/spree/shipping_method.rb@@ -10,9 +10,12 @@ module Spreeif defined?(Spree::VendorConcern)include Spree::VendorConcernend+ include Spree::MemoizedDataextend Spree::DisplayMoney+ MEMOIZED_METHODS = %w[display_estimated_price digital?]+# Used for #refresh_ratesDISPLAY_ON_FRONT_END = 1DISPLAY_ON_BACK_END = 2@@ -118,6 +121,13 @@ module Spreeendend+ # Returns true if the shipping method is digital+ #+ # @return [Boolean]+ def digital?+ @digital ||= calculator.is_a?(Spree::Calculator::Shipping::DigitalDelivery)+ end+private# Some shipping methods are only meant to be set via backenddiff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rbindex f2e21cab47..dea6647a7d 100644--- a/core/app/models/spree/variant.rb+++ b/core/app/models/spree/variant.rb@@ -492,6 +492,8 @@ module Spreeend# Is this variant purely digital? (no physical product)+ #+ # @return [Boolean]def digital?product.digital?end