spree_frontend 3.1.0 → 4.7.0

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

@@ -1,71 +1,37 @@
-<div class="panel panel-default" id="payment" data-hook>
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= Spree.t(:payment_information) %></h3>
-  </div>
-  <div class="panel-body" data-hook="checkout_payment_step">
-    <% if @payment_sources.present? %>
-      <div class="card_options">
-        <%= radio_button_tag 'use_existing_card', 'yes', true %>
-        <label for="use_existing_card_yes">
-          <%= Spree.t(:use_existing_cc) %>
-        </label>
-        <%= radio_button_tag 'use_existing_card', 'no' %>
-        <label for="use_existing_card_no">
-          <%= Spree.t(:use_new_cc_or_payment_method) %>
-        </label>
-      </div>
-
-      <div id="existing_cards">
-        <p class="form-group" data-hook="existing_cards">
-          <table class="existing-credit-card-list">
-            <tbody>
-              <% @payment_sources.each do |card| %>
-                <tr id="<%= dom_id(card,'spree')%>" class="<%= cycle('even', 'odd') %>">
-                  <td><%= card.name %></td>
-                  <td><%= card.display_number %></td>
-                  <td><%= card.month %> / <%= card.year %></td>
-                  <td>
-                    <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
-                  </td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-        </p>
-      </div>
-    <% end %>
+<div id="payment" data-hook>
+  <p class="payment-type checkout-content-header">
+    <%= Spree.t(:payment_type).upcase %>
+  </p>
 
+  <div data-hook="checkout_payment_step">
     <%= render partial: 'spree/checkout/payment/storecredit' %>
 
-    <ul class="list-group" id="payment-method-fields" data-hook>
-      <% @order.available_payment_methods.each do |method| %>
-        <li class="list-group-item">
-          <label>
-            <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
-            <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
-          </label>
+    <ul id="payment-method-fields" class="list-unstyled position-relative" data-hook>
+      <% checkout_available_payment_methods.each do |method| %>
+        <li class="radio">
+          <%= label_tag '', class: "form-check-label spree-radio-label payment-option", data: { type: method.id == @payment_sources&.first&.payment_method_id ? 'card' : nil } do %>
+            <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
+                                 method.id,
+                                 method.id == @order.payments.checkout.last&.payment_method_id || method == checkout_available_payment_methods.first %>
+            <span class="spree-radio-label-custom-input"></span>
+            <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
+          <% end %>
         </li>
       <% end %>
     </ul>
 
-    <ul class="nav" id="payment-methods" data-hook>
-      <% @order.available_payment_methods.each do |method| %>
-        <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods.last %>" data-hook>
-          <fieldset>
-            <%= render :partial => "spree/checkout/payment/#{method.method_type}", :locals => { :payment_method => method } %>
-          </fieldset>
-        </li>
-      <% end %>
-    </ul>
+    <div class="payment-sources">
+      <%= render partial: 'payment_sources' if @payment_sources.present? %>
 
-    <p class='field' data-hook='coupon_code'>
-      <%= form.label :coupon_code %>
-      <%= form.text_field :coupon_code, :class => 'form-control' %>
-    </p>
+      <ul id="payment-methods" class="list-unstyled position-relative mb-0 payment-sources-add-form" data-hook>
+        <% checkout_available_payment_methods.each do |method| %>
+          <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == checkout_available_payment_methods.last %>" data-hook>
+            <fieldset>
+              <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
+            </fieldset>
+          </li>
+        <% end %>
+      </ul>
+    </div>
   </div>
 </div>
-
-<div class="well text-right form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), class: 'btn btn-lg btn-success primary' %>
-  <script>Spree.disableSaveOnClick();</script>
-</div>

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/checkout/_summary.html.erb

@@ -1,72 +1,83 @@
-<h3><%= Spree.t(:order_summary) %></h3>
-
-<table class="table" data-hook="order_summary">
-  <tbody>
-    <tr data-hook="item_total">
-      <td><strong><%= Spree.t(:item_total) %>:</strong></td>
-      <td><strong><%= order.display_item_total.to_html %></strong></td>
-    </tr>
+<div class="checkout-content-summary">
+  <h3 class="text-uppercase text-center checkout-content-summary-header"><%= Spree.t(:order_summary) %></h3>
+  <div class="w-100 text-uppercase checkout-content-summary-table" data-hook="order_summary">
+    <div class="d-table-cell"><%= Spree.t(:subtotal) %>:</div>
+    <div class="d-table-cell text-right"><%= order.display_item_total.to_html %></div>
 
     <% if order.line_item_adjustments.nonzero.exists? %>
-      <tbody data-hook="order_details_promotion_adjustments">
-        <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-          <tr class="total">
-            <td><%= label %></td>
-            <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
-          </tr>
-        <% end %>
-      </tbody>
+      <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <div class="d-table-cell"><%= label %></div>
+        <div class="d-table-cell text-right"><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></div>
+      <% end %>
     <% end %>
 
-    <tbody data-hook="order_details_tax_adjustments">
-      <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
-        <tr class="total">
-          <td><%= label %></td>
-          <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
-        </tr>
-      <% end %>
-    </tbody>
+    <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+      <div class="d-table-cell"><%= label %></div>
+      <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+      <div class="d-table-cell text-right"
+           data-hook='tax-total'
+           data-currency='<%= Money::Currency.find(order.currency).symbol %>'
+           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 %>'>
+        <%= tax_total.to_html %>
+      </div>
+    <% end %>
 
-    <% if order.passed_checkout_step?("delivery") && order.shipments.any? %>
-      <tr data-hook="shipping_total">
-        <td><%= Spree.t(:shipping_total) %>:</td>
-        <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
-      </tr>
+    <% 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" 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) %>
+        <div class="d-table-cell text-right"
+            data-hook='shipping-total'
+            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 %>'>
+          <%= shipping_total.to_html %>
+        </div>
 
-      <% if order.shipment_adjustments.nonzero.exists? %>
-        <tbody data-hook="order_details_shipment_promotion_adjustments">
+        <% if order.shipment_adjustments.nonzero.exists? %>
           <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-            <tr class="total">
-              <td><%= label %>:</td>
-              <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
-            </tr>
+            <div class="d-table-cell"><%= label %>:</div>
+            <div class="d-table-cell text-right">
+              <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
+            </div>
           <% end %>
-        </tbody>
+        <% end %>
       <% end %>
     <% end %>
 
     <% if order.adjustments.nonzero.eligible.exists? %>
-      <tbody id="summary-order-charges" data-hook>
-        <% order.adjustments.nonzero.eligible.each do |adjustment| %>
-        <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-          <tr class="total">
-            <td><%= adjustment.label %>:</td>
-            <td><%= adjustment.display_amount.to_html %></td>
-          </tr>
-        <% end %>
-      </tbody>
+      <% order.adjustments.nonzero.eligible.each do |adjustment| %>
+        <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount.zero?) %>
+        <div class="d-table-cell total"><%= adjustment.label %>:</div>
+        <div class="d-table-cell total text-right">
+          <%= adjustment.display_amount.to_html %>
+        </div>
+      <% end %>
     <% end %>
 
-    <tr data-hook="order_total">
-      <td><strong><%= Spree.t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total' class="lead text-primary"><%= order.display_total.to_html %></span></strong></td>
-    </tr>
+    <div class="checkout-content-summary-table-order-total">
+      <div class="d-table-cell"><%= Spree.t(:total) %>:</div>
+      <div class="d-table-cell text-right">
+        <span id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
+          <%= order.display_total.to_html %>
+        </span>
+      </div>
+    </div>
 
     <% if order.using_store_credit? %>
-      <tr data-hook="order_details_store_credit">
-        <td><%= Spree.t(:store_credit_name) %>:</strong></td>
-        <td><span id='summary-store-credit'><%= order.display_total_applied_store_credit.to_html %></span></td>
-      </tr>
+      <div class="d-table-cell"><%= Spree.t(:store_credit_name) %>:</div>
+      <div class="d-table-cell text-right">
+        <span id='summary-store-credit'>
+          <%= order.display_total_applied_store_credit.to_html %>
+        </span>
+      </div>
     <% end %>
-  </tbody>
-</table>
+  </div>
+</div>

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

@@ -1,49 +1,62 @@
-<% content_for :google_analytics do %>
-  <%= render partial: 'spree/shared/google_checkout.js', locals: { order: @order, step_number: (@order.checkout_steps.index(@order.state) + 1) } %>
-<% end %>
+<% @body_id = 'checkout-page' %>
 
-<div id="checkout" data-hook>
+<%
+content_for :head do
+  agent = request.env['HTTP_USER_AGENT']
+  if agent =~ /Safari/ && !(agent =~ /Chrome/)
+%>
+  <script>
+    if (!!window.performance && window.performance.navigation.type === 2) {
+      window.location.reload();
+    }
+    window.onpageshow = function(event) {
+      if (event.persisted) {
+        window.location.reload()
+      }
+    }
+  </script>
+<%
+  end
+end
+%>
+
+<div id="checkout" class="container checkout" data-hook>
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 
-  <div class="row" data-hook="checkout_header">
-    <div class="col-sm-3">
-      <h1 data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
+  <div class="row align-items-center flex-column checkout-header" data-hook="checkout_header">
+    <div class="text-uppercase checkout-header-title">
+      <h1 data-hook="checkout_title"><%= Spree.t('checkout_page.header') %></h1>
     </div>
-    <div class="col-sm-9" data-hook="checkout_progress">
+    <div class="checkout-progress" data-hook="checkout_progress" role="navigation" aria-label="<%= Spree.t('checkout_page.checkout_navigation') %>">
       <%= checkout_progress %>
     </div>
   </div>
 
-  <div class="row" data-hook="checkout_content">
-    <div class="<%= if @order.state != 'confirm' then 'col-md-9' else 'col-md-12' end %>" data-hook="checkout_form_wrapper">
-      <%= form_for @order, url: update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
-        <% if @order.state == 'address' || !@order.email? %>
-          <div class="panel panel-default">
-            <div class="panel-body">
-              <div class="form-group">
-                <%= form.label :email %>
-                <%= form.text_field :email, class: 'form-control' %>
-              </div>
-            </div>
-          </div>
-        <% end %>
+  <div class="row checkout-content" data-hook="checkout_content">
+    <%= form_for @order, url: spree.update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}", class: "w-100 d-lg-flex align-items-lg-baseline  flex-wrap position-relative", data: { turbo: false } } do |form| %>
+      <div class="<%= if @order.state != 'confirm' then 'col-lg-6' else 'col-md-12' end %>" data-hook="checkout_form_wrapper">
         <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, form: form %>
-      <% end %>
-    </div>
-    <% if @order.state != 'confirm' %>
-      <div id="checkout-summary" data-hook="checkout_summary_box" class="col-md-3">
-        <%= render partial: 'summary', locals: { order: @order } %>
       </div>
+
+      <% unless @order.confirm? %>
+        <div id="checkout-summary" class="col-md-12 col-lg-auto" data-hook="checkout_summary_box">
+          <div class="checkout-summary-container position-sticky">
+            <%= render partial: '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>
+      <% end %>
     <% end %>
   </div>
 </div>
 
 <script>
-  Spree.current_order_id = "<%= @order.number %>"
-  Spree.current_order_token = "<%= @order.guest_token %>"
+  window.addEventListener('DOMContentLoaded', function() {
+    Spree.current_order_id = "<%= @order.number %>"
+    Spree.current_order_token = "<%= @order.token %>"
+  })
 </script>
-
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag 'jquery.validate/localization/messages_' + I18n.locale.to_s.downcase.gsub('-', '') %>
-<% end %>

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

@@ -1,42 +1,30 @@
-<div class="well clearfix">
-  <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image', :class => 'pull-right', :width => '170', :height => '28' %>
+<div class="payment-gateway">
+
   <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-  <p class="field">
-    <%= label_tag "name_on_card_#{payment_method.id}" do %>
-      <%= Spree.t(:name_on_card) %><abbr class="required" title="required">*</abbr>
-    <% end %>
-    <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card_#{payment_method.id}", :class => 'form-control required'} %>
-  </p>
+  <div class="payment-gateway-fields">
+    <div class="mb-4 payment-gateway-field checkout-content-inner-field">
+      <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card", class: 'spree-flat-input', placeholder: Spree.t(:name_on_card)} %>
+    </div>
 
-  <p class="field" data-hook="card_number">
-    <%= label_tag "card_number" do %>
-      <%= Spree.t(:card_number) %><abbr class="required" title="required">*</abbr>
-    <% end %>
-    <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
-    <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'form-control required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "off") %>
-    &nbsp;
-    <span id="card_type" style="display:none;">
-      ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
-        <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
-      )
-    </span>
-  </p>
-  <div class="row">
-    <div class="col-md-8 field" data-hook="card_expiration">
-      <%= label_tag "card_expiry" do %>
-        <%= Spree.t(:expiration) %><abbr class="required" title="required">*</abbr>
-      <% end %>
-      <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "form-control required cardExpiry", :placeholder => "MM / YY" %>
+    <div class="mb-4 payment-gateway-field checkout-content-inner-field" data-hook="card_number">
+      <% 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="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
+        )
+      </span>
     </div>
-    <div class="col-md-4 field" data-hook="card_code">
-      <%= label_tag "card_code" do %>
-        <%= Spree.t(:card_code) %><abbr class="required" title="required">*</abbr>
-      <% end %>
-      <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'form-control required cardCode', :size => 5) %>
-      <%= link_to "(#{Spree.t(:what_is_this)})", spree.content_path('cvv'), :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
+    <div class="payment-gateway-half-fields d-flex justify-content-between">
+      <div class="payment-gateway-field checkout-content-inner-field" data-hook="card_expiration">
+        <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: 'spree-flat-input cardExpiry', placeholder: "MM/YYYY" %>
+      </div>
+      <div class="payment-gateway-field checkout-content-inner-field" data-hook="card_code">
+        <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(id: 'card_code', class: 'spree-flat-input cardCode', size: 5, placeholder: Spree.t(:cvv)) %>
+      </div>
     </div>
-  </div>
 
-  <%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
+    <%= hidden_field_tag "#{param_prefix}[cc_type]", '', id: "cc_type", class: 'ccType' %>
+  </div>
 </div>

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

@@ -1,16 +1,17 @@
 <% if @order.using_store_credit? %>
-  <div class="alert alert-success text-center" data-hook="checkout_payment_store_credit_success">
-    <h3><%= Spree.t('store_credit.applicable_amount', amount: Spree::Money.new(@order.total_applicable_store_credit, { currency: @order.currency })) %></h3>
+  <div class="d-flex flex-column mb-5" data-hook="checkout_payment_store_credit_success">
+    <h3 class="store-credit-title"><%= Spree.t('store_credit.applicable_amount', amount: Spree::Money.new(@order.total_applicable_store_credit, { currency: @order.currency })).html_safe %></h3>
     <% if @order.covered_by_store_credit? %>
-      <p><%= Spree.t('store_credit.remaining_amount', amount: @order.display_store_credit_remaining_after_capture) %></p>
+      <p><%= Spree.t('store_credit.remaining_amount', amount: @order.display_store_credit_remaining_after_capture).html_safe %></p>
     <% else %>
-      <p><%= Spree.t('store_credit.additional_payment_needed', amount: @order.display_order_total_after_store_credit) %></p>
+      <p><%= Spree.t('store_credit.additional_payment_needed', amount: @order.display_order_total_after_store_credit).html_safe %></p>
+      <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'store-credit-button continue btn btn-lg btn-primary font-weight-bold text-uppercase align-self-start' %>
     <% end %>
   </div>
 
 <% elsif @order.could_use_store_credit? %>
-  <div class="alert alert-info text-center" data-hook="checkout_payment_store_credit_available">
-    <h2><%= Spree.t('store_credit.available_amount', amount: @order.display_total_available_store_credit) %></h2>
-    <%= button_tag Spree.t('store_credit.apply'), name: 'apply_store_credit', class: 'continue btn btn-lg btn-primary' %>
+  <div class="d-flex align-items-center justify-content-between mb-5" data-hook="checkout_payment_store_credit_available">
+    <h2 class="store-credit-title"><%= Spree.t('store_credit.available_amount', amount: @order.display_total_available_store_credit).html_safe %></h2>
+    <%= button_tag Spree.t('store_credit.apply'), name: 'apply_store_credit', class: 'store-credit-button continue btn btn-lg btn-primary font-weight-bold text-uppercase' %>
   </div>
 <% end %>

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

@@ -0,0 +1,30 @@
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
+<div class="checkout-registration container">
+  <div class="row col-xs-12 col-lg-11 mx-auto">
+    <div class="col-xs-12 col-lg-6">
+      <%= render partial: 'spree/shared/login' if defined?(spree_login_path) %>
+    </div>
+    <div class="col-xs-12 col-lg-6">
+      <div class="col-lg-11 mx-auto">
+        <% if defined?(spree_signup_path) %>
+          <%= render partial: 'spree/shared/registration', locals: { registration_button: '' } %>
+        <% end %>
+        <% if Spree::Config[:allow_guest_checkout] %>
+          <div class="checkout-registration-styled-or">
+            <%= Spree.t(:or) %>
+          </div>
+          <% path = spree.respond_to?(:update_checkout_registration_path) ? spree.update_checkout_registration_path : spree_signup_path %>
+
+          <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration', data: { turbo: false } } do |f| %>
+            <div class="form-group">
+              <p class="form-group checkout-content-inner-field">
+                <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %>
+              </p>
+            </div>
+            <%= f.submit Spree.t(:continue_as_guest), class: 'btn btn-block btn-outline-primary spree-btn' %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<% if @cms_page %>
+  <% if simple_page?(@cms_page) %>
+  <div class="container">
+    <div class="row my-5">
+      <div class="col-12">
+        <%= @cms_page.content.html_safe %>
+      </div>
+    </div>
+  </div>
+  <% else %>
+      <% @cms_page.cms_sections.each do |section| %>
+        <%= build_section(section) %>
+      <% end %>
+  <% end %>
+<% end %>
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>

data/app/views/spree/errors/not_found.html.erb

@@ -0,0 +1,7 @@
+<div class="container">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-1 text-primary">404</h1>
+    <p><strong><%= Spree.t(:page_not_found) %></strong></p>
+    <p><%= Spree.t(:get_back_to_the) %> <%= link_to Spree.t(:home_page), spree.root_url %></p>
+  </div>
+</div>

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

@@ -1,12 +1,22 @@
-<% content_for :sidebar do %>
-  <div data-hook="homepage_sidebar_navigation">
-    <%= render :partial => 'spree/shared/taxonomies' %>
+<% if @homepage %>
+    <% @homepage.cms_sections.each do |section| %>
+      <%= build_section(section) %>
+    <% end %>
+<% else %>
+  <div id="missingHomepage" class="container my-5">
+    <div class="row my-5">
+      <div class="col-12">
+        <figure class="logo mx-auto missing-homepage-logo-container">
+          <%= logo %>
+        </figure>
+      </div>
+      <div class="col-12 mb-5 text-center">
+        <h1 class="mb-3"><%= Spree.t('we_will_be_back') %></h1>
+        <h4 class="text-dark"><%= Spree.t('we_are_busy_updating', store_name: current_store.name) %></h4>
+        <h4 class="text-dark"><%= Spree.t('please_check_back_soon') %></h4>
+      </div>
+    </div>
   </div>
 <% end %>
 
-<div data-hook="homepage_products">
-  <% cache(cache_key_for_products) do %>
-    <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
-  <% end %>
-</div>
-
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>

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

@@ -0,0 +1,28 @@
+<!doctype html>
+<!--[if lt IE 7 ]> <html class="ie ie6" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 7 ]>    <html class="ie ie7" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 8 ]>    <html class="ie ie8" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
+<!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
+  <head data-hook="inside_head">
+    <%= render partial: 'spree/shared/head' %>
+  </head>
+  <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
+    <%= render partial: 'spree/shared/checkout_header' %>
+    <div id="overlay" class="overlay"></div>
+
+    <div data-hook>
+      <main id="content" data-hook>
+        <%= flash_messages %>
+        <%= yield %>
+      </main>
+
+      <%= yield :templates %>
+    </div>
+
+    <footer>
+      <%= render 'spree/shared/copyright' %>
+    </footer>
+    <%= render 'spree/shared/translations' %>
+  </body>
+</html>

data/app/views/spree/layouts/spree_application.html.erb

@@ -8,22 +8,20 @@
     <%= render partial: 'spree/shared/head' %>
   </head>
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
-    <%= render partial: 'spree/shared/google_analytics.js' %>
+    <%= render partial: 'spree/shared/get_started' %>
     <%= render partial: 'spree/shared/header' %>
+    <div id="overlay" class="overlay hide-on-esc"></div>
 
-    <div class="container">
-      <div class="row" data-hook>
-        <%= breadcrumbs(@taxon) %>
+    <div data-hook>
+      <%= flash_messages %>
+      <main class="col-12" id="content" data-hook>
+        <%= yield %>
+      </main>
 
-        <%= render partial: 'spree/shared/sidebar' if content_for? :sidebar %>
-
-        <div id="content" class="<%= !content_for?(:sidebar) ? "col-sm-12" : "col-sm-8 col-md-9" %>" data-hook>
-          <%= flash_messages %>
-          <%= yield %>
-        </div>
-
-        <%= yield :templates %>
-      </div>
+      <%= yield :templates %>
     </div>
+
+    <%= render partial: 'spree/shared/footer' %>
+    <%= render 'spree/shared/translations' %>
   </body>
 </html>

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

@@ -0,0 +1 @@
+<%= render 'spree/shared/locale_dropdown' %>

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

@@ -2,7 +2,7 @@
   <tr class="adjustment">
     <td colspan="4" align='right'><h5><%= type %>: <%= label %></h5></td>
     <td colspan='2'>
-      <h5><%= Spree::Money.new(adjustments.sum(&:amount), :currency => @order.currency) %></h5>
+      <h5><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></h5>
     </td>
   </tr>
 <% end %>