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
Merge branch 'master' into feature/cms_pages
Matthew Kennedydef517c91c98
diff --cc backend/app/assets/javascripts/spree/backend.jsindex 2e698264fb,95aa4b5fd0..fe50f7890d--- a/backend/app/assets/javascripts/spree/backend.js+++ b/backend/app/assets/javascripts/spree/backend.js@@@ -50,8 -39,8 +50,9 @@@//= require spree/backend/product_picker//= require spree/backend/progress//= require spree/backend/promotions+ //= require spree/backend/cms/_index//= require spree/backend/menus/_index+//= require spree/backend/cms/_index//= require spree/backend/returns/expedited_exchanges_warning//= require spree/backend/returns/return_item_selection//= require spree/backend/shipmentsdiff --cc backend/app/assets/javascripts/spree/backend/cms/_index.es6index 7c42f74ada,34fe8da4fb..e0edcc6ac5--- a/backend/app/assets/javascripts/spree/backend/cms/_index.es6+++ b/backend/app/assets/javascripts/spree/backend/cms/_index.es6@@@ -1,3 -1,1 +1,4 @@@+//= require spree/backend/cms/page+//= require spree/backend/cms/section+//= require spree/backend/cms/linkable+ //= require spree/backend/cms/linksdiff --cc core/app/models/spree/store.rbindex feb70bfa0b,a3ebcee4a1..62dc1cf6ae--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@@ -7,8 -7,10 +7,11 @@@ module Sprehas_many :payment_methods, class_name: 'Spree::PaymentMethod'has_many :menus+ has_many :cms_pages+ has_many :store_products, class_name: 'Spree::StoreProduct', dependent: :destroy+ has_many :products, through: :store_products, class_name: 'Spree::Product'+belongs_to :default_country, class_name: 'Spree::Country'belongs_to :checkout_zone, class_name: 'Spree::Zone'