spree_frontend 4.2.0.rc3 → 4.2.2

data/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb

@@ -4,8 +4,8 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
+    paginator:     the paginator that renders the pagination tags inside -%>
+
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>

data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="prev page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>

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

@@ -1,54 +1,54 @@
 <% address_id = address_type.chars.first %>
 
-<div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <div class="form-group" id=<%="#{address_id}firstname" %>>
+<div class="inner" data-hook='<%= "#{address_type}_inner" %>'>
+  <div class="form-group" id='<%= "#{address_id}firstname" %>'>
     <%= form.label :firstname do %>
       <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :firstname, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}lastname" %>>
+  <div class="form-group" id='<%= "#{address_id}lastname" %>'>
     <%= form.label :lastname do %>
       <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :lastname, class: 'form-control', required: true %>
   </div>
   <% if Spree::Config[:company] %>
-    <div class="form-group" id=<%="#{address_id}company" %>>
+    <div class="form-group" id='<%= "#{address_id}company" %>'>
       <%= form.label :company, Spree.t(:company) %>
       <%= form.text_field :company, class: 'form-control' %>
     </div>
   <% end %>
-  <div class="form-group" id=<%="#{address_id}address1" %>>
+  <div class="form-group" id='<%= "#{address_id}address1" %>'>
     <%= form.label :address1 do %>
       <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :address1, class: 'form-control required' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}address2" %>>
+  <div class="form-group" id='<%= "#{address_id}address2" %>'>
     <%= form.label :address2, Spree.t(:street_address_2) %>
     <%= form.text_field :address2, class: 'form-control' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}city" %>>
+  <div class="form-group" id='<%= "#{address_id}city" %>'>
     <%= form.label :city do %>
       <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :city, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}country" %>>
+  <div class="form-group" id='<%= "#{address_id}country" %>'>
     <%= form.label :country_id do %>
       <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <span id=<%="#{address_id}country-selection" %>>
+    <span id='<%= "#{address_id}country-selection" %>'>
       <%= form.collection_select :country_id, available_countries, :id, :name, {}, { class: 'form-control', required: true } %>
     </span>
   </div>
 
   <% if Spree::Config[:address_requires_state] %>
-    <div class="form-group" id=<%="#{address_id}state" %>>
+    <div class="form-group" id='<%= "#{address_id}state" %>'>
       <% have_states = !address.country.states.empty? %>
       <%= form.label :state do %>
-        <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
+        <%= Spree.t(:state) %><abbr class='required' title="required" id='<%= "#{address_id}state-required" %>'>*</abbr>
       <% end %>
 
       <%== state_elements = [
@@ -62,28 +62,27 @@
                             class: !have_states ? 'form-control' : 'form-control hidden',
                             required: !have_states,
                             disabled: have_states)
-         ].join.gsub('"', "'").gsub("\n", "")
-      %>
+         ].join.gsub('"', "'").gsub("\n", "") %>
     </div>
       <noscript>
         <%= form.text_field :state_name, class: 'form-control', required: true %>
       </noscript>
   <% end %>
 
-  <div class="form-group" id=<%="#{address_id}zipcode" %>>
+  <div class="form-group" id='<%= "#{address_id}zipcode" %>'>
     <%= form.label :zipcode do %>
       <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.text_field :zipcode, class: 'form-control', required: address.require_zipcode? %>
   </div>
-  <div class="form-group" id=<%="#{address_id}phone" %>>
+  <div class="form-group" id='<%= "#{address_id}phone" %>'>
     <%= form.label :phone do %>
       <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.phone_field :phone, class: 'form-control', required: address.require_phone? %>
   </div>
   <% if Spree::Config[:alternative_shipping_phone] %>
-    <div class="form-group" id=<%="#{address_id}altphone" %>>
+    <div class="form-group" id='<%= "#{address_id}altphone" %>'>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
       <%= form.phone_field :alternative_phone, class: 'form-control' %>
     </div>

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

@@ -11,8 +11,8 @@
     address_name: 'address',
     address_form: f,
     address_type: 'shipping',
-    address: @address
-  %>
+    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

@@ -10,8 +10,8 @@
       address_name: 'address',
       address_form: f,
       address_type: 'shipping',
-      address: @address
-    %>
+      address: @address %>
+
     <%= f.submit t(:save, scope: :address_book), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>

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

@@ -1,11 +1,9 @@
-<% @addresses = try_spree_current_user ? user_available_addresses : [] %>
-
 <% if !try_spree_current_user || try_spree_current_user.email.blank? %>
   <div class="row">
     <div class="col-12 mb-4">
       <div class="form-group checkout-content-inner-field has-float-label">
         <%= form.email_field :email, class: 'required spree-flat-input', required: true, placeholder: Spree.t(:email) %>
-        <%= form.label :email, class: 'text-uppercase'%>
+        <%= form.label :email, class: 'text-uppercase' %>
       </div>
     </div>
   </div>
@@ -28,10 +26,10 @@
             <%= label_tag :order_use_billing, Spree.t(:use_billing_address), class: 'spree-checkbox-label' %>
           </div>
         <% end %>
-        <% if @addresses.present? %>
+        <% if user_available_addresses.present? %>
         <div class="select_address mb-5">
           <div class="form-group col">
-            <% @addresses.each_with_index do |address, idx| %>
+            <% user_available_addresses.each_with_index do |address, idx| %>
             <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) %>
@@ -51,7 +49,7 @@
         </div>
         <% end %>
         <%= form.fields_for address_name do |address_form| %>
-          <div class="inner checkout-content-inner" data-hook=<%="#{address_type}_inner" %>>
+          <div class="inner checkout-content-inner" data-hook='<%= "#{address_type}_inner" %>'>
             <%= render partial: 'spree/addresses/form', locals: {
               address_name: address_name,
               address_form: address_form,

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

@@ -2,37 +2,5 @@
   <p class="checkout-content-header">
     <%= Spree.t(:summary).upcase %>
   </p>
-  <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">
-        <%= Spree.t(:products) %>
-      </div>
-      <div class="d-table w-100">
-        <div class="d-none d-lg-table-row text-secondary text-uppercase">
-          <p class="d-table-cell pb-1">
-            <%= Spree.t(:product) %>
-          </p>
-          <p class="d-table-cell pb-1">
-            <%= Spree.t(:price) %>
-          </p>
-          <p class="d-table-cell pb-1">
-            <%= Spree.t(:quantity) %>
-          </p>
-          <p class="d-table-cell pb-1">
-            <%= Spree.t(:total) %>
-          </p>
-        </div>
-        <%= render partial: 'spree/shared/line_item', collection: @order.line_items, cached: true %>
-      </div>
-    </div>
-    <%= render partial: 'spree/checkout/delivery_informations', locals: { class_name: 'd-lg-none' } %>
-    <div id="checkout-summary" class="w-100" data-hook="checkout_summary_box">
-      <%= render partial: 'spree/checkout/summary', locals: { order: @order } %>
-      <div data-hook="buttons">
-        <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>
-        <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>
-      </div>
-    </div>
-  </div>
+  <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>
 </div>

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

@@ -1,6 +1,6 @@
-<div id="<%= dom_id(card,'spree')%>" class="payment-sources-list-item">
+<div id="<%= dom_id(card,'spree') %>" class="payment-sources-list-item">
   <label class="form-check-label spree-radio-label">
-    <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
+    <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" } %>
     <span class="spree-radio-label-custom-input"></span>
     <%= credit_card_icon(card.cc_type) %>
     <span>****<%= card.last_digits %>,&nbsp</span>

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

@@ -3,42 +3,49 @@
     <%= Spree.t(:delivery_information) %>
   </div>
   <dl>
-    <div>
-      <dt class="text-uppercase">
-        <%= Spree.t(:shipping_address) %>
-        <%= checkout_edit_link %>
-      </dt>
-      <dd><%= sanitize @order.ship_address.to_s, tags: %w[br] %></dd>
-    </div>
-    <div>
-      <dt class="text-uppercase">
-        <%= Spree.t(:billing_address) %>
-        <%= checkout_edit_link %>
-      </dt>
-      <dd><%= sanitize @order.bill_address.to_s, tags: %w[br] %></dd>
-    </div>
-    <div>
-      <dt class="text-uppercase">
-        <%= Spree.t(:shipping) %>
-        <%= checkout_edit_link('delivery') %>
-      </dt>
-      <% @order.shipments.pending.each do |shipment| %>
-        <dd><%= shipment.shipping_method&.name %> </dd>
-      <% end %>
-    </div>
-    <div>
-      <dt class="text-uppercase">
-        <%= Spree.t(:payment) %>
-        <%= checkout_edit_link('payment') %>
-      </dt>
-      <dd>
-        <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>
-      </dd>
-      <dd>
-        <% if @order.using_store_credit? %>
-          <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
+    <% if order.has_step?("address") %>
+      <div data-hook="order-ship-address">
+        <dt class="text-uppercase">
+          <%= Spree.t(:shipping_address) %>
+          <%= checkout_edit_link %>
+        </dt>
+        <%= render 'spree/shared/address', address: order.ship_address %>
+      </div>
+      <div data-hook="order-bill-address">
+        <dt class="text-uppercase">
+          <%= Spree.t(:billing_address) %>
+          <%= checkout_edit_link %>
+        </dt>
+        <%= render 'spree/shared/address', address: order.bill_address %>
+      </div>
+    <% end %>
+    <% if order.has_step?("delivery") %>
+      <div data-hook="order-shipment">
+        <dt class="text-uppercase">
+          <%= Spree.t(:shipping) %>
+          <%= checkout_edit_link('delivery') %>
+        </dt>
+        <% @order.shipments.valid.each do |shipment| %>
+          <dd><%= shipment.shipping_method&.name %> </dd>
         <% end %>
-      </dd>
-    </div>
+        <%= render 'spree/shared/shipment_tracking', order: order if order.shipped? %>
+      </div>
+    <% end %>
+    <% if order.has_step?("payment") %>
+      <div data-hook="order-payment">
+        <dt class="text-uppercase">
+          <%= Spree.t(:payment) %>
+          <%= checkout_edit_link('payment') %>
+        </dt>
+        <dd>
+          <%= render collection: @order.payments.valid, partial: 'spree/shared/payment' %>
+        </dd>
+        <dd>
+          <% if @order.using_store_credit? %>
+            <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'continue btn' %>
+          <% end %>
+        </dd>
+      </div>
+    <% end %>
   </dl>
 </div>

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

@@ -20,8 +20,7 @@
            data-non-shipment-tax='<%= adjustments.reject{ |adj| adj.adjustable_type== 'Spree::Shipment'}.sum(&:amount) %>'
            thousands-separator='<%= tax_total.thousands_separator %>'
            decimal-mark='<%= tax_total.decimal_mark %>'
-           precision='<%= Money::Currency.find(order.currency).exponent %>'
-      >
+           precision='<%= Money::Currency.find(order.currency).exponent %>'>
         <%= tax_total.to_html %>
       </div>
     <% end %>
@@ -29,7 +28,7 @@
     <% if order.passed_checkout_step?("address") && order.shipments.any? %>
       <% if order.has_free_shipping? %>
         <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
-        <div class="d-table-cell text-right"><%= Spree.t(:free) %></div>
+        <div class="d-table-cell text-right" data-hook="is-free-shipping"><%= Spree.t(:free) %></div>
       <% else %>
         <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
         <% shipping_total = Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency) %>
@@ -38,8 +37,7 @@
             data-currency='<%= Money::Currency.find(order.currency).symbol %>'
             thousands-separator='<%= shipping_total.thousands_separator %>'
             decimal-mark='<%= shipping_total.decimal_mark %>'
-            precision='<%= Money::Currency.find(order.currency).exponent %>'
-        >
+            precision='<%= Money::Currency.find(order.currency).exponent %>'>
           <%= shipping_total.to_html %>
         </div>
 

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

@@ -11,7 +11,7 @@
       <% options_hash = Rails.env.production? ? {autocomplete: 'off'} : {} %>
       <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(id: 'card_number', class: 'spree-flat-input cardNumber', size: 19, maxlength: 19, autocomplete: "off", placeholder: Spree.t(:card_number)) %>
       <span id="card_type" style="display:none;">
-        ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
+        ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
           <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
         )
       </span>

data/app/views/spree/home/index.html.erb

@@ -4,14 +4,14 @@
   <img class="lazyload hero-image position-absolute"
     data-src="<%= asset_path('homepage/main_banner.jpg') %>"
     data-srcset="<%= image_source_set('homepage/main_banner') %>"
-    alt="<%= Spree.t('homepage.summer_collection')%>" />
+    alt="Summer Collection">
 
   <div class="hero-content">
     <div class="homepage-hero-image-text mb-2 mx-auto pb-3 pb-md-4">
-      <%= Spree.t('homepage.summer_collection') %>
+      Summer Collection
     </div>
     <div>
-      <%= link_to Spree.t('homepage.shop_now'), spree.products_path, class: 'btn btn-primary spree-btn px-5' %>
+      <%= link_to 'SHOP NOW', spree.products_path, class: 'btn btn-primary spree-btn px-5' %>
     </div>
   </div>
 </div>
@@ -24,10 +24,10 @@
         <img class="w-100 lazyload"
           data-src="<%= asset_path('homepage/category_banner_upper.jpg') %>"
           data-srcset="<%= image_source_set('homepage/category_banner_upper') %>"
-          alt="<%= Spree.t('homepage.men')%>" />
+          alt="Men">
 
         <div class="homepage-taxon-box-text">
-          <h3><%= Spree.t('homepage.men') %></h3>
+          <h3>Men</h3>
         </div>
       <% end %>
 
@@ -35,10 +35,10 @@
         <img class="w-100 lazyload"
           data-src="<%= asset_path('homepage/category_banner_lower.jpg') %>"
           data-srcset="<%= image_source_set('homepage/category_banner_lower') %>"
-          alt="<%= Spree.t('homepage.sportswear')%>" />
+          alt="Sportswear">
 
-        <div class="homepage-taxon-box-text" role="img" aria-label="<%= Spree.t('homepage.sportswear') %>">
-          <h3><%= Spree.t('homepage.sportswear') %></h3>
+        <div class="homepage-taxon-box-text" role="img" aria-label="Sportswear">
+          <h3>Sportswear</h3>
         </div>
       <% end %>
 
@@ -50,10 +50,10 @@
         <img class="w-100 lazyload"
           data-src="<%= asset_path('homepage/big_category_banner.jpg') %>"
           data-srcset="<%= image_source_set('homepage/big_category_banner') %>"
-          alt="<%= Spree.t('homepage.women')%>" />
+          alt="Women">
 
         <div class="homepage-taxon-box-text">
-          <h3><%= Spree.t('homepage.women') %></h3>
+          <h3>Women</h3>
         </div>
       <% end %>
 
@@ -65,16 +65,15 @@
 
 <div class="homepage-fashion-trends-box mb-3">
   <div class="text-center">
-    <div class="homepage-fashion-trends-box-summer-text mb-1"><%= Spree.t('homepage.summer_2020') %></div>
-    <div class="homepage-fashion-trends-box-fashion-trends-text mb-2"><%= Spree.t('homepage.fashion_trends') %></div>
+    <div class="homepage-fashion-trends-box-summer-text mb-1">Summer 2021</div>
+    <div class="homepage-fashion-trends-box-fashion-trends-text mb-2">FASHION TRENDS</div>
     <div class="homepage-fashion-trends-box-description-text text-center mb-3">
-      <%= Spree.t('homepage.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.
     </div>
-    <%= link_to Spree.t('homepage.read_more'), spree.nested_taxons_path('trending'), class: 'btn px-5 spree-btn btn-outline-primary' %>
+    <%= link_to 'READ MORE', spree.nested_taxons_path('trending'), class: 'btn px-5 spree-btn btn-outline-primary' %>
   </div>
 </div>
 
-
 <div data-product-carousel data-product-carousel-taxon-id='trending' class="mb-3"></div>
 
 <div class="container">
@@ -85,14 +84,14 @@
           <img class="w-100 lazyload"
             data-src="<%= asset_path('homepage/promo_banner_left.jpg') %>"
             data-srcset="<%= image_source_set('homepage/promo_banner_left') %>"
-            alt="<%= Spree.t('homepage.new_collection')%>" />
+            alt="NEW COLLECTION">
 
-          <div class="homepage-bottom-box-inner" role="img" aria-label="<%= Spree.t('homepage.new_collection') %>">
+          <div class="homepage-bottom-box-inner" role="img" aria-label="New Collection">
             <div class="homepage-bottom-box-inner-small-text">
-              <%= Spree.t('homepage.new_collection') %>
+              New Collection
             </div>
             <div class="homepage-bottom-box-inner-big-text">
-              <%= Spree.t('homepage.streetstyle') %>
+              Streetstyle
             </div>
           </div>
         </div>
@@ -105,14 +104,14 @@
           <img class="w-100 lazyload"
             data-src="<%= asset_path('homepage/promo_banner_right.jpg') %>"
             data-srcset="<%= image_source_set('homepage/promo_banner_right') %>"
-            alt="<%= Spree.t('homepage.summer_sale')%>" />
+            alt="Summer Sale">
 
           <div class="homepage-bottom-box-inner">
             <div class="homepage-bottom-box-inner-small-text">
-              <%= Spree.t('homepage.summer_sale') %>
+              Summer Sale
             </div>
             <div class="homepage-bottom-box-inner-big-text">
-              <%= Spree.t('homepage.up_to_60') %>
+              Up To 60%
             </div>
           </div>
         </div>