solidus_frontend 2.4.2 → 2.5.0.beta1

data/app/controllers/spree/checkout_controller.rb

@@ -76,7 +76,7 @@ module Spree
     end
 
     def set_successful_flash_notice
-      flash.notice = Spree.t(:order_processed_successfully)
+      flash.notice = t('spree.order_processed_successfully')
       flash['order_completed'] = true
     end
 
@@ -155,7 +155,7 @@ module Spree
     def ensure_sufficient_stock_lines
       if @order.insufficient_stock_lines.present?
         out_of_stock_items = @order.insufficient_stock_lines.collect(&:name).to_sentence
-        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity, names: out_of_stock_items)
+        flash[:error] = t('spree.inventory_error_flash_for_insufficient_quantity', names: out_of_stock_items)
         redirect_to spree.cart_path
       end
     end
@@ -206,7 +206,7 @@ module Spree
     end
 
     def rescue_from_spree_gateway_error(exception)
-      flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
+      flash.now[:error] = t('spree.spree_gateway_error_flash_for_checkout')
       @order.errors.add(:base, exception.message)
       render :edit
     end

data/app/controllers/spree/locale_controller.rb

@@ -6,9 +6,9 @@ module Spree
       end
       if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
         session[:locale] = I18n.locale = params[:locale]
-        flash.notice = Spree.t(:locale_changed)
+        flash.notice = t('spree.locale_changed')
       else
-        flash[:error] = Spree.t(:locale_not_changed)
+        flash[:error] = t('spree.locale_not_changed')
       end
       redirect_back_or_default(spree.root_path)
     end

data/app/controllers/spree/orders_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   class OrdersController < Spree::StoreController
     before_action :check_authorization
-    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/products', 'spree/orders'
 
     respond_to :html
@@ -48,7 +47,7 @@ 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, Spree.t(:please_enter_reasonable_quantity))
+        @order.errors.add(:base, t('spree.please_enter_reasonable_quantity'))
       end
 
       begin
@@ -71,7 +70,7 @@ module Spree
     end
 
     def populate_redirect
-      flash[:error] = Spree.t(:populate_get_error)
+      flash[:error] = t('spree.populate_get_error')
       redirect_to('/cart')
     end
 
@@ -85,9 +84,9 @@ module Spree
 
     def accurate_title
       if @order && @order.completed?
-        Spree.t(:order_number, number: @order.number)
+        t('spree.order_number', number: @order.number)
       else
-        Spree.t(:shopping_cart)
+        t('spree.shopping_cart')
       end
     end
 
@@ -115,7 +114,7 @@ module Spree
     def assign_order
       @order = current_order
       unless @order
-        flash[:error] = Spree.t(:order_not_found)
+        flash[:error] = t('spree.order_not_found')
         redirect_to(root_path) && return
       end
     end

data/app/controllers/spree/products_controller.rb

@@ -3,7 +3,6 @@ module Spree
     before_action :load_product, only: :show
     before_action :load_taxon, only: :index
 
-    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/taxons'
 
     respond_to :html

data/app/controllers/spree/store_controller.rb

@@ -39,7 +39,7 @@ module Spree
     def lock_order
       Spree::OrderMutex.with_lock!(@order) { yield }
     rescue Spree::OrderMutex::LockFailed
-      flash[:error] = Spree.t(:order_mutex_error)
+      flash[:error] = t('spree.order_mutex_error')
       redirect_to spree.cart_path
     end
   end

data/app/controllers/spree/taxons_controller.rb

@@ -1,6 +1,5 @@
 module Spree
   class TaxonsController < Spree::StoreController
-    rescue_from ActiveRecord::RecordNotFound, with: :render_404
     helper 'spree/products'
 
     respond_to :html

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

@@ -1,43 +1,44 @@
 <% address_id = address_type.chars.first %>
 <div class="inner" data-hook=<%="#{address_type}_inner" %>>
   <p class="field" id=<%="#{address_id}firstname" %>>
-    <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span><br />
-    <%= form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name' %>
+    <%= form.label :firstname, t('spree.first_name') %><span class="required">*</span><br />
+    <%= form.text_field :firstname, class: 'required', autocomplete: address_type + ' given-name', required: true, autofocus: true %>
   </p>
 
   <p class="field" id=<%="#{address_id}lastname" %>>
-    <%= form.label :lastname, Spree.t(:last_name) %><span class="required">*</span><br />
+    <%= form.label :lastname, t('spree.last_name') %><br />
     <%= form.text_field :lastname, autocomplete: address_type + ' family-name' %>
   </p>
 
   <% if Spree::Config[:company] %>
     <p class="field" id=<%="#{address_id}company" %>>
-      <%= form.label :company, Spree.t(:company) %><br />
+      <%= form.label :company, t('spree.company') %><br />
       <%= form.text_field :company, autocomplete: address_type + ' organization' %>
     </p>
   <% end %>
 
   <p class="field" id=<%="#{address_id}address1" %>>
-    <%= form.label :address1, Spree.t(:street_address) %><span class="required">*</span><br />
-    <%= form.text_field :address1, class: 'required', autocomplete: address_type + ' address-line1' %>
+    <%= form.label :address1, t('spree.street_address') %><span class="required">*</span><br />
+    <%= form.text_field :address1, class: 'required', autocomplete: address_type + ' address-line1',  required: true %>
   </p>
 
   <p class="field" id=<%="#{address_id}address2" %>>
-    <%= form.label :address2, Spree.t(:street_address_2) %><br />
+    <%= form.label :address2, I18n.t('spree.street_address_2') %><br />
     <%= form.text_field :address2, autocomplete: address_type + ' address-line2' %>
   </p>
 
   <p class="field" id=<%="#{address_id}city" %>>
-    <%= form.label :city, Spree.t(:city) %><span class="required">*</span><br />
-    <%= form.text_field :city, class: 'required', autocomplete: address_type + ' address-level2' %>
+    <%= form.label :city, t('spree.city') %><span class="required">*</span><br />
+    <%= form.text_field :city, class: 'required', autocomplete: address_type + ' address-level2',  required: true %>
   </p>
 
   <p class="field" id=<%="#{address_id}country" %>>
-    <%= form.label :country_id, Spree.t(:country) %><span class="required">*</span><br />
+    <%= form.label :country_id, t('spree.country') %><span class="required">*</span><br />
     <span id=<%="#{address_id}country-selection" %>>
       <%= form.collection_select :country_id, available_countries, :id, :name, {},
           class: 'required',
-          autocomplete: address_type + ' country-name'
+          autocomplete: address_type + ' country-name',
+          required: true
         %>
     </span>
   </p>
@@ -45,7 +46,7 @@
   <% if Spree::Config[:address_requires_state] %>
     <p class="field" id=<%="#{address_id}state" %>>
       <% have_states = !address.country.states.empty? %>
-      <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
+      <%= form.label :state, t('spree.state') %><span class='required' id=<%="#{address_id}state-required"%>>*</span><br/>
 
       <span class="js-address-fields" style="display: none;">
         <%=
@@ -56,7 +57,7 @@
               class: have_states ? 'required' : '',
               style: have_states ? '' : 'display: none;',
               disabled: !have_states,
-              autocomplete: address_type + ' address-level1'
+              autocomplete: address_type + ' address-level1',
             })
           %>
         <%=
@@ -65,30 +66,31 @@
             class: !have_states ? 'required' : '',
             style: have_states ? 'display: none;' : '',
             disabled: have_states,
-            autocomplete: address_type + ' address-level1'
+            autocomplete: address_type + ' address-level1',
           )
         %>
       </span>
       <noscript>
-        <%= form.text_field :state_name, class: 'required', autocomplete: address_type + ' address-level1' %>
+        <%= form.text_field :state_name, class: 'required', autocomplete: address_type + ' address-level1',  required: true %>
       </noscript>
     </p>
   <% end %>
 
   <p class="field" id=<%="#{address_id}zipcode" %>>
-    <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><% end %><br />
-    <%= form.text_field :zipcode, class: "#{'required' if address.require_zipcode?}", autocomplete: address_type + ' postal-code' %>
+    <%= form.label :zipcode, t('spree.zip') %><% if address.require_zipcode? %><span class="required">*</span><% end %><br />
+    <%= form.text_field :zipcode, class: "#{'required' if address.require_zipcode?}", autocomplete: address_type + ' postal-code',  required: true %>
   </p>
 
   <p class="field" id=<%="#{address_id}phone" %>>
-    <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><% end %><br />
-    <%= form.phone_field :phone, class: "#{'required' if address.require_phone?}", autocomplete: address_type + ' home tel' %>
+    <%= form.label :phone, t('spree.phone') %><% if address.require_phone? %><span class="required">*</span><% end %><br />
+    <% phone_hash = address.require_phone? ? { class: 'required', required: true } : {} %>
+    <%= form.phone_field :phone, phone_hash.merge({ autocomplete: address_type + ' home tel' }) %>
   </p>
 
   <% if Spree::Config[:alternative_shipping_phone] %>
     <p class="field" id=<%="#{address_id}altphone" %>>
-      <%= form.label :alternative_phone, Spree.t(:alternative_phone) %><br />
-      <%= form.phone_field :alternative_phone, autocomplete: address_type + ' tel' %>
+      <%= form.label :alternative_phone, t('spree.alternative_phone') %><br />
+      <%= form.phone_field :alternative_phone, autocomplete: address_type + ' tel'%>
     </p>
   <% end %>
 </div>

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

@@ -1,7 +1,7 @@
 <div class="columns alpha six" data-hook="billing_fieldset_wrapper">
   <fieldset id="billing" data-hook>
     <%= form.fields_for :bill_address do |bill_form| %>
-      <legend align="center"><%= Spree.t(:billing_address) %></legend>
+      <legend align="center"><%= t('spree.billing_address') %></legend>
       <%= render partial: 'spree/address/form', locals: { form: bill_form, address_type: 'billing', address: @order.bill_address } %>
     <% end %>
   </fieldset>
@@ -10,10 +10,10 @@
 <div class="columns omega six" data-hook="shipping_fieldset_wrapper">
   <fieldset id="shipping" data-hook>
     <%= form.fields_for :ship_address do |ship_form| %>
-      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+      <legend align="center"><%= t('spree.shipping_address') %></legend>
       <p class="field checkbox" data-hook="use_billing">
         <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
-        <%= label_tag :order_use_billing, Spree.t(:use_billing_address), id: 'use_billing' %>
+        <%= label_tag :order_use_billing, t('spree.use_billing_address'), id: 'use_billing' %>
       </p>
       <%= render partial: 'spree/address/form', locals: { form: ship_form, address_type: 'shipping', address: @order.ship_address } %>
     <% end %>
@@ -22,12 +22,12 @@
 <hr class="clear" />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
+  <%= submit_tag t('spree.save_and_continue'), class: 'continue button primary' %>
   <% if try_spree_current_user %>
     <span data-hook="save_user_address">
       &nbsp; &nbsp;
       <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>
-      <%= label_tag :save_user_address, Spree.t(:save_my_address) %>
+      <%= label_tag :save_user_address, t('spree.save_my_address') %>
     </span>
   <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <fieldset id="order_details" data-hook>
   <div class="clear"></div>
-  <legend align="center"><%= Spree.t(:confirm) %></legend>
+  <legend align="center"><%= t('spree.confirm') %></legend>
   <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>
 </fieldset>
 
@@ -12,11 +12,11 @@
       <div class="terms_and_conditions" data-hook="terms_and_conditions">
         <div class="policy"><%= render partial: "spree/checkout/terms_and_conditions" %></div>
         <%= check_box_tag :accept_terms_and_conditions, 'accepted', false %>
-        <%= label_tag :accept_terms_and_conditions, Spree.t(:agree_to_terms_of_service) %>
+        <%= label_tag :accept_terms_and_conditions, t('spree.agree_to_terms_of_service') %>
       </div>
     <% end %>
 
-    <%= submit_tag Spree.t(:place_order),
+    <%= submit_tag t('spree.place_order'),
       disabled: requires_acceptance,
       class: "continue button primary #{ 'disabled' if requires_acceptance }" %>
   <% end %>

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

@@ -1,12 +1,12 @@
 <fieldset id='shipping_method' data-hook>
-  <legend align="center"><%= Spree.t(:delivery) %></legend>
+  <legend align="center"><%= t('spree.delivery') %></legend>
   <div class="inner" data-hook="shipping_method_inner">
     <div id="methods">
       <%= form.fields_for :shipments do |ship_form| %>
 
         <div class="shipment">
           <h3 class="stock-location" data-hook="stock-location">
-            <%= Spree.t(:package_from) %>
+            <%= t('spree.package_from') %>
             <strong class="stock-location-name" data-hook="stock-location-name"><%= ship_form.object.stock_location.name %></strong>
           </h3>
 
@@ -19,14 +19,16 @@
             </colgroup>
             <thead>
               <th></th>
-              <th align='left'><%= Spree.t(:item) %></th>
-              <th><%= Spree.t(:qty) %></th>
-              <th><%= Spree.t(:price) %></th>
+              <th align='left'><%= t('spree.item') %></th>
+              <th><%= t('spree.qty') %></th>
+              <th><%= t('spree.price') %></th>
             </thead>
             <tbody>
               <% ship_form.object.manifest.each do |item| %>
                 <tr class="stock-item">
-                  <td class="item-image"><%= image_tag item.variant.display_image.attachment(:mini) %></td>
+                  <td class="item-image">
+                    <%= render 'spree/shared/image', image: item.variant.display_image, size: :mini %>
+                  </td>
                   <td class="item-name"><%= item.variant.name %></td>
                   <td class="item-qty"><%= item.quantity %></td>
                   <td class="item-price"><%= display_price(item.variant) %></td>
@@ -35,7 +37,7 @@
             </tbody>
           </table>
 
-          <h5 class="stock-shipping-method-title"><%= Spree.t(:shipping_method) %></h5>
+          <h5 class="stock-shipping-method-title"><%= t('spree.shipping_method') %></h5>
           <ul class="field radios shipping-methods">
             <% ship_form.object.shipping_rates.each do |rate| %>
               <li class="shipping-method">
@@ -54,7 +56,7 @@
       <% if @differentiator.try(:missing?) %>
         <div class="shipment unshippable">
           <h3 class="stock-location" data-hook="stock-location">
-            <%= Spree.t(:unshippable_items) %>
+            <%= t('spree.unshippable_items') %>
           </h3>
           <table class="stock-contents" data-hook="stock-missing">
             <colgroup>
@@ -65,14 +67,16 @@
             </colgroup>
             <thead>
               <th></th>
-              <th align='left'><%= Spree.t(:item) %></th>
-              <th><%= Spree.t(:qty) %></th>
-              <th><%= Spree.t(:price) %></th>
+              <th align='left'><%= t('spree.item') %></th>
+              <th><%= t('spree.qty') %></th>
+              <th><%= t('spree.price') %></th>
             </thead>
             <tbody>
               <% @differentiator.missing.each do |variant, quantity| %>
                 <tr class="stock-item">
-                  <td class="item-image"><%= image_tag variant.display_image.attachment(:mini) %></td>
+                  <td class="item-image">
+                    <%= render 'spree/shared/image', image: variant.display_image, size: :mini %>
+                  </td>
                   <td class="item-name"><%= variant.name %></td>
                   <td class="item-qty"><%= quantity %></td>
                   <td class="item-price"><%= display_price(variant) %></td>
@@ -86,7 +90,7 @@
     </div>
     <% if Spree::Config[:shipping_instructions] %>
       <p id="minstrs" data-hook>
-        <%= form.label :special_instructions, Spree.t(:shipping_instructions) %><br />
+        <%= form.label :special_instructions, t('spree.shipping_instructions') %><br />
         <%= form.text_area :special_instructions, cols: 40, rows: 7 %>
       </p>
     <% end %>
@@ -96,5 +100,5 @@
 <br />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
+  <%= submit_tag t('spree.save_and_continue'), class: 'continue button primary' %>
 </div>

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

@@ -1,16 +1,16 @@
 <fieldset id="payment" data-hook>
-  <legend align="center"><%= Spree.t(:payment_information) %></legend>
+  <legend align="center"><%= t('spree.payment_information') %></legend>
   <div data-hook="checkout_payment_step">
     <% if @wallet_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) %>
+          <%= t('spree.use_existing_cc') %>
         </label>
         <br/>
         <%= radio_button_tag 'use_existing_card', 'no' %>
         <label for="use_existing_card_no">
-          <%= Spree.t(:use_new_cc_or_payment_method) %>
+          <%= t('spree.use_new_cc_or_payment_method') %>
         </label>
       </div>
 
@@ -40,7 +40,7 @@
       <p>
         <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) %>
+          <%= t(method.name, scope: 'spree.payment_methods', default: method.name) %>
         </label>
       </p>
       <% end %>
@@ -60,7 +60,7 @@
       <%= form.label :coupon_code %><br />
       <%= form.text_field :coupon_code %>
       <button type="button" class="button" id="coupon-code-apply-button">
-        <%= Spree.t(:apply_code) %>
+        <%= t('spree.apply_code') %>
       </button>
 
     </p>
@@ -72,6 +72,6 @@
 <br class="space" />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
+  <%= submit_tag t('spree.save_and_continue'), class: 'continue button primary' %>
   <script>Spree.disableSaveOnClick();</script>
 </div>

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

@@ -1,9 +1,9 @@
-<h3><%= Spree.t(:order_summary) %></h3>
+<h3><%= t('spree.order_summary') %></h3>
 
 <table data-hook="order_summary">
   <tbody>
     <tr data-hook="item_total">
-      <td><strong><%= Spree.t(:item_total) %>:</strong></td>
+      <td><strong><%= t('spree.item_total') %>:</strong></td>
       <td><strong><%= order.display_item_total.to_html %></strong></td>
     </tr>
 
@@ -29,7 +29,7 @@
 
     <% if order.passed_checkout_step?("delivery") && order.shipments.any? %>
       <tr data-hook="shipping_total">
-        <td><%= Spree.t(:shipping_total) %>:</td>
+        <td><%= t('spree.shipping_total') %>:</td>
         <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
       </tr>
 
@@ -59,13 +59,13 @@
 
     <% if order.total_applicable_store_credit > 0.0 %>
       <tr data-hook="checkout-summary-store-credit">
-        <td><%= Spree.t("store_credit.store_credit") %>:</td>
+        <td><%= t('spree.store_credit.store_credit') %>:</td>
         <td><%= order.display_total_applicable_store_credit.to_html %></td>
       </tr>
     <% end %>
 
     <tr data-hook="order_total">
-      <td><strong><%= Spree.t(:order_total) %>:</strong></td>
+      <td><strong><%= t('spree.order_total') %>:</strong></td>
       <td><strong><span id='summary-order-total'><%= order.display_order_total_after_store_credit.to_html %></span></strong></td>
     </tr>
   </tbody>