spree_core 4.0.0.rc3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a92eeda37655c24a7921c434a9e7cef57121e16da3457279999d2011f898bea8
-  data.tar.gz: 85dc63ab6533ea10eb138804558df376e33f1bfe24e0345d5209665a76c3b724
+  metadata.gz: a5c784614a14ca9019dd8effe620628917a726c4b173302a4e96a11cd8dde241
+  data.tar.gz: d50f4eefd34a384068ccb6eb814badec4e0cc829b52785bcafea37caa09e335a
 SHA512:
-  metadata.gz: 368d97922da6dbda108e121097efce68a7393b556a0f3c0d8504db6158be11a42a1177d5a85e77c43d01d29de224f45666928a00ab0e3865274e44c0cb50b4fa
-  data.tar.gz: 3298b2b794cae1e7c9b8653c581af1d7bb5077cc8a7b199644657b903597f807ec2c8cf2312f78a5a88f01d1c06905016dcd5948bdab77ec000b38ae7e0b79f0
+  metadata.gz: 43b7df9743323b445496eb6ca7f8d326ef5f28c01d258455d61ccfcdfcf7ade994ba11fe5fca6bb8a83010f0fd571d40f6514adc416e0aab7332fd93be3d4916
+  data.tar.gz: c98509b281dd94ed9bcf13ffdc19bbdc54ac38c3e0027b93b28305f041522d12d23d77cd8cf5299084d7eb8f0b723803d4c1e2aa025299248f37409354f4b77f

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/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.0'
   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.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-09 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