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.

Update api

Matthew Kennedy9a27476aed9c
diff --git a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
index 6e5d4e751f..20d5e1c6a1 100644
--- a/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/menus_controller.rb
@@ -14,18 +14,14 @@ module Spree
def collection_serializer_params
{
- currency: current_currency,
- store: current_store,
- user: spree_current_user,
+ store: current_store
}
end
def serializer_params
{
- currency: current_currency,
store: current_store,
- user: spree_current_user,
- include_menu_items: true,
+ include_menu_items: true
}
end
diff --git a/api/app/serializers/spree/v2/storefront/menu_serializer.rb b/api/app/serializers/spree/v2/storefront/menu_serializer.rb
index ec55472a93..c2a8fc61b0 100644
--- a/api/app/serializers/spree/v2/storefront/menu_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/menu_serializer.rb
@@ -4,9 +4,9 @@ module Spree
class MenuSerializer < BaseSerializer
set_type :menu
- attributes :name, :unique_code, :store_ids
+ attributes :name, :unique_code
- has_many :menu_items, if: proc { |_record, params| params && params[:include_menu_items] }
+ has_many :menu_items
end
end
end
diff --git a/api/app/serializers/spree/v2/storefront/store_serializer.rb b/api/app/serializers/spree/v2/storefront/store_serializer.rb
index 9fdcf3dce3..9fbcd42bee 100644
--- a/api/app/serializers/spree/v2/storefront/store_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/store_serializer.rb
@@ -8,6 +8,8 @@ module Spree
:twitter, :instagram, :default_locale, :customer_support_email, :default_country_id, :description,
:address, :contact_phone, :supported_locales
+ has_many :menus, record_type: :menu
+
has_one :default_country, serializer: :country, record_type: :country, id_method_name: :default_country_id
end
end
diff --git a/api/app/serializers/spree/v2/storefront/taxon_serializer.rb b/api/app/serializers/spree/v2/storefront/taxon_serializer.rb
index 0eb69b732a..97aff9c9f5 100644
--- a/api/app/serializers/spree/v2/storefront/taxon_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/taxon_serializer.rb
@@ -26,10 +26,10 @@ module Spree
has_many :products, record_type: :product
has_one :image,
- object_method_name: :icon,
- id_method_name: :icon_id,
- record_type: :taxon_image,
- serializer: :taxon_image
+ object_method_name: :icon,
+ id_method_name: :icon_id,
+ record_type: :taxon_image,
+ serializer: :taxon_image
end
end
end
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index feab2dc692..7d52947b68 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -1,7 +1,8 @@
module Spree
class Menu < Spree::Base
has_many :menu_items, dependent: :destroy
- has_and_belongs_to_many :stores
+ has_many :navigations, inverse_of: :menu
+ has_many :stores, through: :navigations
before_validation :paremeterize_unique_code
after_create :set_root
diff --git a/core/app/models/spree/navigation.rb b/core/app/models/spree/navigation.rb
new file mode 100644
index 0000000000..4c53216578
--- /dev/null
+++ b/core/app/models/spree/navigation.rb
@@ -0,0 +1,8 @@
+module Spree
+ class Navigation < Spree::Base
+ self.table_name = 'spree_menus_stores'
+
+ belongs_to :menu, class_name: 'Spree::Menu'
+ belongs_to :store, class_name: 'Spree::Store'
+ end
+end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index efc793a0ab..7f686a4015 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -2,7 +2,10 @@ module Spree
class Store < Spree::Base
has_many :orders, class_name: 'Spree::Order'
has_many :payment_methods, class_name: 'Spree::PaymentMethod'
- has_many :menus, class_name: 'Spree::Menu'
+
+ has_many :navigations, inverse_of: :store
+ has_many :menus, through: :navigations
+
belongs_to :default_country, class_name: 'Spree::Country'
belongs_to :checkout_zone, class_name: 'Spree::Zone'