spree_backend 2.0.13 → 2.1.0

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

@@ -3,42 +3,34 @@ module Spree
     class ReportsController < Spree::Admin::BaseController
       respond_to :html
 
-      class << self
-        def available_reports
-          @@available_reports
-        end
-
-        def add_available_report!(report_key, report_description_key = nil)
-          if report_description_key.nil?
-            report_description_key = "#{report_key}_description"
-          end
-          @@available_reports[report_key] = {name: Spree.t(report_key), description: Spree.t(report_description_key)}
-        end
-      end
-
-      def initialize
-        super 
-        ReportsController.add_available_report!(:sales_total)
-      end
+      AVAILABLE_REPORTS = {
+        :sales_total => { :name => Spree.t(:sales_total), :description => Spree.t(:sales_total_description) }
+      }
 
       def index
-        @reports = ReportsController.available_reports
+        @reports = AVAILABLE_REPORTS
       end
 
       def sales_total
         params[:q] = {} unless params[:q]
 
-        if params[:q][:completed_at_gt].blank?
-          params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
+        if params[:q][:created_at_gt].blank?
+          params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
         else
-          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
+          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
         end
 
-        if params[:q] && !params[:q][:completed_at_lt].blank?
-          params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
+        if params[:q] && !params[:q][:created_at_lt].blank?
+          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 
-        params[:q][:s] ||= "completed_at desc"
+        if params[:q].delete(:completed_at_not_null) == "1"
+          params[:q][:completed_at_not_null] = true
+        else
+          params[:q][:completed_at_not_null] = false
+        end
+
+        params[:q][:s] ||= "created_at desc"
 
         @search = Order.complete.ransack(params[:q])
         @orders = @search.result
@@ -58,8 +50,6 @@ module Spree
         Spree::Admin::ReportsController
       end
 
-      @@available_reports = {}
-
     end
   end
 end

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

@@ -6,29 +6,26 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
 
   respond_to :html
+  respond_to :js, :except => [:show, :index]
 
   def new
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      if request.xhr?
-        format.js   { render :layout => false }
-      end
+      format.js   { render :layout => false }
     end
   end
 
   def edit
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      if request.xhr?
-        format.js   { render :layout => false }
-      end
+      format.js   { render :layout => false }
     end
   end
 
   def update
     invoke_callbacks(:update, :before)
-    if @object.update_attributes(params[object_name])
+    if @object.update_attributes(permitted_resource_params)
       invoke_callbacks(:update, :after)
       flash[:success] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
@@ -43,7 +40,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def create
     invoke_callbacks(:create, :before)
-    @object.attributes = params[object_name]
+    @object.attributes = permitted_resource_params
     if @object.save
       invoke_callbacks(:create, :after)
       flash[:success] = flash_message_for(@object, :successfully_created)
@@ -254,6 +251,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     end
 
+    # Allow all attributes to be updatable.
+    #
+    # Other controllers can, should, override it to set custom logic
+    def permitted_resource_params
+      params.require(object_name).permit!
+    end
+
     def collection_actions
       [:index]
     end

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

@@ -13,7 +13,7 @@ module Spree
       def create
         variant = Variant.find(params[:variant_id])
         stock_location = StockLocation.find(params[:stock_location_id])
-        stock_movement = stock_location.stock_movements.build(params[:stock_movement])
+        stock_movement = stock_location.stock_movements.build(stock_movement_params)
         stock_movement.stock_item = stock_location.set_up_stock_item(variant)
 
         if stock_movement.save
@@ -35,6 +35,10 @@ module Spree
       end
 
       private
+        def stock_movement_params
+          params.require(:stock_movement).permit(permitted_stock_movement_attributes)
+        end
+
         def stock_item
           @stock_item ||= StockItem.find(params[:id])
         end

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

@@ -13,7 +13,7 @@ module Spree
       end
 
       def create
-        @stock_movement = stock_location.stock_movements.build(params[:stock_movement])
+        @stock_movement = stock_location.stock_movements.build(stock_movement_params)
         @stock_movement.save
         flash[:success] = flash_message_for(@stock_movement, :successfully_created)
         redirect_to admin_stock_location_stock_movements_path(stock_location)
@@ -28,6 +28,10 @@ module Spree
       def stock_location
         @stock_location ||= StockLocation.find(params[:stock_location_id])
       end
+
+      def stock_movement_params
+        params.require(:stock_movement).permit(:quantity, :stock_item_id, :action)
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Spree
       before_filter :load_stock_locations, :only => :index
 
       def index
-        @q = StockTransfer.search(params[:q])
+        @q = StockTransfer.ransack(params[:q])
 
         @stock_transfers = @q.result
                              .includes(:stock_movements => { :stock_item => :stock_location })

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

@@ -8,7 +8,7 @@ module Spree
         if params[:ids]
           @taxons = Spree::Taxon.where(:id => params[:ids].split(','))
         else
-          @taxons = Spree::Taxon.limit(20).search(:name_cont => params[:q]).result
+          @taxons = Spree::Taxon.limit(20).ransack(:name_cont => params[:q]).result
         end
       end
 
@@ -39,22 +39,39 @@ module Spree
         parent_id = params[:taxon][:parent_id]
         new_position = params[:taxon][:position]
 
-        if parent_id
-          @taxon.parent = Taxon.find(parent_id.to_i)
-        end
-
-        if new_position
-          @taxon.child_index = new_position.to_i
-        end
+        if parent_id || new_position #taxon is being moved
+          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
+          new_position = new_position.nil? ? -1 : new_position.to_i
 
-        @taxon.save!
+          # Bellow is a very complicated way of finding where in nested set we
+          # should actually move the taxon to achieve sane results,
+          # JS is giving us the desired position, which was awesome for previous setup,
+          # but now it's quite complicated to find where we should put it as we have
+          # to differenciate between moving to the same branch, up down and into
+          # first position.
+          new_siblings = new_parent.children
+          if new_position <= 0 && new_siblings.empty?
+            @taxon.move_to_child_of(new_parent)
+          elsif new_parent.id != @taxon.parent_id
+            if new_position == 0
+              @taxon.move_to_left_of(new_siblings.first)
+            else
+              @taxon.move_to_right_of(new_siblings[new_position-1])
+            end
+          elsif new_position < new_siblings.index(@taxon)
+            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
+          else
+            @taxon.move_to_right_of(new_siblings[new_position-1]) # we move down
+          end
+          # Reset legacy position, if any extensions still rely on it
+          new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
 
-        # regenerate permalink
-        if parent_id
-          @taxon.reload
-          @taxon.set_permalink
-          @taxon.save!
-          @update_children = true
+          if parent_id
+            @taxon.reload
+            @taxon.set_permalink
+            @taxon.save!
+            @update_children = true
+          end
         end
 
         if params.key? "permalink_part"
@@ -65,7 +82,7 @@ module Spree
         #check if we need to rename child taxons if parent name or permalink changes
         @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
 
-        if @taxon.update_attributes(params[:taxon])
+        if @taxon.update_attributes(taxon_params)
           flash[:success] = flash_message_for(@taxon, :successfully_updated)
         end
 
@@ -90,6 +107,15 @@ module Spree
         respond_with(@taxon) { |format| format.json { render :json => '' } }
       end
 
+      private
+        def taxon_params
+          params.require(:taxon).permit(permitted_params)
+        end
+
+        def permitted_params
+          [:name, :parent_id, :position, :icon, :description, :permalink,
+           :taxonomy_id, :meta_description, :meta_keywords, :meta_title]
+        end
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, :format => Spree.t('date_picker.format', default: '%Y/%m/%d'))
+          l(date, :format => Spree.t('date_picker.format'))
         else
           nil
         end
@@ -71,7 +71,7 @@ module Spree
         when :integer
           text_field_tag(name, value, preference_field_options(options))
         when :boolean
-          hidden_field_tag(name, 0, id: "#{name}_hidden") +
+          hidden_field_tag(name, 0) +
           check_box_tag(name, 1, value, preference_field_options(options))
         when :string
           text_field_tag(name, value, preference_field_options(options))

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

@@ -29,9 +29,7 @@ module Spree
           link = link_to(titleized_label, destination_url)
         end
 
-        selected = if options[:match_path].is_a? Regexp
-          request.fullpath =~ options[:match_path]
-        elsif options[:match_path]
+        selected = if options[:match_path]
           request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
@@ -62,7 +60,7 @@ module Spree
 
       def link_to_clone(resource, options={})
         options[:data] = {:action => 'clone'}
-        link_to_with_icon('icon-copy', Spree.t(:clone), clone_admin_product_url(resource), options)
+        link_to_with_icon('icon-copy', Spree.t(:clone), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
@@ -71,9 +69,8 @@ module Spree
       end
 
       def link_to_edit(resource, options={})
-        url = options[:url] || edit_object_url(resource)
         options[:data] = {:action => 'edit'}
-        link_to_with_icon('icon-edit', Spree.t(:edit), url, options)
+        link_to_with_icon('icon-edit', Spree.t(:edit), edit_object_url(resource), options)
       end
 
       def link_to_edit_url(url, options={})

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

@@ -3,22 +3,11 @@ module Spree
     module StockMovementsHelper
       def pretty_originator(stock_movement)
         if stock_movement.originator.respond_to?(:number)
-          if stock_movement.originator.respond_to?(:order)
-            link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
-          else
-            stock_movement.originator.number
-          end
+          stock_movement.originator.number
         else
           ""
         end
       end
-
-      def display_variant(stock_movement)
-        variant = stock_movement.stock_item.variant
-        output = variant.name
-        output += "<br>(#{variant.options_text})" unless variant.options_text.blank?
-        output.html_safe
-      end
     end
   end
 end

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

@@ -64,11 +64,11 @@
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />
-          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth', :autocomplete => 'off' %>
+          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth' %>
         </div>
         <div class="field">
           <%= label_tag :preferred_smtp_password, Spree.t(:smtp_password) %><br />
-          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth', :autocomplete => 'off' %>
+          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth' %>
         </div>
       </fieldset>
     </div>

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

@@ -1,5 +1,4 @@
 <%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
-<%= render :partial => "spree/admin/variants/autocomplete_stock", :formats => :js %>
 
 <div id="add-line-item" data-hook>
   <fieldset class="no-border-bottom">

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

@@ -3,11 +3,7 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
-  <% else %>
-    <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
-  <% end %>
+  <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
   <% if order.adjustments.eligible.exists? %>
     <fieldset class="no-border-bottom">
       <legend><%= Spree.t('adjustments') %></legend>

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

@@ -68,7 +68,7 @@
 
       <tr class="show-method total">
         <td colspan="4">
-          <% if shipment.adjustment.present? && shipment.shipping_method.present? %>
+          <% if shipment.adjustment.present? %>
             <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
           <% else %>
             <%= Spree.t(:cannot_set_shipping_method_without_address) %>
@@ -101,14 +101,6 @@
         </td>
       </tr>
 
-      <% if @order.special_instructions.present? %>
-        <tr class='special_instructions'>
-          <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= @order.special_instructions %>
-          </td>
-        </tr>
-      <% end %>
-
       <tr class="show-tracking total">
         <td colspan="5">
           <% if shipment.tracking.present? %>
@@ -125,4 +117,4 @@
       </tr>
     </tbody>
   </table>
-</div>
+</div>

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

@@ -25,7 +25,7 @@
           <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
           <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
           <%= link_to '', '#', :class => 'split-item icon_link icon-resize-horizontal no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-          <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove' }, :title => Spree.t('delete') %>
+          <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => { :confirm => Spree.t(:are_you_sure), 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
         <% end %>
       </td>
     <% end %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -22,11 +22,11 @@
               <% guest = @order.user.nil? || @order.user.anonymous? %>
               <li>
                 <%= radio_button_tag :guest_checkout, true, guest %>
-                <%= Spree.t(:say_yes) %>
+                <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
               </li>
               <li>
                 <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-                <%= Spree.t(:say_no) %>
+                <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
               </li>
               <%= hidden_field_tag :user_id, @order.user_id %>
             <% end %>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -10,7 +10,7 @@
   <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
-<% if @order.cart? || (@order.checkout_steps.include?("address") && @order.address?) %>
+<% if @order.cart? %>
   <div id="select-customer" data-hook>
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:customer_search) %></legend>

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

@@ -60,7 +60,7 @@
       <div class="omega four columns">
         <div class="field checkbox">
           <label>
-            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
+            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
             <%= Spree.t(:show_only_complete_orders) %>
           </label>
         </div>
@@ -87,9 +87,7 @@
        <col style="width: 10%;">
        <col style="width: 10%;">
        <col style="width: 12%;">
-       <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-         <col style="width: 12%;">
-       <% end %>
+       <col style="width: 12%;">
        <col style="width: 25%;">
        <col style="width: 10%;">
        <col style="width: 8%;">
@@ -104,9 +102,7 @@
         <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, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
         <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 data-hook="admin_orders_index_header_actions" class="actions"></th>
@@ -119,9 +115,7 @@
         <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>
-          <% end %>
+        <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
         <td><%= mail_to order.email %></td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">

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

@@ -1,3 +1,5 @@
+<% # Usage of old-style form helpers in this file is INTENTIONAL
+   # For reasons, see commit 3e981c7. %>
 <div data-hook="admin_payment_method_form_fields">
 
   <div data-hook="payment_method">

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

@@ -8,9 +8,9 @@
   <div class="omega nine columns">
     <div class="field">
       <label><%= Spree.t(:payment_method) %></label>
-      <ul id='payment-methods'>
+      <ul>
         <% @payment_methods.each do |method| %>
-          <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
+          <li>
             <label data-hook="payment_method_field">
               <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
               <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>

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

@@ -10,9 +10,9 @@
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
+      <tr data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
         <td><%= pretty_time(payment.created_at) %></td>
-        <td class="align-center amount"><%= payment.display_amount.to_html %></td>
+        <td class='align-center'><%= payment.display_amount.to_html %></td>
         <td class="align-center"><%= link_to payment_method_name(payment), spree.admin_order_payment_path(@order, payment) %></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">

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_title do %>
   <i class="icon-arrow-right"></i>
-  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
+  <%= Spree.t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>
   <i class="icon-arrow-right"></i>
   <%= payment_method_name(@payment) %>
 <% end %>
@@ -14,5 +14,5 @@
 <%= 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 %></span> </h5>
+  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.amount %></span> </h5>
 </div>

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

@@ -29,9 +29,8 @@
     </div>
     <div class="three columns">
       <div data-hook="card_expiration" class="field">
-        <%= label_tag 'card_month', raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
-        <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required select2', :id => 'card_month') %>
-        <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required select2', :id => 'card_year') %>
+        <%= label_tag 'card_month', raw(t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required", :placeholder => "MM / YY" %>
       </div>
     </div>
     <div class="omega two columns">

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

@@ -2,18 +2,28 @@
   <legend align="center"><%= Spree.t(:credit_card) %></legend>
 
   <div class="row">
-    <div class="alpha six columns">
+    <div class="alpha six columns">      
       <dl>
-        <dt><%= Spree.t(:card_type) %>:</dt>
-        <dd><%= payment.source.cc_type %></dd>
-
         <dt><%= Spree.t(:card_number) %>:</dt>
         <dd><%= payment.source.display_number %></dd>
 
         <dt><%= Spree.t(:expiration) %>:</dt>
         <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
+
+        <dt><%= Spree.t(:card_code) %>:</dt>
+        <dd><%= payment.source.verification_value %></dd>
       </dl>
     </div>
+
+    <div class="omega six columns">
+      <dl>
+        <dt><%= Spree.t(:maestro_or_solo_cards) %>:</dt>
+        <dd><%= payment.source.issue_number %></dd>
+
+        <dt><%= Spree.t(:start_date) %>:</dt>
+        <dd><%= payment.source.start_month %>/<%= payment.source.start_year %></dd>
+      </dl>
+    </div>    
   </div>
 
-</fieldset>
+</fieldset>