spree_core 4.2.0.rc2 → 4.2.0.rc3

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

@@ -1,42 +1,6 @@
 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
+    class Sort < ::Spree::BaseSorter
     end
   end
 end

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

@@ -1,53 +1,30 @@
 module Spree
   module Products
-    class Sort
-      def initialize(scope, params, current_currency)
-        @scope    = scope
-        @sort     = params[:sort]
+    class Sort < ::Spree::BaseSorter
+      def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])
+        super(scope, params, allowed_sort_attributes)
         @currency = params[:currency] || current_currency
       end
 
       def call
-        products = updated_at(scope)
-        products = price(products)
+        products = by_param_attribute(scope)
+        products = by_price(products)
 
         products.distinct
       end
 
       private
 
-      attr_reader :sort, :scope, :currency
-
-      def desc_order
-        @desc_order ||= String(sort)[0] == '-'
-      end
-
-      def sort_field
-        @sort_field ||= desc_order ? sort[1..-1] : sort
-      end
-
-      def updated_at?
-        sort_field == 'updated_at'
-      end
+      attr_reader :sort, :scope, :currency, :allowed_sort_attributes
 
       def price?
         sort_field == 'price'
       end
 
-      def order_direction
-        desc_order ? :desc : :asc
-      end
-
-      def updated_at(products)
-        return products unless updated_at?
-
-        products.order(updated_at: order_direction)
-      end
-
-      def price(products)
-        return products unless price?
+      def by_price(scope)
+        return scope unless price?
 
-        products.joins(master: :prices).
+        scope.joins(master: :prices).
           select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
           distinct.
           where(spree_prices: { currency: currency }).

data/app/validators/email_validator.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /\A[^@\s]+@[^@\s]+\z/
-      record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+      record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
     end
   end
 end

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'RMA'
+end

data/config/initializers/rails61_fixes.rb

@@ -0,0 +1,3 @@
+if Rails::VERSION::STRING >= '6.1'
+  ActiveRecord::Base.has_many_inversing = false
+end

data/config/locales/en.yml

@@ -6,7 +6,7 @@ en:
           attributes:
             desired_shipment:
               can_not_transfer_within_same_shipment: can not be same as current shipment
-              not_enough_stock_at_desired_location: not enough stock in desired stock location
+              has_not_enough_stock_at_desired_location: has not enough stock in desired stock location
             current_shipment:
               has_already_been_shipped: has already been shipped
               can_not_have_backordered_inventory_units: has backordered inventory units
@@ -142,7 +142,8 @@ en:
         url: Site URL
         meta_description: Meta Description
         meta_keywords: Meta Keywords
-        seo_title: Seo Title
+        seo_robots: SEO Robots
+        seo_title: SEO Title
         name: Site Name
         mail_from_address: Mail From Address
       spree/store_credit:
@@ -695,7 +696,6 @@ en:
     confirm: Confirm
     confirm_delete: Confirm Deletion
     confirm_password: Password Confirmation
-    contact_email: Contact email
     contact_phone: Contact phone
     contact_us: Contact us
     continue: Continue
@@ -850,6 +850,7 @@ en:
         blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
+        cannot_remove_icon: Cannot remove image
       services:
         get_shipping_rates:
           no_shipping_address: To generate Shipping Rates Order needs to have a Shipping Address
@@ -900,7 +901,7 @@ en:
     flat_rate_per_order: Flat Rate
     flexible_rate: Flexible Rate
     follow_us: Follow us
-    footer_info: Footer info
+    footer: Footer
     forgot_password: Forgot password?
     free: Free
     free_shipping: Free Shipping
@@ -958,8 +959,6 @@ 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
@@ -1131,6 +1130,7 @@ en:
     no_available_date_set: No available date set
     no_country: No country set
     no_payment_found: No payment found
+    no_payment_provider_settings_message: This payment provider has no custom settings available
     no_pending_payments: No pending payments
     no_product_available:
       for_this_quantity: Sorry, it looks like some products are not available in selected quantity.
@@ -1153,6 +1153,7 @@ en:
     not_found: ! '%{resource} is not found'
     note: Note
     notice_messages:
+      icon_removed: Image has been successfully removed
       prices_saved: Prices successfully saved
       product_cloned: Product has been cloned
       product_deleted: Product has been deleted
@@ -1253,6 +1254,7 @@ en:
     payment_processing_failed: Payment could not be processed, please check the details you entered
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
+    payment_provider_settings: Payment Provider Settings
     payment_state: Payment State
     payment_states:
       balance_due: balance due
@@ -1437,6 +1439,7 @@ en:
     rejected: Rejected
     remember_me: Remember me
     remove: Remove
+    remove_image: Remove Image
     rename: Rename
     report: Report
     reports: Reports
@@ -1512,12 +1515,14 @@ en:
     select_a_return_authorization_reason: Select a reason for the return authorization
     select_a_stock_location: Select a stock location
     select_a_store_credit_reason: Select a reason for the store credit
+    select_an_option: Select an option
     select_stock: Select stock
     selected_quantity_not_available: ! 'selected of %{item} is not available.'
-    seo: SEO
     send_copy_of_all_mails_to: Send Copy of All Mails To
     send_mails_as: Send Mails As
-    seo_title: SEO title
+    seo: SEO
+    seo_robots: SEO Robots
+    seo_title: SEO Title
     server: Server
     server_error: The server returned an error
     settings: Settings
@@ -1653,6 +1658,18 @@ en:
       unable_to_create: Unable to create store.
       unable_to_update: Unable to update store.
       unable_to_delete: Unable to delete store.
+    store_form:
+      code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"
+      checkout_zone_help: "Selecting a Zone will limit customers on Checkout to Addresses in Countries or States in that Zone.
+        For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"
+      languages_help: "Install <a href='https://github.com/spree-contrib/spree_i18n target='_blank' class='alert-link'>Spree I18n extension</a> to add more languages"
+      social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"
+      default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"
+      footer_help: "This content is visible in the footer section of your Store"
+      mail_from_address_help: "This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)"
+      customer_support_email_help: "This email is visible to your Store visitors in the Footer section"
+      new_order_notifications_email_help: "If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to"
+      seo_robots: "Please check <a href='https://developers.google.com/search/reference/robots_meta_tag' target='_blank'>this page for more help</a>"
     store_set_default_button: Set as default
     stores: Stores
     store_credit_name: Store Credit

data/db/migrate/20130326175857_add_stock_location_to_rma.rb

@@ -1,4 +1,4 @@
-class AddStockLocationToRma < ActiveRecord::Migration[4.2]
+class AddStockLocationToRMA < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_return_authorizations, :stock_location_id, :integer
   end

data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb

@@ -0,0 +1,5 @@
+class AddDefaultCountryKindToSpreeZones < ActiveRecord::Migration[6.0]
+  def change
+    change_column_default(:spree_zones, :kind, :state)
+  end
+end

data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb

@@ -0,0 +1,5 @@
+class RemoveContactEmailFromSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :spree_stores, :contact_email
+  end
+end

data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb

@@ -0,0 +1,10 @@
+class CreateSpreePaymentMethodsStores < ActiveRecord::Migration[6.0]
+  def change
+    create_table :spree_payment_methods_stores, id: false do |t|
+      t.belongs_to :payment_method
+      t.belongs_to :store
+    end
+
+    add_index :spree_payment_methods_stores, [:payment_method_id, :store_id], unique: true, name: 'payment_mentod_id_store_id_unique_index'
+  end
+end

data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb

@@ -0,0 +1,15 @@
+class MigrateDataPaymentMethodsStores < ActiveRecord::Migration[6.0]
+  def up
+    Spree::PaymentMethod.all.each do |payment_method|
+      next if payment_method.store_ids.any?
+
+      if payment_method[:store_id].present?
+        payment_method.store_ids = payment_method[:store_id]
+      else
+        payment_method.store_ids = Spree::Store.ids
+      end
+
+      payment_method.save
+    end
+  end
+end

data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb

@@ -0,0 +1,5 @@
+class RemoveStoreIdFromSpreePaymentMethods < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :spree_payment_methods, :store_id, :integer
+  end
+end

data/lib/spree/core/product_filters.rb

@@ -68,9 +68,9 @@ module Spree
       def self.price_filter
         v = Spree::Price.arel_table
         conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].between(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].between(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].between(18..20)],
                  [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name: Spree.t(:price_range),

data/lib/spree/core/version.rb

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

data/lib/spree/i18n.rb

@@ -1,35 +1,21 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
-require 'spree/i18n/base'
+require 'action_view'
 
 module Spree
-  extend ActionView::Helpers::TranslationHelper
-  extend ActionView::Helpers::TagHelper
+  class TranslationHelperWrapper
+    include ActionView::Helpers::TranslationHelper
+  end
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(*args)
-      @virtual_path = virtual_path
+    def translate(key, options = {})
+      options[:scope] = [*options[:scope]].unshift(:spree).uniq
 
-      options = args.extract_options!
-      options[:scope] = [*options[:scope]].unshift(:spree)
-      args << options
-      super(*args)
+      TranslationHelperWrapper.new.translate(key, **options)
     end
 
     alias t translate
-
-    def context
-      Spree::ViewContext.context
-    end
-
-    def virtual_path
-      if context
-        path = context.instance_variable_get('@virtual_path')
-
-        path&.gsub(/spree/, '')
-      end
-    end
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -99,9 +99,9 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_email, :contact_phone,
+                          :description, :address, :contact_phone,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id]
+                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/service_module.rb

@@ -47,7 +47,11 @@ module Spree
       def call(input = nil)
         input ||= {}
         @_passed_input = Result.new(true, input)
-        result = super
+        result = if input.is_a?(Hash)
+                   super(**input)
+                 else
+                   super(input)
+                 end
         @_passed_input = result if result.is_a? Result
         enforce_data_format
         @_passed_input
@@ -71,7 +75,7 @@ module Spree
         end
 
         begin
-          @_passed_input = callable.call(@_passed_input.value)
+          @_passed_input = callable.call(**@_passed_input.value)
         rescue ArgumentError => e
           if e.message.include? 'missing'
             raise IncompatibleParamsPassed, "You didn't pass #{e.message} to callable '#{callable.name}'"

data/lib/spree/testing_support/capybara_config.rb

@@ -23,4 +23,4 @@ else
   end
 end
 Capybara.default_max_wait_time = 45
-Capybara.server = :webrick
+Capybara.server = :puma

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

@@ -8,15 +8,13 @@ FactoryBot.define do
 
     after(:create) do |shipment, _evalulator|
       shipment.add_shipping_method(create(:shipping_method), true)
-
-      shipment.order.line_items.each do |line_item|
-        line_item.quantity.times do
-          shipment.inventory_units.create(
-            order_id: shipment.order_id,
-            variant_id: line_item.variant_id,
-            line_item_id: line_item.id
-          )
-        end
+      shipment.order.line_items.map do |line_item|
+        shipment.inventory_units.create(
+          order_id: shipment.order_id,
+          variant_id: line_item.variant_id,
+          line_item_id: line_item.id,
+          quantity: line_item.quantity
+        )
       end
     end
   end

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

@@ -1,24 +1,27 @@
 FactoryBot.define do
-  factory :global_zone, class: Spree::Zone do
-    sequence(:name) { |n| "GlobalZone_#{n}" }
-    description { generate(:random_string) }
-    zone_members do |proxy|
-      zone = proxy.instance_eval { @instance }
-      Spree::Country.all.map do |c|
-        Spree::ZoneMember.create(zoneable: c, zone: zone)
-      end
-    end
-  end
-
   factory :zone, class: Spree::Zone do
     name        { generate(:random_string) }
     description { generate(:random_string) }
 
     factory :zone_with_country do
+      kind { :country }
+
       zone_members do |proxy|
         zone = proxy.instance_eval { @instance }
-        country = create(:country)
-        [Spree::ZoneMember.create(zoneable: country, zone: zone)]
+
+        [Spree::ZoneMember.create(zoneable: create(:country), zone: zone)]
+      end
+
+      factory :global_zone, class: Spree::Zone do
+        sequence(:name) { |n| "GlobalZone_#{n}" }
+
+        zone_members do |proxy|
+          zone = proxy.instance_eval { @instance }
+
+          Spree::Country.all.map do |country|
+            Spree::ZoneMember.where(zoneable: country, zone: zone).first_or_create
+          end
+        end
       end
     end
   end