spree_core 3.7.0.rc1 → 3.7.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49eb4666a35ce5b88c3ce5bc92b0cf34503851edee70623f215bc674ea3d322f
-  data.tar.gz: cefaa50b133701b0572392a03c11bdf4544e9ca97aa0eaa34e5293cd2892336f
+  metadata.gz: b7124c86a59c0fdd43a117c2765d9d7253de04054cef1c787934ce48abf06c9c
+  data.tar.gz: 3c00c9709cd38461a3aeeff347a2377482766c54501d3a91bf8cc429d043a52c
 SHA512:
-  metadata.gz: 1d422e99c814605fe9cbb9ce7eaf3bedd80e93f6298446bd6a9b30cc8d1d3d8e8d870926222aa437bb6d58a0ec725bfb1192a0d28c48c1cadc9a97e0dd3d504d
-  data.tar.gz: caf99f8ededb70977b1e1eba5adcaff62a60108d62b469b82d885921539f8acc1f84528a9161d28f48f7f6ab7755e866eb34392df936904dc1aaaa29a59becf6
+  metadata.gz: 33c2354b25887911fef568f618c9d0316cfbda57bb0839ab2b3172e7a8f72ba798b8fce7bc7e2354ca2c913444647b2b44c885cd60a605196279ada234fd3242
+  data.tar.gz: d62478a37f518d87cf21a7caec39d9a12314c1532bfa7cba161a5c1945077588ddec70ff741ba77445bd9c7290021853809accc423abf0f4c606ce9b1904607c

data/app/finders/spree/orders/find_complete.rb

@@ -0,0 +1,69 @@
+module Spree
+  module Orders
+    class FindComplete
+      attr_reader :user, :number, :token
+
+      def initialize(user: nil, number: nil, token: nil)
+        @user = user
+        @number = number
+        @token = token
+      end
+
+      def execute
+        orders = by_user(scope)
+        orders = by_number(orders)
+        orders = by_token(orders)
+
+        orders
+      end
+
+      private
+
+      def scope
+        user? ? user.orders.complete.includes(scope_includes) : Spree::Order.complete.includes(scope_includes)
+      end
+
+      def user?
+        user.present?
+      end
+
+      def number?
+        number.present?
+      end
+
+      def token?
+        token.present?
+      end
+
+      def by_user(orders)
+        return orders unless user?
+
+        orders
+      end
+
+      def by_number(orders)
+        return orders unless number?
+
+        orders.where(number: number)
+      end
+
+      def by_token(orders)
+        return orders unless token?
+
+        orders.where(token: token)
+      end
+
+      def scope_includes
+        {
+          line_items: [
+            variant: [
+              :images,
+              option_values: :option_type,
+              product: :product_properties,
+            ]
+          ]
+        }
+      end
+    end
+  end
+end

data/app/models/spree/address.rb

@@ -29,8 +29,8 @@ module Spree
 
     validate :state_validate, :postal_code_validate
 
-    delegate :name, :iso3, to: :country, prefix: true
-    delegate :abbr,        to: :state,   prefix: true, allow_nil: true
+    delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
+    delegate :abbr, to: :state, prefix: true, allow_nil: true
 
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
@@ -49,6 +49,14 @@ module Spree
       end
     end
 
+    def iso_name
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+    Address#iso_name is deprecated and will be removed in Spree 4.0.
+    Please use Address#country_iso_name instead
+      DEPRECATION
+      country_iso_name
+    end
+
     def full_name
       "#{firstname} #{lastname}".strip
     end
@@ -57,6 +65,10 @@ module Spree
       state.try(:abbr) || state.try(:name) || state_name
     end
 
+    def state_name_text
+      state_name.present? ? state_name : state&.name
+    end
+
     def same_as?(other)
       ActiveSupport::Deprecation.warn(<<-EOS, caller)
         Address#same_as? is deprecated and will be removed in Spree 4.0. Please use Address#== instead"

data/app/models/spree/country.rb

@@ -22,6 +22,10 @@ module Spree
       default || find_by(iso: 'US') || first
     end
 
+    def self.by_iso(iso)
+      where(['LOWER(iso) = ?', iso.downcase]).or(where(['LOWER(iso3) = ?', iso.downcase])).take
+    end
+
     def default?
       id == Spree::Config[:default_country_id]
     end

data/app/models/spree/credit_card.rb

@@ -2,8 +2,11 @@ module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
 
+    # to migrate safely from older Spree versions that din't provide safe deletion for CCs
+    # we need to ensure that we have a connection to the DB and that the `deleted_at` column exists
     if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
-        connection.data_source_exists?(:spree_credit_cards) &&
+        connected? &&
+        table_exists? &&
         connection.column_exists?(:spree_credit_cards, :deleted_at)
       acts_as_paranoid
     end

data/app/models/spree/line_item.rb

@@ -20,7 +20,7 @@ module Spree
     validates :quantity, numericality: { only_integer: true, message: Spree.t('validation.must_be_int') }
     validates :price, numericality: true
 
-    validates_with Stock::AvailabilityValidator
+    validates_with Spree::Stock::AvailabilityValidator
     validate :ensure_proper_currency, if: -> { order.present? }
 
     before_destroy :verify_order_inventory_before_destroy, if: -> { order.has_checkout_step?('delivery') }
@@ -85,7 +85,7 @@ module Spree
     alias money display_total
 
     def sufficient_stock?
-      Stock::Quantifier.new(variant).can_supply? quantity
+      Spree::Stock::Quantifier.new(variant).can_supply? quantity
     end
 
     def insufficient_stock?
@@ -153,7 +153,7 @@ module Spree
     end
 
     def recalculate_adjustments
-      Adjustable::AdjustmentsUpdater.update(self)
+      Spree::Adjustable::AdjustmentsUpdater.update(self)
     end
 
     def update_tax_charge

data/app/models/spree/shipment.rb

@@ -269,7 +269,7 @@ module Spree
     end
 
     def shipping_method
-      selected_shipping_rate.try(:shipping_method) || shipping_rates.first.try(:shipping_method)
+      selected_shipping_rate&.shipping_method || shipping_rates.first&.shipping_method
     end
 
     def tax_category
@@ -292,7 +292,7 @@ module Spree
     end
 
     def tracking_url
-      @tracking_url ||= shipping_method.build_tracking_url(tracking)
+      @tracking_url ||= shipping_method&.build_tracking_url(tracking)
     end
 
     def update_amounts

data/app/models/spree/variant.rb

@@ -81,7 +81,7 @@ module Spree
       )
     end
 
-    scope :not_deleted, -> { where("#{Variant.quoted_table_name}.deleted_at IS NULL") }
+    scope :not_deleted, -> { where("#{Spree::Variant.quoted_table_name}.deleted_at IS NULL") }
 
     scope :for_currency_and_available_price_amount, ->(currency = nil) do
       currency ||= Spree::Config[:currency]
@@ -112,7 +112,7 @@ module Spree
       if self[:tax_category_id].nil?
         product.tax_category
       else
-        TaxCategory.find(self[:tax_category_id])
+        Spree::TaxCategory.find(self[:tax_category_id])
       end
     end
 

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

@@ -4,10 +4,29 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
+        params = replace_country_iso_with_id(params, 'ship') if address_with_country_iso_present?(params, 'ship')
+        params = replace_country_iso_with_id(params, 'bill') if address_with_country_iso_present?(params, 'bill')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
       end
+
+      private
+
+      def address_with_country_iso_present?(params, address_kind = 'ship')
+        return false unless params.dig(:order, "#{address_kind}_address_attributes".to_sym, :country_iso)
+        return false if params.dig(:order, "#{address_kind}_address_attributes".to_sym, :country_id)
+
+        true
+      end
+
+      def replace_country_iso_with_id(params, address_kind = 'ship')
+        country_id = Spree::Country.by_iso(params[:order]["#{address_kind}_address_attributes"].fetch(:country_iso))&.id
+
+        params[:order]["#{address_kind}_address_attributes"]['country_id'] = country_id
+        params[:order]["#{address_kind}_address_attributes"].delete(:country_iso)
+        params
+      end
     end
   end
 end

data/app/sorters/spree/orders/sort.rb

@@ -0,0 +1,42 @@
+module Spree
+  module Orders
+    class Sort
+      attr_reader :scope, :sort
+
+      def initialize(scope, params)
+        @scope = scope
+        @sort = params[:sort]
+      end
+
+      def call
+        orders = completed_at(scope)
+
+        orders
+      end
+
+      private
+
+      def desc_order
+        @desc_order ||= String(sort)[0] == '-'
+      end
+
+      def sort_field
+        @sort_field ||= desc_order ? sort[1..-1] : sort
+      end
+
+      def order_direction
+        desc_order ? :asc : :desc
+      end
+
+      def completed_at?
+        sort_field.eql?('completed_at')
+      end
+
+      def completed_at(orders)
+        return orders unless completed_at?
+
+        orders.order(completed_at: order_direction)
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -31,7 +31,7 @@ module Spree
 
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_id, :state_id,
+      :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]

data/lib/spree/testing_support/capybara_ext.rb

@@ -106,7 +106,7 @@ module CapybaraExt
   def wait_for_ajax(delay = Capybara.default_max_wait_time)
     Timeout.timeout(delay) do
       active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active')
-      active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active') until active.zero?
+      active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active') until active.nil? || active.zero?
     end
   end
 

data/spree_core.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
 
-  s.required_ruby_version     = '>= 2.3.0'
+  s.required_ruby_version     = '>= 2.3.3'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.author      = 'Sean Schofield'
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemerchant', '~> 1.67'
   s.add_dependency 'acts_as_list', '~> 0.8'
-  s.add_dependency 'awesome_nested_set', '~> 3.1.3'
+  s.add_dependency 'awesome_nested_set', '~> 3.1.4'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 2.0'
   s.add_dependency 'deface', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.0.rc1
+  version: 3.7.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +385,7 @@ files:
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
+- app/finders/spree/orders/find_complete.rb
 - app/finders/spree/orders/find_current.rb
 - app/finders/spree/products/find.rb
 - app/finders/spree/taxons/find.rb
@@ -606,6 +607,7 @@ files:
 - app/services/spree/checkout/update.rb
 - app/services/spree/compare_line_items.rb
 - app/services/spree/generate_token.rb
+- app/sorters/spree/orders/sort.rb
 - app/sorters/spree/products/sort.rb
 - app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
@@ -1057,7 +1059,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1065,7 +1067,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.