solidus_backend 2.4.2 → 2.5.0.beta1

data/app/views/spree/admin/images/index.html.erb

@@ -5,13 +5,15 @@
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
+    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
   <% end %>
 <% end %>
 
-<div id="images" data-hook></div>
+<div id="new_image" class="hidden">
+  <%= render 'new', product: @product, image: Spree::Image.new(viewable: @product) %>
+</div>
 
-<fieldset>
+<fieldset class="no-border-bottom">
   <legend align="center"><%= t(".upload_images") %></legend>
 
   <div id="upload-zone">
@@ -51,7 +53,7 @@
   <thead>
     <tr data-hook="images_header">
       <th></th>
-      <th><%= Spree.t(:thumbnail) %></th>
+      <th><%= t('spree.thumbnail') %></th>
       <% if @product.has_variants? %>
         <th><%= Spree::Variant.model_name.human %></th>
       <% end %>
@@ -67,6 +69,6 @@
 
 <% if no_images %>
   <div class="no-objects-found">
-    <%= Spree.t(:no_images_found) %>.
+    <%= t('spree.no_images_found') %>.
   </div>
 <% end %>

data/app/views/spree/admin/images/new.html.erb

@@ -1,12 +1 @@
-<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
-  <fieldset data-hook="new_image">
-    <legend align="center"><%= Spree.t(:new_image) %></legend>
-
-      <%= render partial: 'form', locals: { f: f } %>
-
-      <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update') %>
-        <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
-      </div>
-  </fieldset>
-<% end %>
+<%= render 'new', product: @product, image: @image %>

data/app/views/spree/admin/log_entries/index.html.erb

@@ -4,8 +4,8 @@
 <% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
-  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment) %></li>
+  <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
+  <li><%= button_link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment) %></li>
 <% end %>
 
 <table class='index' id='listing_log_entries'>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -7,5 +7,5 @@
   </td>
   <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
-  <td class="actions"><%= link_to_remove_fields Spree.t('actions.remove'), f, no_text: true %></td>
+  <td class="actions"><%= link_to_remove_fields t('spree.actions.remove'), f, no_text: true %></td>
 </tr>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -6,7 +6,7 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", class: 'button' %>
+      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'button' %>
     </span>
   </li>
   <% end %>

data/app/views/spree/admin/option_types/index.html.erb

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::OptionType) %>
     <li id="new_ot_link">
-      <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { remote: true, id: 'new_option_type_link' } %>
+      <%= button_link_to t('spree.new_option_type'), new_admin_option_type_url, { remote: true, id: 'new_option_type_link' } %>
     </li>
   <% end %>
 <% end %>
@@ -47,7 +47,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::OptionType,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/option_types/new.html.erb

@@ -2,7 +2,7 @@
 
 <%= form_for [:admin, @option_type] do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree.t(:new_option_type) %></legend>
+    <legend align="center"><%= t('spree.new_option_type') %></legend>
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -1,9 +1,9 @@
 <div id="add-line-item" class="js-shipment-add-variant" data-hook>
   <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:add_product) %></legend>
+    <legend align="center"><%= t('spree.add_product') %></legend>
 
     <div data-hook="add_product_name" class="field">
-      <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
+      <%= label_tag :add_variant_id, t('spree.name_or_sku') %>
       <%= text_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth" %>
     </div>
   </fieldset>

data/app/views/spree/admin/orders/_carton.html.erb

@@ -3,9 +3,9 @@
     <legend align="center" class="stock-location" data-hook="stock-location">
       <span class="carton-number"><%= carton.number %></span>
       -
-      <span class="carton-state"><%= Spree.t("shipment_states.shipped") %></span>
+      <span class="carton-state"><%= t('spree.shipment_states.shipped') %></span>
       <span class="carton-exchange"><%= Spree::Exchange.model_name.human if carton.any_exchanges? %></span>
-      <%= Spree.t(:package_from) %>
+      <%= t('spree.package_from') %>
       <strong class="stock-location-name" data-hook="stock-location-name">'<%= carton.stock_location.name %>'</strong>
     </legend>
   </fieldset>
@@ -35,7 +35,7 @@
             <strong><%= method.name %></strong>
           </td>
         <% else %>
-          <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+          <td colspan='5'><%= t('spree.no_shipping_method_selected') %></td>
         <% end %>
       </tr>
 
@@ -52,27 +52,27 @@
           <% if carton.tracking.present? %>
             <strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong> <%= carton.tracking %>
           <% else %>
-            <i><%= Spree.t(:no_tracking_present) %></i>
+            <i><%= t('spree.no_tracking_present') %></i>
           <% end %>
         </td>
       </tr>
 
       <tr class='shipment-numbers'>
         <td colspan="5">
-          <strong><%= Spree.t(:shipment_numbers) %>:&nbsp;</strong><%= carton.shipment_numbers.join(", ") %>
+          <strong><%= t('spree.shipment_numbers') %>:&nbsp;</strong><%= carton.shipment_numbers.join(", ") %>
         </td>
       </tr>
 
       <tr class='ship-date'>
         <td colspan="5">
-          <strong><%= Spree.t(:shipment_date) %>:&nbsp;</strong><%= carton.display_shipped_at %>
+          <strong><%= t('spree.shipment_date') %>:&nbsp;</strong><%= carton.display_shipped_at %>
         </td>
       </tr>
 
       <% if carton.orders.size > 1 %>
         <tr class='order-numbers'>
           <td colspan="5">
-            <strong><%= Spree.t(:carton_orders) %>:&nbsp;</strong>
+            <strong><%= t('spree.carton_orders') %>:&nbsp;</strong>
             <% (carton.orders - [order]).each do |order| %>
               <%= link_to order.number, edit_admin_order_path(order) %>
             <% end %>
@@ -83,7 +83,7 @@
       <% if carton.external_number.present? %>
         <tr class="external-number">
           <td colspan="5">
-            <strong><%= Spree.t(:carton_external_number) %>:&nbsp;</strong><%= carton.external_number %>
+            <strong><%= t('spree.carton_external_number') %>:&nbsp;</strong><%= carton.external_number %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/orders/_carton_manifest.html.erb

@@ -13,7 +13,7 @@
     <td class="item-price"><%= item.line_item.single_money.to_html %></td>
     <td class="item-qty-show">
         <% item.states.each do |state,count| %>
-          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
+          <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
     <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>

data/app/views/spree/admin/orders/_order_details.html.erb

@@ -3,7 +3,7 @@
     render "spree/admin/orders/adjustments", {
       adjustments: order.line_item_adjustments,
       order: order,
-      title: Spree.t(:line_item_adjustments)
+      title: t('spree.line_item_adjustments')
     }
   %>
 </div>
@@ -12,7 +12,7 @@
     render "spree/admin/orders/adjustments", {
       adjustments: order.shipment_adjustments,
       order: order,
-      title: Spree.t(:shipment_adjustments)
+      title: t('spree.shipment_adjustments')
     }
   %>
 </div>
@@ -21,12 +21,12 @@
     render "spree/admin/orders/adjustments", {
       adjustments: order.adjustments,
       order: order,
-      title: Spree.t(:order_adjustments)
+      title: t('spree.order_adjustments')
     }
   %>
 </div>
 
 <fieldset class="no-border-bottom <%= "hidden" if order.line_items.none? %>" id="order-total" data-hook="order_details_total">
-  <legend><%= Spree.t(:order_total) %></legend>
+  <legend><%= t('spree.order_total') %></legend>
   <span class="order-total"><%= order.display_total %></span>
 </fieldset>

data/app/views/spree/admin/orders/_risk_analysis.html.erb

@@ -1,19 +1,19 @@
 <fieldset class="no-border-bottom" id="risk_analysis">
-  <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
+  <legend><%= "#{t('spree.risk_analysis')}: #{t('spree.not') unless @order.is_risky?} #{t('spree.risky')}" %></legend>
   <table>
     <thead>
-      <th><%= Spree.t('risk')%></th>
-      <th><%= Spree.t('status')%></th>
+      <th><%= t('spree.risk')%></th>
+      <th><%= t('spree.status')%></th>
     </thead>
     <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
       <tr class="">
         <td><strong>
-          <%= Spree.t(:failed_payment_attempts) %>:
+          <%= t('spree.failed_payment_attempts') %>:
         </strong></td>
         <td>
           <span class="pill pill-<%= @order.payments.failed.count > 0 ? 'warning' : 'complete' %>">
-            <%= Spree.t(
-              :payments_failed_count,
+            <%= t(
+              'spree.payments_failed_count',
               count: @order.payments.failed.count
             ) %>
           </span>
@@ -21,26 +21,26 @@
       </tr>
 
       <tr>
-        <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
+        <td><strong><%= t('spree.avs_response') %>:</strong></td>
         <td>
           <span class="pill pill-<%= latest_payment.is_avs_risky? ? 'warning' : 'complete' %>">
             <% if latest_payment.is_avs_risky? %>
               <%= avs_response_code[latest_payment.avs_response] %>
             <% else %>
-              <%= Spree.t(:success) %>
+              <%= t('spree.success') %>
             <% end %>
           </span>
         </td>
       </tr>
 
       <tr>
-        <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
+        <td><strong><%= t('spree.cvv_response') %>:</strong></td>
         <td>
           <span class="pill pill-<%= latest_payment.is_cvv_risky? ? 'warning' : 'complete' %>">
             <% if latest_payment.is_cvv_risky? %>
               <%= cvv_response_code[latest_payment.cvv_response_code] %>
             <% else %>
-              <%= Spree.t(:success) %>
+              <%= t('spree.success') %>
             <% end %>
           </span>
         </td>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -9,16 +9,18 @@
     <legend align="center" class="stock-location" data-hook="stock-location">
       <span class="shipment-number"><%= shipment.number %></span>
       -
-      <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
-      <%= Spree.t(:package_from) %>
+      <span class="shipment-state"><%= t(shipment.state, scope: "spree.shipment_states") %></span>
+      <%= t('spree.package_from') %>
       <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
     </legend>
 
     <% if shipment.ready? && can?(:ship, shipment) %>
       <%= form_tag("#", class: "admin-ship-shipment") do %>
-        <%= check_box_tag :send_mailer, true, true %>
-        <%= label_tag :send_mailer, Spree.t(:send_mailer) %>
-        <%= submit_tag Spree.t('actions.ship'), class: "ship-shipment-button" %>
+        <label>
+          <%= check_box_tag :send_mailer, true, true %>
+          <%= t('spree.send_mailer') %>
+        </label>
+        <%= submit_tag t('spree.actions.ship'), class: "ship-shipment-button" %>
       <% end %>
     <% end %>
   </fieldset>
@@ -47,80 +49,20 @@
       <%= render 'spree/admin/orders/shipment_manifest', { shipment_number: shipment.number, shipment_manifest: manifest_items } %>
 
       <% unless shipment.shipped? %>
-        <tr class="edit-method hidden total">
-          <th><%= Spree::ShippingMethod.model_name.human %></th>
-          <td colspan="4">
-            <%= select_tag :selected_shipping_rate_id,
-              options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-              {class: 'custom-select fullwidth', data: {'shipment-number' => shipment.number } } %>
-          </td>
-          <td class="actions">
-            <% if can? :update, shipment %>
-              <%= button_tag '', class: 'save-method fa fa-check no-text with-tip',
-                data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
-              <%= button_tag '', class: 'cancel-method fa fa-cancel no-text with-tip',
-                data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
-            <% end %>
-          </td>
-        </tr>
-        <% end %>
-
-        <tr class="show-method total">
-          <% if rate = shipment.selected_shipping_rate %>
-            <th><%= Spree::ShippingMethod.model_name.human %></th>
-            <td colspan="3">
-              <%= rate.name %>
-            </td>
-            <td class="total">
-              <%= shipment.display_cost %>
-            </td>
-          <% else %>
-            <td colspan="5"><%= Spree.t(:no_shipping_method_selected) %></td>
-          <% end %>
-
-          <td class="actions">
-            <% if can?(:update, shipment) && !shipment.shipped? %>
-              <%= button_tag '', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
-            <% end %>
-          </td>
+        <tr class="edit-shipping-method vertical-middle">
         </tr>
+      <% end %>
 
-      <tr class="edit-tracking hidden total">
-        <th><%= Spree::Shipment.human_attribute_name(:tracking) %></th>
-        <td colspan="4">
-          <%= text_field_tag :tracking, shipment.tracking, id: nil %>
-        </td>
-        <td class="actions">
-          <% if can? :update, shipment %>
-            <%= button_tag '', class: 'save-tracking fa fa-check no-text with-tip', data: { action: 'save', 'shipment-number' => shipment.number }, title: Spree.t('actions.save'), type: :button %>
-            <%= button_tag '', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), type: :button %>
-          <% end %>
-        </td>
+      <tr class="edit-tracking vertical-middle">
       </tr>
 
       <% if order.special_instructions.present? %>
         <tr class='special_instructions'>
           <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+            <strong><%= t('spree.special_instructions') %>:&nbsp;</strong><%= order.special_instructions %>
           </td>
         </tr>
       <% end %>
-
-      <tr class="show-tracking total">
-        <th><%= Spree::Shipment.human_attribute_name(:tracking) %></th>
-        <td colspan="4" class="tracking-value">
-          <% if shipment.tracking.present? %>
-            <%= shipment.tracking %>
-          <% else %>
-            <i><%= Spree.t(:no_tracking_present) %></i>
-          <% end %>
-        </td>
-        <td class="actions">
-          <% if can? :update, shipment %>
-            <%= button_tag '', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
-          <% end %>
-        </td>
-      </tr>
     </tbody>
   </table>
 </div>

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -15,15 +15,15 @@
     <td class="item-price"><%= item.line_item.single_money.to_html %></td>
     <td class="item-qty-show">
         <% item.states.each do |state,count| %>
-          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
+          <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
     <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
 
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <% if can? :update, item %>
-        <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'edit', 'variant-id' => item.variant.id }, title: Spree.t('actions.split'), type: :button %>
-        <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { action: 'remove', 'variant-id' => item.variant.id }, title: Spree.t('actions.delete'), type: :button %>
+        <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'edit', 'variant-id' => item.variant.id }, title: t('spree.actions.split'), type: :button %>
+        <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { action: 'remove', 'variant-id' => item.variant.id }, title: t('spree.actions.delete'), type: :button %>
       <% end %>
     </td>
   </tr>

data/app/views/spree/admin/orders/cart.html.erb

@@ -3,13 +3,13 @@
         <li><%= event_links %></li>
     <% end %>
     <% if can?(:resend, @order) && @order.completed? %>
-        <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post %></li>
+        <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
     <% end %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Cart' } %>
 
-<% admin_breadcrumb(Spree.t(:cart)) %>
+<% admin_breadcrumb(t('spree.cart')) %>
 
 
 <div data-hook="admin_order_edit_header">

data/app/views/spree/admin/orders/confirm.html.erb

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Confirm'} %>
 
-<% admin_breadcrumb(Spree.t(:confirm_order)) %>
+<% admin_breadcrumb(t('spree.confirm_order')) %>
 
 
 <%= render partial: 'spree/admin/orders/confirm/customer_details', locals: {order: @order} %>
@@ -17,7 +17,7 @@
     locals: {
       adjustments: @order.line_item_adjustments,
       order: @order,
-      title: Spree.t(:line_item_adjustments),
+      title: t('spree.line_item_adjustments'),
     }
   ) if @order.line_item_adjustments.eligible.any?
 %>
@@ -28,7 +28,7 @@
     locals: {
       adjustments: @order.shipment_adjustments,
       order: @order,
-      title: Spree.t(:shipment_adjustments),
+      title: t('spree.shipment_adjustments'),
     }
   ) if @order.shipment_adjustments.eligible.any?
 %>
@@ -39,14 +39,14 @@
     locals: {
       adjustments: @order.adjustments,
       order: @order,
-      title: Spree.t(:order_adjustments),
+      title: t('spree.order_adjustments'),
     }
   ) if @order.adjustments.eligible.any?
 %>
 
 <% if @order.line_items.exists? %>
   <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
-    <legend><%= Spree.t(:order_total) %></legend>
+    <legend><%= t('spree.order_total') %></legend>
     <span class="order-total"><%= @order.display_total %></span>
   </fieldset>
 <% end %>
@@ -55,6 +55,6 @@
 
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
   <%= button_to [:complete, :admin, @order], { class: 'button', method: 'put' } do %>
-    <%= Spree.t(:complete_order) %>
+    <%= t('spree.complete_order') %>
   <% end %>
 </div>