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 Kennedya6cf0349de2b
diff --cc backend/app/assets/javascripts/spree/backend.jsindex 04f2af98f0,95aa4b5fd0..681d380ca6--- a/backend/app/assets/javascripts/spree/backend.js+++ b/backend/app/assets/javascripts/spree/backend.js@@@ -13,8 -13,6 +13,9 @@@//= require jquery-ui/widgets/autocomplete//= require select2-full//= require sweetalert2+//= require tinymce++//= require spree/backend/global/tinymce+//= require underscore-min.js//= require jsonapi-serializer.mindiff --cc backend/app/assets/stylesheets/spree/backend/spree_admin.css.scssindex 972e20dec9,3c1e883a12..2ce6d932f4--- a/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss+++ b/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss@@@ -24,7 -24,7 +24,8 @@@@import 'plugins/flatpickr';@import 'plugins/select2_bootstrap4';@import 'plugins/select2_custom';+@import 'plugins/tinymce_custom';+ @import 'plugins/nav_x';@import 'shared/base';@import 'shared/forms';diff --cc backend/app/views/spree/admin/menus/_form.html.erbindex 600a7b38d7,9223389396..684deeab2d--- a/backend/app/views/spree/admin/menus/_form.html.erb+++ b/backend/app/views/spree/admin/menus/_form.html.erb@@@ -1,27 -1,19 +1,19 @@@<div data-hook="admin_menu_form_fields" class="row">- <div class="col-12 col-md-6">- <%= f.field_container :name, class: ['form-group'] do %>- <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>- <%= f.text_field :name, class: 'form-control', required: true %>- <%= f.error_message_on :name %>- <% end %>+ <%= f.field_container :name, class: ['form-group col-12 col-md-4'] do %>+ <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>+ <%= f.text_field :name, class: 'form-control', required: true %>+ <%= f.error_message_on :name %>+ <% end %>- <%= f.field_container :location, class: ['form-group'] do %>- <%= f.label :location, Spree.t('location') %>- <%= f.select(:location, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), {include_blank: false}, class: 'select2') %>- <%= f.error_message_on :location %>- <% end %>- </div>- <div class="col-12 col-md-6">- <%= f.field_container :menu_stores, class: ['form-group'] do %>- <%= label_tag :menu_stores, Spree.t(:stores) %>- <%= collection_select(:menu, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>- <%= f.error_message_on :menu_stores %>- <% end %>- <%= f.field_container :locale, class: ['form-group'] do %>- <%= f.label :language %>- <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @menu.locale || I18n.locale), {}, { class: 'select2' } %>- <%= f.error_message_on :default_locale %>- <% end %>- </div>+ <%= f.field_container :location, class: ['form-group col-12 col-md-4'] do %>+ <%= f.label :location, Spree.t('location') %>- <%= f.select(:location, menu_locations_dropdown_values, {include_blank: false}, class: 'select2') %>++ <%= f.select(:location, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), {include_blank: false}, class: 'select2') %>+ <%= f.error_message_on :location %>+ <% end %>++ <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %>+ <%= f.label :language %>+ <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @menu.locale || I18n.locale), {}, { class: 'select2' } %>+ <%= f.error_message_on :default_locale %>+ <% end %></div>diff --cc backend/app/views/spree/admin/menus/index.html.erbindex c7dce66f56,1e028044cc..f3a56f9b29--- a/backend/app/views/spree/admin/menus/index.html.erb+++ b/backend/app/views/spree/admin/menus/index.html.erb@@@ -17,16 -18,14 +18,13 @@@<%= f.text_field :name_cont, size: 15, class: "form-control js-quick-search-target js-filterable" %></div></div>- <div class="col-12 col-lg-6">+ <div class="col-12 col-lg-4"><div class="form-group">-- <%= label_tag :q_location_eq, Spree.t(:location) %>- <%= f.select :location_eq, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), { include_blank: true }, class: 'select2-clear js-filterable' %>- <%= f.select :location_eq, menu_locations_dropdown_values, { include_blank: true }, class: 'select2-clear js-filterable' %>++ <%= label_tag :q_location_eq, Spree.t(:location) %><%= f.select :location_eq, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), { include_blank: true }, class: 'select2-clear js-filterable' %></div></div>- </div>- <div class="row">- <div class="col-12 col-lg-6">+ <div class="col-12 col-lg-4"><div class="form-group"><%= label_tag :q_locale_eq, Spree.t(:language) %><%= f.select :locale_eq, all_locales_options, { include_blank: true }, class: 'select2-clear js-filterable' %>diff --cc core/app/models/spree/app_dependencies.rbindex c20f2f7ff4,8635cedde1..3a3d73871f--- a/core/app/models/spree/app_dependencies.rb+++ b/core/app/models/spree/app_dependencies.rb@@@ -74,9 -75,9 +74,10 @@@ module Spredef set_default_finders@address_finder = 'Spree::Addresses::Find'@country_finder = 'Spree::Countries::Find'+ @cms_page_finder_finder = 'Spree::CmsPage::Find'@menu_finder = 'Spree::Menus::Find'@current_order_finder = 'Spree::Orders::FindCurrent'+ @current_store_finder = 'Spree::Stores::FindCurrent'@completed_order_finder = 'Spree::Orders::FindComplete'@credit_card_finder = 'Spree::CreditCards::Find'@products_finder = 'Spree::Products::Find'diff --cc core/app/models/spree/store.rbindex 80eb6832d2,93e9c9d0a0..f4fcc506e3--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@@ -4,10 -4,11 +4,12 @@@ module SpreFAVICON_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freezehas_many :orders, class_name: 'Spree::Order'- has_many :payment_methods, class_name: 'Spree::PaymentMethod'++ has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'+ has_many :payment_methods, through: :store_payment_methods, class_name: 'Spree::PaymentMethod'has_many :menus+ has_many :cms_pageshas_many :store_products, class_name: 'Spree::StoreProduct', dependent: :destroyhas_many :products, through: :store_products, class_name: 'Spree::Product'diff --cc frontend/config/routes.rbindex 31d35656ab,f872473c07..8803c1747e--- a/frontend/config/routes.rb+++ b/frontend/config/routes.rb@@@ -34,6 -34,7 +34,9 @@@ Spree::Core::Engine.add_routes dget '/api_tokens', to: 'store#api_tokens'post '/ensure_cart', to: 'store#ensure_cart'+ get "#{Spree::Config[:storefront_pages_path]}/:slug", to: 'cms_pages#show', as: :page+++ get '/forbidden', to: 'errors#forbidden', as: :forbidden+ get '/unauthorized', to: 'errors#unauthorized', as: :unauthorizedendend