spree_core 4.0.0.rc3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a92eeda37655c24a7921c434a9e7cef57121e16da3457279999d2011f898bea8
-  data.tar.gz: 85dc63ab6533ea10eb138804558df376e33f1bfe24e0345d5209665a76c3b724
+  metadata.gz: db64342f32e3f2f8e7961e45d306348ddd82c3c2db66c06d5a80f6f17367b098
+  data.tar.gz: 8a5bb4027de95e826f19d23d73803b4fcf4395b5beedb8f5ae5a252ab273ea0c
 SHA512:
-  metadata.gz: 368d97922da6dbda108e121097efce68a7393b556a0f3c0d8504db6158be11a42a1177d5a85e77c43d01d29de224f45666928a00ab0e3865274e44c0cb50b4fa
-  data.tar.gz: 3298b2b794cae1e7c9b8653c581af1d7bb5077cc8a7b199644657b903597f807ec2c8cf2312f78a5a88f01d1c06905016dcd5948bdab77ec000b38ae7e0b79f0
+  metadata.gz: 31d55a0e769fdc0f9a58c3c31653f557c25a7fc02d4cfb870344a5a06cea1d8eb0369fee44b40ef1f19ec4e940a597ce859b726d81e12df400f43e7966cf0fc7
+  data.tar.gz: e2057c1a8c82ff57071dcf0be48e1fa15f600bb676892baf8cb931b1339edeacde7437b06d2663265e13740848e3f520fe018d40dd19261afae5cd4c5cbad2a5

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/models/spree/order.rb

@@ -617,6 +617,14 @@ module Spree
       end
     end
 
+    def valid_promotions
+      order_promotions.where(promotion_id: valid_promotion_ids).uniq(&:promotion_id)
+    end
+
+    def valid_promotion_ids
+      all_adjustments.eligible.nonzero.promotion.map { |a| a.source.promotion_id }.uniq
+    end
+
     private
 
     def link_by_email

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/controller_helpers/store.rb

@@ -43,7 +43,7 @@ module Spree
         private
 
         def current_tax_zone
-          current_order.try(:tax_zone) || Spree::Zone.default_tax
+          @current_tax_zone ||= current_order.try(:tax_zone) || Spree::Zone.default_tax
         end
       end
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.0.0.rc3'
+    '4.0.4'
   end
 end

data/spree_core.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
   s.add_dependency 'twitter_cldr', '~> 4.3'
+  s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'mini_magick', '~> 4.9.4'
   s.add_dependency 'image_processing', '~> 1.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc3
+  version: 4.0.4
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -314,6 +314,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1049,7 +1063,7 @@ homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1064,8 +1078,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []