spree_core 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9abe56060f0568926e082bc13e3984b3819c23f5e5658b14ff58e44589a9e51
-  data.tar.gz: ca29391589cf6bf06c8f20bfb248be16fae419b3fb683255803f01a355f0ddac
+  metadata.gz: 5fc843401beee13a77c3d23fa5fceacc0465b7c20ecd76068666703e4d7addd5
+  data.tar.gz: 31a3220b19ff45d6495c4929024c6c10d9d8d1da78498914960d21ab75a63e6f
 SHA512:
-  metadata.gz: e2aea90e9694d9b2ac45d23e7a5ea5fd07bc25a7ba93a614328f740857c8c10b6c6d644ff3bc258c3a600f3ae8836e6ad5b1d9473799ffc1c672e7878afd3ff3
-  data.tar.gz: 423b46182c0785e1915315afa475f0125f9d832fcab13ff34abc83f7628681d24d555cc6513b4338c8f282b40f833825b8015502b73162946f908e6535ad5b46
+  metadata.gz: 61f76f5ba5be894e74d09b68ee7d8b797a9bcd62f10607c442a4009089cfe3170a0846a5711b03fa7522c7de85a9e0db00b22bd502ae39a651ffbf1544d84d33
+  data.tar.gz: 90c8b7435675640ffaaca1bb635bd7a929b54197973c79226f333196caf44a044e1bc821c47ddc3f6f8ce84ebb6522f9b07f76855aa45550e0f69cd5ab8e23ed

data/app/models/spree/app_configuration.rb

@@ -44,6 +44,7 @@ module Spree
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
     preference :currency, :string, default: 'USD'
     preference :default_country_id, :integer
+    preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
     preference :layout, :string, default: 'spree/layouts/spree_application'

data/app/models/spree/variant.rb

@@ -48,7 +48,8 @@ module Spree
       validates :cost_price
       validates :price
     end
-    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false }, allow_blank: true
+    validates :sku, uniqueness: { conditions: -> { where(deleted_at: nil) }, case_sensitive: false },
+                    allow_blank: true, unless: :disable_sku_validation?
 
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
@@ -324,5 +325,9 @@ module Spree
     def clear_in_stock_cache
       Rails.cache.delete(in_stock_cache_key)
     end
+
+    def disable_sku_validation?
+      Spree::Config[:disable_sku_validation]
+    end
   end
 end

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

@@ -7,9 +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
+        run :generate_or_return_shipping_rates
       end
 
       private
@@ -31,6 +29,11 @@ module Spree
         success(order: order)
       end
 
+      def generate_or_return_shipping_rates(order:)
+        generate_shipping_rates(order: order) if order.shipments.empty?
+        return_shipments(order: order)
+      end
+
       def generate_shipping_rates(order:)
         ApplicationRecord.transaction do
           order.create_proposed_shipments
@@ -42,13 +45,7 @@ module Spree
       end
 
       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)
+        success(order.reload.shipments.includes([shipping_rates: :shipping_method]))
       end
     end
   end

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -26,5 +26,6 @@ Spree.dependencies do |dependencies|
   # dependencies.cart_add_item_service = 'MyNewAwesomeService'
 end
 
+# Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.7'
+    '4.1.8'
   end
 end

data/spree_core.gemspec

@@ -6,17 +6,23 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
+  s.author      = 'Sean Schofield'
+  s.email       = 'sean@spreecommerce.com'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
+  s.homepage    = 'http://spreecommerce.org'
+  s.license     = 'BSD-3-Clause'
+
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
+    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
+  }
 
   s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
-  s.homepage    = 'http://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
-
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1083,8 +1083,12 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree/issues
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.8
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.8
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1100,7 +1104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []