spree_core 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0dd0bbc96d64d482272852915dfdbb1ddebc7a6cc219bd6401a6f589072a0fe
-  data.tar.gz: 6daeb36116e792adae64e718e5026d3242f17cba858e0b14bd9b7fd1eca35a4f
+  metadata.gz: 2aebe22e0a667ec8af1d2d93c6e8b61e7632b42c3cd5daf6bf9854dce6e8de70
+  data.tar.gz: 6436afb8bd363314d87c59062354e62adae62c9ca871d4e61d2211bc59d8fffc
 SHA512:
-  metadata.gz: ed5e760973d8dd27db03b90eab449a026b69bbe2fb2693ad2f0e5f9f80d1d725c734f90c80caf90c491da71efb1f2d7934b2c8868faf9541a6a2c6c0c1e75048
-  data.tar.gz: 12bf3f8c265308aeae44d6953ab2b70ed7387038227948522cb6f7588744b618f1ccecabfc90c100e04fe8a1eb4b2e3d076aeb2096fe1bf6d9421eaaa3278652
+  metadata.gz: 9403530f8211a89b26b0d579176a44c444c63279311c996c5b737208dd4b6e952f5940ab8fb49c3290ae7f35efd7b36f17e42947572755746817471e266bfdab
+  data.tar.gz: 17a9a46be73ce49d828ea879050539cb5fe6493dc8570db6eedc87ae3f153f9dad121c1500ca674da412136100135ee8cf35a3f52b9582daeb2d4ae1f7401cc3

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

@@ -4,13 +4,15 @@ module Spree
       def initialize(scope:, params:, current_currency:)
         @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(',')
-        @name     = params.dig(:filter, :name)
-        @options  = params.dig(:filter, :options).try(:to_unsafe_hash)
+        @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(',')
+        @name         = params.dig(:filter, :name)
+        @options      = params.dig(:filter, :options).try(:to_unsafe_hash)
+        @deleted      = params.dig(:filter, :show_deleted)
+        @discontinued = params.dig(:filter, :show_discontinued)
       end
 
       def execute
@@ -20,13 +22,15 @@ module Spree
         products = by_taxons(products)
         products = by_name(products)
         products = by_options(products)
+        products = include_deleted(products)
+        products = include_discontinued(products)
 
         products
       end
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :scope
+      attr_reader :ids, :skus, :price, :currency, :taxons, :name, :options, :scope, :deleted, :discontinued
 
       def ids?
         ids.present?
@@ -100,6 +104,14 @@ module Spree
           products.with_option_value(key, value)
         end.inject(:&)
       end
+
+      def include_deleted(products)
+        deleted ? products.with_deleted : products.not_deleted
+      end
+
+      def include_discontinued(products)
+        discontinued ? products : products.not_discontinued
+      end
     end
   end
 end

data/app/models/spree/app_dependencies.rb

@@ -11,7 +11,7 @@ module Spree
       :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
       :coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,
       :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-      :products_finder, :taxon_finder, :line_item_by_variant_finder
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -38,6 +38,7 @@ module Spree
       @cart_remove_item_service = 'Spree::Cart::RemoveItem'
       @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
       @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
+      @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
 
       # checkout
       @checkout_next_service = 'Spree::Checkout::Next'

data/app/services/spree/cart/estimate_shipping_rates.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Cart
+    class EstimateShippingRates
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, country_iso: nil)
+        country_id = country_id(country_iso)
+        dummy_order = generate_dummy_order(order, country_id)
+
+        packages = ::Spree::Stock::Coordinator.new(dummy_order).packages
+        estimator = ::Spree::Stock::Estimator.new(dummy_order)
+        shipping_rates = if order.line_items.any? && packages.any?
+                           estimator.shipping_rates(packages.first)
+                         else
+                           []
+                         end
+
+        success(shipping_rates)
+      end
+
+      private
+
+      def country_id(country_iso)
+        if country_iso.present?
+          ::Spree::Country.by_iso(country_iso)&.id
+        else
+          ::Spree::Country.default.id
+        end
+      end
+
+      def generate_dummy_order(order, country_id)
+        dummy_order = order.dup
+        dummy_order.line_items = order.line_items
+        dummy_order.ship_address = ::Spree::Address.new(country_id: country_id)
+        dummy_order
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/factories/country_factory.rb

@@ -2,8 +2,8 @@ FactoryBot.define do
   factory :country, class: Spree::Country do
     sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
     sequence(:name)     { |n| "NAME_#{n}" }
-    iso                 { 'US' }
-    iso3                { 'USA' }
+    sequence(:iso)      { |n| "I#{n}" }
+    sequence(:iso3)     { |n| "IS#{n}" }
     numcode             { 840 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -594,6 +594,7 @@ files:
 - app/paginators/spree/shared/paginate.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
+- app/services/spree/cart/estimate_shipping_rates.rb
 - app/services/spree/cart/recalculate.rb
 - app/services/spree/cart/remove_item.rb
 - app/services/spree/cart/remove_line_item.rb