solidus_backend 2.3.1 → 2.4.0.beta1

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

@@ -51,7 +51,7 @@
   </fieldset>
 <% end %>
 
-<fieldset data-hook="reimbursements" class="no-border-bottom align-center">
+<fieldset data-hook="reimbursements" class="no-border-bottom">
   <legend align="center"><%= plural_resource_name(Spree::Reimbursement) %></legend>
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>

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

@@ -15,7 +15,7 @@
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree::CustomerReturn.human_attribute_name(:number) %></th>
-        <th><%= Spree::CustomerReturn.human_attribute_name(:pre_tax_total) %></th>
+        <th><%= Spree::CustomerReturn.human_attribute_name(:total_excluding_vat) %></th>
         <th><%= Spree::CustomerReturn.human_attribute_name(:total) %></th>
         <th><%= Spree::CustomerReturn.human_attribute_name(:created_at) %></th>
         <th><%= Spree::CustomerReturn.human_attribute_name(:reimbursement_status) %></th>
@@ -24,16 +24,16 @@
     </thead>
     <tbody>
       <% @customer_returns.each do |customer_return| %>
-        <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row">
           <td><%= link_to customer_return.number, edit_admin_order_customer_return_path(@order, customer_return) %></td>
-          <td><%= customer_return.display_pre_tax_total.to_html %></td>
+          <td><%= customer_return.display_total_excluding_vat.to_html %></td>
           <td><%= customer_return.display_total.to_html %></td>
           <td><%= pretty_time(customer_return.created_at) %></td>
           <td>
             <% if customer_return.fully_reimbursed? %>
-              <span class="state success"><%= Spree.t(:reimbursed) %></span>
+              <span class="pill pill-complete"><%= Spree.t(:reimbursed) %></span>
             <% else %>
-              <span class="state notice"><%= Spree.t(:incomplete) %></span>
+              <span class="pill pill-pending"><%= Spree.t(:incomplete) %></span>
             <% end %>
           </td>
           <td class='actions align-center' data-hook="admin_orders_customer_returns_index_row_actions">

data/app/views/spree/admin/images/_image_row.html.erb

@@ -1,15 +1,25 @@
-<tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
+<tr id="<%= spree_dom_id image %>" data-hook="images_row">
 
-  <td class="no-border">
+  <td>
     <% if can?(:update_positions, Spree::Image) %>
       <span class="handle"></span>
     <% end %>
   </td>
 
   <td>
-    <%= link_to image.attachment.url(:product) do %>
+    <span class="modal-image-trigger" data-toggle="modal" data-target="#modal-image-<%= image.id %>">
       <%= render 'spree/admin/shared/image', image: image, size: :mini %>
-    <% end %>
+    </span>
+    <%= render(
+      "spree/admin/shared/modal",
+      target: "modal-image-#{image.id}",
+      title: image.alt,
+      content: %{
+        <div class='align-center'>
+          #{image_tag(image.attachment.url(:large))}
+        </div>
+      }.html_safe
+    ) %>
   </td>
 
   <% if @product.has_variants? %>

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

@@ -50,7 +50,8 @@
 
   <thead>
     <tr data-hook="images_header">
-      <th colspan="2"><%= Spree.t(:thumbnail) %></th>
+      <th></th>
+      <th><%= Spree.t(:thumbnail) %></th>
       <% if @product.has_variants? %>
         <th><%= Spree::Variant.model_name.human %></th>
       <% end %>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -1,11 +1,11 @@
-<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
-  <% if f.object.persisted? %>
-    <td class="no-border">
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value">
+  <td>
+    <% if f.object.persisted? %>
       <span class="handle"></span>
       <%= f.hidden_field :id %>
-    </td>
-  <% end %>
-  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
+    <% end %>
+  </td>
+  <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields Spree.t('actions.remove'), f, no_text: true %></td>
 </tr>

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

@@ -25,7 +25,8 @@
     <table class="index sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
         <tr>
-          <th colspan="2"><%= Spree::OptionValue.human_attribute_name(:name) %></th>
+          <th></th>
+          <th><%= Spree::OptionValue.human_attribute_name(:name) %></th>
           <th><%= Spree::OptionValue.human_attribute_name(:presentation) %></th>
           <th class="actions"></th>
         </tr>

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

@@ -22,7 +22,7 @@
   </colgroup>
   <thead>
     <tr data-hook="option_header">
-      <th class="no-border"></th>
+      <th></th>
       <th><%= Spree::OptionType.human_attribute_name(:name) %></th>
       <th><%= Spree::OptionType.human_attribute_name(:presentation) %></th>
       <th class="actions"></th>
@@ -30,10 +30,10 @@
   </thead>
   <tbody>
     <% @option_types.each do |option_type| %>
-      <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
-        <td class="no-border"><span class="handle"></span></td>
-        <td class="align-center"><%= option_type.name %></td>
-        <td class="align-center presentation"><%= option_type.presentation %></td>
+      <tr class="spree_option_type" id="<%= spree_dom_id option_type %>" data-hook="option_row">
+        <td><span class="handle"></span></td>
+        <td><%= option_type.name %></td>
+        <td class="presentation"><%= option_type.presentation %></td>
         <td class="actions">
           <% if can?(:update, option_type) %>
             <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) %>

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

@@ -7,11 +7,11 @@
         <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
       </tr>
     </thead>
-    <tbody data-hook="order_details_adjustments"  class="with-border">
+    <tbody data-hook="order_details_adjustments">
       <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
         <tr class="total">
-          <td><strong><%= label %>:</strong></td>
-          <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>
+          <td><%= label %>:</td>
+          <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -52,7 +52,7 @@
           <% if carton.tracking.present? %>
             <strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong> <%= carton.tracking %>
           <% else %>
-            <%= Spree.t(:no_tracking_present) %>
+            <i><%= Spree.t(:no_tracking_present) %></i>
           <% end %>
         </td>
       </tr>

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

@@ -10,12 +10,12 @@
         <%= item.variant.sku %>
       <% end %>
     </td>
-    <td class="item-price align-center"><%= item.line_item.single_money.to_html %></td>
-    <td class="item-qty-show align-center">
+    <td class="item-price"><%= item.line_item.single_money.to_html %></td>
+    <td class="item-qty-show">
         <% item.states.each do |state,count| %>
           <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
   </tr>
 <% end %>

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

@@ -10,33 +10,35 @@
         <td><strong>
           <%= Spree.t(:failed_payment_attempts) %>:
         </strong></td>
-          <td class="align-center">
-            <span class="<%= @order.payments.failed.count > 0 ? 'state void' : 'state complete' %>">
-              <%= link_to Spree.t(:payments_failed_count,
-                                  count: @order.payments.failed.count),
-                          spree.admin_order_payments_path(@order) %>
-            </span>
+        <td>
+          <span class="pill pill-<%= @order.payments.failed.count > 0 ? 'warning' : 'complete' %>">
+            <%= Spree.t(
+              :payments_failed_count,
+              count: @order.payments.failed.count
+            ) %>
+          </span>
         </td>
       </tr>
 
       <tr>
         <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
-        <td class="align-center">
-          <% if latest_payment.is_avs_risky? %>
-            <span class="state void"><%= Spree.t(:error) %>:</span>
-            <%= avs_response_code[latest_payment.avs_response] %>
-          <% else %>
-            <span class="state complete"><%= Spree.t(:success) %></span>
-          <% end %>
+        <td>
+          <span class="pill pill-<%= latest_payment.is_avs_risky? ? 'warning' : 'complete' %>">
+            <% if latest_payment.is_avs_risky? %>
+              <%= avs_response_code[latest_payment.avs_response] %>
+            <% else %>
+              <%= Spree.t(:success) %>
+            <% end %>
+          </span>
         </td>
       </tr>
 
       <tr>
         <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
-        <td class="align-center">
-          <span class="<%= latest_payment.is_cvv_risky? ? 'state void' : 'state complete' %>">
+        <td>
+          <span class="pill pill-<%= latest_payment.is_cvv_risky? ? 'warning' : 'complete' %>">
             <% if latest_payment.is_cvv_risky? %>
-              <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
+              <%= cvv_response_code[latest_payment.cvv_response_code] %>
             <% else %>
               <%= Spree.t(:success) %>
             <% end %>

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

@@ -25,12 +25,12 @@
 
   <table class="stock-contents shipment index" data-hook="stock-contents">
     <colgroup>
-      <col style="width: 10%;" />
+      <col style="width: 17.5%;" />
       <col style="width: 30%;" />
+      <col style="width: 12.5%;" />
       <col style="width: 15%;" />
       <col style="width: 15%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
+      <col style="width: 10%;" />
     </colgroup>
 
     <thead>
@@ -48,23 +48,17 @@
 
       <% unless shipment.shipped? %>
         <tr class="edit-method hidden total">
-          <td colspan="5">
-            <div class="row">
-              <div class="col-12">
-                <div class="field">
-                  <%= label_tag 'selected_shipping_rate_id', Spree::ShippingMethod.model_name.human %>
-                  <%= select_tag :selected_shipping_rate_id,
-                        options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-                        {class: 'custom-select fullwidth', data: {'shipment-number' => shipment.number } } %>
-                </div>
-              </div>
-            </div>
+          <th><%= Spree::ShippingMethod.model_name.human %></th>
+          <td colspan="4">
+            <%= select_tag :selected_shipping_rate_id,
+              options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+              {class: 'custom-select fullwidth', data: {'shipment-number' => shipment.number } } %>
           </td>
           <td class="actions">
             <% if can? :update, shipment %>
-              <%= link_to '', '#', class: 'save-method fa fa-check no-text with-tip',
+              <%= button_tag '', class: 'save-method fa fa-check no-text with-tip',
                 data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
-              <%= link_to '', '#', class: 'cancel-method fa fa-cancel no-text with-tip',
+              <%= button_tag '', class: 'cancel-method fa fa-cancel no-text with-tip',
                 data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
             <% end %>
           </td>
@@ -73,32 +67,33 @@
 
         <tr class="show-method total">
           <% if rate = shipment.selected_shipping_rate %>
-            <td colspan="4">
-              <strong><%= rate.name %></strong>
+            <th><%= Spree::ShippingMethod.model_name.human %></th>
+            <td colspan="3">
+              <%= rate.name %>
             </td>
-            <td class="total" align="center">
-              <span><%= shipment.display_cost %></span>
+            <td class="total">
+              <%= shipment.display_cost %>
             </td>
           <% else %>
-            <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+            <td colspan="5"><%= Spree.t(:no_shipping_method_selected) %></td>
           <% end %>
 
           <td class="actions">
             <% if can?(:update, shipment) && !shipment.shipped? %>
-              <%= link_to '', '#', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
+              <%= button_tag '', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
             <% end %>
           </td>
         </tr>
 
       <tr class="edit-tracking hidden total">
-        <td colspan="5">
-          <label><%= Spree::Shipment.human_attribute_name(:tracking) %>:</label>
+        <th><%= Spree::Shipment.human_attribute_name(:tracking) %></th>
+        <td colspan="4">
           <%= text_field_tag :tracking, shipment.tracking, id: nil %>
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', class: 'save-tracking fa fa-check no-text with-tip', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
-            <%= link_to '', '#', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
+            <%= button_tag '', class: 'save-tracking fa fa-check no-text with-tip', data: { action: 'save', 'shipment-number' => shipment.number }, title: Spree.t('actions.save'), type: :button %>
+            <%= button_tag '', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), type: :button %>
           <% end %>
         </td>
       </tr>
@@ -112,16 +107,17 @@
       <% end %>
 
       <tr class="show-tracking total">
-        <td colspan="5" class="tracking-value">
+        <th><%= Spree::Shipment.human_attribute_name(:tracking) %></th>
+        <td colspan="4" class="tracking-value">
           <% if shipment.tracking.present? %>
-            <strong><%= Spree::Shipment.human_attribute_name(:tracking) %>:</strong> <%= shipment.tracking %>
+            <%= shipment.tracking %>
           <% else %>
-            <%= Spree.t(:no_tracking_present) %>
+            <i><%= Spree.t(:no_tracking_present) %></i>
           <% end %>
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
+            <%= button_tag '', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
           <% end %>
         </td>
       </tr>

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

@@ -3,7 +3,7 @@
       data-item-quantity="<%= item.quantity %>"
       data-variant-id="<%= item.variant.id %>"
       >
-    <td class="item-image">
+    <td class="item-image align-center">
       <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
     </td>
     <td class="item-name">
@@ -12,18 +12,18 @@
         <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>
     </td>
-    <td class="item-price align-center"><%= item.line_item.single_money.to_html %></td>
-    <td class="item-qty-show align-center">
+    <td class="item-price"><%= item.line_item.single_money.to_html %></td>
+    <td class="item-qty-show">
         <% item.states.each do |state,count| %>
           <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
 
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <% if can? :update, item %>
-        <%= link_to '', '#', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('actions.split') %>
-        <%= link_to '', '#', class: 'delete-item fa fa-trash no-text with-tip', data: { 'variant-id' => item.variant.id}, title: Spree.t('actions.delete') %>
+        <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'edit', 'variant-id' => item.variant.id }, title: Spree.t('actions.split'), type: :button %>
+        <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { action: 'remove', 'variant-id' => item.variant.id }, title: Spree.t('actions.delete'), type: :button %>
       <% end %>
     </td>
   </tr>

data/app/views/spree/admin/orders/confirm/_line_items.html.erb

@@ -17,13 +17,13 @@
           <td class="line-item-name">
             <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
           </td>
-          <td class="line-item-price align-center">
+          <td class="line-item-price">
             <%= item.single_money.to_html %>
           </td>
-          <td class="line-item-qty-show align-center">
+          <td class="line-item-qty-show">
             <%= item.quantity %>
           </td>
-          <td class="line-item-total align-center">
+          <td class="line-item-total">
             <%= line_item_shipment_price(item, item.quantity) %>
           </td>
         </tr>

data/app/views/spree/admin/orders/confirm/_payments.html.erb

@@ -20,18 +20,18 @@
           <td>
             <%= pretty_time(payment.created_at) %>
           </td>
-          <td class="align-center amount">
+          <td class="amount">
             <%= payment.display_amount.to_html %>
           </td>
-          <td class="align-center">
+          <td>
             <%= payment_method_name(payment) %>
           </td>
-          <td class="align-center">
+          <td>
             <%= payment.transaction_id %>
           </td>
-          <td class="align-center">
-            <span class="state <%= payment.state %>">
-              <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
+          <td>
+            <span class="pill pill-<%= payment.state %>">
+              <%= Spree.t(payment.state, scope: :payment_states) %>
             </span>
           </td>
         </tr>

data/app/views/spree/admin/orders/confirm/_shipment.html.erb

@@ -26,7 +26,7 @@
           <td colspan="4">
             <strong><%= rate.name %></strong>
           </td>
-          <td class="total" align="center">
+          <td class="total">
             <span><%= shipment.display_cost %></span>
           </td>
         <% else %>

data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb

@@ -9,12 +9,12 @@
         <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>
     </td>
-    <td class="item-price align-center"><%= item.line_item.single_money.to_html %></td>
-    <td class="item-qty-show align-center">
+    <td class="item-price"><%= item.line_item.single_money.to_html %></td>
+    <td class="item-qty-show">
         <% item.states.each do |state,count| %>
           <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
         <% end %>
     </td>
-    <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
+    <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
   </tr>
 <% end %>

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

@@ -141,20 +141,36 @@
           <th><%= sort_link @search, :shipment_state %></th>
         <% end %>
         <th><%= sort_link @search, :email %></th>
-        <th><%= sort_link @search, :total %></th>
+        <th class="align-right"><%= sort_link @search, :total %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
     <% @orders.each do |order| %>
-      <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-        <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
-        <td class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
-        <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
-        <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
-          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-            <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+      <tr data-hook="admin_orders_index_rows">
+        <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+        <td><%= link_to order.number, edit_admin_order_path(order) %></td>
+        <td>
+          <span class="pill pill-<%= order.state %>">
+            <%= Spree.t(order.state, scope: :order_state) %>
+          </span>
+        </td>
+        <td>
+          <% if order.payment_state  %>
+            <span class="pill pill-<%= order.payment_state %>">
+              <%= Spree.t(order.payment_state, scope: :payment_states) %>
+            </span>
           <% end %>
+        </td>
+        <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <td>
+            <% if order.shipment_state %>
+              <span class="pill pill-<%= order.shipment_state %>">
+                <%= Spree.t(order.shipment_state, scope: :shipment_states) %>
+              </span>
+            <% end %>
+          </td>
+        <% end %>
         <td>
           <% if order.user %>
             <%= link_to order.email, edit_admin_user_path(order.user) %>
@@ -162,7 +178,7 @@
             <%= mail_to order.email %>
           <% end %>
         </td>
-        <td class="align-center"><%= order.display_total.to_html %></td>
+        <td class="align-right"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
           <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true %>
         </td>

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

@@ -19,7 +19,10 @@
             <% if @object.preference_source.present? %>
               <%= Spree.t :preference_source_using, name: @object.preference_source %>
             <% elsif !@object.new_record? %>
-              <%= preference_fields(@object, f) %>
+              <% @object.preferences.keys.each do |key| %>
+                <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(key)}",
+                   form: f, attribute: "preferred_#{key}", label: Spree.t(key) %>
+              <% end %>
             <% end %>
           </div>
 

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

@@ -26,24 +26,28 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
-        <th class="no-border"></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(:available_to_users) %></th>
         <th><%= Spree::PaymentMethod.human_attribute_name(:available_to_admin) %></th>
-        <th><%= Spree::PaymentMethod.human_attribute_name(:active) %></th>
+        <th><%= Spree::PaymentMethod.human_attribute_name(:state) %></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.model_name.human %></td>
+        <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
+          <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.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="align-center">
+            <span class="pill pill-<%= method.active ? 'active' : 'inactive' %>">
+              <%= Spree.t(method.active? ? :active : :inactive) %>
+            </span>
+          </td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">
             <% if can?(:update, method.becomes(Spree::PaymentMethod)) %>
               <%= link_to_edit method.becomes(Spree::PaymentMethod), no_text: true %>

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

@@ -9,7 +9,7 @@
     </thead>
     <tbody>
       <% @payment.capture_events.each do |capture_event| %>
-        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
           <td><%= pretty_time(capture_event.created_at) %></td>
           <td><%= capture_event.display_amount %></td>
         </tr>

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

@@ -12,16 +12,20 @@
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment <%= cycle('odd', 'even', name: 'payment_table_cycle')%>" data-payment-id="<%= payment.id %>">
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment" 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">
+        <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 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><%= payment_method_name(payment) %></td>
+        <td><%= payment.transaction_id %></td>
+        <td>
+          <span class="pill pill-<%= payment.state %>">
+            <%= Spree.t(payment.state, scope: :payment_states) %>
+          </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'} %>

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

@@ -3,8 +3,8 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb do %>
   <%= payment_method_name(@payment) %>
-  <span class="state <%= @payment.state %>">
-    <%= Spree.t(@payment.state, scope: :payment_states, default: @payment.state.capitalize) %>
+  <span class="pill pill-<%= @payment.state %>">
+    <%= Spree.t(@payment.state, scope: :payment_states ) %>
   </span>
 <% end %>