spree_core 4.2.0.rc5 → 4.2.0

data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb

@@ -5,9 +5,9 @@
       <%= raw(adjustment.label) %>:
     </p>
   </td>
-  <td>
+  <td class="purchase_total-col">
     <p class="f-fallback purchase_total">
       <%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
     </p>
   </td>
-</tr>
+</tr>

data/app/views/spree/shared/purchased_items_table/_line_item.html.erb

@@ -18,7 +18,7 @@
     </strong>
     <p class="purchase_item--additional"><%= raw(line_item.variant.options_text) -%></p>
   </td>
-  <td class="align-right">
+  <td class="align-right" width="30%">
     <span class="f-fallback purchase_item_price">
       <%= line_item.quantity %> x <%= line_item.single_money %><br>
       <%= line_item.display_amount %>

data/config/locales/en.yml

@@ -755,14 +755,14 @@ en:
     new_order_notifications_email: New Order Notifications Email
     cut: Cut
     cvv: CVV
+    no_cc_type: N/A
     cvv_response: CVV Response
     date: Date
     date_completed: Date Completed
     date_picker:
-      first_day: 0
-      format: ! '%Y/%m/%d'
-      js_format: Y/m/d
-      js_date_time: Y/m/d - H:i
+      # FlatPickr human friendly formatting
+      fpr_human_friendly_date_format: M j, Y
+      fpr_human_friendly_date_time_format: M j, Y at H:i
     date_range: Date Range
     default: Default
     default_country_cannot_be_deleted: Default country cannot be deleted
@@ -1613,9 +1613,9 @@ en:
       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.
+      checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.
         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"
+      locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"
       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"
@@ -1672,6 +1672,7 @@ en:
     summary: Summary
     supported_currencies: Supported Currencies
     supported_currencies_long: A comma separated list of supported currencies
+    supported_locales: Supported Locales
     tax: Tax
     tax_included: "Tax (incl.)"
     tax_categories: Tax Categories

data/db/migrate/20191017121054_add_supported_currencies_to_store.rb

@@ -2,6 +2,7 @@ class AddSupportedCurrenciesToStore < ActiveRecord::Migration[6.0]
   def change
     unless column_exists?(:spree_stores, :supported_currencies)
       add_column :spree_stores, :supported_currencies, :string
+      Spree::Store.reset_column_information
       Spree::Store.all.each do |store|
         store.update_attribute(:supported_currencies, store.default_currency)
       end

data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb

@@ -1,6 +1,10 @@
 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
+    unless column_exists?(:spree_option_types, :filterable)
+      add_column :spree_option_types, :filterable, :boolean, default: true, null: false
+    end
+    unless index_exists?(:spree_option_types, :filterable)
+      add_index :spree_option_types, :filterable
+    end
   end
 end

data/db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb

@@ -0,0 +1,11 @@
+class AddSupportedLocalesToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :supported_locales)
+      add_column :spree_stores, :supported_locales, :string
+      Spree::Store.reset_column_information
+      Spree::Store.all.each do |store|
+        store.update_attribute(:supported_locales, store.default_locale)
+      end
+    end
+  end
+end

data/db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb

@@ -0,0 +1,22 @@
+class MigrateSpreeI18nGlobalizeConfig < ActiveRecord::Migration[6.0]
+  def up
+    locales = []
+
+    if defined?(SpreeI18n) && defined?(SpreeI18n::Config)
+      locales = (locales << SpreeI18n::Config[:available_locales]).flatten.uniq.compact
+    end
+
+    if defined?(SpreeGlobalize) && defined?(SpreeGlobalize::Config)
+      locales = (locales << SpreeGlobalize::Config[:supported_locales]).flatten.uniq.compact
+    end
+
+    default_store = Spree::Store.default
+    if default_store.supported_locales.blank? || default_store.supported_locales == default_store.default_locale
+      locales = (locales << default_store.default_locale).uniq.compact.join(',')
+      default_store.update(supported_locales: locales)
+    end
+  end
+
+  def down
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -10,7 +10,8 @@ module Spree
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :copy_storefront, type: :boolean, default: true, banner: 'copy storefront from spree frontend to your application for easy customization'
+    class_option :install_storefront, type: :boolean, default: true, banner: 'installs storefront configuration files'
+    class_option :copy_storefront, type: :boolean, default: false, banner: 'copy all storefront views and stylesheets'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -30,6 +31,7 @@ module Spree
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
+      @install_storefront = options[:install_storefront]
       @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
@@ -40,11 +42,6 @@ module Spree
 
     def add_files
       template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
-
-      if Spree::Core::Engine.frontend_available? || Rails.env.test?
-        template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
-        template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
-      end
     end
 
     def additional_tweaks
@@ -91,6 +88,12 @@ module Spree
       empty_directory 'app/overrides'
     end
 
+    def install_storefront
+      if @install_storefront && Spree::Core::Engine.frontend_available?
+        generate 'spree:frontend:install'
+      end
+    end
+
     def copy_storefront
       if @copy_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:frontend:copy_storefront'

data/lib/spree/core/controller_helpers/currency.rb

@@ -12,19 +12,19 @@ module Spree
         end
 
         def current_currency
-          # session support was previously in SpreeMultiCurrency so we would like
-          # to keep it for now
           @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
                                   session[:currency]
                                 elsif params[:currency].present? && supported_currency?(params[:currency])
                                   params[:currency]
-                                else
+                                elsif current_store.present?
                                   current_store.default_currency
-                                end
+                                else
+                                  Spree::Config[:currency]
+                                end&.upcase
         end
 
         def supported_currencies
-          @supported_currencies ||= current_store.supported_currencies_list
+          @supported_currencies ||= current_store&.supported_currencies_list
         end
 
         def supported_currencies_for_all_stores
@@ -37,7 +37,9 @@ module Spree
         end
 
         def supported_currency?(currency_iso_code)
-          supported_currencies.map(&:iso_code).include?(currency_iso_code)
+          return false if supported_currencies.nil?
+
+          supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
         end
       end
     end

data/lib/spree/core/controller_helpers/locale.rb

@@ -12,6 +12,7 @@ module Spree
           helper_method :current_locale
           helper_method :supported_locale?
           helper_method :available_locales
+          helper_method :locale_param
         end
 
         def set_locale
@@ -19,38 +20,38 @@ module Spree
         end
 
         def current_locale
-          # session support was previously in SpreeI18n so we would like to keep it for now
-          # for easer upgrade
-          @current_locale ||= if defined?(session) && session.key?(:locale) && supported_locale?(session[:locale])
-                                session[:locale]
-                              elsif params[:locale].present? && supported_locale?(params[:locale])
+          @current_locale ||= if params[:locale].present? && supported_locale?(params[:locale])
                                 params[:locale]
                               elsif respond_to?(:config_locale, true) && config_locale.present?
                                 config_locale
                               else
-                                current_store.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
+                                current_store&.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
                               end
         end
 
         def supported_locales
-          @supported_locales ||= current_store.supported_locales_list
+          @supported_locales ||= current_store&.supported_locales_list
         end
 
         def supported_locale?(locale_code)
+          return false if supported_locales.nil?
+
           supported_locales.include?(locale_code&.to_s)
         end
 
         def supported_locales_for_all_stores
-          @supported_locales_for_all_stores ||= (if defined?(SpreeI18n)
-                                                   (SpreeI18n::Locale.all << :en).map(&:to_s)
-                                                 else
-                                                   [Rails.application.config.i18n.default_locale, I18n.locale, :en]
-                                                 end).uniq.compact
+          @supported_locales_for_all_stores ||= Spree.available_locales
         end
 
         def available_locales
           Spree::Store.available_locales
         end
+
+        def locale_param
+          return if I18n.locale.to_s == current_store.default_locale || current_store.default_locale.nil?
+
+          I18n.locale.to_s
+        end
       end
     end
   end

data/lib/spree/core/controller_helpers/search.rb

@@ -5,7 +5,7 @@ module Spree
         def build_searcher(params)
           Spree::Config.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
-            searcher.current_currency = current_currency
+            searcher.current_currency = current_currency&.upcase
           end
         end
       end

data/lib/spree/core/version.rb

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

data/lib/spree/i18n.rb

@@ -16,6 +16,18 @@ module Spree
       TranslationHelperWrapper.new.translate(key, **options)
     end
 
+    def available_locales
+      locales_from_i18n = I18n.available_locales
+      locales =
+        if defined?(SpreeI18n)
+          (SpreeI18n::Locale.all << :en).map(&:to_s)
+        else
+          [Rails.application.config.i18n.default_locale, I18n.locale, :en]
+        end
+
+      (locales + locales_from_i18n).uniq.compact
+    end
+
     alias t translate
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -99,7 +99,7 @@ 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_phone,
+                          :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
                           :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 

data/lib/spree/service_module.rb

@@ -1,8 +1,8 @@
 module Spree
   module ServiceModule
     module Callable
-      def call(*args)
-        new.call(*args).tap do |result|
+      def call(*args, **kwargs)
+        new.call(*args, **kwargs).tap do |result|
           return yield(result) if block_given?
         end
       end

data/lib/spree/testing_support/common_rake.rb

@@ -15,7 +15,7 @@ namespace :common do
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', '--install_storefront=false', "--user_class=#{args[:user_class]}"]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")

data/lib/spree/testing_support/controller_requests.rb

@@ -9,7 +9,7 @@ module Spree
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
           Please use get, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'GET')
@@ -18,7 +18,7 @@ module Spree
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
           Please use post, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'POST')
@@ -27,7 +27,7 @@ module Spree
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
           Please use put, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PUT')
@@ -36,7 +36,7 @@ module Spree
       # # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
           Please use patch, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PATCH')
@@ -45,7 +45,7 @@ module Spree
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
           Please use delete, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'DELETE')
@@ -53,35 +53,35 @@ module Spree
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
 
       def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :patch)
       end
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)
       end

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

@@ -8,6 +8,7 @@ FactoryBot.define do
     new_order_notifications_email { 'store-owner@example.com' }
     default_currency       { 'USD' }
     supported_currencies   { 'USD,EUR,GBP' }
+    default_locale         { 'en' }
     facebook               { 'spreecommerce' }
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }

data/lib/spree/testing_support/flatpickr_capybara.rb

@@ -0,0 +1,101 @@
+module Spree
+  module TestingSupport
+    module FlatpickrCapybara
+      def fill_in_date_manually(label_text, with:)
+        with_open_flatpickr(label_text) do |field|
+          fill_in field[:id], with: with
+        end
+      end
+
+      def fill_in_date_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+        end
+      end
+
+      def fill_in_date_time_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+
+          within_flatpickr_time do
+            select_flatpickr_hour(with.split('-')[3])
+
+            select_flatpickr_min(with.split('-')[4])
+          end
+        end
+      end
+
+      def fill_in_date_with_js(label_text, with:)
+        date_field = find("input[id='#{label_text}']")
+        script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"
+
+        page.execute_script(script)
+      end
+
+      private
+
+      def with_open_flatpickr(label_text)
+        field_label = find_field(id: label_text, type: :hidden)
+
+        date_field = field_label.sibling('.flatpickr-alt-input')
+        date_field.click # Open the widget
+
+        yield(date_field)
+
+        date_field.send_keys :tab # Close the date picker widget
+      end
+
+      def within_open_flatpickr(label_text)
+        with_open_flatpickr(label_text) do
+          within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }
+        end
+      end
+
+      def within_flatpickr_months
+        within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }
+      end
+
+      def within_flatpickr_time
+        within find('.flatpickr-time') { yield }
+      end
+
+      def select_flatpickr_month(month)
+        find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option
+      end
+
+      def fill_in_flatpickr_year(year)
+        find('input.cur-year').set(year)
+      end
+
+      def click_on_flatpickr_day(day)
+        within_flatpickr_days do
+          find('span', text: day).click
+        end
+      end
+
+      def within_flatpickr_days
+        within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }
+      end
+
+      def select_flatpickr_hour(hour)
+        find('input.flatpickr-hour').set(hour)
+      end
+
+      def select_flatpickr_min(min)
+        find('input.flatpickr-minute').set(min)
+      end
+    end
+  end
+end