spree_core 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29650107328af4517005d07604fcb0bbb1b320f3b230cf525ea5b5185c6ba9ad
-  data.tar.gz: bb2bd5a002a4ea76220267ffce213bee8ada0b1729ff5aaae8b84f52e132905c
+  metadata.gz: e0dd0bbc96d64d482272852915dfdbb1ddebc7a6cc219bd6401a6f589072a0fe
+  data.tar.gz: 6daeb36116e792adae64e718e5026d3242f17cba858e0b14bd9b7fd1eca35a4f
 SHA512:
-  metadata.gz: 455068e019649a50acc0f6a362be017c5255631526f788824be75fa69c3579bcbd53d4338edd454142ec8011ae7a17832f4eed2cb7b52fe0c7424746187b635d
-  data.tar.gz: e3071c8e8a693ebad94d06e1bc73b15ffcdcefd809cb052577f3bfc2cfa05a097c423577ff50b093a46ad0d025976f6ab880056edb27b377ffd7282c08cd693e
+  metadata.gz: ed5e760973d8dd27db03b90eab449a026b69bbe2fb2693ad2f0e5f9f80d1d725c734f90c80caf90c491da71efb1f2d7934b2c8868faf9541a6a2c6c0c1e75048
+  data.tar.gz: 12bf3f8c265308aeae44d6953ab2b70ed7387038227948522cb6f7588744b618f1ccecabfc90c100e04fe8a1eb4b2e3d076aeb2096fe1bf6d9421eaaa3278652

data/app/finders/spree/products/find.rb

@@ -5,6 +5,7 @@ module Spree
         @scope = scope
 
         @ids      = String(params.dig(:filter, :ids)).split(',')
+        @skus     = String(params.dig(:filter, :skus)).split(',')
         @price    = String(params.dig(:filter, :price)).split(',')
         @currency = params[:currency] || current_currency
         @taxons   = String(params.dig(:filter, :taxons)).split(',')
@@ -14,6 +15,7 @@ module Spree
 
       def execute
         products = by_ids(scope)
+        products = by_skus(products)
         products = by_price(products)
         products = by_taxons(products)
         products = by_name(products)
@@ -24,12 +26,16 @@ module Spree
 
       private
 
-      attr_reader :ids, :price, :currency, :taxons, :name, :options, :scope
+      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :scope
 
       def ids?
         ids.present?
       end
 
+      def skus?
+        skus.present?
+      end
+
       def price?
         price.present?
       end
@@ -56,6 +62,12 @@ module Spree
         products.where(id: ids)
       end
 
+      def by_skus(products)
+        return products unless skus?
+
+        products.joins(:variants_including_master).distinct.where(spree_variants: { sku: skus })
+      end
+
       def by_price(products)
         return products unless price?
 

data/app/models/spree/order.rb

@@ -103,15 +103,15 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
 
     with_options dependent: :destroy do
-      has_many :state_changes, as: :stateful
-      has_many :line_items, -> { order(:created_at) }, inverse_of: :order
-      has_many :payments
-      has_many :return_authorizations, inverse_of: :order
-      has_many :adjustments, -> { order(:created_at) }, as: :adjustable
+      has_many :state_changes, as: :stateful, class_name: 'Spree::StateChange'
+      has_many :line_items, -> { order(:created_at) }, inverse_of: :order, class_name: 'Spree::LineItem'
+      has_many :payments, class_name: 'Spree::Payment'
+      has_many :return_authorizations, inverse_of: :order, class_name: 'Spree::ReturnAuthorization'
+      has_many :adjustments, -> { order(:created_at) }, as: :adjustable, class_name: 'Spree::Adjustment'
     end
-    has_many :reimbursements, inverse_of: :order
+    has_many :reimbursements, inverse_of: :order, class_name: 'Spree::Reimbursement'
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
-    has_many :inventory_units, inverse_of: :order
+    has_many :inventory_units, inverse_of: :order, class_name: 'Spree::InventoryUnit'
     has_many :variants, through: :line_items
     has_many :products, through: :variants
     has_many :refunds, through: :payments
@@ -124,7 +124,7 @@ module Spree
     has_many :order_promotions, class_name: 'Spree::OrderPromotion'
     has_many :promotions, through: :order_promotions, class_name: 'Spree::Promotion'
 
-    has_many :shipments, dependent: :destroy, inverse_of: :order do
+    has_many :shipments, class_name: 'Spree::Shipment', dependent: :destroy, inverse_of: :order do
       def states
         pluck(:state).uniq
       end

data/app/models/spree/payment_method/check.rb

@@ -1,5 +1,5 @@
 module Spree
-  class PaymentMethod::Check < PaymentMethod
+  class PaymentMethod::Check < ::Spree::PaymentMethod
     def actions
       %w{capture void}
     end

data/app/models/spree/payment_method/store_credit.rb

@@ -1,5 +1,5 @@
 module Spree
-  class PaymentMethod::StoreCredit < PaymentMethod
+  class PaymentMethod::StoreCredit < ::Spree::PaymentMethod
     def payment_source_class
       ::Spree::StoreCredit
     end

data/app/models/spree/stock/coordinator.rb

@@ -11,7 +11,7 @@ module Spree
 
       def shipments
         packages.map do |package|
-          package.to_shipment.tap { |s| s.address = order.ship_address }
+          package.to_shipment.tap { |s| s.address_id = order.ship_address_id }
         end
       end
 

data/app/models/spree/stock/inventory_unit_builder.rb

@@ -9,10 +9,10 @@ module Spree
         @order.line_items.map do |line_item|
           # They go through multiple splits, avoid loading the
           # association to order until needed.
-          InventoryUnit.new(
+          Spree::InventoryUnit.new(
             pending: true,
-            line_item: line_item,
-            variant: line_item.variant,
+            line_item_id: line_item.id,
+            variant_id: line_item.variant_id,
             quantity: line_item.quantity,
             order_id: @order.id
           )

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.7.0'
+    '3.7.1'
   end
 end

data/spree_core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 2.0'
   s.add_dependency 'deface', '~> 1.0'
-  s.add_dependency 'ffaker', '~> 2.2'
+  s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '~> 5.2.1'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement