spree_core 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aebe22e0a667ec8af1d2d93c6e8b61e7632b42c3cd5daf6bf9854dce6e8de70
-  data.tar.gz: 6436afb8bd363314d87c59062354e62adae62c9ca871d4e61d2211bc59d8fffc
+  metadata.gz: d659f0992a4f2aa8af409c5cbd50f1e824b39bae09cc69a107990abf4e557120
+  data.tar.gz: 41babfa431effea64e542e2698f6ed74054e489e5f5075e2841590fd76857b7a
 SHA512:
-  metadata.gz: 9403530f8211a89b26b0d579176a44c444c63279311c996c5b737208dd4b6e952f5940ab8fb49c3290ae7f35efd7b36f17e42947572755746817471e266bfdab
-  data.tar.gz: 17a9a46be73ce49d828ea879050539cb5fe6493dc8570db6eedc87ae3f153f9dad121c1500ca674da412136100135ee8cf35a3f52b9582daeb2d4ae1f7401cc3
+  metadata.gz: 0ca1f7d8862e25123578e339dab67e71259a9572ebb3edb28e7c4e720b5d2f4e34b2accf904aa6cf59468aeb2137cbb38268f22517d4d58efd01d4051b753022
+  data.tar.gz: bf207628a2fbff24f23e7bacf6f357a0b3efc95075e19ec95671a5b667a34fc314c91895e6b8e84f9ab2ed025e18c6314cae77a224e0acf7a759a0fa161a3f72

data/app/models/spree/order.rb

@@ -1,4 +1,4 @@
-require 'spree/order/checkout'
+require_dependency 'spree/order/checkout'
 
 module Spree
   class Order < Spree::Base

data/app/models/spree/promotion/rules/item_total.rb

@@ -39,7 +39,7 @@ module Spree
         end
 
         def ineligible_message_max
-          if preferred_operator_max == 'gte'
+          if preferred_operator_max == 'lt'
             eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max)
           else
             eligibility_error_message(:item_total_more_than, amount: formatted_amount_max)

data/app/services/spree/checkout/get_shipping_rates.rb

@@ -7,6 +7,7 @@ module Spree
         run :reload_order
         run :ensure_shipping_address
         run :ensure_line_items_present
+        run :move_order_to_delivery_state
         run :generate_shipping_rates
         run :return_shipments
       end
@@ -43,6 +44,12 @@ module Spree
       def return_shipments(order:)
         success(order.shipments.includes([shipping_rates: :shipping_method]))
       end
+
+      def move_order_to_delivery_state(order:)
+        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until order.state == 'delivery'
+
+        success(order: order)
+      end
     end
   end
 end

data/config/initializers/state_machine.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module MachineDecorator
+  protected
+
+  # Determines whether there's already a helper method defined within the
+  # given scope.  This is true only if one of the owner's ancestors defines
+  # the method and is further along in the ancestor chain than this
+  # machine's helper module.
+  def owner_class_ancestor_has_method?(scope, method)
+    return false unless owner_class_has_method?(scope, method)
+
+    superclasses = owner_class.ancestors.select { |ancestor| ancestor.is_a?(Class) }[1..-1]
+
+    if scope == :class
+      current = owner_class.singleton_class
+      superclass = superclasses.first
+    else
+      current = owner_class
+      superclass = owner_class.superclass
+    end
+
+    # Generate the list of modules that *only* occur in the owner class, but
+    # were included *prior* to the helper modules, in addition to the
+    # superclasses
+    ancestors = current.ancestors - superclass.ancestors + superclasses
+    ancestors = ancestors[ancestors.index(@helper_modules[scope])..-1].reverse
+
+    # Search for for the first ancestor that defined this method
+    ancestors.detect do |ancestor|
+      ancestor = ancestor.singleton_class if scope == :class && ancestor.is_a?(Class)
+      ancestor.method_defined?(method) || ancestor.private_method_defined?(method)
+    end
+  end
+end
+
+::StateMachines::Machine.prepend MachineDecorator

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.7.2'
+    '3.7.3'
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -145,6 +145,14 @@ module CapybaraExt
   end
 end
 
+def wait_for(options = {})
+  default_options = { error: nil, seconds: 5 }.merge(options)
+
+  Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
+rescue Selenium::WebDriver::Error::TimeOutError
+  default_options[:error].nil? ? false : raise(default_options[:error])
+end
+
 Capybara.configure do |config|
   config.match = :prefer_exact
   config.ignore_hidden_elements = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -639,6 +639,7 @@ files:
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
 - config/initializers/premailer_rails.rb
+- config/initializers/state_machine.rb
 - config/initializers/use_paperclip.rb
 - config/locales/en.yml
 - config/routes.rb