spree_backend 2.3.13 → 2.4.0.rc1

data/app/controllers/spree/admin/return_authorizations_controller.rb

@@ -3,8 +3,9 @@ module Spree
     class ReturnAuthorizationsController < ResourceController
       belongs_to 'spree/order', :find_by => :number
 
-      update.after :associate_inventory_units
-      create.after :associate_inventory_units
+      before_action :load_form_data, only: [:new, :edit]
+      create.fails  :load_form_data
+      update.fails  :load_form_data
 
       def fire
         @return_authorization.send("#{params[:e]}!")
@@ -12,10 +13,39 @@ module Spree
         redirect_to :back
       end
 
-      protected
-        def associate_inventory_units
-          (params[:return_quantity] || []).each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
+      private
+
+      def load_form_data
+        load_return_items
+        load_reimbursement_types
+        load_return_authorization_reasons
+      end
+
+      # To satisfy how nested attributes works we want to create placeholder ReturnItems for
+      # any InventoryUnits that have not already been added to the ReturnAuthorization.
+      def load_return_items
+        all_inventory_units = @return_authorization.order.inventory_units
+        associated_inventory_units = @return_authorization.return_items.map(&:inventory_unit)
+        unassociated_inventory_units = all_inventory_units - associated_inventory_units
+
+        new_return_items = unassociated_inventory_units.map do |new_unit|
+          Spree::ReturnItem.new(inventory_unit: new_unit).tap(&:set_default_pre_tax_amount)
         end
+
+        @form_return_items = (@return_authorization.return_items + new_return_items).sort_by(&:inventory_unit_id)
+      end
+
+      def load_reimbursement_types
+        @reimbursement_types = Spree::ReimbursementType.accessible_by(current_ability, :read).active
+      end
+
+      def load_return_authorization_reasons
+        @reasons = Spree::ReturnAuthorizationReason.active
+        # Only allow an inactive reason if it's already associated to the RMA
+        if @return_authorization.reason && !@return_authorization.reason.active?
+          @reasons << @return_authorization.reason
+        end
+      end
     end
   end
 end

data/app/controllers/spree/admin/return_items_controller.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    class ReturnItemsController < ResourceController
+      def location_after_save
+        url_for([:edit, :admin, @return_item.customer_return.order, @return_item.customer_return])
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/search_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class SearchController < Spree::Admin::BaseController
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
+      before_action :check_json_authenticity, only: :index
       respond_to :json
 
       # TODO: Clean this up by moving searching out to user_class_extensions

data/app/controllers/spree/admin/shipping_methods_controller.rb

@@ -1,9 +1,9 @@
 module Spree
   module Admin
     class ShippingMethodsController < ResourceController
-      before_filter :load_data, :except => [:index]
-      before_filter :set_shipping_category, :only => [:create, :update]
-      before_filter :set_zones, :only => [:create, :update]
+      before_action :load_data, except: :index
+      before_action :set_shipping_category, only: [:create, :update]
+      before_action :set_zones, only: [:create, :update]
 
       def destroy
         @object.destroy

data/app/controllers/spree/admin/states_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class StatesController < ResourceController
       belongs_to 'spree/country'
-      before_filter :load_data
+      before_action :load_data
 
       def index
         respond_with(@collection) do |format|

data/app/controllers/spree/admin/stock_items_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class StockItemsController < Spree::Admin::BaseController
-      before_filter :determine_backorderable, only: :update
+      before_action :determine_backorderable, only: :update
 
       def update
         stock_item.save

data/app/controllers/spree/admin/stock_locations_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class StockLocationsController < ResourceController
 
-      before_filter :set_country, :only => :new
+      before_action :set_country, only: :new
 
       private
 

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class StockTransfersController < Admin::BaseController
-      before_filter :load_stock_locations, :only => :index
+      before_action :load_stock_locations, only: :index
 
       def index
         @q = StockTransfer.ransack(params[:q])
@@ -37,7 +37,7 @@ module Spree
 
       private
       def load_stock_locations
-        @stock_locations = Spree::StockLocation.active.order('name ASC')
+        @stock_locations = Spree::StockLocation.active.order_default
       end
 
       def source_location

data/app/controllers/spree/admin/tax_rates_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class TaxRatesController < ResourceController
-      before_filter :load_data
+      before_action :load_data
 
       private
 

data/app/controllers/spree/admin/users_controller.rb

@@ -3,11 +3,11 @@ module Spree
     class UsersController < ResourceController
       rescue_from Spree::Core::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
 
-      after_filter :sign_in_if_change_own_password, :only => :update
+      after_action :sign_in_if_change_own_password, only: :update
 
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
-      before_filter :load_roles
+      before_action :check_json_authenticity, only: :index
+      before_action :load_roles
 
       def index
         respond_with(@collection) do |format|
@@ -66,7 +66,7 @@ module Spree
 
       def orders
         params[:q] ||= {}
-        @search = Spree::Order.ransack(params[:q].merge(user_id_eq: @user.id))
+        @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
         @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 

data/app/controllers/spree/admin/variants_controller.rb

@@ -3,9 +3,9 @@ module Spree
     class VariantsController < ResourceController
       belongs_to 'spree/product', :find_by => :slug
       new_action.before :new_before
-      before_filter :load_data, :only => [:new, :create, :edit, :update]
+      before_action :load_data, only: [:new, :create, :edit, :update]
 
-      # override the destory method to set deleted_at value
+      # override the destroy method to set deleted_at value
       # instead of actually deleting the product.
       def destroy
         @variant = Variant.find(params[:id])

data/app/controllers/spree/admin/zones_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ZonesController < ResourceController
-      before_filter :load_data, :except => [:index]
+      before_action :load_data, except: :index
 
       def new
         @zone.zone_members.build

data/app/helpers/spree/admin/customer_returns_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module CustomerReturnsHelper
+      def reimbursement_types
+        @reimbursement_types ||= Spree::ReimbursementType.accessible_by(current_ability, :read).active
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -145,7 +145,7 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        is_active = url.ends_with?(controller.controller_name) || 
+        is_active = url.ends_with?(controller.controller_name) ||
                     url.ends_with?("#{controller.controller_name}/edit") ||
                     url.ends_with?("#{controller.controller_name.singularize}/edit")
         options.merge!(:class => is_active ? 'active' : nil)

data/app/helpers/spree/admin/reimbursement_type_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module ReimbursementTypeHelper
+      def reimbursement_type_name(reimbursement_type)
+        reimbursement_type.present? ? reimbursement_type.name.humanize : ''
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/reimbursements_helper.rb

@@ -0,0 +1,14 @@
+module Spree
+  module Admin
+    module ReimbursementsHelper
+      def reimbursement_status_color(reimbursement)
+        case reimbursement.reimbursement_status
+        when 'reimbursed' then 'success'
+        when 'pending' then 'notice'
+        when 'errored' then 'error'
+        else raise "unknown reimbursement status: #{reimbursement.reimbursement_status}"
+        end
+      end
+    end
+  end
+end

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -10,10 +10,14 @@
   </thead>
   <tbody>
     <%= render :partial => "adjustment", :collection => @adjustments %>
-    <tr>
+    <tr data-hook="adjustment_buttons">
       <td class="align-center" colspan='4'>
-        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), :method => :get %>&nbsp;
-        <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), :method => :get %>
+        <div>
+          <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get %>
+        </div>
+        <div>
+          <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get %>
+        </div>
       </td>
       <td class='actions'>&nbsp;</td>
     </tr>

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

@@ -0,0 +1,36 @@
+<table class="index">
+  <thead data-hook="customer_return_header">
+    <tr>
+      <th><%= Spree.t(:number) %></th>
+      <th><%= Spree.t(:total) %></th>
+      <th><%= Spree.t(:status) %></th>
+      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% reimbursements.each do |reimbursement| %>
+      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row" class="<%= cycle('odd', 'even')%>">
+        <td>
+          <% if reimbursement.reimbursed? %>
+            <%= link_to reimbursement.number, url_for([:admin, @order, reimbursement]) %>
+          <% else %>
+            <%= reimbursement.number %>
+          <% end %>
+        </td>
+        <td><%= reimbursement.display_total %></td>
+        <td>
+          <span class="state <%= reimbursement_status_color(reimbursement) %>">
+            <%= reimbursement.reimbursement_status %>
+          </span>
+        </td>
+        <td><%= pretty_time(reimbursement.created_at) %></td>
+        <td class="actions">
+          <% if !reimbursement.reimbursed? %>
+            <%= link_to_edit_url url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,50 @@
+<table class="show return-items-table">
+  <thead>
+    <tr>
+      <th><%= Spree.t(:product) %></th>
+      <th><%= Spree.t(:sku) %></th>
+      <th><%= Spree.t(:pre_tax_amount) %></th>
+      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
+      <th><%= Spree.t(:exchange_for) %></th>
+      <th><%= Spree.t(:acceptance_errors) %></th>
+      <% if show_decision %>
+        <th class="actions"></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% return_items.each do |return_item| %>
+      <tr>
+        <td>
+          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+        </td>
+        <td>
+          <%= return_item.inventory_unit.variant.sku %>
+        </td>
+        <td class="align-center">
+          <%= return_item.display_pre_tax_amount %>
+        </td>
+        <td class="align-center">
+          <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
+        </td>
+        <td class="align-center">
+          <%= return_item.exchange_variant.try(:options_text) %>
+        </td>
+        <td class="align-center">
+          <%= return_item.acceptance_status_errors %>
+        </td>
+        <% if show_decision %>
+          <td class='actions'>
+            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-up icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+              Spree.t(:accept)
+            <% end %>
+            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-down icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
+              Spree.t(:reject)
+            <% end %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,43 @@
+<table class="index return-items-table">
+  <thead>
+    <tr>
+      <th>
+        <%= check_box_tag 'select-all' %>
+      </th>
+      <th><%= Spree.t(:product) %></th>
+      <th><%= Spree.t(:sku) %></th>
+      <th><%= Spree.t(:pre_tax_amount) %></th>
+      <th><%= Spree.t(:exchange_for) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= f.fields_for :return_items, return_items do |item_fields| %>
+      <% return_item = item_fields.object %>
+
+      <tr>
+        <td class="align-center" class="inventory-unit-checkbox">
+          <div style="display:none">
+            <%= item_fields.hidden_field :inventory_unit_id %>
+            <%= item_fields.hidden_field :return_authorization_id %>
+            <%= item_fields.hidden_field :pre_tax_amount %>
+          </div>
+
+          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
+        </td>
+        <td>
+          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+        </td>
+        <td>
+          <%= return_item.inventory_unit.variant.sku %>
+        </td>
+        <td class="align-center">
+          <%= return_item.display_pre_tax_amount %>
+        </td>
+        <td class="align-center">
+          <%= return_item.exchange_variant.try(:options_text) %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,65 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+
+<% content_for :page_title do %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
+<% end %>
+
+<% if @manual_intervention_return_items.any? %>
+  <fieldset data-hook="manual_intervention_return_items" class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:manual_intervention_required) %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @manual_intervention_return_items, show_decision: true} %>
+  </fieldset>
+<% end %>
+
+<% if @pending_return_items.any? %>
+  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:pending) %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @pending_return_items, show_decision: true} %>
+  </fieldset>
+<% end %>
+
+<% if @accepted_return_items.any? %>
+  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:accepted) %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @accepted_return_items, show_decision: false} %>
+  </fieldset>
+<% end %>
+
+<% if @rejected_return_items.any? %>
+  <fieldset data-hook="rejected_return_items" class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:rejected) %></legend>
+    <%= render partial: 'return_item_decision', locals: {return_items: @rejected_return_items, show_decision: false} %>
+  </fieldset>
+<% end %>
+
+<% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? %>
+  <fieldset data-hook="reimbursements" class="no-border-bottom no-border-top align-center">
+    <% if @customer_return.completely_decided? %>
+      <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
+        <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
+        <%= f.button class: 'button fa fa-reply' do %>
+          <%= Spree.t(:create_reimbursement) %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <div class="no-objects-found">
+        <%= Spree.t(:unable_to_create_reimbursements) %>
+      </div>
+    <% end %>
+  </fieldset>
+<% end %>
+
+<fieldset data-hook="reimbursements" class="no-border-bottom align-center">
+  <legend align="center"><%= Spree.t(:reimbursements) %></legend>
+  <% if @customer_return.reimbursements.any? %>
+    <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
+  <% else %>
+    <div class="no-objects-found">
+      <%= Spree.t(:none) %>
+    </div>
+  <% end %>
+</fieldset>

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

@@ -0,0 +1,60 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+
+<% content_for :page_actions do %>
+  <% if @order.shipments.any?(&:shipped?) %>
+    <li>
+      <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'plus' %>
+    </li>
+  <% end %>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'arrow-left' %></li>
+<% end %>
+
+<% content_for :page_title do %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_returns) %>
+<% end %>
+
+<% if @order.shipments.any?(&:shipped?) %>
+
+  <% if @customer_returns.any? %>
+    <table class="index">
+      <thead data-hook="customer_return_header">
+        <tr>
+          <th><%= Spree.t(:return_number) %></th>
+          <th><%= Spree.t(:pre_tax_total) %></th>
+          <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+          <th><%= Spree.t(:reimbursement_status) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @customer_returns.each do |customer_return| %>
+          <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row" class="<%= cycle('odd', 'even')%>">
+            <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><%= pretty_time(customer_return.created_at) %></td>
+            <td>
+              <% if customer_return.fully_reimbursed? %>
+                <span class="state success"><%= Spree.t(:reimbursed) %></span>
+              <% else %>
+                <span class="state notice"><%= Spree.t(:incomplete) %></span>
+              <% end %>
+            </td>
+            <td class='actions align-center' data-hook="admin_orders_customer_returns_index_row_actions">
+              <%= link_to_edit_url edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/customer_return')) %>,
+      <%= link_to Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order) %>!
+    </div>
+  <% end %>
+
+<% else %>
+  <div data-hook="customer_return_cannot_create" class="no-objects-found">
+    <%= Spree.t(:cannot_create_customer_returns) %>
+  </div>
+<% end %>

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

@@ -0,0 +1,60 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+
+<% content_for :page_title do %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_customer_return) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
+<% end %>
+
+<% if @rma_return_items.any? || @new_return_items.any? %>
+
+  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
+  <%= form_for [:admin, @order, @customer_return] do |f| %>
+    <fieldset class="no-border-top">
+      <div data-hook="admin_customer_return_form_fields">
+        <fieldset class='no-border-bottom'>
+          <legend align='center'><%= Spree.t(:items_in_rmas) %></legend>
+          <% if @rma_return_items.any? %>
+            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
+          <% else %>
+            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
+          <% end %>
+        </fieldset>
+
+        <fieldset class='no-border-bottom'>
+          <legend align='center'><%= Spree.t(:other_items_in_other) %></legend>
+          <% if @new_return_items.any? %>
+            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
+          <% else %>
+            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
+          <% end %>
+        </fieldset>
+
+        <%= f.field_container :stock_location do %>
+          <%= f.label :stock_location, Spree.t(:stock_location) %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.error_message_on :stock_location_id %>
+        <% end %>
+
+      </div>
+
+      <div class="form-buttons filter-actions actions" data-hook="buttons">
+        <%= button Spree.t(:create), 'ok' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'remove' %>
+      </div>
+    </fieldset>
+  <% end %>
+
+<% else %>
+
+  <div class="twelve columns">
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:all_items_have_been_returned) %>,
+      <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
+    </div>
+  </div>
+
+<% end %>

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

@@ -39,6 +39,12 @@
           <br />
           <%= f.text_field :url, class: 'fullwidth'  %>
         </div>
+
+        <div class="field" data-hook="admin_general_setting_mail_from_address">
+          <%= f.label :mail_from_address %>
+          <br />
+          <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
+        </div>
       <% end %>
 
       <div class="row">

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

@@ -1,18 +1,18 @@
 <div data-hook="admin_image_form_fields">
   <div class="four columns alpha">
     <div data-hook="file" class="field">
-      <%= f.label Spree.t(:filename) %><br>
+      <%= f.label :attachment, Spree.t(:filename) %><br>
       <%= f.file_field :attachment %>
     </div>
     <div data-hook="variant" class="field">
-      <%= f.label Spree::Variant.model_name.human %><br>
-      <%= f.select :viewable_id, @variants, {}, {:class => 'select2 fullwidth'} %>
+      <%= f.label :viewable_id, Spree::Variant.model_name.human %><br>
+      <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
     </div>
   </div>
   <div data-hook="alt_text" class="field omega five columns">
-    <%= f.label Spree.t(:alt_text) %><br>
-    <%= f.text_area :alt, :rows => 4, :class => 'fullwidth' %>
+    <%= f.label :alt, Spree.t(:alt_text) %><br>
+    <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
   </div>
 </div>
 
-<div class="clear"></div>
+<div class="clear"></div>

data/app/views/spree/admin/log_entries/_credit_card.html.erb

@@ -0,0 +1,4 @@
+<tr>
+  <td>Message</td>
+  <td><%= entry.parsed_details.message %></td>
+</tr>

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

@@ -22,10 +22,7 @@
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td>Message</td>
-          <td><%= entry.parsed_details.message %></td>
-        </tr>
+        <%= render "spree/admin/log_entries/#{@payment.payment_method.name.gsub(' ', '').underscore}", entry: entry %>
       </tbody>
   <% end %>
-</table>
+</table>