solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
 <% admin_breadcrumb(@stock_location.name) %>
 
@@ -12,8 +12,6 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
 
 
@@ -9,13 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::StockLocation) %>
       <li>
-        <%= button_link_to Spree.t(:new_stock_location), new_object_url, { id: 'admin_new_stock_location' } %>
-      </li>
-    <% end %>
-
-    <% if can?(:create, Spree::StockTransfer) %>
-      <li>
-        <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path %>
+        <%= button_link_to t('spree.new_stock_location'), new_object_url, { id: 'admin_new_stock_location' } %>
       </li>
     <% end %>
   </ul>
@@ -53,7 +47,7 @@
           <td><%= admin_stock_location_display_name(stock_location) %></td>
           <td>
             <span class="pill pill-<%= stock_location.active? ? 'active' : 'inactive' %>">
-              <%= Spree.t(stock_location.active? ? :active : :inactive) %>
+              <%= t(stock_location.active? ? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td>
@@ -76,7 +70,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::StockLocation,
                         new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
-<% admin_breadcrumb(Spree.t(:new_stock_location)) %>
+<% admin_breadcrumb(t('spree.new_stock_location')) %>
 
 
 <% content_for :page_actions do %>
@@ -12,8 +12,6 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @stock_locations } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>

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

@@ -1,12 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name)) %>
+<% admin_breadcrumb(t('spree.stock_movements_for_stock_location', stock_location_name: @stock_location.name)) %>
 
 
 <% content_for :page_actions do %>
   <% if can?(:display, Spree::StockLocation) %>
     <li>
-      <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, class: 'button' %>
+      <%= link_to_with_icon 'arrow-left', t('spree.back_to_stock_locations_list'), admin_stock_locations_path, class: 'button' %>
     </li>
   <% end %>
 <% end %>
@@ -38,7 +38,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::StockMovement,
                  new_resource_url: new_object_url %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_store_credit_form_fields" class="row">
   <div class="col-12">
     <%= f.field_container :amount do %>
-      <%= f.label :amount, class: 'required' %><br />
+      <%= f.label :amount, class: 'required' %>
       <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency_attr: :currency, required: true %>
       <%= f.error_message_on :amount %>
       <%= f.error_message_on :currency %>
@@ -9,9 +9,9 @@
   </div>
   <div class="col-12">
     <%= f.field_container :category_id do %>
-      <%= f.label :category_id, class: 'required' %><br />
+      <%= f.label :category_id, class: 'required' %>
       <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
-        { include_blank: true }, { class: 'custom-select fullwidth', placeholder: Spree.t("admin.store_credits.select_reason") } %>
+        { include_blank: true }, { class: 'custom-select fullwidth', placeholder: t('spree.admin.store_credits.select_reason') } %>
       <%= f.error_message_on :category_id %>
     <% end %>
   </div>

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

@@ -1,8 +1,7 @@
-<div class="col-12">
-  <%= f.field_container :reason do %>
-    <%= 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: 'custom-select fullwidth', placeholder: Spree.t("admin.store_credits.select_amount_update_reason") } %>
-    <%= f.error_message_on :reason %>
-  <% end %>
-</div>
+<%= f.field_container :reason do %>
+  <%= f.label :reason, t('spree.reason'), class: 'required' %>
+  <%= select_tag :update_reason_id, options_from_collection_for_select(@update_reasons, :id, :name),
+    include_blank: t('spree.choose_reason'), class: 'custom-select fullwidth',
+    placeholder: t('spree.admin.store_credits.select_amount_update_reason') %>
+  <%= f.error_message_on :reason %>
+<% end %>

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

@@ -2,7 +2,7 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StoreCredit), spree.admin_user_store_credits_path(@user)) %>
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
-<% admin_breadcrumb(Spree.t(:edit)) %>
+<% admin_breadcrumb(t('spree.edit')) %>
 
 
 <%= render 'spree/admin/users/sidebar' %>
@@ -12,17 +12,21 @@
 
 <%= form_for [:admin, @user, @store_credit], url: update_amount_admin_user_store_credit_path, method: :put do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree.t("admin.store_credits.edit_amount") %></legend>
+    <legend align="center"><%= t('spree.admin.store_credits.edit_amount') %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
-      <div class="col-9">
+      <div class="col-6">
         <%= f.field_container :amount do %>
           <%= f.label :amount, class: 'required' %><br />
-          <%= f.number_field :amount, min: 0.00, step: :any %>
+          <%= render "spree/admin/shared/number_with_currency", f: f,
+            amount_attr: :amount, currency: @store_credit.currency, required: true %>
           <%= f.error_message_on :amount %>
         <% end %>
       </div>
-      <%= render partial: 'update_reason_field', locals: { f: f } %>
+      <div class="col-6">
+        <%= render 'update_reason_field', f: f %>
+      </div>
     </div>
-    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: admin_user_store_credits_path(@user, @store_credit) } %>
+    <%= render 'spree/admin/shared/edit_resource_links',
+      collection_url: admin_user_store_credits_path(@user, @store_credit) %>
   </fieldset>
 <% end %>

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

@@ -2,7 +2,7 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StoreCredit), spree.admin_user_store_credits_path(@user)) %>
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
-<% admin_breadcrumb(Spree.t(:edit)) %>
+<% admin_breadcrumb(t('spree.edit')) %>
 
 
 <%= render 'spree/admin/users/sidebar' %>
@@ -12,13 +12,15 @@
 
 <%= form_for [:admin, @user, @store_credit], url: invalidate_admin_user_store_credit_path, method: :put do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree.t("admin.store_credits.invalidate_store_credit") %></legend>
+    <legend align="center"><%= t('spree.admin.store_credits.invalidate_store_credit') %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
-      <%= render partial: 'update_reason_field', locals: { f: f } %>
+      <div class="col-12">
+        <%= render partial: 'update_reason_field', locals: { f: f } %>
+      </div>
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('store_credit.actions.invalidate') %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_user_store_credit_path(@user, @store_credit) %>
+      <%= button t('spree.store_credit.actions.invalidate') %>
+      <%= button_link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -7,30 +7,30 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::StoreCredit) %>
-    <li><%= link_to Spree.t("admin.store_credits.add"), new_admin_user_store_credit_path(@user), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button' %></li>
   <% end %>
 <% end %>
 
 <% if @store_credits.any? %>
   <% @store_credits.group_by(&:currency).each do |currency, credits| %>
-    <fieldset class="sc-current-balance">
+    <fieldset class="sc-current-balance no-border-bottom">
       <legend>
-        <%= currency %> <%= Spree.t("admin.store_credits.current_balance") %>
+        <%= t('spree.admin.store_credits.current_balance') %>
         <% total = credits.sum(&:amount_remaining) %>
         <%= Spree::Money.new(total, currency: currency) %>
       </legend>
 
       <table class="sc-table">
         <thead>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
-          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
+          <th><%= t('spree.admin.store_credits.amount_credited') %></th>
+          <th><%= t('spree.admin.store_credits.amount_used') %></th>
+          <th><%= t('spree.admin.store_credits.amount_authorized') %></th>
+          <th><%= t('spree.admin.store_credits.credit_type') %></th>
+          <th><%= t('spree.admin.store_credits.created_by') %></th>
+          <th><%= t('spree.admin.store_credits.created_at') %></th>
+          <th><%= t('spree.admin.store_credits.invalidated') %></th>
           <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
-        <thead>
+        </thead>
         <tbody>
           <% credits.each do |store_credit| %>
             <tr>
@@ -53,7 +53,7 @@
                 <span><%= l store_credit.created_at.to_date %></span>
               </td>
               <td>
-                <span><%= store_credit.invalidated? %></span>
+                <span><%= t store_credit.invalidated? ? 'spree.say_yes' : 'spree.say_no' %></span>
               </td>
               <td class="actions" data-hook="admin_store_credits_index_row_actions">
                 <% if can?(:show, store_credit) %>
@@ -67,7 +67,7 @@
     </fieldset>
   <% end %>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StoreCredit,
                  new_resource_url: new_object_url %>

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

@@ -1,7 +1,7 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
-<% admin_breadcrumb(Spree.t(:new_store_credit)) %>
+<% admin_breadcrumb(t('spree.new_store_credit')) %>
 
 
 <%= render 'spree/admin/users/sidebar' %>
@@ -11,7 +11,7 @@
 
 <%= form_for [:admin, @user, @store_credit] do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree.t("admin.store_credits.new") %></legend>
+    <legend align="center"><%= t('spree.admin.store_credits.new') %></legend>
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_user_store_credits_path(@user) } %>
   </fieldset>

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

@@ -8,10 +8,10 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if @store_credit.editable? && can?(:edit, @store_credit) %>
-    <li><%= link_to_with_icon 'dollar', Spree.t("admin.store_credits.change_amount"), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.change_amount'), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
   <% end %>
   <% if @store_credit.invalidateable? && can?(:invalidate, @store_credit) %>
-    <li><%= link_to_with_icon 'ban', Spree.t("invalidate"), edit_validity_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
+    <li><%= link_to t('spree.invalidate'), edit_validity_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
   <% end %>
 <% end %>
 
@@ -23,73 +23,65 @@
   </colgroup>
   <tr>
     <td>
-      <strong><%= Spree::StoreCredit.human_attribute_name(:amount) %>:</strong>
+      <strong><%= t('spree.admin.store_credits.amount_credited') %></strong>
     </td>
     <td><%= @store_credit.display_amount.to_html %></td>
     <td class='actions'></td>
   </tr>
   <tr>
     <td>
-      <strong><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %>:</strong>
+      <strong><%= t('spree.admin.store_credits.created_by') %></strong>
     </td>
     <td><%= @store_credit.created_by_email %></td>
     <td class='actions'></td>
   </tr>
   <tr>
     <td>
-      <strong><%= Spree.t("admin.store_credits.credit_type") %>:</strong>
+      <strong><%= t('spree.admin.store_credits.credit_type') %></strong>
     </td>
     <td><%= @store_credit.category_name %></td>
     <td class='actions'></td>
   </tr>
-  <tr id='memo-display-row'>
+  <tr class='store-credit-memo-row' data-original-value='<%= @store_credit.memo %>'>
     <td>
-      <strong><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</strong>
-    </td>
-    <td class='js-memo-text'>
-      <%= @store_credit.memo %>
-    </td>
-    <td class='actions'>
-      <% 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('actions.edit') %>
-      <% end %>
-    </td>
-  </tr>
-  <tr id='memo-edit-row' class='hidden' data-original-value='<%= @store_credit.memo %>'>
-    <td>
-      <strong><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</strong>
+      <strong><%= t('spree.admin.store_credits.memo') %></strong>
     </td>
     <td>
-      <%= form_tag admin_user_store_credit_path(@user, @store_credit), method: :put, remote: true, id: 'sc_memo_edit_form' do %>
-        <%= text_area_tag 'store_credit[memo]', @store_credit.memo  %>
+      <div class='store-credit-memo-text'>
+        <%= @store_credit.memo %>
+      </div>
+
+      <%= form_tag admin_user_store_credit_path(@user, @store_credit), method: :put, remote: true, class: 'store-credit-memo-form', id: 'store_credit_memo_form' do %>
+        <%= text_area_tag 'store_credit[memo]', @store_credit.memo, class: 'fullwidth' %>
       <% end %>
     </td>
     <td class='actions'>
       <% if can?(:update, @store_credit) %>
-        <%= link_to '', '#', class: 'js-save-memo fa fa-check no-text with-tip', data: { user_id: @user.id, store_credit_id: @store_credit.id, action: 'save' }, title: Spree.t('actions.save') %>
-        <%= link_to '', '#', class: 'js-cancel-memo fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel') %>
+        <%= button_tag '', class: "fa fa-check save-memo no-text with-tip", "data-action": "save", title: t('spree.actions.save'), type: 'submit', form: 'store_credit_memo_form' %>
+        <%= button_tag '', class: "fa fa-cancel cancel-memo no-text with-tip", "data-action": "cancel", title: t('spree.actions.cancel'), type: 'reset', form: 'store_credit_memo_form' %>
+        <%= button_tag '', class: "fa fa-edit edit-memo no-text with-tip", "data-action": "edit", title: t('spree.actions.edit') %>
       <% end %>
     </td>
   </tr>
 </table>
 
-<fieldset>
-  <legend align='center'><%= Spree.t("admin.store_credits.history") %></legend>
+<fieldset class="no-border-bottom">
+  <legend align='center'><%= t('spree.admin.store_credits.history') %></legend>
   <table>
     <colgroup>
-      <col style="width: 15%;" />
+      <col style="width: 20%;" />
       <col style="width: 10%;" />
       <col style="width: 10%;" />
       <col style="width: 25%;" />
       <col style="width: 10%;" />
-      <col style="width: 30%;" />
+      <col style="width: 25%;" />
     </colgroup>
     <thead>
       <tr>
-        <th><%= Spree.t(:date) %></th>
+        <th><%= t('spree.date') %></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><%= t('spree.admin.store_credits.amount_credited') %></th>
+        <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
         <th><%= Spree::StoreCreditUpdateReason.human_attribute_name(:name) %></th>
       </tr>
@@ -98,7 +90,7 @@
       <% @store_credit_events.each do |event| %>
         <tr>
           <td data-hook="admin_show_store_credit_date_cell">
-            <%= pretty_time(event.created_at) %>
+            <%= pretty_time(event.created_at, :short) %>
           </td>
           <td><%= store_credit_event_admin_action_name(event) %></td>
           <td><%= event.display_amount %></td>

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

@@ -43,7 +43,7 @@
 <%= f.field_container :default_currency do %>
   <%= f.label :default_currency %>
   <%= f.select :default_currency,
-    ::Money::Currency.all.map(&:iso_code),
+    Spree::Config.available_currencies.map(&:iso_code),
     { include_blank: true },
     { class: 'select2 fullwidth' } %>
   <%= f.error_message_on :default_currency %>

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_store), new_admin_store_url %>
+    <%= button_link_to t('spree.new_store'), new_admin_store_url %>
   </li>
 <% end %>
 

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

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Store) %>
     <li>
-      <%= link_to Spree.t(:new_store), new_admin_store_url, class: 'button' %>
+      <%= link_to t('spree.new_store'), new_admin_store_url, class: 'button' %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/general_tabs' %>
 
 <% admin_breadcrumb(link_to(plural_resource_name(Spree::Store), admin_stores_path)) %>
-<% admin_breadcrumb(Spree.t(:new_store)) %>
+<% admin_breadcrumb(t('spree.new_store')) %>
 
 <% content_for :page_actions do %>
 <% end %>