solidus_backend 2.4.2 → 2.5.0.beta1

data/app/models/spree/backend_configuration.rb

@@ -15,7 +15,7 @@ module Spree
                             :shipping_categories, :stock_locations,
                             :refund_reasons, :reimbursement_types, :return_authorization_reasons]
     PROMOTION_TABS     ||= [:promotions, :promotion_categories]
-    STOCK_TABS         ||= [:stock_items, :stock_transfers]
+    STOCK_TABS         ||= [:stock_items]
     USER_TABS          ||= [:users, :store_credits]
 
     # An item which should be drawn in the admin menu
@@ -107,7 +107,6 @@ module Spree
           'cubes',
           condition: -> { can?(:admin, Spree::StockItem) },
           label: :stock,
-          partial: 'spree/admin/shared/stock_sub_menu',
           url: :admin_stock_items_path
         ),
         MenuItem.new(

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb Spree.t(:settings) %>
-<% admin_breadcrumb Spree.t('admin.tab.checkout') %>
+<% admin_breadcrumb t('spree.settings') %>
+<% admin_breadcrumb t('spree.admin.tab.checkout') %>
 <% admin_breadcrumb link_to plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
 <% admin_breadcrumb @object.name %>
 

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

@@ -1,13 +1,13 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::AdjustmentReason)) %>
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to Spree.t(:new_adjustment_reason), new_object_url, { id: 'admin_new_named_type' } %>
+      <%= button_link_to t('spree.new_adjustment_reason'), new_object_url, { id: 'admin_new_named_type' } %>
     </li>
   </ul>
 <% end %>
@@ -34,7 +34,7 @@
           </td>
           <td>
             <span class="pill pill-<%= adjustment_reason.active? ? 'active' : 'inactive' %>">
-              <%= Spree.t(adjustment_reason.active? ? :active : :inactive) %>
+              <%= t(adjustment_reason.active? ? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td class="actions">
@@ -45,7 +45,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::AdjustmentReason,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path) %>
-<% admin_breadcrumb(Spree.t(:new_adjustment_reason)) %>
+<% admin_breadcrumb(t('spree.new_adjustment_reason')) %>
 
 <% content_for :page_actions do %>
 <% end %>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -13,12 +13,12 @@
     <tr data-hook="adjustment_buttons">
       <td class="align-right" colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to Spree.t(:unfinalize_all_adjustments), adjustments_unfinalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :get %>
         <% end %>
       </td>
       <td colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to Spree.t(:finalize_all_adjustments), adjustments_finalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :get %>
         <% end %>
       </td>
       <td class='actions'>&nbsp;</td>

data/app/views/spree/admin/adjustments/_form.html.erb

@@ -20,7 +20,7 @@
     <div class="col-3">
       <%= f.field_container :label do %>
         <%= f.label :adjustment_reason_id %><br/>
-        <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'custom-select fullwidth'}) %>
+        <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => t('spree.select_a_reason'), class: 'custom-select fullwidth'}) %>
       <% end %>
     </div>
 

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
-<% admin_breadcrumb("#{Spree.t('actions.edit')} #{Spree::Adjustment.model_name.human}") %>
+<% admin_breadcrumb("#{t('spree.actions.edit')} #{Spree::Adjustment.model_name.human}") %>
 
 <% content_for :page_actions do %>
 <% end %>
@@ -12,8 +12,8 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue) %>
-      <%= link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), class: 'button' %>
+      <%= button t('spree.continue') %>
+      <%= link_to t('spree.actions.cancel'), admin_order_adjustments_url(@order), class: 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Adjustment %>
     <li>
-      <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order) %>
+      <%= button_link_to t('spree.new_adjustment'), new_admin_order_adjustment_url(@order) %>
     </li>
   <% end %>
 <% end %>
@@ -14,8 +14,8 @@
 
 <% if @order.can_add_coupon? %>
   <div data-hook="adjustments_new_coupon_code">
-    <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code) %>
-    <%= button Spree.t(:add_coupon_code), nil, 'submit', id: "add_coupon_code" %>
+    <%= text_field_tag "coupon_code", "", placeholder: t('spree.coupon_code') %>
+    <%= button t('spree.add_coupon_code'), nil, 'submit', id: "add_coupon_code" %>
   </div>
 <% end %>
 <%= javascript_tag do -%>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
-<% admin_breadcrumb(Spree.t(:new_adjustment)) %>
+<% admin_breadcrumb(t('spree.new_adjustment')) %>
 
 
 <% content_for :page_actions do %>
@@ -14,8 +14,8 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue) %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order) %>
+      <%= button t('spree.continue') %>
+      <%= button_link_to t('spree.actions.cancel'), admin_order_adjustments_url(@order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Cancel Inventory'} %>
 
-<% admin_breadcrumb(Spree.t(:cancel_inventory)) %>
+<% admin_breadcrumb(t('spree.cancel_inventory')) %>
 
 <table class="stock-contents index">
   <colgroup>
@@ -36,7 +36,7 @@
           <td class="inventory-unit-quantity align-center">1</td>
           <td class="inventory-unit-state">
             <span class="pill pill-<%= inventory_unit.state %>">
-              <%= Spree.t(inventory_unit.state, scope: :inventory_states) %>
+              <%= t(inventory_unit.state, scope: 'spree.inventory_states') %>
             </span>
           </td>
           <td class="inventory-unit-shipment"><%= inventory_unit.shipment.number %></td>
@@ -47,7 +47,7 @@
       <% end %>
       <tr class="submit-cancellation">
         <td colspan="6" class="align-center">
-          <%= f.submit Spree.t(:cancel_inventory) %>
+          <%= f.submit t('spree.cancel_inventory') %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb

@@ -21,9 +21,9 @@
         <td><%= reimbursement.display_total %></td>
         <td>
           <span class="pill pill-<%= reimbursement.reimbursement_status %>">
-            <%= Spree.t(
+            <%= t(
               reimbursement.reimbursement_status,
-              scope: :reimbursement_states
+              scope: 'spree.reimbursement_states'
             ) %>
           </span>
         </td>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -40,9 +40,9 @@
         </td>
         <td>
           <span class="pill pill-<%= return_item.reception_status %>">
-            <%= Spree.t(
+            <%= t(
               return_item.reception_status,
-              scope: :reception_states
+              scope: 'spree.reception_states'
             ) %>
           </span>
         </td>
@@ -50,17 +50,17 @@
           <td>
             <%= form_for [:admin, return_item] do |f| %>
               <%= f.hidden_field 'reception_status_event', value: 'receive' %>
-              <%= f.button Spree.t('actions.receive'), class: 'with-tip', "data-action" => 'save' %>
+              <%= f.button t('spree.actions.receive'), class: 'with-tip', "data-action" => 'save' %>
             <% end %>
           </td>
         <% end %>
         <% if show_decision %>
           <td class='actions'>
-            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-up icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
-              <%= Spree.t(:accept) %>
+            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-up icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: t('spree.accept'), method: 'put' } do %>
+              <%= t('spree.accept') %>
             <% end %>
-            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-down icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
-              <%= Spree.t(:reject) %>
+            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-down icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: t('spree.reject'), method: 'put' } do %>
+              <%= t('spree.reject') %>
             <% end %>
           </td>
         <% end %>

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -39,9 +39,9 @@
         </td>
         <td>
           <span class="pill pill-<%= return_item.inventory_unit.state %>">
-            <%= Spree.t(
+            <%= t(
               return_item.inventory_unit.state,
-              scope: :inventory_states
+              scope: 'spree.inventory_states'
             ) %>
           </span>
         </td>

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

@@ -8,28 +8,28 @@
 
 <% if @manual_intervention_return_items.any? %>
   <fieldset data-hook="manual_intervention_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:manual_intervention_required) %></legend>
+    <legend align="center"><%= t('spree.manual_intervention_required') %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @manual_intervention_return_items, show_decision: true} %>
   </fieldset>
 <% end %>
 
 <% if @pending_return_items.any? %>
   <fieldset data-hook="pending_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:pending) %></legend>
+    <legend align="center"><%= t('spree.pending') %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @pending_return_items, show_decision: true} %>
   </fieldset>
 <% end %>
 
 <% if @accepted_return_items.any? %>
   <fieldset data-hook="accepted_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:accepted) %></legend>
+    <legend align="center"><%= t('spree.accepted') %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @accepted_return_items, show_decision: false} %>
   </fieldset>
 <% end %>
 
 <% if @rejected_return_items.any? %>
   <fieldset data-hook="rejected_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:rejected) %></legend>
+    <legend align="center"><%= t('spree.rejected') %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @rejected_return_items, show_decision: false} %>
   </fieldset>
 <% end %>
@@ -40,12 +40,12 @@
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
         <%= f.button class: 'button' do %>
-          <%= Spree.t(:create_reimbursement) %>
+          <%= t('spree.create_reimbursement') %>
         <% end %>
       <% end %>
     <% else %>
       <div class="no-objects-found">
-        <%= Spree.t(:unable_to_create_reimbursements) %>
+        <%= t('spree.unable_to_create_reimbursements') %>
       </div>
     <% end %>
   </fieldset>
@@ -57,7 +57,7 @@
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>
     <div class="no-objects-found">
-      <%= Spree.t(:none) %>
+      <%= t('spree.none') %>
     </div>
   <% end %>
 </fieldset>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::CustomerReturn %>
     <li>
-      <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order) %>
+      <%= button_link_to t('spree.new_customer_return'), spree.new_admin_order_customer_return_path(@order) %>
     </li>
   <% end %>
 <% end %>
@@ -31,9 +31,9 @@
           <td><%= pretty_time(customer_return.created_at) %></td>
           <td>
             <% if customer_return.fully_reimbursed? %>
-              <span class="pill pill-complete"><%= Spree.t(:reimbursed) %></span>
+              <span class="pill pill-complete"><%= t('spree.reimbursed') %></span>
             <% else %>
-              <span class="pill pill-pending"><%= Spree.t(:incomplete) %></span>
+              <span class="pill pill-pending"><%= t('spree.incomplete') %></span>
             <% end %>
           </td>
           <td class='actions align-center' data-hook="admin_orders_customer_returns_index_row_actions">
@@ -44,7 +44,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::CustomerReturn,
                  new_resource_url: new_object_url %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
-<% admin_breadcrumb(Spree.t(:new_customer_return)) %>
+<% admin_breadcrumb(t('spree.new_customer_return')) %>
 
 
 <% content_for :page_actions do %>
@@ -14,43 +14,43 @@
     <fieldset class="no-border-top">
       <div data-hook="admin_customer_return_form_fields">
         <fieldset class='no-border-bottom'>
-          <legend align='center'><%= Spree.t(:items_in_rmas) %></legend>
+          <legend align='center'><%= t('spree.items_in_rmas') %></legend>
           <% if @rma_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
           <% else %>
-            <div class="col-9 no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="no-objects-found"><%= t('spree.none') %></div>
           <% end %>
         </fieldset>
 
         <fieldset class='no-border-bottom'>
-          <legend align='center'><%= Spree.t(:other_items_in_other) %></legend>
+          <legend align='center'><%= t('spree.other_items_in_other') %></legend>
           <% if @new_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
           <% else %>
-            <div class="col-9 no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="no-objects-found"><%= t('spree.none') %></div>
           <% end %>
         </fieldset>
 
         <%= f.field_container :stock_location do %>
           <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
-          <%= f.select :stock_location_id, Spree::StockLocation.order_default.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location')} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
 
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.create') %>
-        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order) %>
+        <%= button t('spree.actions.create') %>
+        <%= button_link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order) %>
       </div>
     </fieldset>
   <% end %>
 
 <% else %>
 
-  <div class="col-9 no-objects-found">
-    <%= Spree.t(:all_items_have_been_returned) %>,
-    <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
+  <div class="no-objects-found">
+    <%= t('spree.all_items_have_been_returned') %>,
+    <%= link_to t('spree.back_to_customer_return_list'), spree.admin_order_customer_returns_path(@order) %>.
   </div>
 
 <% end %>

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

@@ -38,11 +38,11 @@
 
   <td class="actions">
     <% if can?(:update, image) %>
-      <%= link_to_with_icon 'check', Spree.t('actions.save'), api_variant_image_path(@product, image), no_text: true, data: {action: 'save'} %>
+      <%= link_to_with_icon 'check', t('spree.actions.save'), api_variant_image_path(@product, image), no_text: true, data: {action: 'save'} %>
 
-      <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
+      <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
 
-      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_path(@product, image), no_text: true, data: {action: 'edit'} %>
+      <%= link_to_with_icon 'edit', t('spree.actions.edit'), edit_admin_product_image_path(@product, image), no_text: true, data: {action: 'edit'} %>
     <% end %>
 
     <% if can?(:destroy, image) %>

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

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

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

@@ -7,7 +7,7 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product) %></li>
+  <li><%= button_link_to t('spree.back_to_images_list'), admin_product_images_url(@product) %></li>
 <% end %>
 
 <%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
@@ -16,7 +16,7 @@
 
     <div class="row">
       <div data-hook="thumbnail" class="field col-2 align-center">
-        <%= f.label Spree.t(:thumbnail) %><br>
+        <%= f.label t('spree.thumbnail') %><br>
         <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
       </div>
       <div class="col-10">
@@ -26,8 +26,8 @@
     </div>
 
     <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' %>
+      <%= button t('spree.actions.update') %>
+      <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
     </div>
   </fieldset>
 <% end %>