solidus_backend 1.2.3 → 1.3.0.beta1

data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb

@@ -8,10 +8,10 @@
   </colgroup>
   <thead data-hook="bulk_variants_header">
     <tr>
-      <th><%= Spree.t('variant') %></th>
-      <th><%= Spree.t('sku') %></th>
-      <th><%= Spree.t('quantity') %></th>
-      <th><%= Spree.t('count_on_hand') %></th>
+      <th><%= Spree::Variant.model_name.human %></th>
+      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+      <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
+      <th><%= Spree::StockItem.human_attribute_name(:count_on_hand) %></th>
     </tr>
   </thead>
   <tbody id="bulk_variants_tbody">

data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb

@@ -2,7 +2,7 @@
   <%= render partial: 'spree/admin/shared/number_field_update_cell', locals: { resource_id: item.id, field_tag: "#{quantity_type}_quantity", number_value: item.send("#{quantity_type}_quantity") } %>
   <td class="actions">
     <%= render partial: 'spree/admin/shared/number_field_update_actions', locals: { resource: item, update_data: {} } %>
-    <%= link_to_with_icon 'trash', Spree.t('delete'), '#', no_text: true, data: { action: 'remove', id: item.id } if quantity_type == 'expected' && can?(:destroy, item) %>
+    <%= link_to_with_icon 'trash', Spree.t('actions.delete'), '#', no_text: true, data: { action: 'remove', id: item.id } if quantity_type == 'expected' && can?(:destroy, item) %>
   </td>
 <% else %>
   <td class='align-center'><%= item.send("#{quantity_type}_quantity") %></td>

data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb

@@ -59,5 +59,5 @@
     </tbody>
   </table>
   <div class="no-objects-found" <%= 'hidden' if @stock_transfer.transfer_items.any? %>>
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/transfer_item')) %>
+    <%= Spree.t(:no_resource, resource: Spree::TransferItem.model_name.human(count: :other)) %>
   </div>

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

@@ -7,28 +7,15 @@
     <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %>
   </li>
   <li>
-    <%= button_link_to Spree.t(:ready_to_ship), '#', icon: 'truck', id: 'ready-to-ship-transfer-button' %>
+    <%= button_link_to Spree.t(:ready_to_ship),
+      finalize_admin_stock_transfer_path(@stock_transfer),
+      icon: 'truck',
+      method: 'put',
+      data: { confirm: Spree.t('finalize_stock_transfer.confirm') }
+    %>
   </li>
 <% end %>
 
-<div id="finalize-stock-transfer-warning">
-  <div class='warning-title'>
-    <i class='fa fa-warning'></i>
-    <span><%= Spree.t(:you_cannot_undo_action) %></span>
-  </div>
-  <div class='action-consequences'>
-    <span><%= Spree.t('finalize_stock_transfer.will_cause') %>:</span>
-    <ul data-hook='finalize-stock-transfer-consequences'>
-      <li><%= Spree.t('finalize_stock_transfer.no_longer_change_items') %></li>
-    </ul>
-  </div>
-  <span><%= Spree.t(:are_you_sure_finalize_stock_transfer) %></span>
-  <div class='actions'>
-    <%= link_to Spree.t(:no_dont_finalize), '#', :id => 'cancel-finalize-link' %>
-    <%= link_to Spree.t(:yes_finalize), finalize_admin_stock_transfer_path(@stock_transfer), { method: 'put' } %>
-  </div>
-</div>
-
 <%= form_for [:admin, @stock_transfer] do |f| %>
   <fieldset class="no-border-top">
     <div>
@@ -36,12 +23,12 @@
       <p><%= @stock_transfer.created_by.email %></p>
     </div>
     <%= f.field_container :description do %>
-      <%= f.label nil, Spree.t(:description) %>
+      <%= f.label :description %>
       <%= f.text_field :description, value: @stock_transfer.description, maxlength: 255, size: 0, class: 'fullwidth' %>
       <%= f.error_message_on :description %>
     <% end %>
     <%= f.field_container :destination_location do %>
-      <%= f.label nil, Spree.t(:destination_location) %>
+      <%= f.label :destination_location_id %>
       <%= f.select :destination_location_id, options_from_collection_for_select(@destination_stock_locations, :id, :name, @stock_transfer.destination_location_id), {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
       <%= f.error_message_on :destination_location %>
     <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:stock_transfers) %>
+  <%= Spree::StockTransfer.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -19,7 +19,7 @@
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="field-block alpha four columns">
         <div class="field">
-          <%= f.label nil, Spree.t(:stock_location) %>
+          <%= f.label nil, Spree::StockLocation.model_name.human %>
           <%= f.select :source_location_id_or_destination_location_id_eq, options_from_collection_for_select(@stock_locations, :id, :name, params[:q][:source_location_id_or_destination_location_id_eq]), {include_blank: true}, {class: 'select2 fullwidth'} %>
         </div>
       </div>
@@ -41,7 +41,7 @@
 
       <div class="field-block alpha four columns">
         <div class="field">
-          <%= f.label nil, Spree.t(:transfer_number) %>
+          <%= f.label nil, Spree::StockTransfer.human_attribute_name(:number) %>
           <%= f.text_field :number_cont, value: params[:q][:number_cont] %>
         </div>
       </div>
@@ -66,7 +66,7 @@
   </div>
 <% end %>
 
-<%= paginate @stock_transfers %>
+<%= paginate @stock_transfers, theme: "solidus_admin" %>
 
 
 <% if @stock_transfers.any? %>
@@ -108,8 +108,10 @@
   </table>
 <% else %>
   <div class="alpha sixteen columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_transfer')) %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                  resource: Spree::StockTransfer,
+                  new_resource_url: new_object_url %>
   </div>
 <% end %>
 
-<%= paginate @stock_transfers %>
+<%= paginate @stock_transfers, theme: "solidus_admin" %>

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

@@ -11,18 +11,17 @@
 <%= form_for [:admin, @stock_transfer] do |f| %>
   <fieldset class="no-border-top">
     <%= f.field_container :source_location do %>
-      <%= f.label nil, Spree.t(:source_location) %>
+      <%= f.label :source_location_id %>
       <%= f.select :source_location_id, options_from_collection_for_select(@source_stock_locations, :id, :name), {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
       <%= f.error_message_on :source_location %>
     <% end %>
     <%= f.field_container :description do %>
-      <%= f.label nil, Spree.t(:description) %>
+      <%= f.label :description %>
       <%= f.text_field :description, maxlength: 255, size: 0, class: 'fullwidth' %>
       <%= f.error_message_on :description %>
     <% end %>
     <div class="filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'arrow-right' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_stock_transfers_path, class: 'button' %>
     </div>
   </fieldset>

data/app/views/spree/admin/stock_transfers/receive.html.erb

@@ -7,29 +7,14 @@
     <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
   </li>
   <li>
-    <%= button_link_to Spree.t(:close), '#', :icon => 'lock', :id => 'close-transfer-button' %>
+    <%= button_link_to Spree.t(:close),
+      close_admin_stock_transfer_path(@stock_transfer),
+      icon: 'lock',
+      method: 'put',
+      data: { confirm: Spree.t('close_stock_transfer.confirm') } %>
   </li>
 <% end %>
 
-<div id="close-stock-transfer-warning">
-  <div class='warning-title'>
-    <i class='fa fa-warning'></i>
-    <span><%= Spree.t(:you_cannot_undo_action) %></span>
-  </div>
-  <div class='action-consequences'>
-    <span><%= Spree.t('close_stock_transfer.will_cause') %>:</span>
-    <ul data-hook='close-stock-transfer-consequences'>
-      <li><%= Spree.t('close_stock_transfer.no_longer_edit') %></li>
-      <li><%= Spree.t('close_stock_transfer.stock_movements_created') %></li>
-    </ul>
-  </div>
-  <span><%= Spree.t(:are_you_sure_close_stock_transfer) %></span>
-  <div class='actions'>
-    <%= link_to Spree.t(:no_dont_close), '#', :id => 'cancel-close-link' %>
-    <%= link_to Spree.t(:yes_close), close_admin_stock_transfer_path(@stock_transfer), { method: 'put' } %>
-  </div>
-</div>
-
 <div id='stock_transfer_summary' class='fullwidth'>
   <div class='location'>
     <span class='summary-field'>From:</span>
@@ -42,7 +27,7 @@
     <span id='total-received-quantity'><%= @stock_transfer.received_item_count %></span>
     /
     <span><%= @stock_transfer.expected_item_count %></span>
-    <span class='summary-field'>Received</span>
+    <span class='summary-field'><%= Spree.t(:received) %></span>
   </div>
 </div>
 

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t('stock_transfer') %> <%= @stock_transfer.number %>
+  <%= Spree::StockTransfer.model_name.human %> <%= @stock_transfer.number %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -18,37 +18,37 @@
   </div>
 
   <div>
-    <label><%= Spree.t(:description) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:description) %></label>
     <p><%= @stock_transfer.description %></p>
   </div>
 
   <div class='field-block alpha three columns'>
-    <label><%= Spree.t(:created_by) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:created_by_id) %></label>
     <p><%= @stock_transfer.created_by.email %></p>
   </div>
 
   <div class='field-block alpha three columns'>
-    <label><%= Spree.t(:created_at) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:created_at) %></label>
     <p><%= @stock_transfer.created_at.try(:to_date) %></p>
   </div>
 
   <div class='field-block alpha three columns'>
-    <label><%= Spree.t(:finalized_at) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:finalized_at) %></label>
     <p><%= @stock_transfer.finalized_at.try(:to_date) %></p>
   </div>
 
   <div class='field-block alpha three columns'>
-    <label><%= Spree.t(:finalized_by) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:finalized_by_id) %></label>
     <p><%= @stock_transfer.finalized_by.try(:email) %></p>
   </div>
 
   <div class='field-block alpha three columns'>
-    <label><%= Spree.t(:shipped_at) %></label>
+    <label><%= Spree::StockTransfer.human_attribute_name(:shipped_at) %></label>
     <p><%= @stock_transfer.shipped_at.try(:to_date) %></p>
   </div>
 </fieldset>
 
 <fieldset>
-  <legend><%= Spree.t(:transfer_items) %></legend>
+  <legend><%= Spree::TransferItem.model_name.human(count: :other) %></legend>
   <%= render partial: 'transfer_item_table', locals: { transfer_items: @stock_transfer.transfer_items, show_expected: true, show_received: true, show_actions: false } %>
 </fieldset>

data/app/views/spree/admin/stock_transfers/tracking_info.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= "#{Spree.t(:ship)} #{Spree.t(:stock_transfer)} \##{@stock_transfer.number}" %>
+  <%= "#{Spree.t('actions.ship')} #{Spree::StockTransfer.model_name.human} \##{@stock_transfer.number}" %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -7,28 +7,15 @@
     <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %>
   </li>
   <li>
-    <%= button_link_to Spree.t(:ship), '#', icon: 'check', id: 'confirm-ship-transfer-button' %>
+    <%= button_link_to Spree.t('actions.ship'),
+      ship_admin_stock_transfer_path(@stock_transfer),
+      icon: 'check',
+      method: 'put',
+      data: { confirm: Spree.t('ship_stock_transfer.confirm') }
+      %>
   </li>
 <% end %>
 
-<div id="ship-stock-transfer-warning" >
-  <div class='warning-title'>
-    <i class='fa fa-warning'></i>
-    <span><%= Spree.t(:you_cannot_undo_action) %></span>
-  </div>
-  <div class='action-consequences'>
-    <span><%= Spree.t('ship_stock_transfer.will_cause') %>:</span>
-    <ul data-hook='ship-stock-transfer-consequences'>
-      <li><%= Spree.t('ship_stock_transfer.no_further_changes') %></li>
-    </ul>
-  </div>
-  <span><%= Spree.t(:are_you_sure_ship_stock_transfer) %></span>
-  <div class='actions'>
-    <%= link_to Spree.t(:no_dont_ship), '#', :id => 'cancel-ship-link' %>
-    <%= link_to Spree.t(:yes_ship), ship_admin_stock_transfer_path(@stock_transfer), { :method => 'PUT', :id => 'confirm-ship-link'} %>
-  </div>
-</div>
-
 <div id='stock_transfer_summary' class='fullwidth'>
   <div class='location'>
     <h5>
@@ -38,7 +25,7 @@
     </h5>
   </div>
   <div class='shipment-description'>
-    <div class='summary-field creator'><%= Spree.t(:created_by) %>: <%= @stock_transfer.created_by.email %></div>
+    <div class='summary-field creator'><%= Spree::StockTransfer.human_attribute_name(:created_by) %>: <%= @stock_transfer.created_by.email %></div>
     <div class='summary-field description'><%= @stock_transfer.description %></div>
   </div>
 </div>
@@ -48,7 +35,7 @@
     <%= form_for [:admin, @stock_transfer] do |f| %>
     <div class='field-block alpha'>
       <div class='field'>
-        <%= f.label "tracking_number", Spree.t(:tracking_number) %>
+        <%= f.label :tracking_number %>
         <%= f.text_field :tracking_number, value: @stock_transfer.tracking_number, maxlength: 255, size: 0, class: 'fullwidth' %>
       </div>
     </div>
@@ -62,6 +49,6 @@
 </fieldset>
 
 <fieldset id='stock-transfer-transfer-items'>
-  <legend align="center"><%= Spree.t(:transfer_items) %></legend>
+  <legend align="center"><%= Spree::TransferItem.model_name.human(count: :other) %></legend>
   <%= render partial: 'transfer_item_table', locals: { transfer_items: @stock_transfer.transfer_items, show_expected: true, show_received: false, show_actions: false } %>
 </fieldset>

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

@@ -1,14 +1,14 @@
 <div data-hook="admin_store_credit_form_fields" class="row">
   <div class="alpha twelve columns">
     <%= f.field_container :amount do %>
-      <%= f.label :amount, Spree.t(:amount) %> <span class="required">*</span><br />
+      <%= f.label :amount, class: 'required' %><br />
       <%= f.number_field :amount, min: 0.00, step: :any %>
       <%= f.error_message_on :amount %>
     <% end %>
   </div>
   <div class="alpha twelve columns">
     <%= f.field_container :category do %>
-      <%= f.label :category, Spree.t(:credit_type) %> <span class="required">*</span><br />
+      <%= f.label :category_id, class: 'required' %><br />
       <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
         { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t("admin.store_credits.select_reason") } %>
       <%= f.error_message_on :category %>
@@ -16,7 +16,7 @@
   </div>
   <div data-hook="admin_store_credit_memo_field" class="alpha twelve columns">
     <%= f.field_container :memo do %>
-      <%= f.label :memo, Spree.t(:memo) %>
+      <%= f.label :memo %>
       <%= f.text_area :memo, class: "fullwidth" %>
       <%= f.error_message_on :memo %>
     <% end %>

data/app/views/spree/admin/store_credits/_update_reason_field.html.erb

@@ -1,6 +1,6 @@
 <div class="alpha twelve columns">
   <%= f.field_container :reason do %>
-    <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span><br />
+    <%= f.label :reason, Spree.t(:reason), class: 'required' %><br />
     <%= select_tag :update_reason_id, options_from_collection_for_select(@update_reasons, :id, :name),
       { include_blank: true , class: 'select2 fullwidth', placeholder: Spree.t("admin.store_credits.select_amount_update_reason") } %>
     <%= f.error_message_on :reason %>

data/app/views/spree/admin/store_credits/edit_amount.html.erb

@@ -13,7 +13,7 @@
     <div data-hook="admin_store_credit_form_fields" class="row">
       <div class="alpha twelve columns">
         <%= f.field_container :amount do %>
-          <%= f.label :amount, Spree.t(:amount) %> <span class="required">*</span><br />
+          <%= f.label :amount, class: 'required' %><br />
           <%= f.number_field :amount, min: 0.00, step: :any %>
           <%= f.error_message_on :amount %>
         <% end %>

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -15,7 +15,6 @@
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t('store_credit.actions.invalidate'), 'ban' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit), icon: 'remove' %>
     </div>
   </fieldset>

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

@@ -12,18 +12,18 @@
 
 <% if @store_credits.any? %>
   <div id='sc-current-balance'>
-    <strong><%= Spree.t("admin.store_credits.current_balance") %>: </strong><%= @user.display_total_available_store_credit %>
+    <strong><%= Spree.t("admin.store_credits.current_balance") %> </strong><%= @user.display_total_available_store_credit %>
   </div>
 
   <table>
     <thead>
-      <th><%= Spree.t("admin.store_credits.credited_html_header") %></th>
-      <th><%= Spree.t("admin.store_credits.used_html_header") %></th>
-      <th><%= Spree.t("admin.store_credits.authed_html_header") %></th>
-      <th><%= Spree.t("admin.store_credits.type_html_header") %></th>
-      <th><%= Spree.t("admin.store_credits.created_by") %></th>
-      <th><%= Spree.t("admin.store_credits.issued_on") %></th>
-      <th><%= Spree.t("admin.store_credits.invalidated") %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
       <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
     <thead>
     <tbody>
@@ -61,9 +61,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree.t("admin.store_credits.resource_name")) %>
-    <% if can?(:create, Spree::StoreCredit) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_user_store_credit_path(@user) %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::StoreCredit,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

data/app/views/spree/admin/store_credits/show.html.erb

@@ -21,14 +21,14 @@
   </colgroup>
   <tr>
     <td>
-      <strong><%= Spree.t(:amount) %>:</strong>
+      <strong><%= Spree::StoreCredit.human_attribute_name(:amount) %>:</strong>
     </td>
     <td><%= @store_credit.display_amount.to_html %></td>
     <td class='actions'></td>
   </tr>
   <tr>
     <td>
-      <strong><%= Spree.t(:created_by) %>:</strong>
+      <strong><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %>:</strong>
     </td>
     <td><%= @store_credit.created_by_email %></td>
     <td class='actions'></td>
@@ -42,20 +42,20 @@
   </tr>
   <tr id='memo-display-row'>
     <td>
-      <strong><%= Spree.t(:memo) %>:</strong>
+      <strong><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</strong>
     </td>
     <td class='js-memo-text'>
       <%= @store_credit.memo %>
     </td>
     <td class='actions align-center'>
       <% if can?(:update, @store_credit) %>
-        <%= link_to '', '#', class: 'js-edit-memo edit-method fa fa-edit no-text with-tip', data: { action: 'edit' }, title: Spree.t('edit') %>
+        <%= link_to '', '#', class: 'js-edit-memo edit-method fa fa-edit no-text with-tip', data: { action: 'edit' }, title: Spree.t('actions.edit') %>
       <% end %>
     </td>
   </tr>
   <tr id='memo-edit-row' class='hidden' data-original-value='<%= @store_credit.memo %>'>
     <td>
-      <strong><%= Spree.t(:memo) %>:</strong>
+      <strong><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</strong>
     </td>
     <td>
       <%= form_tag admin_user_store_credit_path(@user, @store_credit), method: :put, remote: true, id: 'sc_memo_edit_form' do %>
@@ -85,18 +85,18 @@
     <thead>
       <tr>
         <th><%= Spree.t(:date) %></th>
-        <th><%= Spree.t(:action) %></th>
-        <th><%= Spree.t(:amount) %></th>
-        <th><%= Spree.t(:created_by) %></th>
-        <th><%= Spree.t("admin.store_credits.total_unused").html_safe %></th>
-        <th><%= Spree.t("admin.store_credits.reason_for_updating").html_safe %></th>
+        <th><%= Spree::StoreCreditEvent.human_attribute_name(:action) %></th>
+        <th><%= Spree::StoreCredit.human_attribute_name(:amount) %></th>
+        <th><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
+        <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
+        <th><%= Spree::StoreCreditUpdateReason.human_attribute_name(:name) %></th>
       </tr>
     </thead>
     <tbody>
       <% @store_credit_events.each do |event| %>
         <tr>
           <td data-hook="admin_show_store_credit_date_cell">
-            <%= event.created_at %>
+            <%= pretty_time(event.created_at) %>
           </td>
           <td><%= store_credit_event_admin_action_name(event) %></td>
           <td class='align-right'><%= event.display_amount %></td>