solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -96,7 +96,7 @@
   </div>
 <% end %>
 
-<%= paginate @orders %>
+<%= paginate @orders, theme: "solidus_admin" %>
 
 <% if @orders.any? %>
   <table class="index" id="listing_orders" data-hook>
@@ -115,18 +115,18 @@
     <thead>
       <tr data-hook="admin_orders_index_headers">
         <% if @show_only_completed %>
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :completed_at %></th>
         <% else %>
-          <th><%= sort_link @search, :created_at,     I18n.t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :created_at %></th>
         <% end %>
-        <th><%= sort_link @search, :number,           I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :state,            I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
-         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
-         <% end %>
-        <th><%= sort_link @search, :email,            I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :total,            I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :number %></th>
+        <th><%= sort_link @search, :state %></th>
+        <th><%= sort_link @search, :payment_state %></th>
+        <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <th><%= sort_link @search, :shipment_state %></th>
+        <% end %>
+        <th><%= sort_link @search, :email %></th>
+        <th><%= sort_link @search, :total %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -157,9 +157,10 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::Order,
+                 new_resource_url: spree.new_admin_order_path %>
   </div>
 <% end %>
 
-<%= paginate @orders %>
+<%= paginate @orders, theme: "solidus_admin" %>

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

@@ -5,12 +5,12 @@
     <div class="alpha four columns">
       <div id="preference-settings">
         <div class="field">
-          <%= f.label :type, Spree.t(:provider) %>
+          <%= f.label :type %>
           <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth js-gateway-type'}) %>
         </div>
 
         <div class="field js-preference-source-wrapper">
-          <%= label_tag :preference_source, 'Preference Source' %>
+          <%= f.label :preference_source %>
           <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'select2 fullwidth js-preference-source') %>
         </div>
 
@@ -25,15 +25,15 @@
         <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
       </div>
       <div data-hook="display" class="field">
-        <%= label_tag :payment_method_display_on, Spree.t(:display) %>
+        <%= f.label :display_on %>
         <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
       </div>
       <div data-hook="auto_capture" class="field">
-        <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
+        <%= f.label :auto_capture %>
         <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
       </div>
       <div data-hook="active" class="field">
-        <%= label_tag nil, Spree.t(:active) %>
+        <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>
         <ul>
           <li>
             <%= radio_button :payment_method, :active, true %>
@@ -49,15 +49,14 @@
 
     <div class="omega eight columns">
       <div data-hook="name" class="field">
-        <%= label_tag :payment_method_name, Spree.t(:name) %>
-        <%= text_field :payment_method, :name, :class => 'fullwidth' %>
+        <%= f.label :name %>
+        <%= f.text_field :name, :class => 'fullwidth' %>
       </div>
       <div data-hook="description" class="field">
-        <%= label_tag :payment_method_description, Spree.t(:description) %>
-        <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+        <%= f.label :description %>
+        <%= f.text_area :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
       </div>
     </div>
-
   </div>
 </div>
 

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

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

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

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/payments_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:payment_methods) %>
+  <%= Spree::PaymentMethod.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -13,27 +13,30 @@
 <% end %>
 
 <% if @payment_methods.any? %>
-  <table class="index" id='listing_payment_methods'>
+  <table class="index sortable" id="listing_payment_methods" data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
     <colgroup>
-      <col style="width: 15%">
-      <col style="width: 35%">
-      <col style="width: 15%">
       <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 15%">
+      <col style="width: 13%">
+      <col style="width: 33%">
+      <col style="width: 13%">
+      <col style="width: 19%">
+      <col style="width: 19%">
+      <col style="width: 13%">
     </colgroup>
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:provider) %></th>
-        <th><%= Spree.t(:display) %></th>
-        <th><%= Spree.t(:active) %></th>
+        <th></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:name) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:type) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:display_on) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:active) %></th>
         <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @payment_methods.each do |method|%>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
+          <td class="no-border"><span class="handle"></span></td>
           <td class="align-center"><%= method.name %></td>
           <td class="align-center"><%= method.type %></td>
           <td class="align-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
@@ -52,10 +55,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/payment_method')) %>
-    <% if can?(:create, Spree::PaymentMethod) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_payment_method_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::PaymentMethod,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>
-

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/payments_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_payment_method) %>
@@ -16,7 +16,7 @@
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button Spree.t(:create), 'ok' %>
+      <%= button Spree.t('actions.create'), 'ok' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if @payment.capture_events.exists? %>
-  <h3><%= Spree.t(:capture_events) %></h3>
+  <h3><%= Spree::PaymentCaptureEvent.model_name.human(count: :other) %></h3>
   <table class="index" id="capture_events">
     <thead>
       <tr data-hook="payments_header">
@@ -16,4 +16,4 @@
       <% end %>
     </tbody>
   </table>
-<% end %>
+<% end %>

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

@@ -1,19 +1,19 @@
 <div data-hook="admin_payment_form_fields" class="row">
   <div class="alpha three columns">
     <div class="field">
-      <%= f.label :amount, Spree.t(:amount) %>
+      <%= f.label :amount %>
       <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'fullwidth' %>
     </div>
   </div>
   <div class="omega nine columns">
     <div class="field">
-      <label><%= Spree.t(:payment_method) %></label>
+      <label><%= Spree::PaymentMethod.model_name.human %></label>
       <ul>
         <% @payment_methods.each do |method| %>
           <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
             <label data-hook="payment_method_field">
               <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method, { class: "payment_methods_radios" } %>
-              <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+              <%= method.name %>
             </label>
           </li>
         <% end %>

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

@@ -1,35 +1,47 @@
 <table class="index" id='payments' data-order-id='<%= @order.number %>'>
   <thead>
     <tr data-hook="payments_header">
-      <th><%= Spree.t(:identifier) %></th>
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:payment_method) %></th>
-      <th><%= Spree.t(:transaction_id) %></th>
-      <th><%= Spree.t(:payment_state) %></th>
+      <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="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even', name: 'payment_table_cycle')%>">
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment <%= cycle('odd', 'even', name: 'payment_table_cycle')%>" 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="align-center amount"><%= payment.display_amount.to_html %></td>
+        <td class="align-center amount">
+          <%= text_field_tag :amount, payment.amount, class: 'js-edit-amount edit-payment-amount editing-show' %>
+          <span class="js-display-amount editing-hide"><%= payment.display_amount.to_html %></span>
+        </td>
         <td class="align-center"><%= payment_method_name(payment) %></td>
         <td class="align-center"><%= payment.transaction_id %></td>
         <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
         <td class="actions">
-          <% 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 %>
-            <% 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} %>
+          <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'} %>
+          </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'} %>
+            <% 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 %>
+              <% 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} %>
+              <% end %>
             <% end %>
-          <% end %>
+          </div>
         </td>
       </tr>
     <% end %>

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

@@ -1,14 +1,14 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:refund) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree::Refund.model_name.human %>
 <% end %>
 
 <%= form_tag do %>
-  <h3><%= Spree.t(:refund) %></h3>
+  <h3><%= Spree::Refund.model_name.human %></h3>
   <fieldset data-hook="credit">
     <p>
-      <%= label_tag :amount, Spree.t(:amount) %>
+      <%= label_tag :amount, Spree::Payment.human_attribute_name(:amount) %>
       <%= text_field_tag :amount, @payment.amount %>
     </p>
     <p class="form-buttons">

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

@@ -10,7 +10,7 @@
 <% end %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:payments) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree::Payment.model_name.human(count: :other) %>
 <% end %>
 
 <% if @order.outstanding_balance? %>
@@ -20,13 +20,13 @@
 <% if @payments.any? %>
 
   <fieldset data-hook="payment_list" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:payments) %></legend>
+    <legend align="center"><%= Spree::Payment.model_name.human(count: :other) %></legend>
     <%= render :partial => 'list', :locals => { :payments => @payments } %>
   </fieldset>
 
   <% if @refunds.any? %>
     <fieldset data-hook="payment_list" class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:refunds) %></legend>
+      <legend align="center"><%= Spree::Refund.model_name.human(count: :other) %></legend>
       <%= render :partial => 'spree/admin/shared/refunds', :locals => { :refunds => @refunds, show_actions: true } %>
     </fieldset>
   <% end %>

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

@@ -21,6 +21,6 @@
     </fieldset>
   <% end %>
 <% else %>
-  <%= Spree.t(:cannot_create_payment_without_payment_methods) %>
-  <%= link_to Spree.t(:please_define_payment_methods), admin_payment_methods_url %>
+  <%= Spree.t(:cannot_create_payment_without_payment_methods_html,
+              link: link_to(Spree.t(:cannot_create_payment_link), admin_payment_methods_url)) %>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <% 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>
   <%= payment_method_name(@payment) %>
   &nbsp;
@@ -19,7 +19,7 @@
 <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
-  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
+  <h5><%= label_tag nil, Spree::Payment.human_attribute_name(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
 </div>
 
-<%= render 'spree/admin/payments/capture_events' %>
+<%= render 'spree/admin/payments/capture_events' %>

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

@@ -17,7 +17,7 @@
       <div data-hook="card_number">
         <div class="field">
           <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
-          <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= label_tag "card_number#{payment_method.id}", Spree::CreditCard.human_attribute_name(:number), class: 'required' %>
           <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
           <span id="card_type" style="display:none;">
             ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -30,20 +30,20 @@
     <div class="alpha four columns">
       <div data-hook="card_name">
         <div class="field">
-          <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= label_tag "card_name#{payment_method.id}", Spree::CreditCard.human_attribute_name(:name), class: 'required' %>
           <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required fullwidth', maxlength: 19 %>
         </div>
       </div>
     </div>
     <div class="three columns">
       <div data-hook="card_expiration" class="field">
-        <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= 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" %>
       </div>
     </div>
     <div class="omega two columns">
       <div data-hook="card_code" class="field">
-        <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
+        <%= 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 %>
         <a href="/content/cvv" class="info cvvLink" target="_blank">
           (<%= Spree.t(:what_is_this) %>)

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

@@ -1,5 +1,5 @@
 <fieldset data-hook="credit_card">
-  <legend align="center"><%= Spree.t(:credit_card) %></legend>
+  <legend align="center"><%= Spree::CreditCard.model_name.human %></legend>
 
   <div class="row">
     <div class="alpha six columns">
@@ -7,13 +7,13 @@
         <dt><%= Spree.t(:name_on_card) %>:</dt>
         <dd><%= payment.source.name %></dd>
 
-        <dt><%= Spree.t(:card_type) %>:</dt>
+        <dt><%= Spree::CreditCard.human_attribute_name(:cc_type) %>:</dt>
         <dd><%= payment.source.cc_type %></dd>
 
-        <dt><%= Spree.t(:card_number) %>:</dt>
+        <dt><%= Spree::CreditCard.human_attribute_name(:number) %>:</dt>
         <dd><%= payment.source.display_number %></dd>
 
-        <dt><%= Spree.t(:expiration) %>:</dt>
+        <dt><%= Spree::CreditCard.human_attribute_name(:expiration) %>:</dt>
         <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
       </dl>
       <% if payment.source.address %>

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

@@ -1,19 +1,19 @@
 <fieldset data-hook="store-credit">
-  <legend align="center"><%= Spree.t(:store_credit, scope: :store_credit) %></legend>
+  <legend align="center"><%= Spree::StoreCredit.model_name.human %></legend>
 
   <div class="row">
     <div class="alpha six columns">
       <dl>
-        <dt><%= Spree.t(:category) %>:</dt>
+        <dt><%= Spree::StoreCreditCategory.model_name.human %>:</dt>
         <dd><%= payment.source.category.name%></dd>
 
-        <dt><%= Spree.t(:memo) %>:</dt>
+        <dt><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</dt>
         <dd><%= payment.source.memo %></dd>
 
-        <dt><%= Spree.t(:created_by) %>:</dt>
+        <dt><%= Spree::StoreCredit.human_attribute_name(:created_by) %>:</dt>
         <dd><%= payment.source.created_by.email %></dd>
 
-        <dt><%= Spree.t(:issued_on, scope: [:admin, :store_credits]) %>:</dt>
+        <dt><%= Spree::StoreCredit.human_attribute_name(:issued_on) %>:</dt>
         <dd><%= l payment.source.created_at.to_date %></dd>
       </dl>
     </div>