spree_core 4.1.9 → 4.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735a7c4cad6166518bb05cc45fcc5a2f303e1b4a11f5ec9ae1e17a6df5916142
-  data.tar.gz: a62c2b5fec62e7c9bf7971198f3805c573785c9e9768d88c61b3ae89b578c31d
+  metadata.gz: c6076d4a3647fbf0b2a1a72578b5cd9336181f4b50c40bda5f7dcffab9806e4a
+  data.tar.gz: 663b00f1b45448020c4274925264c31ef11363fc6bd4561db5eff1f8897c4b5f
 SHA512:
-  metadata.gz: 25b68dc35a114eaa937dc25fc06576065d8b56baa23d4839cdfa401c08fb5f85638e65d924cba0f9f84b9585761eb3855cf938811c288578968aee2d0ef3e2bb
-  data.tar.gz: 67270a8f7d20847ddcced170c3ebb82b419d89ffff202905d4a9161b13cd526a954b67367bf925133822a0903e5a7a41e81f2f11e4abadf7d9b375b5bdf54793
+  metadata.gz: 235b59d743b4d580fe4b9e2a16d082a39285bccbee99f9fea6615c65e0e760a9134a0267ed9def3d9bac5fa76974416127dbdaeeac52865b8578b6926a5d2c65
+  data.tar.gz: 2bdc502c7b9134df69893818a1e230bd546ff895f8d0733e4ff380dbb2a8c4be9eccfe0acc356c8e618ad2d75d75f74228955af8961231617e00e0ec19e6ec27

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

@@ -0,0 +1,17 @@
+module Spree
+  module Addresses
+    class Find
+      def initialize(scope:, params:)
+        @scope = scope
+      end
+
+      def execute
+        scope
+      end
+
+      private
+
+      attr_reader :scope
+    end
+  end
+end

data/app/models/spree/app_dependencies.rb

@@ -11,7 +11,8 @@ 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, :cart_estimate_shipping_rates_service
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
+      :account_create_address_service, :account_update_address_service, :address_finder
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -59,9 +60,14 @@ module Spree
       # coupons
       # TODO: we should split this service into 2 seperate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
+
+      # account
+      @account_create_address_service = 'Spree::Account::Addresses::Create'
+      @account_update_address_service = 'Spree::Account::Addresses::Update'
     end
 
     def set_default_finders
+      @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'

data/app/services/spree/account/addresses/base.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Account
+    module Addresses
+      class Base
+        prepend Spree::ServiceModule::Base
+
+        private
+
+        attr_accessor :country
+
+        def fill_country_and_state_ids(params)
+          replace_country_iso_with_id(params)
+          fill_state_id(params)
+        end
+
+        def replace_country_iso_with_id(params)
+          iso = params[:country_iso]
+          return params unless iso.present?
+
+          country = Spree::Country.by_iso(iso)
+          params[:country_id] = country&.id
+          params.delete(:country_iso)
+          params
+        end
+
+        def fill_state_id(params)
+          state_name = params[:state_name]
+          return params unless state_name.present?
+
+          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
+          return params unless country
+
+          params[:state_id] = country.states.find_by(name: state_name)&.id
+          params
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/create.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Create < ::Spree::Account::Addresses::Base
+        def call(user:, address_params:)
+          fill_country_and_state_ids(address_params)
+
+          address = user.addresses.new(address_params)
+          if address.save
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/update.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Update < ::Spree::Account::Addresses::Base
+        def call(address:, address_params:)
+          address_params[:country_id] ||= address.country_id
+          fill_country_and_state_ids(address_params)
+
+          if address.update(address_params)
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,12 @@ 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')
+        ship_changed = address_with_country_iso_present?(params, 'ship')
+        bill_changed = address_with_country_iso_present?(params, 'bill')
+        params = replace_country_iso_with_id(params, 'ship') if ship_changed
+        params = replace_country_iso_with_id(params, 'bill') if bill_changed
+        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
+        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -20,6 +24,13 @@ module Spree
         true
       end
 
+      def selected_shipping_rate_present?(params)
+        shipments_attributes = params.dig(:order, :shipments_attributes)
+        return false unless shipments_attributes
+
+        shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
+      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
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.9'
+    '4.1.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.1.9
+  version: 4.1.10
 platform: ruby
 authors:
 - Sean Schofield
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -406,6 +406,7 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/finders/spree/addresses/find.rb
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -618,6 +619,9 @@ files:
 - app/presenters/spree/variant_presenter.rb
 - app/presenters/spree/variants/option_types_presenter.rb
 - app/presenters/spree/variants/options_presenter.rb
+- app/services/spree/account/addresses/base.rb
+- app/services/spree/account/addresses/create.rb
+- app/services/spree/account/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -1085,10 +1089,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.9
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.10
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.9
-post_install_message:
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.10
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1104,7 +1108,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: []