solidus_frontend 2.9.6 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a3b04e427501e6c465c89d3a7a5278be8b999ab29dbbe0af9841df1d1032c8
-  data.tar.gz: f62b17d100120614790bf81f0f0f202f1b55918489b242f8b89cb311406f96a2
+  metadata.gz: 8276f0fe5ca9fe4d4a2d8d327f7d9b5a747564c69a101bf95168f3462e8ce6b3
+  data.tar.gz: c51e8b73de741bc504e151d55a79e3715a37f4bc88a574d4a9c96b6ceae889c4
 SHA512:
-  metadata.gz: 7385f7eb310a92fcb4eaf18b2fd377cf08ee0c863bd806724dd860ad70d99dceadb59807edf6dcd6b8d2608a12e1064f301c912664d44616c235f6ac79e6ec6e
-  data.tar.gz: dda5bfdd5c4c33f6bbdda2692d24a24ec0953686c4ebfec47137451fd830a7a36e884b1577fef5a24f03c0007f95401820c6118ac38e2ed6452215f449d22454
+  metadata.gz: dcc274c38109e0f2bae29bc3820f13d679705b5132657950983e2347bc3d4d5e8c23c7e74a92e0961f21d6a38323b0b367e561a92ee2a06642eebaf1f33ebfaa
+  data.tar.gz: 01366c21ebae0cebdb9e7fbfdd2f1778ea54159ff5f0c627e093c0fcd70cbd49d18d1e4a781c41212cee42e560f0684e74b74efc949a3860e12d21a8e96cf247

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/assets/stylesheets/spree/frontend/screen.css.scss

@@ -963,8 +963,8 @@ p[data-hook="use_billing"] {
   }
 
   input[type="text"] {
-    flex: 3 0;
-    width: 100%;
+    flex: 1 auto;
+    width: 50%;
     margin-right: 5px;
   }
 
@@ -1268,7 +1268,7 @@ table.order-summary {
 // # Logo
 #logo {
   padding: 20px 0;
-  
+
   > a {
     display: inline-block;
   }

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
@@ -149,13 +149,22 @@ module Spree
       redirect_to(spree.cart_path) && return unless @order
     end
 
-    def set_state_if_present
+    # Allow the customer to only go back or stay on the current state
+    # 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 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
@@ -206,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,9 +39,13 @@ 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')
+        redirect_to cart_path
+      end
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
@@ -55,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 => e
-        @order.errors.add(:base, e.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/lib/generators/solidus/views/override_generator.rb

@@ -24,6 +24,7 @@ module Solidus
       def copy_views
         views_to_copy.each do |file|
           next if File.directory?(file)
+
           dest_file = Pathname.new(file).relative_path_from(source_dir)
           copy_file file, Rails.root.join('app', 'views', 'spree', dest_file)
         end
@@ -33,8 +34,8 @@ module Solidus
 
       def views_to_copy
         if @options['only']
-          VIEWS.select do |v|
-            Pathname.new(v).relative_path_from(source_dir).to_s.include?(@options['only'])
+          VIEWS.select do |view|
+            Pathname.new(view).relative_path_from(source_dir).to_s.include?(@options['only'])
           end
         else
           VIEWS

data/lib/spree/frontend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/frontend_configuration'
+
+module Spree
+  module Frontend
+    Config = Spree::FrontendConfiguration.new
+  end
+end

data/lib/spree/frontend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/frontend/config'
+
 module Spree
   module Frontend
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
 
-      initializer "spree.frontend.environment", before: :load_config_initializers do |_app|
-        Spree::Frontend::Config = Spree::FrontendConfiguration.new
-      end
+      # Leave initializer empty for backwards-compatability. Other apps
+      # might still rely on this event.
+      initializer "spree.frontend.environment", before: :load_config_initializers do; end
     end
   end
 end

data/lib/spree/frontend/middleware/seo_assist.rb

@@ -38,11 +38,11 @@ module Spree
         end
 
         def build_query(params)
-          params.map { |k, v|
-            if v.class == Array
-              build_query(v.map { |x| ["#{k}[]", x] })
+          params.map { |key, value|
+            if value.class == Array
+              build_query(value.map { |parameter| ["#{key}[]", parameter] })
             else
-              k + "=" + Rack::Utils.escape(v)
+              key + "=" + Rack::Utils.escape(value)
             end
           }.join("&")
         end

data/{app/models → lib}/spree/frontend_configuration.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class FrontendConfiguration < Preferences::Configuration
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: I18n.default_locale
 
     # Add your terms and conditions in app/views/spree/checkout/_terms_and_conditions.en.html.erb
     preference :require_terms_and_conditions_acceptance, :boolean, default: false

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.2.2'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
+  s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.11.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-10-23 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.9.6
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +218,6 @@ files:
 - app/controllers/spree/taxons_controller.rb
 - app/helpers/spree/orders_helper.rb
 - app/helpers/spree/taxon_filters_helper.rb
-- app/models/spree/frontend_configuration.rb
 - app/views/spree/address/_form.html.erb
 - app/views/spree/address/_form_hidden.html.erb
 - app/views/spree/checkout/_address.html.erb
@@ -264,59 +277,19 @@ files:
 - lib/generators/solidus/views/override_generator.rb
 - lib/solidus_frontend.rb
 - lib/spree/frontend.rb
+- lib/spree/frontend/config.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
+- lib/spree/frontend_configuration.rb
 - 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
@@ -324,16 +297,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
-requirements:
-- none
+requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.
 test_files: []