spree_core 4.2.0.rc1 → 4.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aaaa7166983682cd10080012ae8c4b54c89808552125eed36bce0345c2ed023
-  data.tar.gz: b330046bd7a2af73be37cfedc5bae1a591c22e0344d62d1672d5ba84d0cf6f84
+  metadata.gz: 3c4aedf602c42650159969df6a8bc7f450fd1c68f6d93d2a40ff8635f691b5be
+  data.tar.gz: 41c8433179fb96ecb5ea01dd0b7f35cf600652531f8bdebdb837e24977cf795f
 SHA512:
-  metadata.gz: f2faa906d370fd03cb6e477b00e9e52c5a658e051df9cf02d6f19a62f1480a99785e038e3ade796c92b2a8dc1cec4c820602e68dcc3615142c9cfe1a191f33bb
-  data.tar.gz: 578828b9e6649880bfd6f1029adc1f0b5563ef5c68cda14d5ff1e3237ccc057953f0b30c4cad0984eff273417701c5303f6efe6ef3f13b19dd4cec4bc67358e2
+  metadata.gz: 5f3c60e7a972db6b1a2747b06485210904a431959eda4bdf5e9b0948207b5352bbff1b9fca5c414ac68b03d872301fb8aaffdbb1aef8b61777c51c5fa927b0c1
+  data.tar.gz: 15fa837cab8e2f12a409ff45432206e01f3d54211545b52c3ae26c0291baa2ee40cd8f49edaccdb9d6914411b8bacff269abc91993968741b959d555b8bdab30

data/app/helpers/spree/base_helper.rb

@@ -1,7 +1,7 @@
 module Spree
   module BaseHelper
     def available_countries
-      checkout_zone = Spree::Zone.find_by(name: Spree::Config[:checkout_zone])
+      checkout_zone = current_store.checkout_zone || Spree::Zone.default_checkout_zone
 
       countries = if checkout_zone && checkout_zone.kind == 'country'
                     checkout_zone.country_list
@@ -212,7 +212,7 @@ module Spree
     def meta_robots
       return unless current_store.respond_to?(:seo_robots)
       return if current_store.seo_robots.blank?
-      
+
       tag('meta', name: 'robots', content: current_store.seo_robots)
     end
   end

data/app/models/spree/adjustment.rb

@@ -27,6 +27,7 @@ module Spree
       belongs_to :source
     end
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :all_adjustments
+    belongs_to :promotion_action, class_name: 'Spree::PromotionAction', foreign_key: :source_id, optional: true # created only for has_free_shipping?
 
     validates :adjustable, :order, :label, presence: true
     validates :amount, numericality: true

data/app/models/spree/app_configuration.rb

@@ -69,8 +69,7 @@ module Spree
     preference :credit_to_new_allocation, :boolean, default: false
 
     # Multi currency configurations
-    preference :allow_currency_change,  :boolean, default: false
-    preference :show_currency_selector, :boolean, default: false
+    preference :show_store_currency_selector, :boolean, default: false
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/line_item.rb

@@ -57,7 +57,7 @@ module Spree
     end
 
     def update_price
-      if Spree::Config.allow_currency_change == true
+      if Spree::Config.show_store_currency_selector == true
         currency_price = Spree::Price.where(
           currency: order.currency,
           variant_id: variant_id

data/app/models/spree/log_entry.rb

@@ -11,7 +11,7 @@ module Spree
     end
 
     def parsed_details
-      @details ||= YAML.load(details)
+      @details ||= YAML.safe_load(details, [ActiveMerchant::Billing::Response])
     end
   end
 end

data/app/models/spree/option_type.rb

@@ -19,6 +19,8 @@ module Spree
 
     default_scope { order(:position) }
 
+    scope :filterable, -> { where(filterable: true) }
+
     accepts_nested_attributes_for :option_values, reject_if: ->(ov) { ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
 
     after_touch :touch_all_products

data/app/models/spree/order.rb

@@ -649,10 +649,10 @@ module Spree
     end
 
     def has_free_shipping?
-      promotions.
-        joins(:promotion_actions).
-        where(spree_promotion_actions: { type: 'Spree::Promotion::Actions::FreeShipping' }).
-        exists?
+      shipment_adjustments.
+        joins(:promotion_action).
+        where(spree_adjustments: { eligible: true, source_type: 'Spree::PromotionAction' },
+              spree_promotion_actions: { type: 'Spree::Promotion::Actions::FreeShipping' }).exists?
     end
 
     private

data/app/models/spree/order/address_book.rb

@@ -55,31 +55,18 @@ module Spree
       def update_or_create_address(attributes = {})
         return if attributes.blank?
 
-        attributes = attributes.select { |_k, v| v.present? }
+        attributes.transform_values! { |v| v == '' ? nil : v }
 
-        if user
-          address = user.addresses.build(attributes.except(:id)).check
-          return address if address.id
-        end
-
-        if attributes[:id]
-          address = Spree::Address.find(attributes[:id])
-          attributes.delete(:id)
+        default_address_scope = user ? user.addresses : ::Spree::Address
+        default_address = default_address_scope.find_by(id: attributes[:id])
 
-          if address&.editable?
-            address.update(attributes)
-            return address
-          else
-            attributes.delete(:id)
-          end
-        end
+        if default_address&.editable?
+          default_address.update(attributes)
 
-        unless attributes[:id]
-          address = Spree::Address.new(attributes)
-          address.save
+          return default_address
         end
 
-        address
+        ::Spree::Address.find_or_create_by(attributes.except(:id, :updated_at, :created_at))
       end
     end
   end

data/app/models/spree/promotion.rb

@@ -194,21 +194,10 @@ module Spree
     end
 
     def used_by?(user, excluded_orders = [])
-      [
-        :adjustments,
-        :line_item_adjustments,
-        :shipment_adjustments
-      ].any? do |adjustment_type|
-        user.orders.complete.joins(adjustment_type).where(
-          spree_adjustments: {
-            source_type: 'Spree::PromotionAction',
-            source_id: actions.map(&:id),
-            eligible: true
-          }
-        ).where.not(
-          id: excluded_orders.map(&:id)
-        ).any?
-      end
+      user.orders.complete.joins(:promotions).joins(:all_adjustments).
+        where.not(spree_orders: { id: excluded_orders.map(&:id) }).
+        where(spree_promotions: { id: id }).
+        where(spree_adjustments: { source_type: 'Spree::PromotionAction', eligible: true }).any?
     end
 
     private

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,7 +25,6 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
-
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
           order.order_promotions.where(promotion_id: promotion.id).destroy_all
@@ -76,7 +75,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/store.rb

@@ -3,6 +3,7 @@ module Spree
     has_many :orders, class_name: 'Spree::Order'
     has_many :payment_methods, class_name: 'Spree::PaymentMethod'
     belongs_to :default_country, class_name: 'Spree::Country'
+    belongs_to :checkout_zone, class_name: 'Spree::Zone'
 
     with_options presence: true do
       validates :name, :url, :mail_from_address, :default_currency, :code
@@ -46,6 +47,10 @@ module Spree
       end.uniq.compact
     end
 
+    def unique_name
+      "#{name} (#{code})"
+    end
+
     private
 
     def ensure_default_exists_and_is_unique

data/app/models/spree/zone.rb

@@ -70,6 +70,10 @@ module Spree
       matches.first
     end
 
+    def self.default_checkout_zone
+      find_by(name: Spree::Config[:checkout_zone])
+    end
+
     def kind
       if self[:kind].present?
         self[:kind]

data/config/locales/en.yml

@@ -52,6 +52,7 @@ en:
       spree/option_type:
         name: Name
         presentation: Presentation
+        filterable: Filterable
       spree/order:
         checkout_complete: Checkout Complete
         completed_at: Completed At
@@ -574,9 +575,6 @@ en:
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
     all: All
-    allow_currency_change:
-      short: Allow Currency Change
-      long: Allow users to change their currency via the currency picker.
     all_adjustments_closed: All adjustments successfully closed!
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
@@ -889,6 +887,7 @@ en:
     filename: Filename
     fill_in_customer_info: Please fill in customer info
     filter: Filter
+    filterable: Filterable
     filter_results: Filter Results
     finalize: Finalize
     find_a_taxon: Find a Taxon
@@ -959,6 +958,8 @@ en:
       supported_locales: Supported Locales
       this_file_language: English (US)
       translations: Translations
+      checkout_zone_warning_html: "Selecting a Zone will limit customers on Checkout to Addresses in Countries in that Zone. <br />
+      Please see documentation: <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones</a>"
     icon: Icon
     image: Image
     images: Images
@@ -1570,15 +1571,15 @@ en:
     shopping_cart: Shopping Cart
     show: Show
     show_active: Show Active
-    show_currency_selector:
-      short: Show Currency Selector
-      long_html: Display the currency picker in the main nav bar. This will only display if there are multiple supported currencies, and <strong>Allow currency change</strong> option is enabled.
     show_deleted: Show Deleted
     show_discontinued: Show Discontinued
     show_only_complete_orders: Only show complete orders
     show_only_considered_risky: Only show risky orders
     show_property: Show Property
     show_rate_in_label: Show rate in label
+    show_store_currency_selector:
+      short: Show Store selector
+      long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
     sign_up: Sign Up
     sku: SKU
     skus: SKUs
@@ -1811,3 +1812,4 @@ en:
     zipcode_required: Zip Code Required
     zone: Zone
     zones: Zones
+    no_limits_zone: No Limits

data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb

@@ -0,0 +1,12 @@
+class AddCheckoutZoneFieldToStore < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :checkout_zone_id)
+      add_column :spree_stores, :checkout_zone_id, :integer
+
+      Spree::Store.reset_column_information
+
+      default_zone = Spree::Zone.default_checkout_zone
+      Spree::Store.update_all(checkout_zone_id: default_zone.id) if default_zone.present?
+    end
+  end
+end

data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb

@@ -0,0 +1,6 @@
+class AddFilterableColumnToSpreeOptionTypes < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_option_types, :filterable, :boolean, default: true, null: false
+    add_index :spree_option_types, :filterable
+  end
+end

data/lib/spree/core/importer/order.rb

@@ -38,7 +38,7 @@ module Spree
             end
           end
           order.reload
-        rescue Exception => e
+        rescue StandardError => e
           order.destroy if order&.persisted?
           raise e.message
         end
@@ -80,7 +80,7 @@ module Spree
 
             adjustments = s.delete(:adjustments_attributes)
             create_adjustments_from_params(adjustments, order, shipment)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import shipments: #{e.message} #{s}"
           end
         end
@@ -115,7 +115,7 @@ module Spree
               line_item.save!
             end
             create_adjustments_from_params(adjustments, order, line_item)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import line items: #{e.message} #{line_item}"
           end
         end
@@ -132,7 +132,7 @@ module Spree
             )
             adjustment.save!
             adjustment.close!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import adjustments: #{e.message} #{a}"
           end
         end
@@ -150,7 +150,7 @@ module Spree
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
             payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import payments: #{e.message} #{p}"
           end
         end
@@ -167,7 +167,7 @@ module Spree
             gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
             imported: true
           )
-        rescue Exception => e
+        rescue StandardError => e
           raise "Order import source payments: #{e.message} #{source_hash}"
         end
 
@@ -179,7 +179,7 @@ module Spree
           hash
         rescue ActiveRecord::RecordNotFound => e
           raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-        rescue Exception => e
+        rescue StandardError => e
           raise "Ensure order import variant: #{e.message} #{hash}"
         end
 
@@ -200,7 +200,7 @@ module Spree
 
             address.delete(:country)
             address[:country_id] = Spree::Country.where(search).first!.id
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address country: #{e.message} #{search}"
           end
         end
@@ -224,7 +224,7 @@ module Spree
             else
               address[:state_name] = search[:name] || search[:abbr]
             end
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address state: #{e.message} #{search}"
           end
         end

data/lib/spree/core/version.rb

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

data/lib/spree/permitted_attributes.rb

@@ -101,7 +101,7 @@ module Spree
                           :customer_support_email, :facebook, :twitter, :instagram,
                           :description, :address, :contact_email, :contact_phone,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo]
+                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

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

@@ -1,4 +1,21 @@
 FactoryBot.define do
+  trait :with_item_total_rule do
+    transient do
+      item_total_threshold_amount { 10 }
+    end
+
+    after(:create) do |promotion, evaluator|
+      rule = Spree::Promotion::Rules::ItemTotal.create!(
+        preferred_operator_min: 'gte',
+        preferred_operator_max: 'lte',
+        preferred_amount_min: evaluator.item_total_threshold_amount,
+        preferred_amount_max: evaluator.item_total_threshold_amount + 100
+      )
+      promotion.rules << rule
+      promotion.save!
+    end
+  end
+
   factory :promotion, class: Spree::Promotion do
     name { 'Promo' }
 
@@ -13,7 +30,16 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
+    trait :with_one_use_per_user_rule do
+      after(:create) do |promotion|
+        rule = Spree::Promotion::Rules::OneUsePerUser.create!
+        promotion.rules << rule
+      end
+    end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
+    factory :promotion_with_one_use_per_user_rule, traits: [:with_line_item_adjustment, :with_one_use_per_user_rule]
 
     trait :with_order_adjustment do
       transient do
@@ -28,24 +54,8 @@ FactoryBot.define do
         promotion.save!
       end
     end
-    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
 
-    trait :with_item_total_rule do
-      transient do
-        item_total_threshold_amount { 10 }
-      end
-
-      after(:create) do |promotion, evaluator|
-        rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator_min: 'gte',
-          preferred_operator_max: 'lte',
-          preferred_amount_min: evaluator.item_total_threshold_amount,
-          preferred_amount_max: evaluator.item_total_threshold_amount + 100
-        )
-        promotion.rules << rule
-        promotion.save!
-      end
-    end
+    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 
@@ -57,5 +67,7 @@ FactoryBot.define do
       action.promotion = promotion
       action.save
     end
+
+    factory :free_shipping_promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :global_zone, class: Spree::Zone do
-    name        { 'GlobalZone' }
+    sequence(:name) { |n| "GlobalZone_#{n}" }
     description { generate(:random_string) }
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }

data/lib/spree/testing_support/i18n.rb

@@ -84,7 +84,7 @@ RSpec.configure do |config|
       end
 
       Spree.check_unused_translations
-      if false && Spree.unused_translation_messages.any?
+      if Spree.unused_translation_messages.any?
         puts "\nThere are unused translations within Spree:"
         puts Spree.unused_translation_messages.sort
         exit(1)

data/spree_core.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
   s.add_dependency 'image_processing', '~> 1.2'
   s.add_dependency 'active_storage_validations', '~> 0.9'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -352,7 +352,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,7 +362,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -976,6 +976,8 @@ files:
 - db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
 - db/migrate/20200610113542_add_label_to_spree_addresses.rb
 - db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
+- db/migrate/20201006110150_add_checkout_zone_field_to_store.rb
+- db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb
 - db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
@@ -1128,9 +1130,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc2
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1146,7 +1148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.