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.

Move order methods to digital module, add category creation on seed fix translation.

Matthew Kennedy1270f8fd9149
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index bafea95595..1d7663d518 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -1,5 +1,6 @@
require_dependency 'spree/order/checkout'
require_dependency 'spree/order/currency_updater'
+require_dependency 'spree/order/digital'
require_dependency 'spree/order/payments'
require_dependency 'spree/order/store_credit'
require_dependency 'spree/order/emails'
@@ -11,6 +12,7 @@ module Spree
include Spree::Order::Checkout
include Spree::Order::CurrencyUpdater
+ include Spree::Order::Digital
include Spree::Order::Payments
include Spree::Order::StoreCredit
include Spree::Order::AddressBook
@@ -663,27 +665,6 @@ module Spree
spree_promotion_actions: { type: 'Spree::Promotion::Actions::FreeShipping' }).exists?
end
- # all products are digital
- def digital?
- line_items.all?(&:digital?)
- end
-
- def some_digital?
- line_items.any?(&:digital?)
- end
-
- def digital_line_items
- line_items.select(&:digital?)
- end
-
- def digital_links
- digital_line_items.map(&:digital_links).flatten
- end
-
- def reset_digital_links!
- digital_links.each(&:reset!)
- end
-
private
def link_by_email
diff --git a/core/app/models/spree/order/digital.rb b/core/app/models/spree/order/digital.rb
new file mode 100644
index 0000000000..567c076f76
--- /dev/null
+++ b/core/app/models/spree/order/digital.rb
@@ -0,0 +1,25 @@
+module Spree
+ class Order < Spree::Base
+ module Digital
+ def digital?
+ line_items.all?(&:digital?)
+ end
+
+ def some_digital?
+ line_items.any?(&:digital?)
+ end
+
+ def digital_line_items
+ line_items.select(&:digital?)
+ end
+
+ def digital_links
+ digital_line_items.map(&:digital_links).flatten
+ end
+
+ def reset_digital_links!
+ digital_links.each(&:reset!)
+ end
+ end
+ end
+end
diff --git a/core/app/services/spree/seeds/shipping_categories.rb b/core/app/services/spree/seeds/shipping_categories.rb
index 7e5526dff6..f2a29f4ecf 100644
--- a/core/app/services/spree/seeds/shipping_categories.rb
+++ b/core/app/services/spree/seeds/shipping_categories.rb
@@ -4,8 +4,8 @@ module Spree
prepend Spree::ServiceModule::Base
def call
- # FIXME: we should use translations here
- Spree::ShippingCategory.find_or_create_by!(name: 'Default')
+ Spree::ShippingCategory.find_or_create_by!(name: I18n.t('spree.seed.shipping.categories.default'))
+ Spree::ShippingCategory.find_or_create_by!(name: I18n.t('spree.seed.shipping.categories.digital'))
end
end
end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 29d2a2fe93..fe60f321e1 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1625,6 +1625,11 @@ en:
say_no: 'No'
say_yes: 'Yes'
scope: Scope
+ seed:
+ shipping:
+ categories:
+ default: Default
+ digital: Digital
search: Search
search_by: 'Search by:'
search_order_number: Order Number