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
Create digital links not only for fully digital products (#12551)
Damian Kaczmarczyk7b3f633d3d57
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rbindex 677f9f4227..92e2597407 100644--- a/core/app/models/spree/line_item.rb+++ b/core/app/models/spree/line_item.rb@@ -178,6 +178,10 @@ module Spree@maximum_quantity ||= variant.backorderable? ? Spree::DatabaseTypeUtilities.maximum_value_for(:integer) : variant.total_on_handend+ def with_digital_assets?+ variant.with_digital_assets?+ end+privatedef ensure_valid_quantitydiff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rbindex 6015629ee0..7c219d9a0a 100644--- a/core/app/models/spree/order/checkout.rb+++ b/core/app/models/spree/order/checkout.rb@@ -85,7 +85,7 @@ module Spreeendbefore_transition to: :complete do |order|- order.create_digital_links if order.some_digital?+ order.create_digital_links if order.with_digital_assets?endafter_transition to: :complete, do: :create_user_recorddiff --git a/core/app/models/spree/order/digital.rb b/core/app/models/spree/order/digital.rbindex c4ec4f7d37..084e892c8c 100644--- a/core/app/models/spree/order/digital.rb+++ b/core/app/models/spree/order/digital.rb@@ -13,6 +13,10 @@ module Spreeline_items.any?(&:digital?)end+ def with_digital_assets?+ line_items.any?(&:with_digital_assets?)+ end+def digital_line_itemsline_items.with_digital_assets.distinctenddiff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rbindex 6d691c8af2..9d432bf789 100644--- a/core/app/models/spree/variant.rb+++ b/core/app/models/spree/variant.rb@@ -482,6 +482,10 @@ module Spreeproduct.digital?end+ def with_digital_assets?+ digitals.any?+ end+def clear_in_stock_cacheRails.cache.delete(in_stock_cache_key)enddiff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rbindex be8a169e20..709a228750 100644--- a/core/spec/models/spree/order/checkout_spec.rb+++ b/core/spec/models/spree/order/checkout_spec.rb@@ -453,6 +453,8 @@ describe Spree::Order, type: :model dolet(:digital_shipping_method) { create(:digital_shipping_method) }let(:digital_product) { create(:product, shipping_category: digital_shipping_method.shipping_categories.first) }let(:variant_digital) { create(:variant, product: digital_product) }+ let(:physical_product_with_digital_asset) { create(:product) }+ let(:variant_physical_with_digital_asset) { create(:variant, product: physical_product_with_digital_asset, digitals: [create(:digital)]) }before doorder.user = FactoryBot.create(:user)@@ -463,6 +465,7 @@ describe Spree::Order, type: :model do# make sure we will actually capture a paymentallow(order).to receive_messages(payment_required?: true)order.line_items << FactoryBot.create(:line_item, variant: variant_digital)+ order.line_items << FactoryBot.create(:line_item, variant: variant_physical_with_digital_asset)Spree::OrderUpdater.new(order).updateorder.save!@@ -477,7 +480,13 @@ describe Spree::Order, type: :model doit 'creates a digital_link for the digital line_item' doorder.next!expect(order.state).to eq 'complete'- expect(order.line_items.first.digital_links).not_to be_empty+ expect(order.line_items.find_by(variant: variant_digital).digital_links).not_to be_empty+ end++ it 'creates a digital_link for the physical line_item if it has a digital asset' do+ order.next!+ expect(order.state).to eq 'complete'+ expect(order.line_items.find_by(variant: variant_physical_with_digital_asset).digital_links).not_to be_emptyendit 'does not assign a default credit card if temporary_credit_card is set' do