solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_shipping_method) %>

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

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:shipping_methods) %>
+  <%= Spree::ShippingMethod.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -23,10 +23,10 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_shipping_methods_index_headers">
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:zone) %></th>
-        <th><%= Spree.t(:calculator) %></th>
-        <th><%= Spree.t(:display) %></th>
+        <th><%= Spree::ShippingMethod.human_attribute_name(:name) %></th>
+        <th><%= Spree::Zone.model_name.human %></th>
+        <th><%= Spree::Calculator.model_name.human %></th>
+        <th><%= Spree::ShippingMethod.human_attribute_name(:display_on) %></th>
         <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -36,7 +36,7 @@
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
           <td class="align-center"><%= shipping_method.calculator.description %></td>
-          <td class="align-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
+          <td class="align-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on.downcase.tr(" ", "_")) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <% if can?(:update, shipping_method) %>
               <%= link_to_edit shipping_method, :no_text => true %>
@@ -52,10 +52,9 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/shipping_method')) %>
-    <% if can?(:create, Spree::ShippingMethod) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_shipping_method_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::ShippingMethod,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_shipping_method) %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_state_form_fields" class="row">
   <div class="alpha six columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %>
+      <%= f.label :name %>
       <%= f.text_field :name, :class => 'fullwidth' %>
     <% end %>
   </div>
   <div class="omega six columns">
     <%= f.field_container :abbr do %>
-      <%= f.label :abbr, Spree.t(:abbreviation) %>
+      <%= f.label :abbr %>
       <%= f.text_field :abbr, :class => 'fullwidth' %>
     <% end %>
   </div>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -6,8 +6,8 @@
   </colgroup>
   <thead>
     <tr data-hook="states_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:abbreviation) %></th>
+      <th><%= Spree::State.human_attribute_name(:name) %></th>
+      <th><%= Spree::State.human_attribute_name(:abbr) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -18,7 +18,7 @@
         <td class="align-center"><%= state.abbr %></td>
         <td class="actions">
           <% if can?(:update, state) %>
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_country_state_url(@country, state), :no_text => true %>
+            <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_country_state_url(@country, state), :no_text => true %>
           <% end %>
           <% if can?(:destroy, state) %>
             <%= link_to_delete state, :no_text => true %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_state) %> <i class="fa fa-arrow-right"></i> <%= @state.name %>

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

@@ -1,7 +1,7 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:states) %>
+  <%= Spree::State.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -13,7 +13,7 @@
 <% end %>
 
 <div data-hook="country" class="field row">
-  <%= label_tag :country, Spree.t(:country) %>
+  <%= label_tag :country, Spree::Country.model_name.human %>
   <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
   <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/areas_tabs' %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
 

data/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -1,6 +1,6 @@
-<%= paginate @variants %>
+<%= paginate @variants, theme: "solidus_admin" %>
 
-<table class="index stock-table number-field-update-table" id="listing_product_stock">
+<table class="index stock-table" id="listing_product_stock">
   <colgroup>
     <col style="width: 50%" />
     <col style="width: 20%" />
@@ -13,19 +13,17 @@
     <tr>
       <th><%= Spree.t(:item) %></th>
       <th><%= Spree.t(:options) %></th>
-      <th><%= Spree.t(:stock_location) %></th>
+      <th><%= Spree::StockLocation.model_name.human %></th>
       <th><%= Spree.t(:backorderable_header) %></th>
       <th><%= Spree.t(:count_on_hand) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
-  <tbody>
-    <% variants.each do |variant| %>
-      <%- locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
-      <%- display_add_row = locations_without_items.any? && can?(:create, Spree::StockItem) %>
-      <%- row_count = (variant.stock_items.map(&:stock_location) & @stock_item_stock_locations).size %>
-      <%- row_count += display_add_row ? 2 : 1 %>
-
+  <% variants.each do |variant| %>
+    <%- locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
+    <%- display_add_row = locations_without_items.any? && can?(:create, Spree::StockItem) %>
+    <%- row_count = @stock_item_stock_locations.count + 2 %>
+    <tbody class="variant-stock-items">
       <tr id="<%= spree_dom_id variant %>">
         <td class="align-center no-padding" rowspan="<%= row_count %>">
           <div class='variant-container'>
@@ -63,22 +61,13 @@
       </tr>
       <% variant.stock_items.each do |item| %>
         <% if @stock_item_stock_locations.include?(item.stock_location) %>
-          <tr class="<%= cycle('odd', 'even', :name => 'stock_locations')%>" data-variant-id="<%= variant.id %>">
-            <td class='align-center location-name-cell'><%= item.stock_location.name %></td>
-            <td class='align-center'>
-              <% if can?(:update, item) %>
-                <%= check_box_tag :backorderable, 'backorderable', item.backorderable?, id: "backorderable-#{item.id}", disabled: "disabled" %>
-              <% end %>
-            </td>
-            <%= render partial: 'spree/admin/shared/number_field_update_cell', locals: { resource_id: item.id, field_tag: :count_on_hand, number_value: item.count_on_hand } %>
-            <td class="actions">
-              <%= render partial: 'spree/admin/shared/number_field_update_actions', locals: { resource: item, update_data: { location_id: item.stock_location_id } } %>
-            </td>
+          <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>">
+            <%# This is rendered in JS %>
           </tr>
         <% end %>
       <% end %>
       <% if display_add_row %>
-        <tr class="<%= cycle('odd', 'even', :name => 'stock_locations')%>" data-variant-id="<%= variant.id %>">
+        <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
           <td class='location-name-cell'>
             <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), { :include_blank => true, :class => 'select2', "data-placeholder" => Spree.t(:add_to_stock_location), :id => "variant-stock-location-#{variant.id}" } %>
           </td>
@@ -89,13 +78,12 @@
             <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
           </td>
           <td class="actions">
-            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', :no_text => true, :data => {:action => 'green', :variant_id => variant.id } if can?(:create, Spree::StockItem) %>
+            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', :no_text => true, :data => {:action => 'green' }, class: "submit" %>
           </td>
         </tr>
       <% end %>
-      <% reset_cycle("stock_locations") %>
-    <% end %>
-  </tbody>
+    </tbody>
+  <% end %>
 </table>
 
-<%= paginate @variants %>
+<%= paginate @variants, theme: "solidus_admin" %>

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

@@ -25,8 +25,6 @@
   <%= render :partial => 'stock_management', :locals => { :variants => @variants } %>
 <% else %>
   <div class="fullwidth no-objects-found">
-    <%= Spree.t(:no_variants_found) %>
-    <br/>
-    <%= Spree.t(:try_changing_search_values) %>
+    <%= Spree.t(:no_variants_found_try_again) %>
   </div>
 <% end %>

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

@@ -2,19 +2,19 @@
   <div class="alpha nine columns" data-hook="stock_location_names">
     <div data-hook="stock_location_name">
       <%= 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', required: true %>
       <% end %>
     </div>
     <div data-hook="stock_location_code">
       <%= f.field_container :code do %>
-        <%= f.label :code, Spree.t(:code) %>
+        <%= f.label :code %>
         <%= f.text_field :code, :class => 'fullwidth', :label => false %>
       <% end %>
     </div>
     <div data-hook="stock_location_admin_name">
       <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name, Spree.t(:internal_name) %>
+        <%= f.label :admin_name %>
         <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
       <% end %>
     </div>
@@ -26,69 +26,69 @@
       <ul>
         <li class="fullwidth" data-hook="stock_location_active">
           <%= f.check_box :active %>
-          <%= f.label :active, Spree.t(:active) %>
+          <%= f.label :active %>
         </li>
         <li class="fullwidth" data-hook="stock_location_default">
           <%= f.check_box :default %>
-          <%= f.label :default, Spree.t(:default) %>
+          <%= f.label :default %>
         </li>
         <li class="fullwidth" data-hook="stock_location_backorderable_default">
           <%= f.check_box :backorderable_default %>
-          <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
+          <%= f.label :backorderable_default %>
         </li>
         <li class="fullwidth" data-hook="stock_location_propagate_all_variants">
           <%= f.check_box :propagate_all_variants %>
-          <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
+          <%= f.label :propagate_all_variants %>
         </li>
         <li class="fullwidth">
-          <%= f.label :active, Spree.t(:restock_inventory) %>
           <%= f.check_box :restock_inventory %>
+          <%= f.label :restock_inventory %>
         </li>
         <li>
-          <%= f.label :active, Spree.t(:fulfillable_stock) %>
           <%= f.check_box :fulfillable %>
+          <%= f.label :fulfillable %>
         </li>
         <li class="fullwidth">
-          <%= f.label :check_stock_on_transfer, Spree.t(:check_stock_on_transfer) %>
           <%= f.check_box :check_stock_on_transfer %>
+          <%= f.label :check_stock_on_transfer %>
         </li>
       </ul>
     <% end %>
   </div>
 
   <div class="alpha six columns field" data-hook="stock_location_address1">
-    <%= f.label :address1, Spree.t(:street_address) %>
+    <%= f.label :address1 %>
     <%= f.text_field :address1, class: 'fullwidth' %>
   </div>
 
   <div class="omega six columns field" data-hook="stock_location_city">
-    <%= f.label :city, Spree.t(:city) %>
+    <%= f.label :city %>
     <%= f.text_field :city, class: 'fullwidth' %>
   </div>
 
   <div class="alpha six columns field" data-hook="stock_location_address2">
-    <%= f.label :address2, Spree.t(:street_address_2) %>
+    <%= f.label :address2 %>
     <%= f.text_field :address2, class: 'fullwidth' %>
   </div>
 
   <div class="three columns field" data-hook="stock_location_zipcode">
-    <%= f.label :zipcode, Spree.t(:zip) %>
+    <%= f.label :zipcode %>
     <%= f.text_field :zipcode, class: 'fullwidth' %>
   </div>
 
   <div class="omega three columns field" data-hook="stock_location_phone">
-    <%= f.label :phone, Spree.t(:phone) %>
+    <%= f.label :phone %>
     <%= f.phone_field :phone, class: 'fullwidth' %>
   </div>
 
   <div class="alpha six columns field" data-hook="stock_location_country">
-    <%= f.label :country_id, Spree.t(:country) %>
+    <%= f.label :country_id %>
     <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
   </div>
 
   <div class="omega six columns field" data-hook="stock_location_state">
     <% if f.object.country %>
-      <%= f.label :state_id, Spree.t(:state) %>
+      <%= f.label :state_id %>
       <span id="state" class="region">
         <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
         <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
@@ -98,7 +98,6 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_include_tag 'spree/backend/address_states.js' %>
   <%= javascript_tag do -%>
     $(document).ready(function(){
       $('span#country .select2').on('change', function() { update_state(''); });

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -17,14 +17,14 @@
 
       <div class="five columns">
         <div class="field" id="stock_movement_variant_id_field">
-          <%= label_tag 'variant_id', Spree.t(:variant) %>
+          <%= label_tag 'variant_id', Spree::Variant.model_name.human %>
           <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2 fullwidth' %>
         </div>
       </div>
 
       <div class="five columns">
         <div class="field" id="stock_movement_quantity_field">
-          <%= label_tag 'quantity', Spree.t(:quantity) %>
+          <%= label_tag 'quantity', Spree::StockMovement.human_attribute_name(:quantity) %>
           <%= number_field_tag :quantity, 1, class: 'fullwidth' %>
         </div>
       </div>
@@ -32,7 +32,6 @@
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:transfer_stock), 'plus' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
     </div>
   </fieldset>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_stock_location) %> <i class="fa fa-arrow-right"></i>

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

@@ -1,7 +1,7 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:stock_locations) %>
+  <%= Spree::StockLocation.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -32,9 +32,9 @@
     <thead>
       <tr data-hook="stock_locations_header">
         <th class="no-border"></th>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:state) %></th>
-        <th><%= Spree.t(:stock_movements) %></th>
+        <th><%= Spree::StockLocation.human_attribute_name(:name) %></th>
+        <th><%= Spree::StockLocation.human_attribute_name(:state_id) %></th>
+        <th><%= Spree::StockMovement.model_name.human(count: :other) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -53,7 +53,7 @@
           <td class="align-center"><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
           <td class="align-center">
             <% if can?(:display, Spree::StockMovement) %>
-              <%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %>
+              <%= link_to Spree::StockMovement.model_name.human(count: :other), admin_stock_location_stock_movements_path(stock_location.id) %>
             <% else %>
               Stock Movements
             <% end %>
@@ -72,9 +72,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_location')) %>
-    <% if can?(:create, Spree::StockLocation) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                        resource: Spree::StockLocation,
+                        new_resource_url: new_object_url %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_stock_location) %>

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

@@ -1,11 +1,11 @@
 <div data-hook="admin_stock_movements_form_fields" class="row">
   <div class="alpha twelve columns">
     <%= f.field_container :quantity do %>
-      <%= f.label :quantity, Spree.t(:quantity) %>
+      <%= f.label :quantity %>
       <%= f.text_field :quantity %>
     <% end %>
     <%= f.field_container :stock_item_id do %>
-      <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
+      <%= f.label :stock_item_id, Spree::StockItem.model_name.human %>
       <%= f.text_field 'stock_item_id', :class => 'fullwidth', :'data-stock-location-id' => params[:stock_location_id] %>
     <% end %>
   </div>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name) %>
@@ -27,9 +27,9 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_stock_movements_index_headers">
-      <th><%= Spree.t(:stock_item) %>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:action) %></th>
+      <th><%= Spree::StockMovement.human_attribute_name(:stock_item) %>
+      <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
+      <th><%= Spree::StockMovement.human_attribute_name(:action) %></th>
     </tr>
   </thead>
   <tbody>
@@ -46,11 +46,10 @@
 </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>
-    <% if can?(:create, Spree::StockMovement) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::StockMovement,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>
 
-<%= paginate @stock_movements %>
+<%= paginate @stock_movements, theme: "solidus_admin" %>