spree_frontend 4.2.0.beta → 4.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011aa871d742c968b59dd68ce90f5833e27d2c78173292aadba241054e7bbf89
-  data.tar.gz: e1383ff17f1496fb69ecaa5ce6ad1a60c9f45792cc7cafc106f6c46f66f04b35
+  metadata.gz: e6310325fadb8490372ab3956820adacc3f2863efafc90657479af4154fecf2c
+  data.tar.gz: fc6a855e4f78e5f08dd5e1df605199a1ca3cdef09e7f3e62daf41f532c825f15
 SHA512:
-  metadata.gz: 8409e99f4ed56c23070669d26c81d710a997bcc46067fc6ced9691f3ab6790ceedfc35a91bcf4b5f64afedbb6701e6aca5bcf29638a0781db9e12dfe2863826f
-  data.tar.gz: b51eae7f43fde751a3279f567ad1c4836ced9da3dbd33e6fa4e38d1038b79d262aafc6d878306a3eb9c34c4f8d465b918089acd43d7c6acac02138d0f06e1f58
+  metadata.gz: dad2b913fb4f1ac3ec06fc49586c1918b5a3fe68393b65231ac7f52348b74cd6b9ea083890afa857a85bbe7f94a59dd4a379bc5b4b146a3dd6a3eb6b2b9201f4
+  data.tar.gz: bc89753cb7503a7823d1ac2af023f23bdd1d9a022d8351393967e878845faa8ce8ee6bbc82510278b2454d795cb804c2aa236e9b730b1ce78864f373ab133419

data/app/assets/images/info.svg

@@ -0,0 +1,7 @@
+<svg width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="MiMedia---iOS-Android" serif:id="MiMedia---iOS/Android">
+        <g id="icon32pt_info" fill="currentColor">
+            <path id="Oval-58" d="M50,94C74.301,94 94,74.301 94,50C94,25.699 74.301,6 50,6C25.699,6 6,25.699 6,50C6,74.301 25.699,94 50,94ZM50,86C69.882,86 86,69.882 86,50C86,30.118 69.882,14 50,14C30.118,14 14,30.118 14,50C14,69.882 30.118,86 50,86ZM57,31.013C57,32.671 56.431,34.085 55.286,35.248C54.145,36.417 52.769,37 51.161,37C49.547,37 48.168,36.417 47.013,35.248C45.861,34.085 45.283,32.671 45.283,31.013C45.283,29.359 45.861,27.942 47.013,26.764C48.165,25.586 49.547,25 51.161,25C52.769,25 54.145,25.589 55.286,26.764C56.431,27.942 57,29.359 57,31.013ZM56.427,70.466C54.71,71.292 53.336,71.919 52.314,72.352C51.291,72.785 50.101,73 48.746,73C46.666,73 45.047,72.381 43.892,71.149C42.738,69.913 42.161,68.345 42.161,66.445C42.161,65.709 42.203,64.952 42.29,64.181C42.377,63.41 42.516,62.539 42.707,61.567L44.856,52.321C45.047,51.436 45.21,50.596 45.339,49.802C45.471,49.014 45.535,48.289 45.535,47.635C45.535,46.454 45.334,45.629 44.934,45.165C44.533,44.7 43.77,44.465 42.637,44.465C42.081,44.465 41.51,44.574 40.928,44.783C40.344,44.993 40,42.534 40,42.534C41.407,41.837 42.752,41.241 44.039,40.745C45.325,40.249 46.541,40 47.691,40C49.757,40 51.352,40.608 52.471,41.823C53.591,43.038 54.151,44.614 54.151,46.558C54.151,46.959 54.114,47.667 54.036,48.678C53.958,49.693 53.814,50.622 53.605,51.467L51.465,60.679C51.291,61.418 51.133,62.264 50.996,63.215C50.855,64.161 50.787,64.883 50.787,65.368C50.787,66.591 51.011,67.425 51.461,67.87C51.913,68.314 52.693,68.535 53.8,68.535C54.321,68.535 54.912,68.423 55.57,68.202C56.227,67.982 56.427,70.466 56.427,70.466Z"/>
+        </g>
+    </g>
+</svg>

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

@@ -8,20 +8,7 @@ Spree.ready(function ($) {
   Spree.onPayment = function () {
     if ($('#checkout_form_payment').length) {
       if ($('#existing_cards').length) {
-        $('#existing_cards').hide()
         $('#payment-methods').hide()
-        $("#payment-method-fields label[data-type='card']").click(function() {
-          $('#existing_cards').show()
-          $('.payment-sources').show()
-          $('.existing-cc-radio').first().prop('checked', true)
-        })
-        $("#payment-method-fields label:not([data-type='card'])").click(function() {
-          $('#existing_cards').hide()
-          $('#payment-methods').hide()
-          $('.payment-sources').hide()
-          $('.existing-cc-radio').prop('checked', false)
-          $('#use_existing_card_no').prop('checked', false)
-        })
         $('.existing-cc-radio').click(function () {
           $(this).prop('checked', true)
           $('#use_existing_card_no').prop('checked', false)
@@ -60,11 +47,26 @@ Spree.ready(function ($) {
       }
 
       $('input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(function () {
+        $('#payment-methods').hide()
+        $('.payment-sources').hide()
         Spree.enableSave()
-        if ($('#payment_method_' + this.value).find('fieldset').children().length == 0) {
-          $('.payment-sources').hide()
-        } else {
-          $('.payment-sources').show()
+        if ($('#payment_method_' + this.value).find('fieldset').children().length !== 0) {
+          if (this.closest('label').dataset.type === 'card') {
+            if ($('#existing_cards').length) {
+              $('.existing-cc-radio').first().prop('checked', true);
+              $('#use_existing_card_no').prop('checked', false)
+              $('#use_existing_card_yes').prop('checked', true)
+              $('#existing_cards').show();
+              $('#payment-methods').hide();
+              $('.payment-sources').show()
+            }
+          } else {
+            $('.existing-cc-radio').prop('checked', false);
+            $('#use_existing_card_no').prop('checked', false);
+            $('#existing_cards').hide();
+            $('#payment-methods').show();
+            $('.payment-sources').show()
+          }
         }
         $('#payment-methods li').hide()
         if (this.checked) {

data/app/assets/stylesheets/spree/frontend.css

@@ -1,6 +1,5 @@
 /*
 * This is a manifest file that includes stylesheets for spree_frontend
- *= require spree/frontend/address_book
  *= require spree/frontend/application
  *= require_self
 */

data/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss

@@ -50,6 +50,12 @@
   }
 }
 
+.field_with_errors {
+  input{
+    border-color: $danger;
+  }
+}
+
 .spree-flat-label {
   color: theme-color("secondary");
   text-transform: uppercase;

data/app/assets/stylesheets/spree/frontend/helpers/spree/frontend_helper.scss

@@ -1,6 +1,7 @@
 #breadcrumbs {
   padding: 0;
 }
+
 .breadcrumb {
   background: none;
   padding: 0.5rem 0;
@@ -23,3 +24,9 @@
 .breadcrumb-product-name {
   padding-right: 9.5px;
 }
+
+.truncate {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss

@@ -257,9 +257,5 @@
     @include media-breakpoint-up(sm) {
       margin-top: 70px;
     }
-    @include media-breakpoint-up(lg) {
-      flex: 0 0 40%;
-      align-self: flex-start;
-    }
   }
 }

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss

@@ -494,9 +494,6 @@
           font-size: font-px-to-rem(16px);
         }
       }
-      .delete-address-img {
-        color: $primary-color;
-      }
     }
 
     #checkout-summary {
@@ -508,7 +505,8 @@
         height: 100%;
         padding: 0;
         max-width: 380px;
-        align-self: flex-end;
+        margin-right: 0;
+        margin-left: auto;
       }
     }
 
@@ -517,3 +515,4 @@
     }
   }
 }
+

data/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss

@@ -62,12 +62,6 @@
           font-size: font-px-to-rem(18px);
         }
       }
-
-      .delete-address-img {
-        @include svg-sizes;
-        color: $primary-color;
-      }
-
       margin-top: 20px;
 
       @include media-breakpoint-up(lg) {

data/app/controllers/spree/products_controller.rb

@@ -12,16 +12,7 @@ module Spree
       @searcher = build_searcher(params.merge(include_images: true, current_store_id: current_store.id))
       @products = @searcher.retrieve_products
 
-      last_modified = @products.maximum(:updated_at)&.utc if @products.respond_to?(:maximum)
-
-      etag = [
-        store_etag,
-        last_modified&.to_i,
-        available_option_types_cache_key,
-        filtering_params_cache_key
-      ]
-
-      fresh_when etag: etag, last_modified: last_modified, public: true
+      fresh_when etag: etag_index, last_modified: last_modified_index, public: true
     end
 
     def show
@@ -29,7 +20,7 @@ module Spree
 
       @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
 
-      if stale?(etag: product_etag, last_modified: @product.updated_at.utc, public: true)
+      if stale?(etag: etag_show, last_modified: last_modified_show, public: true)
         @product_summary = Spree::ProductSummaryPresenter.new(@product).call
         @product_properties = @product.product_properties.includes(:property)
         @product_price = @product.price_in(current_currency).amount
@@ -96,7 +87,16 @@ module Spree
       end
     end
 
-    def product_etag
+    def etag_index
+      [
+        store_etag,
+        last_modified_index,
+        available_option_types_cache_key,
+        filtering_params_cache_key
+      ]
+    end
+
+    def etag_show
       [
         store_etag,
         @product,
@@ -105,5 +105,21 @@ module Spree
         @product.possible_promotions.maximum(:updated_at),
       ]
     end
+
+    alias product_etag etag_show
+
+    def last_modified_index
+      products_last_modified      = @products.maximum(:updated_at)&.utc if @products.respond_to?(:maximum)
+      current_store_last_modified = current_store.updated_at.utc
+
+      [products_last_modified, current_store_last_modified].compact.max
+    end
+
+    def last_modified_show
+      product_last_modified       = @product.updated_at.utc
+      current_store_last_modified = current_store.updated_at.utc
+
+      [product_last_modified, current_store_last_modified].compact.max
+    end
   end
 end

data/app/helpers/spree/frontend_helper.rb

@@ -166,7 +166,13 @@ module Spree
 
     def plp_and_carousel_image(product, image_class = '')
       image = default_image_for_product_or_variant(product)
-      image_url = image&.plp_url || asset_path('noimage/plp.png')
+
+      image_url = if image.present?
+                    main_app.url_for(image.url('plp'))
+                  else
+                    asset_path('noimage/plp.png')
+                  end
+
       image_style = image&.style(:plp)
 
       lazy_image(

data/app/views/spree/addresses/edit.html.erb

@@ -1,13 +1,18 @@
 <%= render 'spree/shared/error_messages', target: @address %>
 <div class="col-lg-6 offset-lg-3">
-  <h3 class="spree-header spree-mb-large spree-mt-large"><%= t(:edit_shipping_address, scope: :address_book) %></h3>
+  <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:edit_address, scope: :address_book) %></h3>
   <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
-    <%= render 'spree/addresses/form',
-      address_name: 'address',
-      address_form: f,
-      address_type: 'shipping',
-      address: @address
-    %>
-    <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
+  <div class="form-group checkout-content-inner-field mb-5 has-float-label">
+    <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
+    <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
+  </div>
+
+  <%= render 'spree/addresses/form',
+    address_name: 'address',
+    address_form: f,
+    address_type: 'shipping',
+    address: @address
+  %>
+  <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>

data/app/views/spree/addresses/new.html.erb

@@ -1,7 +1,11 @@
 <%= render 'spree/shared/error_messages', target: @address %>
 <div class="col-lg-6 offset-lg-3">
-  <h3 class="spree-header spree-mb-large spree-mt-large"><%= t(:new_shipping_address, scope: :address_book) %></h3>
+  <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_address, scope: :address_book) %></h3>
   <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+  <div class="form-group checkout-content-inner-field mb-5 has-float-label">
+    <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
+    <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
+  </div>
     <%= render 'spree/addresses/form',
       address_name: 'address',
       address_form: f,

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

@@ -29,23 +29,24 @@
           </div>
         <% end %>
         <% if @addresses.present? %>
-        <div class="select_address">
-          <div class="form-group">
+        <div class="select_address mb-5">
+          <div class="form-group col">
             <% @addresses.each_with_index do |address, idx| %>
-            <span class="d-block mb-2" id="<%= [address_type, dom_id(address)].join('_') %>">
-              <label class="form-check-label spree-radio-label">
+            <div class="row mb-3" id="<%= [address_type, dom_id(address)].join('_') %>">
+              <label class="form-check-label spree-radio-label col-8">
                 <%= form.radio_button "#{address_name}_id", address.id, checked: (address.id == try_spree_current_user["#{address_name}_id"] || idx == 0) %>
                 <span class="spree-radio-label-custom-input"></span>
-                <span class="d-inline-block align-top">
                   <%= render "spree/users/address", address: address %>
-                </span>
               </label>
-            </span>
+              <%= render "spree/users/address_controls", address: address %>
+            </div>
             <% end %>
-            <label class="form-check-label spree-radio-label">
-              <%= form.radio_button "#{address_name}_id", 0, class: 'form-check-input' %> <%= Spree.t('address_book.other_address') %>
-              <span class="spree-radio-label-custom-input"></span>
-            </label>
+            <div class="row mb-3">
+              <label class="form-check-label spree-radio-label col">
+                <%= form.radio_button "#{address_name}_id", 0, class: 'form-check-input' %> <h4><%= Spree.t('address_book.other_address') %></h4>
+                <span class="spree-radio-label-custom-input"></span>
+              </label>
+            </div>
           </div>
         </div>
         <% end %>

data/app/views/spree/checkout/_confirm.html.erb

@@ -2,7 +2,7 @@
   <p class="checkout-content-header">
     <%= Spree.t(:summary).upcase %>
   </p>
-  <div class='checkout-confirm-order-details d-flex flex-column flex-lg-wrap' id="order_summary" data-hook>
+  <div class='checkout-confirm-order-details' id="order_summary" data-hook>
     <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-none d-lg-block' } %>
     <div class="checkout-confirm-order-details-line-items d-flex flex-column align-items-center w-100">
       <div class="checkout-confirm-order-details-line-items-header d-none d-sm-block d-lg-none align-self-start mb-3">

data/app/views/spree/checkout/_payment.html.erb

@@ -4,7 +4,6 @@
   </p>
 
   <div data-hook="checkout_payment_step">
-
     <%= render partial: 'spree/checkout/payment/storecredit' %>
 
     <ul id="payment-method-fields" class="list-unstyled position-relative" data-hook>
@@ -22,25 +21,7 @@
     </ul>
 
     <div class="payment-sources">
-      <% if @payment_sources.present? %>
-        <div id="existing_cards" class="payment-sources-existing-cards">
-          <%= radio_button_tag 'use_existing_card', 'yes', true, class: 'd-none' %>
-          <div class="form-group" data-hook="existing_cards">
-            <div class="d-flex flex-column payment-sources-list">
-              <% @payment_sources.each do |card| %>
-                <%= render partial: 'credit_card', locals: { card: card } %>
-              <% end %>
-              <div>
-                <label class="form-check-label spree-radio-label col-6 mb-2">
-                  <%= radio_button_tag 'use_existing_card', 'no' %>
-                  <span class="spree-radio-label-custom-input"></span>
-                  <span><%= Spree.t(:add_new_credit_card) %></span>
-                </label>
-              </div>
-            </div>
-          </div>
-        </div>
-      <% end %>
+      <%= render partial: 'payment_sources' if @payment_sources.present? %>
 
       <ul id="payment-methods" class="list-unstyled position-relative mb-0 payment-sources-add-form" data-hook>
         <% checkout_available_payment_methods.each do |method| %>

data/app/views/spree/checkout/_payment_sources.html.erb

@@ -0,0 +1,17 @@
+<div id="existing_cards" class="payment-sources-existing-cards" style="display:none;">
+  <%= radio_button_tag 'use_existing_card', 'yes', true, class: 'd-none' %>
+  <div class="form-group" data-hook="existing_cards">
+    <div class="d-flex flex-column payment-sources-list">
+      <% @payment_sources.each do |card| %>
+        <%= render partial: 'credit_card', locals: { card: card } %>
+      <% end %>
+      <div>
+        <label class="form-check-label spree-radio-label col-6 mb-2">
+          <%= radio_button_tag 'use_existing_card', 'no' %>
+          <span class="spree-radio-label-custom-input"></span>
+          <span><%= Spree.t(:add_new_credit_card) %></span>
+        </label>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -20,7 +20,7 @@
       </div>
       <div class="d-flex flex-nowrap align-items-center justify-content-center">
         <figure class="logo flex-grow-0 flex-xl-grow-0 order-xl-0 header-spree-fluid-logo m-0">
-          <%= logo %>
+          <%= logo(nil, {method: :get}) %>
         </figure>
       </div>
     </div>

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

@@ -1,7 +1,8 @@
 <title><%= title %></title>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<%== meta_image_data_tag %>
+<%== og_meta_data_tags %>
 <%== meta_data_tags %>
+<%== meta_robots %>
 <%= canonical_tag(current_store.url) %>
 <%= favicon_link_tag 'favicon.ico' %>
 <%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', 'data-turbolinks-track': 'reload' %>

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

@@ -1,21 +1,17 @@
-<div class="d-flex align-items-start justify-content-between">
-  <div class="row">
-    <address class="mb-0 col-12">
-      <span class="account-page-user-full-name">
-        <%= address.full_name %>
-      </span>
-
-      <div><%= "#{address.address1} #{address.address2}" %>,</div>
-      <div><%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,</div>
-      <div><%= address.country.name %></div>
-    </address>
+<address class="mb-0 col-12">
+  <% if address.label&.present? %>
+    <h4 class="m-0 truncate"><%= address.label %></h4>
+  <% end %>
+  <span class="account-page-user-full-name">
+    <%= address.full_name %>
+  </span>
+  <div>
+    <%= "#{address.address1} #{address.address2}" %>,
   </div>
-  <div class="d-flex ml-2">
-    <div role="button" class="bg-transparent border-0 px-1 mr-1 address-button delete-button js-delete-address-link" data-address="<%= spree.address_path(address) %>">
-      <%= inline_svg_tag 'garbage_2.svg', class: "delete-address-img" %>
-    </div>
-    <%= link_to spree.edit_address_path(address), method: :get, class: 'address-button px-1', role: 'button', data: { hook: 'edit_address' } do %>
-      <%= inline_svg_tag 'edit.svg', class: "delete-address-img" %>
-    <% end %>
+  <div>
+    <%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,
   </div>
-</div>
+  <div>
+    <%= address.country.name %>
+  </div>
+</address>

data/app/views/spree/users/_address_controls.html.erb

@@ -0,0 +1,11 @@
+<%= link_to(spree.edit_address_path(address), method: :get, class: 'ml-1 d-inline-block', data: { hook: 'edit_address' }) do %>
+  <%= inline_svg_tag('edit.svg', width: 24, height: 24) %>
+<% end %>
+
+<%= link_to '#', class: 'js-delete-address-link ml-3', data: { turbolinks: false, hook: 'remove_address', address: spree.address_path(address) }, aria: { label: Spree.t('address_book.remove_address') } do %>
+    <%= icon(name: 'garbage_2',
+             classes: '',
+             width: 24,
+             height: 24)
+    %>
+<% end %>

data/app/views/spree/users/show.html.erb

@@ -5,8 +5,8 @@
     <div class="col-xs-12 col-lg-4">
       <dt class="text-uppercase account-page-user-info-item-title">
         <%= Spree.t(:account_info) %>
-        <%= link_to spree.edit_user_path(@user), class: "account-page-user-info-item-title-edit" do %>
-          <%= inline_svg_tag 'edit.svg', class: "account-page-user-info-item-title-edit-img" %>
+          <%= link_to spree.edit_user_path(@user), class: "account-page-user-info-item-title-edit" do %>
+          <%= inline_svg_tag('edit.svg', width: 27.6, height: 24) %>
         <% end %>
       </dt>
       <dd class="account-page-user-info-item-definition"><%= @user.email %></dd>
@@ -18,18 +18,21 @@
       </div>
     </div>
     <div class="col-xs-12 col-lg-8 mt-sm-5 mt-lg-0">
-      <%= link_to Spree.t(:add_new_address), spree.new_address_path, class: 'account-page-new-address-link', method: :get %>
-
+      <h4 class="mb-3"><%= link_to Spree.t(:add_new_address), spree.new_address_path, method: :get %></h4>
       <div class="row">
         <% @user.addresses.each_with_index do |address, index| %>
-          <div class="col-xs-12 col-lg-6">
+          <div class="col-12 col-sm-6 mb-3">
             <% index += 1 %>
             <% if index % 3 == 0 %>
-              <div class="account-page-user-info-item">
-              </div>
+              <div class="account-page-user-info-item my-4"></div>
             <% end %>
-            <div class="account-page-user-info-item">
-              <%= render "spree/users/address", address: address %>
+            <div class="row">
+              <div class="col-8 col-lg-6">
+                <%= render "spree/users/address", address: address %>
+              </div>
+              <div class="col">
+                <%= render "spree/users/address_controls", address: address %>
+              </div>
             </div>
           </div>
         <% end %>
@@ -38,7 +41,6 @@
   </div>
 
   <div data-hook="account_my_orders" class="account-page-orders" id="account-my-orders">
-
     <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header" ><%= Spree.t(:my_orders) %></h3>
     <% if @orders.present? %>
       <table>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta
+        version: 4.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -487,6 +487,7 @@ files:
 - app/assets/images/homepage/promo_banner_right_mobile.jpg
 - app/assets/images/homepage/promo_banner_right_tablet_landscape.jpg
 - app/assets/images/homepage/promo_banner_right_tablet_portrait.jpg
+- app/assets/images/info.svg
 - app/assets/images/instagram.svg
 - app/assets/images/logo-spree.png
 - app/assets/images/logo.png
@@ -570,7 +571,6 @@ files:
 - app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js
 - app/assets/javascripts/spree/lazysizes.config.js
 - app/assets/stylesheets/spree/frontend.css
-- app/assets/stylesheets/spree/frontend/address_book.scss
 - app/assets/stylesheets/spree/frontend/application.scss
 - app/assets/stylesheets/spree/frontend/bootstrap-patches.scss
 - app/assets/stylesheets/spree/frontend/components-bootstrap/.gitkeep
@@ -672,6 +672,7 @@ files:
 - app/views/spree/checkout/_delivery.html.erb
 - app/views/spree/checkout/_delivery_informations.html.erb
 - app/views/spree/checkout/_payment.html.erb
+- app/views/spree/checkout/_payment_sources.html.erb
 - app/views/spree/checkout/_summary.html.erb
 - app/views/spree/checkout/edit.html.erb
 - app/views/spree/checkout/payment/_check.html.erb
@@ -762,6 +763,7 @@ files:
 - app/views/spree/taxons/product_carousel.html.erb
 - app/views/spree/taxons/show.html.erb
 - app/views/spree/users/_address.html.erb
+- app/views/spree/users/_address_controls.html.erb
 - app/views/spree/users/edit.html.erb
 - app/views/spree/users/show.html.erb
 - config/initializers/assets.rb
@@ -782,10 +784,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -801,8 +803,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
 test_files: []

data/app/assets/stylesheets/spree/frontend/address_book.scss

@@ -1,8 +0,0 @@
-div#checkout #checkout_form_address {
-  #billing, #shipping {
-    .select_address label { float: none; }
-    input[type=radio] { width: auto; }
-  }
-}
-
-.hidden { display: none; }