spree_core 4.2.0.rc3 → 4.2.2

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -8,10 +8,13 @@
           <td></td>
           <td>
             <p class="f-fallback purchase_total purchase_total--label">
-              <%= Spree.t(:promotion) %> <%= label %>:
+              <%= Spree.t(:promotion) %>:
+            </p>
+            <p class="f-fallback purchase_total--name purchase_total--label">
+              <%= label %>
             </p>
           </td>
-          <td>
+          <td class="purchase_total-col">
             <p class="f-fallback purchase_total">
               <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
             </p>
@@ -25,10 +28,13 @@
       <td></td>
       <td>
         <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:shipping) %> <%= name %>:
+          <%= Spree.t(:shipping) %>:
+        </p>
+        <p class="f-fallback purchase_total--name purchase_total--label">
+          <%= name %>
         </p>
       </td>
-      <td>
+      <td class="purchase_total-col">
         <p class="f-fallback purchase_total">
           <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
         </p>
@@ -41,10 +47,13 @@
         <td></td>
         <td>
           <p class="f-fallback purchase_total purchase_total--label">
-            <%= Spree.t(:tax) %> <%= label %>:
+            <%= Spree.t(:tax) %>:
+          </p>
+          <p class="f-fallback purchase_total--name purchase_total--label">
+            <%= label %>
           </p>
         </td>
-        <td>
+        <td class="purchase_total-col">
           <p class="f-fallback purchase_total">
             <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
           </p>

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,9 +18,9 @@
     </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 %>
+      <%= line_item.quantity %> x <%= line_item.single_money %><br>
       <%= line_item.display_amount %>
     </span>
   </td>

data/config/locales/en.yml

@@ -663,7 +663,6 @@ en:
       jackets_and_coats: JACKET & COASTS
       new_collection: NEW COLLECTION
       special_offers: SPECIAL OFFERS
-      summer_2019: SUMMER 2019
     channel: Channel
     charged: Charged
     checkout: Checkout
@@ -756,42 +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:
-      am: 'AM'
-      first_day: 0
-      format: ! '%Y/%m/%d'
-      hourAriaLabel: 'Hour'
-      js_format: Y/m/d
-      js_date_time: Y/m/d - H:i
-      minuteAriaLabel: 'Minute'
-      pm: 'PM'
-      rangeSeparator: ' to '
-      scrollTitle: 'Scroll to increment'
-      toggleTitle: 'Click to toggle'
-      weekAbbreviation: 'Wk'
-      yearAriaLabel: 'Year'
-      sun: 'Sun'
-      mon: 'Mon'
-      tue: 'Tue'
-      wed: 'Wed'
-      thu: 'Thu'
-      fri: 'Fri'
-      sat: 'Sat'
-      lh_jan: 'January'
-      lh_feb: 'February'
-      lh_mar: 'March'
-      lh_apr: 'April'
-      lh_may: 'May'
-      lh_jun: 'June'
-      lh_jul: 'July'
-      lh_aug: 'August'
-      lh_sep: 'September'
-      lh_oct: 'October'
-      lh_nov: 'November'
-      lh_dec: 'December'
+      # 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
@@ -926,24 +897,6 @@ en:
     hide_from_subcategories_nav: Hide from subcategories navigation
     home: Home
     home_page: homepage
-    homepage:
-      bestsellers: BESTSELLERS
-      fashion_trends: FASHION TRENDS
-      fashion_trends_note: Want to rock this season’s hottest trend in style? These are the top fashion from Summer 2020 Fashion Weeks that are coming our way this season.
-      men: MEN
-      new: NEW
-      new_collection: NEW COLLECTION
-      read_more: READ MORE
-      shoes: SHOES
-      shop_now: SHOP NOW
-      sportswear: SPORTSWEAR
-      streetstyle: STREETSTYLE
-      summer_2020: Summer 2020
-      summer_collection:  Summer Collection
-      summer_sale: SUMMER SALE
-      trending: TRENDING
-      up_to_60: UP TO 60%
-      women: WOMEN
     help_center: Help Center
     i18n:
       available_locales: Available Locales
@@ -1582,7 +1535,7 @@ en:
     show_only_considered_risky: Only show risky orders
     show_property: Show Property
     show_rate_in_label: Show rate in label
-    show_store_currency_selector:
+    show_store_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
@@ -1660,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"
@@ -1719,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/config/routes.rb

@@ -1,5 +1,6 @@
 Spree::Core::Engine.add_routes do
-  get '/forbidden', to: 'home#forbidden', as: :forbidden
+  get '/forbidden', to: 'errors#forbidden', as: :forbidden
+  get '/unauthorized', to: 'errors#unauthorized', as: :unauthorized
 end
 
 Spree::Core::Engine.draw_routes

data/db/default/spree/stores.rb

@@ -11,6 +11,7 @@ else
     s.customer_support_email       = 'support@example.com'
     s.default_currency             = 'USD'
     s.default_country_id           = Spree::Config[:default_country_id]
+    s.default_locale               = I18n.locale
     s.seo_title                    = 'Spree Commerce Demo Shop'
     s.meta_description             = 'This is the new Spree UX DEMO | OVERVIEW: http://bit.ly/new-spree-ux | DOCS: http://bit.ly/spree-ux-customization-docs | CONTACT: https://spreecommerce.org/contact/'
     s.facebook                     = 'spreecommerce'

data/db/default/spree/zones.rb

@@ -1,13 +1,16 @@
 eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
+uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
 north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
 south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
 middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
 asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
 
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).each do |name|
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR).each do |name|
   eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
 
+uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
+
 %w(US CA).each do |name|
   north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end

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/20210120142527_ensure_default_locale_in_spree_stores.rb

@@ -0,0 +1,5 @@
+class EnsureDefaultLocaleInSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    Spree::Store.where(default_locale: nil).update_all(default_locale: I18n.locale)
+  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.rb

@@ -105,4 +105,5 @@ require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/controller_helpers/currency_helpers'
+require 'spree/core/controller_helpers/locale'
+require 'spree/core/controller_helpers/currency'

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

@@ -76,7 +76,9 @@ module Spree
             redirect_to spree.forbidden_path
           else
             store_location
-            if respond_to?(:spree_login_path)
+            if request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
+              redirect_to spree.admin_login_path
+            elsif respond_to?(:spree_login_path)
               redirect_to spree_login_path
             elsif spree.respond_to?(:root_path)
               redirect_to spree.root_path

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

@@ -10,8 +10,6 @@ module Spree
 
           layout :get_layout
 
-          before_action :set_user_language
-
           protected
 
           # can be used in views as well as controllers.
@@ -43,12 +41,12 @@ module Spree
           private
 
           def set_user_language
-            locale = session[:locale]
-            locale = store_locale if respond_to?(:store_locale, true) && locale.blank?
-            locale = config_locale if respond_to?(:config_locale, true) && locale.blank?
-            locale = Rails.application.config.i18n.default_locale if locale.blank?
-            locale = I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale.to_s)
-            I18n.locale = locale
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common#set_user_language is deprecated and will be removed in Spree 5.0.
+              Please use `before_action :set_locale` instead
+            DEPRECATION
+
+            set_locale
           end
 
           # Returns which layout to render.

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

@@ -0,0 +1,54 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Currency
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :supported_currencies
+          helper_method :supported_currencies_for_all_stores
+          helper_method :current_currency
+          helper_method :supported_currency?
+          helper_method :currency_param
+        end
+
+        def current_currency
+          @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
+                                  session[:currency]
+                                elsif params[:currency].present? && supported_currency?(params[:currency])
+                                  params[:currency]
+                                elsif current_store.present?
+                                  current_store.default_currency
+                                else
+                                  Spree::Config[:currency]
+                                end&.upcase
+        end
+
+        def supported_currencies
+          @supported_currencies ||= current_store&.supported_currencies_list
+        end
+
+        def supported_currencies_for_all_stores
+          @supported_currencies_for_all_stores ||= begin
+            (
+              Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
+            ).
+              compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
+          end
+        end
+
+        def supported_currency?(currency_iso_code)
+          return false if supported_currencies.nil?
+
+          supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
+        end
+
+        def currency_param
+          return if current_currency == current_store.default_currency
+
+          current_currency
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Locale
+        extend ActiveSupport::Concern
+
+        included do
+          before_action :set_locale
+
+          helper_method :supported_locales
+          helper_method :supported_locales_for_all_stores
+          helper_method :current_locale
+          helper_method :supported_locale?
+          helper_method :available_locales
+          helper_method :locale_param
+        end
+
+        def set_locale
+          I18n.locale = current_locale
+        end
+
+        def current_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
+                              end
+        end
+
+        def supported_locales
+          @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 ||= 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
+end