solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,15 +1,15 @@
 <table class="show return-items-table">
   <thead>
     <tr>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:acceptance_errors) %></th>
-      <th><%= Spree.t(:reception_status) %></th>
+      <th><%= Spree::Product.model_name.human %></th>
+      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
       <% unless return_items.all?(&:received?)%>
-        <th><%= Spree.t(:item_received?) %></th>
+        <th><%= Spree::ReturnItem.human_attribute_name(:item_received?) %></th>
       <% end %>
       <% if show_decision %>
         <th class="actions"></th>
@@ -27,7 +27,7 @@
           <%= return_item.inventory_unit.variant.sku %>
         </td>
         <td class="align-center">
-          <%= return_item.display_pre_tax_amount %>
+          <%= return_item.display_amount %>
         </td>
         <td class="align-center">
           <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
@@ -45,7 +45,7 @@
           <td class='align-center'>
             <%= form_for [:admin, return_item] do |f| %>
               <%= f.hidden_field 'reception_status_event', value: 'receive' %>
-              <%= f.button Spree.t(:receive), class: 'fa icon_link no-text with-tip', "data-action" => 'save' %>
+              <%= f.button Spree.t('actions.receive'), class: 'fa icon_link no-text with-tip', "data-action" => 'save' %>
             <% end %>
           </td>
         <% end %>

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

@@ -4,14 +4,14 @@
       <th>
         <%= check_box_tag 'select-all' %>
       </th>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:state) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:resellable?) %></th>
-      <th><%= Spree.t(:reception_status) %></th>
-      <th><%= Spree.t(:reason) %></th>
+      <th><%= Spree::Product.model_name.human %></th>
+      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:resellable) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
+      <th><%= Spree::ReturnItem.human_attribute_name(:return_reason) %></th>
     </tr>
   </thead>
   <tbody>
@@ -23,9 +23,9 @@
           <div style="display:none">
             <%= item_fields.hidden_field :inventory_unit_id %>
             <%= item_fields.hidden_field :return_authorization_id %>
-            <%= item_fields.hidden_field :pre_tax_amount %>
+            <%= item_fields.hidden_field :amount %>
           </div>
-          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
+          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.amount}, '1', '0' %>
         </td>
         <td>
           <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
@@ -35,7 +35,7 @@
           <%= return_item.inventory_unit.variant.sku %>
         </td>
         <td class="align-center">
-          <%= return_item.display_pre_tax_amount %>
+          <%= return_item.display_amount %>
         </td>
         <td class="align-center">
           <%= return_item.inventory_unit.state %>

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

@@ -1,7 +1,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>
+  <i class="fa fa-arrow-right"></i> <%= Spree::CustomerReturn.model_name.human %> #<%= @customer_return.number %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -54,7 +54,7 @@
 <% end %>
 
 <fieldset data-hook="reimbursements" class="no-border-bottom align-center">
-  <legend align="center"><%= Spree.t(:reimbursements) %></legend>
+  <legend align="center"><%= Spree::Reimbursement.model_name.human(count: :other) %></legend>
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>

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

@@ -10,18 +10,18 @@
 <% end %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_returns) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree::CustomerReturn.model_name.human(count: :other) %>
 <% end %>
 
 <% if @customer_returns.any? %>
   <table class="index">
     <thead data-hook="customer_return_header">
       <tr>
-        <th><%= Spree.t(:return_number) %></th>
-        <th><%= Spree.t(:pre_tax_total) %></th>
-        <th><%= Spree.t(:total) %></th>
-        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-        <th><%= Spree.t(:reimbursement_status) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:number) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:pre_tax_total) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:total) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:created_at) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:reimbursement_status) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -48,9 +48,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/customer_return')) %>
-    <% if can? :create, Spree::CustomerReturn %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order) %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::CustomerReturn,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -33,7 +33,7 @@
         </fieldset>
 
         <%= f.field_container :stock_location do %>
-          <%= f.label :stock_location, Spree.t(:stock_location) %>
+          <%= 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.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
@@ -41,8 +41,7 @@
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t(:create), 'ok' %>
-        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button Spree.t('actions.create'), 'ok' %>
         <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'remove' %>
       </div>
     </fieldset>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/general_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:general_settings) %>
@@ -10,40 +10,52 @@
     <fieldset class="general no-border-top">
 
       <%= fields_for :store do |f| %>
-        <div class="field" data-hook="admin_general_setting_input_name">
-          <%= f.label :name %>
-          <br />
-          <%= f.text_field :name, class: 'fullwidth' %>
+        <div data-hook="admin_general_setting_input_name">
+          <%= f.field_container :name do %>
+            <%= f.label :name %>
+            <%= f.text_field :name, class: 'fullwidth' %>
+            <%= f.error_message_on :name %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_seo_title">
-          <%= f.label :seo_title %>
-          <br />
-          <%= f.text_field :seo_title, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_seo_title">
+          <%= f.field_container :seo_title do %>
+            <%= f.label :seo_title %>
+            <%= f.text_field :seo_title, class: 'fullwidth'  %>
+            <%= f.error_message_on :seo_title %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_meta_keywords">
-          <%= f.label :meta_keywords %>
-          <br />
-          <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_meta_keywords">
+          <%= f.field_container :meta_keywords do %>
+            <%= f.label :meta_keywords %>
+            <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+            <%= f.error_message_on :meta_keywords %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_meta_description">
-          <%= f.label :meta_description %>
-          <br />
-          <%= f.text_field :meta_description, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_meta_description">
+          <%= f.field_container :meta_description do %>
+            <%= f.label :meta_description %>
+            <%= f.text_field :meta_description, class: 'fullwidth'  %>
+            <%= f.error_message_on :meta_description %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_input_url">
-          <%= f.label :url %>
-          <br />
-          <%= f.text_field :url, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_input_url">
+          <%= f.field_container :url do %>
+            <%= f.label :url %>
+            <%= f.text_field :url, class: 'fullwidth'  %>
+            <%= f.error_message_on :url %>
+          <% end %>
         </div>
 
-        <div class="field" data-hook="admin_general_setting_mail_from_address">
-          <%= f.label :mail_from_address %>
-          <br />
-          <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+        <div data-hook="admin_general_setting_mail_from_address">
+          <%= f.field_container :mail_from_address do %>
+            <%= f.label :mail_from_address %>
+            <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+            <%= f.error_message_on :mail_from_address %>
+          <% end %>
         </div>
       <% end %>
 
@@ -66,7 +78,6 @@
       <% if can? :update, :general_settings %>
         <div class="form-buttons filter-actions actions" data-hook="buttons">
           <%= button Spree.t('actions.update'), 'refresh' %>
-          <span class="or"><%= Spree.t(:or) %></span>
           <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
         </div>
       <% end %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_image_form_fields">
   <div class="four columns alpha">
     <div data-hook="file" class="field">
-      <%= f.label :attachment, Spree.t(:filename) %><br>
+      <%= f.label :attachment %><br>
       <%= f.file_field :attachment %>
     </div>
     <div data-hook="variant" class="field">
@@ -10,7 +10,7 @@
     </div>
   </div>
   <div data-hook="alt_text" class="field omega five columns">
-    <%= f.label :alt, Spree.t(:alt_text) %><br>
+    <%= f.label :alt %><br>
     <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
   </div>
 </div>

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

@@ -19,7 +19,6 @@
     <div class="clear"></div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'refresh' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %>
     </div>
   </fieldset>

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

@@ -29,7 +29,7 @@
         <% if @product.has_variants? %>
           <th><%= Spree::Variant.model_name.human %></th>
         <% end %>
-        <th><%= Spree.t(:alt_text) %></th>
+        <th><%= Spree::Image.human_attribute_name(:alt) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -51,7 +51,7 @@
           <td><%= image.alt %></td>
           <td class="actions">
             <% if can?(:update, image) %>
-              <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
+              <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
             <% end %>
             <% if can?(:destroy, image) %>
               <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>

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

@@ -6,10 +6,7 @@
     
       <div class="form-buttons filter-actions actions" data-hook="buttons">
         <%= button Spree.t('actions.update'), 'refresh' %>
-        <span class="or"><%= Spree.t(:or) %></span>
         <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
       </div>
   </fieldset>
 <% end %>
-
-<%= javascript_include_tag 'spree/backend/images/new.js' %>

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

@@ -2,9 +2,9 @@
 
 <% content_for :page_title do %>
   <i class="fa fa-arrow-right"></i>
-  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
+  <%= Spree::Payment.model_name.human %>
   <i class="fa fa-arrow-right"></i>
-  <%= Spree.t(:log_entries) %>
+  <%= Spree::LogEntry.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_option_type_form_fields" class="align-center row">
   <div class="alpha eight columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+      <%= f.label :name, class: 'required' %><br />
       <%= f.text_field :name, :class => "fullwidth" %>
       <%= f.error_message_on :name %>
     <% end %>
@@ -9,9 +9,9 @@
 
   <div class="omega eight columns">
     <%= f.field_container :presentation do %>
-      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span><br />
+      <%= f.label :presentation, class: 'required' %><br />
       <%= f.text_field :presentation, :class => "fullwidth" %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
-</div>
+</div>

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

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

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

@@ -16,16 +16,19 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
-  <fieldset>
-    <legend align="center"><%= Spree.t(:option_values) %></legend>
 
+  <fieldset class="no-border-bottom">
+    <legend><%= Spree::OptionType.model_name.human %></legend>
     <%= render :partial => 'form', :locals => { :f => f } %>
+  </fieldset>
 
+  <fieldset>
+    <legend><%= Spree::OptionValue.model_name.human(count: :other) %></legend>
     <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
         <tr>
-          <th colspan="2"><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:display) %></th>
+          <th colspan="2"><%= Spree::OptionValue.human_attribute_name(:name) %></th>
+          <th><%= Spree::OptionValue.human_attribute_name(:presentation) %></th>
           <th class="actions"></th>
         </tr>
       </thead>
@@ -35,7 +38,6 @@
         <% end %>
       </tbody>
     </table>
-
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:option_types) %>
+  <%= Spree::OptionType.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -23,8 +23,8 @@
   <thead>
     <tr data-hook="option_header">
       <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:presentation) %></th>
+      <th><%= Spree::OptionType.human_attribute_name(:name) %></th>
+      <th><%= Spree::OptionType.human_attribute_name(:presentation) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -48,9 +48,8 @@
 </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/option_type')) %>
-    <% if can?(:create, Spree::OptionType) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_option_type_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::OptionType,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<div id="add-line-item" data-hook>
+<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>
 

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

@@ -3,8 +3,10 @@
     <legend><%= title %></legend>
     <table>
       <thead>
-        <th><%= Spree.t('name')%></th>
-        <th><%= Spree.t('amount')%></th>
+        <tr>
+          <th><%= Spree::Adjustment.human_attribute_name(:name)%></th>
+          <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
+        </tr>
       </thead>
       <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
         <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>

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

@@ -4,7 +4,7 @@
       <span class="carton-number"><%= carton.number %></span>
       -
       <span class="carton-state"><%= Spree.t("shipment_states.shipped") %></span>
-      <span class="carton-exchange"><%= Spree.t(:exchange) if carton.any_exchanges? %></span>
+      <span class="carton-exchange"><%= Spree::Exchange.model_name.human if carton.any_exchanges? %></span>
       <%= Spree.t(:package_from) %>
       <strong class="stock-location-name" data-hook="stock-location-name">'<%= carton.stock_location.name %>'</strong>
     </legend>
@@ -20,10 +20,10 @@
     </colgroup>
 
     <thead>
-      <th colspan="2"><%= Spree.t(:item_description) %></th>
-      <th><%= Spree.t(:price) %></th>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:total) %></th>
+      <th colspan="2"><%= Spree::LineItem.human_attribute_name(:description) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
+      <th><%= Spree::LineItem.human_attribute_name(:total) %></th>
     </thead>
 
     <tbody data-hook="carton-details" data-shipment-number="<%= carton.number %>" data-order-number="<%= order.number %>">
@@ -42,7 +42,7 @@
       <% if order.special_instructions.present? %>
         <tr class='special_instructions'>
           <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+            <strong><%= Spree::Order.human_attribute_name(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
           </td>
         </tr>
       <% end %>
@@ -50,7 +50,7 @@
       <tr class="show-tracking total">
         <td colspan="5">
           <% if carton.tracking.present? %>
-            <strong><%= Spree.t(:tracking) %>:</strong> <%= carton.tracking %>
+            <strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong> <%= carton.tracking %>
           <% else %>
             <%= Spree.t(:no_tracking_present) %>
           <% end %>