solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
 <% admin_breadcrumb(@payment_method.name) %>
@@ -14,7 +14,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button Spree.t('actions.update') %>
+      <%= button t('spree.actions.update') %>
     </div>
   </fieldset>
 

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

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 <% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %>
 
@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PaymentMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_payment_method), new_object_url, id: 'admin_new_payment_methods_link' %>
+      <%= button_link_to t('spree.new_payment_method'), new_object_url, id: 'admin_new_payment_methods_link' %>
     </li>
   <% end %>
 <% end %>
@@ -41,11 +41,11 @@
           <td><span class="handle"></span></td>
           <td><%= method.name %></td>
           <td><%= method.model_name.human %></td>
-          <td class="align-center"><%= method.available_to_users ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="align-center"><%= method.available_to_admin ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="align-center"><%= method.available_to_users ? t('spree.say_yes') : t('spree.say_no') %></td>
+          <td class="align-center"><%= method.available_to_admin ? t('spree.say_yes') : t('spree.say_no') %></td>
           <td class="align-center">
             <span class="pill pill-<%= method.active ? 'active' : 'inactive' %>">
-              <%= Spree.t(method.active? ? :active : :inactive) %>
+              <%= t(method.active? ? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">
@@ -61,7 +61,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::PaymentMethod,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/payments_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
-<% admin_breadcrumb(Spree.t(:new_payment_method)) %>
+<% admin_breadcrumb(t('spree.new_payment_method')) %>
 
 
 <% content_for :page_actions do %>
@@ -15,7 +15,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button Spree.t('actions.create') %>
+      <%= button t('spree.actions.create') %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/payments/_capture_events.html.erb

@@ -3,8 +3,8 @@
   <table class="index" id="capture_events">
     <thead>
       <tr data-hook="payments_header">
-        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-        <th><%= Spree.t(:amount) %></th>
+        <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+        <th><%= t('spree.amount') %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/spree/admin/payments/_list.html.erb

@@ -1,48 +1,68 @@
 <table class="index" id='payments' data-order-id='<%= @order.number %>'>
+  <colgroup>
+    <col style="width: 15%"/>
+    <col style="width: 15%"/>
+    <col style="width: 15%"/>
+    <col style="width: 10%"/>
+    <col style="width: 10%"/>
+    <col style="width: 20%"/>
+    <col style="width: 15%"/>
+  </colgroup>
   <thead>
     <tr data-hook="payments_header">
       <th><%= Spree::Payment.human_attribute_name(:number) %></th>
       <th><%= Spree::Payment.human_attribute_name(:created_at) %></th>
-      <th><%= Spree::Payment.human_attribute_name(:amount) %></th>
       <th><%= Spree::PaymentMethod.model_name.human %></th>
       <th><%= Spree::Payment.human_attribute_name(:response_code) %></th>
       <th><%= Spree::Payment.human_attribute_name(:state) %></th>
+      <th class="align-right"><%= Spree::Payment.human_attribute_name(:amount) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment" data-payment-id="<%= payment.id %>">
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment vertical-middle" data-payment-id="<%= payment.id %>">
         <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
-        <td><%= pretty_time(payment.created_at) %></td>
-        <td class="amount">
-          <%= text_field_tag :amount, payment.amount, class: 'js-edit-amount align-right editing-show' %>
-          <span class="js-display-amount editing-hide"><%= payment.display_amount.to_html %></span>
-        </td>
+        <td><%= l(payment.created_at, format: :short) %></td>
         <td><%= payment_method_name(payment) %></td>
         <td><%= payment.transaction_id %></td>
         <td>
           <span class="pill pill-<%= payment.state %>">
-            <%= Spree.t(payment.state, scope: :payment_states) %>
+            <%= t(payment.state, scope: 'spree.payment_states') %>
           </span>
         </td>
+        <td class="amount align-right">
+          <div class="editing-show">
+            <form class="editing-show">
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text number-with-currency-symbol">
+                    <%= ::Money::Currency.find(@order.currency).symbol %>
+                  </span>
+                </div>
+                <%= text_field_tag :amount, payment.amount, class: 'js-edit-amount align-right form-control' %>
+              </div>
+            </form>
+          </div>
+          <span class="js-display-amount editing-hide"><%= payment.display_amount.to_html %></span>
+        </td>
         <td class="actions">
           <div class="editing-show">
-            <%= link_to_with_icon 'save', Spree.t('actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
-            <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), nil, no_text: true, class: "js-cancel", data: {action: 'cancel'} %>
+            <%= link_to_with_icon 'save', t('spree.actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
+            <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, class: "js-cancel", data: {action: 'cancel'} %>
           </div>
           <div class="editing-hide">
             <% if payment.pending? %>
-              <%= link_to_with_icon 'edit', Spree.t('actions.edit'), nil, no_text: true, class: "js-edit", data: {action: 'edit'} %>
+              <%= link_to_with_icon 'edit', t('spree.actions.edit'), nil, no_text: true, class: "js-edit", data: {action: 'edit'} %>
             <% end %>
             <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
             <% allowed_actions.each do |action| %>
               <% if action == 'credit' %>
-                <%= link_to_with_icon 'reply', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
+                <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
               <% elsif action == 'capture' && !@order.completed? %>
                 <%# no capture prior to completion. payments get captured when the order completes. %>
               <% else %>
-                <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action} %>
+                <%= link_to_with_icon action, t(action, scope: 'spree'), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action} %>
               <% end %>
             <% end %>
           </div>

data/app/views/spree/admin/payments/credit.html.erb

@@ -12,7 +12,7 @@
       <%= text_field_tag :amount, @payment.amount %>
     </p>
     <p class="form-buttons">
-      <%= button Spree.t(:make_refund) %>
+      <%= button t('spree.make_refund') %>
     </p>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
-      <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order) %>
+      <%= button_link_to t('spree.new_payment'), new_admin_order_payment_url(@order) %>
     </li>
   <% end %>
 <% end %>
@@ -11,7 +11,7 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 
 <% if @order.outstanding_balance? %>
-  <h5 class="outstanding-balance"><%= @order.outstanding_balance < 0 ? Spree.t(:credit_owed) : Spree.t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong></h5>
+  <h5 class="outstanding-balance"><%= @order.outstanding_balance < 0 ? t('spree.credit_owed') : t('spree.balance_due') %>: <strong><%= @order.display_outstanding_balance %></strong></h5>
 <% end %>
 
 <% if @payments.any? %>
@@ -29,5 +29,5 @@
   <% end %>
 
 <% else %>
-  <div class="col-9 no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
+  <div class="no-objects-found"><%= t('spree.order_has_no_payments') %></div>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
-<% admin_breadcrumb(Spree.t(:new_payment)) %>
+<% admin_breadcrumb(t('spree.new_payment')) %>
 
 
 <% content_for :page_actions do %>
@@ -15,11 +15,11 @@
       <%= render partial: 'form', locals: { f: f } %>
 
       <div class="filter-actions actions" data-hook="buttons">
-        <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update') %>
+        <%= button @order.cart? ? t('spree.actions.continue') : t('spree.actions.update') %>
       </div>
     </fieldset>
   <% end %>
 <% else %>
-  <%= Spree.t(:cannot_create_payment_without_payment_methods_html,
-              link: link_to(Spree.t(:cannot_create_payment_link), admin_payment_methods_url)) %>
+  <%= t('spree.cannot_create_payment_without_payment_methods_html',
+              link: link_to(t('spree.cannot_create_payment_link'), admin_payment_methods_url)) %>
 <% end %>

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

@@ -4,13 +4,13 @@
 <% admin_breadcrumb do %>
   <%= payment_method_name(@payment) %>
   <span class="pill pill-<%= @payment.state %>">
-    <%= Spree.t(@payment.state, scope: :payment_states ) %>
+    <%= t(@payment.state, scope: 'spree.payment_states') %>
   </span>
 <% end %>
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
+  <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
 <% end %>
 
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -1,20 +1,19 @@
 <fieldset class="no-border-bottom js-edit-credit-card">
-  <div class="field" data-hook="previous_cards">
-    <% if previous_cards.any? %>
+  <legend><%= payment_method.name %></legend>
+
+  <% if previous_cards.any? %>
+    <div class="field" data-hook="previous_cards">
       <% previous_cards.each do |card| %>
         <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
       <% end %>
-      <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
-    <% end %>
-  </div>
+      <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= t('spree.use_new_cc') %></label>
+    </div>
+  <% end %>
 
   <div id="card_form<%= payment_method.id %>" data-hook class="js-new-credit-card-form">
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
-
-    <div class="clear"></div>
-
     <div class="row">
-      <div class="col-5">
+      <div class="col-6">
         <div data-hook="card_number">
           <div class="field">
             <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
@@ -23,7 +22,7 @@
           </div>
         </div>
       </div>
-      <div class="col-5">
+      <div class="col-6">
         <div data-hook="card_name">
           <div class="field">
             <%= label_tag "card_name#{payment_method.id}", Spree::CreditCard.human_attribute_name(:name), class: 'required' %>
@@ -31,28 +30,28 @@
           </div>
         </div>
       </div>
-      <div class="col-4">
+    </div>
+    <div class="row">
+      <div class="col-6">
         <div data-hook="card_expiration" class="field">
           <%= label_tag "card_expiry#{payment_method.id}", Spree::CreditCard.human_attribute_name(:expiration), class: 'required' %>
-          <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
+          <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry fullwidth", placeholder: "MM / YY" %>
         </div>
       </div>
-      <div class="col-3">
+      <div class="col-6">
         <div data-hook="card_code" class="field">
           <%= label_tag "card_code#{payment_method.id}", Spree::CreditCard.human_attribute_name(:card_code), class: 'required' %>
           <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
         </div>
       </div>
     </div>
-
-    <div class="clear"></div>
-
-    <%= label_tag "card_address#{payment_method.id}", Spree.t(:billing_address) %>
-    <% address = @order.bill_address || @order.ship_address || Spree::Address.build_default %>
-    <%= fields_for "#{param_prefix}[address_attributes]", address do |f| %>
-      <%= render partial: 'spree/admin/shared/address_form', locals: { f: f, type: "billing" } %>
-    <% end %>
-
-    <div class="clear"></div>
   </div>
 </fieldset>
+
+<fieldset>
+  <legend><%= t('spree.billing_address') %></legend>
+  <% address = @order.bill_address || @order.ship_address || Spree::Address.build_default %>
+  <%= fields_for "#{param_prefix}[address_attributes]", address do |f| %>
+    <%= render partial: 'spree/admin/shared/address_form', locals: { f: f, type: "billing" } %>
+  <% end %>
+</fieldset>

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-4">
       <dl>
-        <dt><%= Spree.t(:name_on_card) %>:</dt>
+        <dt><%= t('spree.name_on_card') %>:</dt>
         <dd><%= payment.source.name %></dd>
 
         <dt><%= Spree::CreditCard.human_attribute_name(:cc_type) %>:</dt>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -19,7 +19,7 @@
 
       <p>
         <%= link_to(
-          Spree.t("admin.store_credits.view"),
+          t('spree.admin.store_credits.view'),
           admin_user_store_credit_path(payment.source.user, payment.source)
         ) %>
       </p>

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

@@ -17,8 +17,7 @@
           <%= f.field_hint :country %>
           <%= f.collection_select :country_iso, available_countries, :iso, :name,
                                   {
-                                    include_blank: t(:any_country, scope: [:spree, :admin, :prices]),
-                                    selected: Spree::Config.admin_vat_country_iso
+                                    include_blank: t(:any_country, scope: [:spree, :admin, :prices])
                                   },
                                   { class: 'custom-select fullwidth', disabled: !f.object.new_record? } %>
         <% end %>

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

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
 <% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
-<% admin_breadcrumb(Spree.t('actions.edit')) %>
+<% admin_breadcrumb(t('spree.actions.edit')) %>
 
 <%= form_for @price, url: spree.admin_product_price_path(@product, @price) do |f| %>
   <fieldset>

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

@@ -8,7 +8,7 @@
 <% end if can?(:create, Spree::Product) %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -64,7 +64,7 @@
 
   <div class="actions filter-actions">
     <div data-hook="admin_orders_index_search_buttons">
-      <%= button Spree.t(:filter_results) %>
+      <%= button t('spree.filter_results') %>
     </div>
   </div>
 

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

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Prices' %>
 <% admin_breadcrumb(link_to(plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product))) %>
-<% admin_breadcrumb(Spree.t('actions.new')) %>
+<% admin_breadcrumb(t('spree.actions.new')) %>
 
 <%= form_for [:admin, @product, @product.prices.build] do |f| %>
   <fieldset data-hook="admin_product_price_new_form">

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -6,7 +6,7 @@
     <% end %>
   </td>
   <td class='property_name'>
-    <%= f.text_field :property_name, class: 'autocomplete' %>
+    <%= f.text_field :property_name, list: 'properties' %>
   </td>
   <td class='value'>
     <%= f.text_field :value %>

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

@@ -7,7 +7,7 @@
   <% if can?(:create, Spree::ProductProperty) %>
     <ul class="tollbar inline-menu">
       <li>
-        <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', class: 'plus button' %>
+        <%= link_to_add_fields t('spree.add_product_properties'), 'tbody#product_properties', class: 'plus button' %>
       </li>
     </ul>
   <% end %>
@@ -44,7 +44,7 @@
 
 <%= form_tag admin_product_product_properties_path, method: :get, id: 'variant_option_value_selections' do %>
   <fieldset class='no-border-bottom'>
-    <legend align="center"><%= Spree.t(:variant_properties) %></legend>
+    <legend align="center"><%= t('spree.variant_properties') %></legend>
     <fieldset class='no-border-top'>
       <% @option_types.each do |option_type, option_values| %>
         <div class="field">
@@ -53,9 +53,9 @@
         </div>
       <% end %>
       <div class="form-buttons filter-actions actions">
-        <%= button Spree.t(:filter_results) %>
+        <%= button t('spree.filter_results') %>
         <% if @option_value_ids.present? %>
-          <%= link_to_add_fields Spree.t(:add_variant_properties), 'tbody#variant_property_values', class: 'plus button' %>
+          <%= link_to_add_fields t('spree.add_variant_properties'), 'tbody#variant_property_values', class: 'plus button' %>
         <% end %>
       </div>
     </fieldset>
@@ -91,13 +91,6 @@
   <% end %>
 <% end %>
 
-<%= javascript_tag do -%>
-  var properties = <%= raw(@properties.to_json) %>;
-  $('#product_properties, #variant_property_values').on('keydown', 'input.autocomplete', function() {
-    already_auto_completed = $(this).is('ac_input');
-    if (!already_auto_completed) {
-      $(this).autocomplete({source: properties});
-      $(this).focus();
-    }
-  });
-<% end -%>
+<datalist id="properties">
+  <%= safe_join @properties.map { |name| tag(:option, value: name) } %>
+</datalist>