solidus_frontend 2.11.1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31ed490105c747f45fdef35a0268b07dafa6e4992e8fabb56fda8efbbe2d761a
-  data.tar.gz: 324b7f28dd19457fb9e7f952cb032326833c0233fdcdfce261daca0cf251d0ce
+  metadata.gz: 2f19e01d0dcb84ddcefa852bdaf556965d5a27f5b2b7884f4c435d5fb5e714b6
+  data.tar.gz: f4d3b81886e51d9c1c5567af09579b22e38ea018aed025eb70d7d01575953d5c
 SHA512:
-  metadata.gz: 201370e619173d90b41b8a8b10eb547df28687b37e5fb0de8a7f979bd9924b4ce2cf8a5d26f9d1c32c6d10498e3fa5d5af9b7357e856390414e6e7d32aaeaa3e
-  data.tar.gz: 92828ff57e08a7e940024e8381d2bda7085beb738c21204af3e56bc9c427b6a81391f0f570af1aa2f2b34f35dfbd72d16d0c1e8154444a7358a1ee6c00731234
+  metadata.gz: 4de5d0c59250804c0fb05332c3850e16ad606ffb65d94def29de868917eff33eae33518ee9efed68569cfc23686e3dfc766320e6e7806f63aa60afb14bdb548f
+  data.tar.gz: 0db810a9dc4bd5aa3f04c70480ed1fda41da275d27d3d338ea95659dd99fa45c5ebf5ca2bf779b3a567f3363044e2027d03ab7f34df259a584fdb251758e33e9

data/app/controllers/spree/checkout_controller.rb

@@ -17,7 +17,6 @@ module Spree
 
     before_action :associate_user
     before_action :check_authorization
-    before_action :apply_coupon_code, only: [:update]
 
     before_action :setup_for_current_state, only: [:edit, :update]
 
@@ -111,10 +110,6 @@ module Spree
       massaged_params = params.deep_dup
 
       move_payment_source_into_payments_attributes(massaged_params)
-      if massaged_params[:order] && massaged_params[:order][:existing_card].present?
-        Spree::Deprecation.warn("Passing order[:existing_card] is deprecated. Send order[:wallet_payment_source_id] instead.", caller)
-        move_existing_card_into_payments_attributes(massaged_params) # deprecated
-      end
       move_wallet_payment_source_id_into_payments_attributes(massaged_params)
       set_payment_parameters_amount(massaged_params, @order)
 
@@ -160,11 +155,6 @@ module Spree
       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
@@ -188,24 +178,6 @@ module Spree
       spree.order_path(@order)
     end
 
-    def apply_coupon_code
-      if update_params[:coupon_code].present?
-        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
-        @order.coupon_code = update_params[:coupon_code]
-
-        handler = PromotionHandler::Coupon.new(@order).apply
-
-        if handler.error.present?
-          flash.now[:error] = handler.error
-        elsif handler.success
-          flash[:success] = handler.success
-        end
-
-        setup_for_current_state
-        respond_with(@order) { |format| format.html { render :edit } } && return
-      end
-    end
-
     def setup_for_current_state
       method_name = :"before_#{@order.state}"
       send(method_name) if respond_to?(method_name, true)
@@ -239,14 +211,6 @@ module Spree
         @wallet_payment_sources = try_spree_current_user.wallet.wallet_payment_sources
         @default_wallet_payment_source = @wallet_payment_sources.detect(&:default) ||
                                          @wallet_payment_sources.first
-
-        @payment_sources = Spree::DeprecatedInstanceVariableProxy.new(
-          self,
-          :deprecated_payment_sources,
-          :@payment_sources,
-          Spree::Deprecation,
-          "Please, do not use @payment_sources anymore, use @wallet_payment_sources instead."
-        )
       end
     end
 
@@ -276,22 +240,5 @@ module Spree
         end
       end
     end
-
-    # This method returns payment sources of the current user. It is no more
-    # used into our frontend. We used to assign the content of this method
-    # into an ivar (@payment_sources) into the checkout payment step. This
-    # method is here only to be able to deprecate this ivar and will be removed.
-    #
-    # DO NOT USE THIS METHOD!
-    #
-    # @return [Array<Spree::PaymentSource>] Payment sources connected to
-    #   current user wallet.
-    # @deprecated This method has been added to deprecate @payment_sources
-    #   ivar and will be removed. Use @wallet_payment_sources instead.
-    def deprecated_payment_sources
-      try_spree_current_user.wallet.wallet_payment_sources
-        .map(&:payment_source)
-        .select { |ps| ps.is_a?(Spree::CreditCard) }
-    end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -10,7 +10,6 @@ module Spree
     before_action :assign_order, only: :update
     # note: do not lock the #edit action because that's where we redirect when we fail to acquire a lock
     around_action :lock_order, only: :update
-    before_action :apply_coupon_code, only: :update
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
@@ -123,21 +122,5 @@ module Spree
         redirect_to(root_path) && return
       end
     end
-
-    def apply_coupon_code
-      if order_params[:coupon_code].present?
-        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
-        @order.coupon_code = order_params[:coupon_code]
-
-        handler = PromotionHandler::Coupon.new(@order).apply
-
-        if handler.error.present?
-          flash.now[:error] = handler.error
-          respond_with(@order) { |format| format.html { render :edit } } && return
-        elsif handler.success
-          flash[:success] = handler.success
-        end
-      end
-    end
   end
 end

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

@@ -1,21 +1,9 @@
 <% address_id = address_type.chars.first %>
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
- <% 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>
-  <% end %>
+  <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>
 
   <% if Spree::Config[:company] %>
     <div class="field" id=<%="#{address_id}company" %>>

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

@@ -1,9 +1,4 @@
-<% 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 :name %>
 <%= form.hidden_field :company %>
 <%= form.hidden_field :address1 %>
 <%= form.hidden_field :address2 %>

data/config/initializers/canonical_rails.rb

@@ -12,5 +12,5 @@ CanonicalRails.setup do |config|
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
 
-  config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :page, :search, :taxon]
 end

data/lib/spree/frontend.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require 'rails/all'
+require 'solidus_core'
+require 'solidus_api'
+
 require 'jquery-rails'
 require 'canonical-rails'
 require 'sassc-rails'
@@ -8,8 +10,5 @@ require 'font-awesome-rails'
 require 'responders'
 require 'kaminari'
 
-require 'solidus_core'
-require 'solidus_api'
-
 require 'spree/frontend/middleware/seo_assist'
 require 'spree/frontend/engine'

data/solidus_frontend.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'canonical-rails', '~> 0.2.0'
+  s.add_dependency 'canonical-rails', '~> 0.2.10'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement