Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Allow ability to switch on or off download restrictions.

Matthew Kennedy7c0e881dc0e1
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index 41a84dd032..c42d361b5d 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -13,10 +13,14 @@ module Spree
end
def expired?
+ return unless line_item.order.store.limit_digital_download_days
+
created_at <= line_item.order.store.digital_asset_authorized_days.day.ago
end
def access_limit_exceeded?
+ return unless line_item.order.store.limit_digital_download_count
+
access_counter >= line_item.order.store.digital_asset_authorized_clicks
end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index a75e154bf3..674f80a210 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -2,8 +2,10 @@ module Spree
class Store < Spree::Base
typed_store :settings do |s|
# Spree Digital Asset Configurations
- s.integer :digital_asset_authorized_clicks, default: 3, null: false # number of times a customer can download a digital file.
- s.integer :digital_asset_authorized_days, default: 2, null: false # number of days after initial purchase the customer can download a file.
+ s.boolean :limit_digital_download_count, default: true, null: false
+ s.boolean :limit_digital_download_days, default: true, null: false
+ s.integer :digital_asset_authorized_clicks, default: 5, null: false # number of times a customer can download a digital file.
+ s.integer :digital_asset_authorized_days, default: 7, null: false # number of days after initial purchase the customer can download a file.
end
MAILER_LOGO_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
@@ -53,6 +55,8 @@ module Spree
validates :name, :url, :mail_from_address, :default_currency, :code
end
+ validates :digital_asset_authorized_clicks, numericality: { only_integer: true, greater_than: 0 }
+ validates :digital_asset_authorized_days, numericality: { only_integer: true, greater_than: 0 }
validates :code, uniqueness: { conditions: -> { with_deleted } }
if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 3fb0de9dd0..f4ae0e74c6 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -133,7 +133,7 @@ module Spree
:default_locale, :default_country_id, :supported_currencies,
:new_order_notifications_email, :mailer_logo, :favicon_image,
:checkout_zone_id, :seo_robots, :digital_asset_authorized_clicks,
- :digital_asset_authorized_days]
+ :digital_asset_authorized_days, :limit_digital_download_count, :limit_digital_download_days]
@@store_credit_attributes = %i[amount currency category_id memo]