spree_core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f198b47ce6ffacaa3ff99713c9b694071dd5e0201cc34600574e5381329416f8
-  data.tar.gz: 245aedf59897d0fe6f034a49a9ec1be6d1a29456b9301638c7c3899cee43e5e2
+  metadata.gz: e79320700b634228f0412b07daf6a3bd7b8af06ec5cc1bfc4ffa13928ea041a5
+  data.tar.gz: aa559a7fd3888ba8be2b02e6d0210430a0535424fb9346133a561f0750b52076
 SHA512:
-  metadata.gz: f823098a0a0ed66d01b8e0f66345a9196491e82baa0bc412816e85e23f9e4a4cc81295a10269e1ae8aed5f7497e1abe17760bb78cf2535005f127cb25abda35c
-  data.tar.gz: 3501369e0121a73fb35010a366d3b201adedfc7a83fff486603a40fbeccf52a80d281c6bffb1bc04f379945b72782972c5d27a4de2d8777ae20d071a4cb30796
+  metadata.gz: 24c0e981d5a9b8e54868224300755b3247a0ac647feb2916f052f1171ac50235fa8bf478200fc6e5c8af226bbc4773f849c09c0402ab6757ebd9ce4c61e0e5ef
+  data.tar.gz: b634ef167616757b41b6e2197c18e6b142b24db859ccd62d01c7b578743cfd235b2d733fe8a95f678669eb8f9f774549fc4ce4abece81353f6f7801790659e2a

data/app/finders/spree/products/find.rb

@@ -143,7 +143,7 @@ module Spree
       end
 
       def include_discontinued(products)
-        discontinued ? products : products.not_discontinued
+        discontinued ? products : products.available
       end
     end
   end

data/app/finders/spree/taxons/find.rb

@@ -44,6 +44,10 @@ module Spree
         name.present?
       end
 
+      def name_matcher
+        Spree::Taxon.arel_table[:name].matches("%#{name}%")
+      end
+
       def by_ids(taxons)
         return taxons unless ids?
 
@@ -71,7 +75,7 @@ module Spree
       def by_name(taxons)
         return taxons unless name?
 
-        taxons.where(name: name)
+        taxons.where(name_matcher)
       end
     end
   end

data/app/models/concerns/spree/user_methods.rb

@@ -29,6 +29,17 @@ module Spree
 
       self.whitelisted_ransackable_associations = %w[bill_address ship_address]
       self.whitelisted_ransackable_attributes = %w[id email]
+
+      def self.with_address(query, address = :ship_address)
+        left_outer_joins(address).
+          where("#{Spree::Address.table_name}.firstname like ?", "%#{query}%").
+          or(left_outer_joins(address).where("#{Spree::Address.table_name}.lastname like ?", "%#{query}%"))
+      end
+
+      def self.with_email_or_addresses_ids(query, addresses_ids = [])
+        where('email LIKE ?', "%#{query}%").
+          or(where(id: addresses_ids))
+      end
     end
 
     # has_spree_role? simply needs to return true or false whether a user has a role or not.

data/app/sorters/spree/products/sort.rb

@@ -11,7 +11,7 @@ module Spree
         products = updated_at(scope)
         products = price(products)
 
-        products
+        products.distinct
       end
 
       private

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.0.1'
+    '4.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant