solidus_frontend 2.10.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf4a33ae63ea7b75b77ef676f7e2faf8af4785b3206d7f91749f454de16690e2
-  data.tar.gz: a67e00d14d14999acd5e4c6a89a050e4bff7a5086bad4f76fe345634d8a64cbe
+  metadata.gz: 31ed490105c747f45fdef35a0268b07dafa6e4992e8fabb56fda8efbbe2d761a
+  data.tar.gz: 324b7f28dd19457fb9e7f952cb032326833c0233fdcdfce261daca0cf251d0ce
 SHA512:
-  metadata.gz: 6474eb4097721563dd08ea496e8c05dea9300ebe54f5fe3e0f7c747c5880f07ce1f59585222e0bb74b1fe175d9ce09f7c5825faf3b89dd69699189d2fb2ca493
-  data.tar.gz: c02d5826a5a8b24dec3f415b38d3ddc428e12e400ac13502218e230514ebefb1748053b8b4395b0ba5384edd021d0f1abf4a7130ca5ca1bfda1533fe37d07c5c
+  metadata.gz: 201370e619173d90b41b8a8b10eb547df28687b37e5fb0de8a7f979bd9924b4ce2cf8a5d26f9d1c32c6d10498e3fa5d5af9b7357e856390414e6e7d32aaeaa3e
+  data.tar.gz: 92828ff57e08a7e940024e8381d2bda7085beb738c21204af3e56bc9c427b6a81391f0f570af1aa2f2b34f35dfbd72d16d0c1e8154444a7358a1ee6c00731234

data/app/assets/javascripts/spree/frontend/checkout/address.js

@@ -14,7 +14,7 @@ Spree.ready(function($) {
       if (countryId != null) {
         if (statesByCountry[countryId] == null) {
           $.get(
-            Spree.routes.states_search,
+            Spree.pathFor('api/states'),
             {
               country_id: countryId
             },

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js

@@ -15,7 +15,7 @@ Spree.onCouponCodeApply = function(e) {
   };
   var req = Spree.ajax({
     method: 'POST',
-    url: Spree.routes.apply_coupon_code(Spree.current_order_id),
+    url: Spree.pathFor('api/orders/' + Spree.current_order_id + '/coupon_codes'),
     data: JSON.stringify(data),
     contentType: "application/json"
   });

data/app/controllers/spree/checkout_controller.rb

@@ -8,8 +8,8 @@ module Spree
   class CheckoutController < Spree::StoreController
     before_action :load_order
     around_action :lock_order
-    before_action :set_state_if_present
 
+    before_action :ensure_order_is_not_skipping_states
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed
     before_action :ensure_sufficient_stock_lines
@@ -17,7 +17,7 @@ module Spree
 
     before_action :associate_user
     before_action :check_authorization
-    before_action :apply_coupon_code
+    before_action :apply_coupon_code, only: [:update]
 
     before_action :setup_for_current_state, only: [:edit, :update]
 
@@ -87,11 +87,23 @@ module Spree
     end
 
     def update_params
-      if update_params = massaged_params[:order]
-        update_params.permit(permitted_checkout_attributes)
+      case params[:state].to_sym
+      when :address
+        massaged_params.require(:order).permit(
+          permitted_checkout_address_attributes
+        )
+      when :delivery
+        massaged_params.require(:order).permit(
+          permitted_checkout_delivery_attributes
+        )
+      when :payment
+        massaged_params.require(:order).permit(
+          permitted_checkout_payment_attributes
+        )
       else
-        # We currently allow update requests without any parameters in them.
-        {}
+        massaged_params.fetch(:order, {}).permit(
+          permitted_checkout_confirm_attributes
+        )
       end
     end
 
@@ -141,13 +153,18 @@ module Spree
     # when trying to change it via params[:state]. It's not allowed to
     # jump forward and skip states (unless #skip_state_validation? is
     # truthy).
-    def set_state_if_present
+    def ensure_order_is_not_skipping_states
       if params[:state]
         redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
         @order.state = params[:state]
       end
     end
 
+    def set_state_if_present
+      ensure_order_is_not_skipping_states
+    end
+    deprecate set_state_if_present: :prevent_order_from_skipping_states, deprecator: Spree::Deprecation
+
     def ensure_checkout_allowed
       unless @order.checkout_allowed?
         redirect_to spree.cart_path
@@ -198,9 +215,8 @@ module Spree
       @order.assign_default_user_addresses
       # If the user has a default address, the previous method call takes care
       # of setting that; but if he doesn't, we need to build an empty one here
-      default = { country_id: Spree::Country.default.id }
-      @order.build_bill_address(default) unless @order.bill_address
-      @order.build_ship_address(default) if @order.checkout_steps.include?('delivery') && !@order.ship_address
+      @order.bill_address ||= Spree::Address.build_default
+      @order.ship_address ||= Spree::Address.build_default if @order.checkout_steps.include?('delivery')
     end
 
     def before_delivery

data/app/controllers/spree/orders_controller.rb

@@ -15,7 +15,7 @@ module Spree
 
     def show
       @order = Spree::Order.find_by!(number: params[:id])
-      authorize! :read, @order, cookies.signed[:guest_token]
+      authorize! :show, @order, cookies.signed[:guest_token]
     end
 
     def update
@@ -39,8 +39,8 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Spree::Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
-      authorize! :read, @order, cookies.signed[:guest_token]
+      @order = current_order(build_order_if_necessary: true)
+      authorize! :edit, @order, cookies.signed[:guest_token]
       associate_user
       if params[:id] && @order.number != params[:id]
         flash[:error] = t('spree.cannot_edit_orders')
@@ -59,12 +59,12 @@ module Spree
       # 2,147,483,647 is crazy. See issue https://github.com/spree/spree/issues/2695.
       if !quantity.between?(1, 2_147_483_647)
         @order.errors.add(:base, t('spree.please_enter_reasonable_quantity'))
-      end
-
-      begin
-        @line_item = @order.contents.add(variant, quantity)
-      rescue ActiveRecord::RecordInvalid => error
-        @order.errors.add(:base, error.record.errors.full_messages.join(", "))
+      else
+        begin
+          @line_item = @order.contents.add(variant, quantity)
+        rescue ActiveRecord::RecordInvalid => error
+          @order.errors.add(:base, error.record.errors.full_messages.join(", "))
+        end
       end
 
       respond_with(@order) do |format|

data/app/controllers/spree/products_controller.rb

@@ -38,7 +38,7 @@ module Spree
 
     def load_product
       if try_spree_current_user.try(:has_spree_role?, "admin")
-        @products = Spree::Product.with_deleted
+        @products = Spree::Product.with_discarded
       else
         @products = Spree::Product.available
       end

data/app/views/spree/address/_form.html.erb

@@ -1,14 +1,21 @@
 <% address_id = address_type.chars.first %>
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <div class="field field-required" id=<%="#{address_id}firstname" %>>
-    <%= form.label :firstname, t('spree.first_name') %>
-    <%= form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name', required: true, autofocus: true %>
-  </div>
+ <% if Spree::Config.use_combined_first_and_last_name_in_address %>
+    <div class="field field-required" id="<%= "#{address_id}name" %>">
+      <%= form.label :name, t('spree.name') %>
+      <%= form.text_field :name, class: 'required', autocomplete: address_type + ' name', required: true, autofocus: true %>
+    </div>
+  <% else %>
+    <div class="field field-required" id="<%= "#{address_id}firstname" %>">
+      <%= form.label :firstname, t('spree.first_name') %>
+      <%= form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name', required: true, autofocus: true %>
+    </div>
 
-  <div class="field" id=<%="#{address_id}lastname" %>>
-    <%= form.label :lastname, t('spree.last_name') %>
-    <%= form.text_field :lastname, autocomplete: address_type + ' family-name' %>
-  </div>
+    <div class="field" id="<%= "#{address_id}lastname" %>">
+      <%= form.label :lastname, t('spree.last_name') %>
+      <%= form.text_field :lastname, autocomplete: address_type + ' family-name' %>
+    </div>
+  <% end %>
 
   <% if Spree::Config[:company] %>
     <div class="field" id=<%="#{address_id}company" %>>

data/app/views/spree/address/_form_hidden.html.erb

@@ -1,5 +1,9 @@
-<%= form.hidden_field :firstname %>
-<%= form.hidden_field :lastname %>
+<% if Spree::Config.use_combined_first_and_last_name_in_address %>
+  <%= form.hidden_field :name %>
+<% else %>
+  <%= form.hidden_field :firstname %>
+  <%= form.hidden_field :lastname %>
+<% end %>
 <%= form.hidden_field :company %>
 <%= form.hidden_field :address1 %>
 <%= form.hidden_field :address2 %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -3,7 +3,7 @@
 
 <div class="field field-required card_name" data-hook="card_name">
   <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %>
-  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name", class: 'cardName' } %>
+  <%= text_field_tag "#{param_prefix}[name]", @order.billing_name, { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name", class: 'cardName' } %>
 </div>
 
 <div class="field field-required card_number" data-hook="card_number">

data/app/views/spree/orders/_form.html.erb

@@ -13,7 +13,7 @@
   <tbody id="line_items" data-hook>
     <%= render partial: 'spree/orders/line_item', collection: order.line_items, locals: { order_form: order_form } %>
   </tbody>
-  <% if order.adjustments.nonzero.exists? || order.line_item_adjustments.nonzero.exists? || order.shipment_adjustments.nonzero.exists? || order.shipments.any? %>
+  <% if order.all_adjustments.nonzero.any? || order.shipments.any? %>
     <tr class="cart-subtotal">
       <td colspan="4" align='right'><h5><%= t('spree.cart_subtotal', count: order.line_items.sum(:quantity)) %></h5></td>
       <td colspan><h5><%= order.display_item_total %></h5></td>

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

@@ -1,5 +1,5 @@
 <div class="address vcard">
-  <div class="fn"><%= address.full_name %></div>
+  <div class="fn"><%= address.name %></div>
   <% unless address.company.blank? %>
     <div class="org">
       <%= address.company %>

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

@@ -1,11 +1,12 @@
 <% size ||= :mini %>
 <% itemprop ||= nil %>
+<% options ||= {} %>
 
 <% if image_url = image.try(:url, size)  %>
   <% if image_alt = image.try(:alt) %>
-    <%= image_tag image_url, alt: image_alt, itemprop: itemprop %>
+    <%= image_tag image_url, { alt: image_alt, itemprop: itemprop }.merge(options) %>
   <% else %>
-    <%= image_tag image_url, itemprop: itemprop %>
+    <%= image_tag image_url, { itemprop: itemprop }.merge(options) %>
   <% end %>
 <% else %>
   <span class="image-placeholder <%= size %>"></span>

data/solidus_frontend.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |s|
 
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io/'
+  s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(spec|script)/})
+  end
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -284,54 +284,12 @@ files:
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.rake
-- script/rails
 - solidus_frontend.gemspec
-- spec/controllers/controller_helpers_spec.rb
-- spec/controllers/locale_controller_spec.rb
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/checkout_controller_with_views_spec.rb
-- spec/controllers/spree/content_controller_spec.rb
-- spec/controllers/spree/current_order_tracking_spec.rb
-- spec/controllers/spree/home_controller_spec.rb
-- spec/controllers/spree/orders_controller_ability_spec.rb
-- spec/controllers/spree/orders_controller_spec.rb
-- spec/controllers/spree/orders_controller_transitions_spec.rb
-- spec/controllers/spree/products_controller_spec.rb
-- spec/controllers/spree/taxons_controller_spec.rb
-- spec/features/address_spec.rb
-- spec/features/automatic_promotion_adjustments_spec.rb
-- spec/features/caching/products_spec.rb
-- spec/features/caching/taxons_spec.rb
-- spec/features/cart_spec.rb
-- spec/features/checkout_confirm_insufficient_stock_spec.rb
-- spec/features/checkout_spec.rb
-- spec/features/checkout_unshippable_spec.rb
-- spec/features/coupon_code_spec.rb
-- spec/features/currency_spec.rb
-- spec/features/first_order_promotion_spec.rb
-- spec/features/free_shipping_promotions_spec.rb
-- spec/features/locale_spec.rb
-- spec/features/order_spec.rb
-- spec/features/products_spec.rb
-- spec/features/promotion_code_invalidation_spec.rb
-- spec/features/quantity_promotions_spec.rb
-- spec/features/taxons_spec.rb
-- spec/features/template_rendering_spec.rb
-- spec/fixtures/thinking-cat.jpg
-- spec/generators/solidus/views/override_generator_spec.rb
-- spec/helpers/base_helper_spec.rb
-- spec/helpers/order_helper_spec.rb
-- spec/helpers/taxon_filters_helper_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_contexts/checkout_setup.rb
-- spec/support/shared_contexts/custom_products.rb
-- spec/support/shared_contexts/locales.rb
-- spec/views/spree/checkout/_summary_spec.rb
-homepage: http://solidus.io/
+homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,16 +297,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
-requirements:
-- none
-rubygems_version: 3.0.3
-signing_key: 
+requirements: []
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.
 test_files: []

data/script/rails

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/spree/frontend/engine', __dir__)
-
-require 'rails/all'
-require 'rails/engine/commands'

data/spec/controllers/controller_helpers_spec.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-# In this file, we want to test that the controller helpers function correctly
-# So we need to use one of the controllers inside Spree.
-# ProductsController is good.
-describe Spree::ProductsController, type: :controller do
-  before do
-    I18n.enforce_available_locales = false
-    stub_spree_preferences(Spree::Frontend::Config, locale: :de)
-    I18n.backend.store_translations(:de, spree: {
-      i18n: { this_file_language: "Deutsch (DE)" }
-    })
-  end
-
-  after do
-    I18n.reload!
-    I18n.locale = :en
-    I18n.enforce_available_locales = true
-  end
-
-  # Regression test for https://github.com/spree/spree/issues/1184
-  it "sets the default locale based off Spree::Frontend::Config[:locale]" do
-    expect(I18n.locale).to eq(:en)
-    get :index
-    expect(I18n.locale).to eq(:de)
-  end
-end

data/spec/controllers/locale_controller_spec.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Spree::LocaleController, type: :controller do
-  include_context "fr locale"
-
-  context 'switch_to_locale specified' do
-    context "available locale" do
-      it 'sets locale and redirects' do
-        get :set, params: { switch_to_locale: 'fr' }
-        expect(I18n.locale).to eq :fr
-        expect(response).to redirect_to('/')
-        expect(session[:locale]).to eq('fr')
-        expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
-      end
-    end
-
-    context "unavailable locale" do
-      it 'does not change locale and redirects' do
-        get :set, params: { switch_to_locale: 'klingon' }
-        expect(I18n.locale).to eq :en
-        expect(response).to redirect_to('/')
-        expect(flash[:error]).to eq(I18n.t("spree.locale_not_changed"))
-      end
-    end
-  end
-
-  context 'locale specified' do
-    context "available locale" do
-      it 'sets locale and redirects' do
-        get :set, params: { locale: 'fr' }
-        expect(I18n.locale).to eq :fr
-        expect(response).to redirect_to('/')
-        expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
-      end
-    end
-
-    context "unavailable locale" do
-      it 'does not change locale and redirects' do
-        get :set, params: { locale: 'klingon' }
-        expect(I18n.locale).to eq :en
-        expect(response).to redirect_to('/')
-        expect(flash[:error]).to eq(I18n.t("spree.locale_not_changed"))
-      end
-    end
-  end
-
-  context 'both locale and switch_to_locale specified' do
-    it 'uses switch_to_locale value' do
-      get :set, params: { locale: 'en', switch_to_locale: 'fr' }
-      expect(I18n.locale).to eq :fr
-      expect(response).to redirect_to('/')
-      expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
-    end
-  end
-end