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
Apply code reviews and implement empty on store change.
Matthew Kennedy1885adce2306
diff --git a/backend/app/controllers/spree/admin/payment_methods_controller.rb b/backend/app/controllers/spree/admin/payment_methods_controller.rbindex 4b7c5451b0..6a2b5fcd10 100644--- a/backend/app/controllers/spree/admin/payment_methods_controller.rb+++ b/backend/app/controllers/spree/admin/payment_methods_controller.rb@@ -50,7 +50,7 @@ module Spreeprivatedef scope- current_store.payment_methods+ current_store.payment_methods.accessible_by(current_ability, :index)enddef collectiondiff --git a/backend/app/controllers/spree/admin/products_controller.rb b/backend/app/controllers/spree/admin/products_controller.rbindex 55332ded8c..bdbcde7821 100644--- a/backend/app/controllers/spree/admin/products_controller.rb+++ b/backend/app/controllers/spree/admin/products_controller.rb@@ -92,7 +92,7 @@ module Spreeprotecteddef scope- current_store.products+ current_store.products.accessible_by(current_ability, :index)enddef find_resourcediff --git a/backend/app/controllers/spree/admin/reports_controller.rb b/backend/app/controllers/spree/admin/reports_controller.rbindex a4f82ceb36..6baa31043b 100644--- a/backend/app/controllers/spree/admin/reports_controller.rb+++ b/backend/app/controllers/spree/admin/reports_controller.rb@@ -63,7 +63,7 @@ module Spreeprivatedef scope- current_store.orders+ current_store.orders.accessible_by(current_ability, :index)enddef model_classdiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex b1afe53f28..5c592e77ee 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -130,8 +130,7 @@ module Spreebefore_create :link_by_emailbefore_update :homogenize_line_item_currencies, if: :currency_changed?- # TODO: handle_store_change- # before_save :handle_store_change+ before_save :handle_store_changewith_options presence: true do# we want to have this case_sentive: true as changing it to false causes all SQL to use LOWER(slug)@@ -412,24 +411,6 @@ module Spreeendend- # TODO: Implement hanedeling of store- # Removes line items from the order if the line item is not- # available in the store the order belongs to.- def sync_line_items_with_order_by_store- line_items.any? do |line_item|- line_item_stores = line_item.variant.product.stores-- line_item_available_store_ids = []- line_item_stores.map do |store|- line_item_available_store_ids << store.id- end-- unless line_item_available_store_ids.include?(store.id)- line_item.destroy- end- end- end-def ensure_line_items_are_in_stockif insufficient_stock_lines.present?restart_checkout_flow@@ -689,8 +670,6 @@ module Spreeprivate- # TODO: Implement hanedeling of store- # change and store scoped products.def handle_store_changereturn if new_record?@@ -698,11 +677,10 @@ module Spreeerrors.add(:base, Spree.t('errors.messages.once_an_order_is_complete_you_can_not_change_store'))throw(:abort)elsif store_id_changed? && !completed?- sync_line_items_with_order_by_store- update_with_updater!- self- else- true+ # TODO: Implement better handeling of store change than+ # just resetting the order using empty!++ empty!endend