spree_core 4.1.0.rc1 → 4.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db73357d472e46822ad95d6ee2071b01413e2f1ab743177f7cfc8845c6830092
-  data.tar.gz: 83c396103e3809183ac12c21f72e4831cb2c10d1089232bdecd58395459a961b
+  metadata.gz: bdc19a0196b06913c237d25f4e45315ea03abf5a5b30e5e660440339daf7e5f0
+  data.tar.gz: c5d95ff6a5ca995ae81ee67ffbfe8b17a09a24afd5f83cfa5e7fc1a3b19a1fb9
 SHA512:
-  metadata.gz: f57f8d0b1bee1cb0b0d77b7aa82ac8f62d89a783e07dbd1e5f2a8a6d780eaf8de46ccf5e898420d423fe1d133ce2645615cd4611580ca92008d006c059667e1a
-  data.tar.gz: 7e3aee2e5bcc514a78dcc8da3cfb5b35635f691fc2fe9ac68002c9cd208bc96b5df4f784da4612cf1ad409dea467e0a5c29cc13e156e25aa7baeb5d72f367f47
+  metadata.gz: '098925f7a1dc32e87a5a1a0798b13a7983d86a1fe5cb8f2f20f9ffb50eb0098c79785e81c849d1137bba1362d01edfd9fe3cdf904092943c3a354f47a057ec3c'
+  data.tar.gz: 8f052c9cc5437ad254105c6e5236968a81c7dd5c1f8af4fd086f97bf684784b3b64f7aaeae317a1840225931848958f7007ae6ffc1b63b319d820062b2cb8cab

data/app/models/spree/order.rb

@@ -51,7 +51,7 @@ module Spree
       go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
-      remove_transition from: :delivery, to: :confirm
+      remove_transition from: :delivery, to: :confirm, unless: ->(order) { order.confirmation_required? }
     end
 
     self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items store]

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -12,6 +12,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
       store.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
       store.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
+      store.default_currency = preference_store.get('spree/app_configuration/currency') { 'USD' }
       store.save!
     else
       # we set defaults for the things we now require

data/lib/spree/core/number_generator.rb

@@ -13,22 +13,23 @@ module Spree
       end
 
       def included(host)
-        generator_method   = method(:generate_permalink)
         generator_instance = self
 
         host.class_eval do
           validates(:number, presence: true, uniqueness: { allow_blank: true })
 
           before_validation do |instance|
-            instance.number ||= generator_method.call(host)
+            instance.number ||= generate_permalink(host)
           end
 
           define_singleton_method(:number_generator) { generator_instance }
+
+          def generate_permalink(host)
+            host.number_generator.generate_permalink(host)
+          end
         end
       end
 
-      private
-
       def generate_permalink(host)
         length = @length
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.0.rc1'
+    '4.1.0.rc2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1102,7 +1102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.