Skip to content

fix Spree::CheckoutController error #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix Spree::CheckoutController error #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6985b92
fix Spree::CheckoutController error
dimidev Sep 7, 2021
07d36b9
add globalize search
dimidev Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/spree/checkout_controller_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ def before_payment
end
end

Spree::CheckoutController.prepend Spree::CheckoutControllerDecorator
Spree::CheckoutController.prepend Spree::CheckoutControllerDecorator if defined? Spree::Frontend

15 changes: 11 additions & 4 deletions app/models/spree/product_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,17 @@ def self.prepended(base)

base.scope :individual_saled, -> { where(individual_sale: true) }

base.scope :search_can_be_part, ->(query){ not_deleted.available.joins(:master)
.where(arel_table["name"].matches("%#{query}%").or(Spree::Variant.arel_table["sku"].matches("%#{query}%")))
.where(can_be_part: true)
.limit(30)
base.scope :search_can_be_part, ->(query){
results = not_deleted.available.joins(:master)

if defined?(SpreeGlobalize)
# FIXME add sku search when globalize
results = results.search_by_name(query)
else
results = results.where(arel_table["name"].matches("%#{query}%").or(Spree::Variant.arel_table["sku"].matches("%#{query}%")))
end

results = results.where(can_be_part: true).limit(30)
}

base.validate :assembly_cannot_be_part, if: :assembly?
Expand Down