spree_promo 1.2.5 → 1.3.0.rc1

data/app/assets/javascripts/admin/promotions.js

@@ -1,6 +1,15 @@
 var initProductActions = function(){
 
-  $(".product_autocomplete").product_autocomplete();
+  // Add classes on promotion items for design
+  $('a.delete').live('mouseover mouseout', function(event) {
+    if (event.type == 'mouseover') {
+      $(this).parent().addClass('action-remove');
+    } else {
+      $(this).parent().removeClass('action-remove');
+    }
+  });
+
+  $(".variant_autocomplete").variantAutocomplete();
 
   $('.calculator-fields').each(function(){
     var $fields_container = $(this);

data/app/assets/stylesheets/admin/spree_promo.css

@@ -1,4 +1,3 @@
 /*
  *= require admin/spree_core
- *= require admin/promotions
 */

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

@@ -5,7 +5,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
     @promotion_action = params[:action_type].constantize.new(params[:promotion_action])
     @promotion_action.promotion = @promotion
     if @promotion_action.save
-      flash.notice = I18n.t(:successfully_created, :resource => I18n.t(:promotion_action))
+      flash[:success] = I18n.t(:successfully_created, :resource => I18n.t(:promotion_action))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
@@ -17,7 +17,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
     @promotion = Spree::Promotion.find(params[:promotion_id])
     @promotion_action = @promotion.promotion_actions.find(params[:id])
     if @promotion_action.destroy
-      flash.notice = I18n.t(:successfully_removed, :resource => I18n.t(:promotion_action))
+      flash[:success] = I18n.t(:successfully_removed, :resource => I18n.t(:promotion_action))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}

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

@@ -10,7 +10,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
     @promotion_rule.promotion = @promotion
     if @promotion_rule.save
-      flash.notice = I18n.t(:successfully_created, :resource => I18n.t(:promotion_rule))
+      flash[:success] = I18n.t(:successfully_created, :resource => I18n.t(:promotion_rule))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
@@ -22,7 +22,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion = Spree::Promotion.find(params[:promotion_id])
     @promotion_rule = @promotion.promotion_rules.find(params[:id])
     if @promotion_rule.destroy
-      flash.notice = I18n.t(:successfully_removed, :resource => I18n.t(:promotion_rule))
+      flash[:success] = I18n.t(:successfully_removed, :resource => I18n.t(:promotion_rule))
     end
     respond_to do |format|
       format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -5,36 +5,25 @@ Spree::CheckoutController.class_eval do
     if @order.update_attributes(object_params)
 
       fire_event('spree.checkout.update')
-
-      if @order.coupon_code.present?
-        event_name = "spree.checkout.coupon_code_added"
-        if promo = Spree::Promotion.with_coupon_code(@order.coupon_code).where(:event_name => event_name).first
-          fire_event(event_name, :coupon_code => @order.coupon_code)
-          # If it doesn't exist, raise an error!
-          # Giving them another chance to enter a valid coupon code
-        else
-          flash[:error] = t(:promotion_not_found)
-          render :edit and return
-        end
-      end
+      render :edit and return unless apply_coupon_code
 
       if @order.next
         state_callback(:after)
       else
         flash[:error] = t(:payment_processing_failed)
-        respond_with(@order, :location => checkout_state_path(@order.state))
+        redirect_to checkout_state_path(@order.state)
         return
       end
 
       if @order.state == 'complete' || @order.completed?
         flash.notice = t(:order_processed_successfully)
         flash[:commerce_tracking] = 'nothing special'
-        respond_with(@order, :location => completion_route)
+        redirect_to completion_route
       else
-        respond_with(@order, :location => checkout_state_path(@order.state))
+        redirect_to checkout_state_path(@order.state)
       end
     else
-      respond_with(@order) { |format| format.html { render :edit } }
+      render :edit
     end
   end
 

data/app/controllers/spree/orders_controller_decorator.rb

@@ -3,14 +3,8 @@ Spree::OrdersController.class_eval do
   def update
     @order = current_order
     if @order.update_attributes(params[:order])
-      if @order.coupon_code.present?
-        if apply_coupon_code
-          flash[:notice] = t(:coupon_code_applied)
-        else
-          flash[:error] = t(:promotion_not_found)
-          render :edit and return
-        end
-      end
+      render :edit and return unless apply_coupon_code
+      
       @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
       fire_event('spree.order.contents_changed')
       respond_with(@order) do |format|
@@ -27,14 +21,4 @@ Spree::OrdersController.class_eval do
     end
   end
 
-  def apply_coupon_code
-    return if @order.coupon_code.blank?
-    if promo = Spree::Promotion.with_coupon_code(@order.coupon_code).first
-      if promo.order_activatable?(@order)
-        fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
-        true
-      end
-    end
-  end
-
 end

data/app/controllers/spree/store_controller_decorator.rb

@@ -0,0 +1,55 @@
+Spree::StoreController.class_eval do
+
+  protected
+    def apply_coupon_code
+      if @order.coupon_code.present?
+        # check if coupon code is already applied
+        if @order.adjustments.promotion.eligible.detect { |p| p.originator.promotion.code == @order.coupon_code }.present?
+          flash[:notice] = t(:coupon_code_already_applied)
+          true
+        else
+          event_name = "spree.checkout.coupon_code_added"
+
+          # TODO should restrict to payload's event name?
+          promotion = Spree::Promotion.find_by_code(@order.coupon_code)
+
+          if promotion.present?
+            if promotion.expired?
+              flash[:error] = t(:coupon_code_expired)
+              return false
+            end
+
+            if promotion.usage_limit_exceeded?
+              flash[:error] = t(:coupon_code_max_usage)
+              return false
+            end
+
+            previous_promo = @order.adjustments.promotion.eligible.first
+            fire_event(event_name, :coupon_code => @order.coupon_code)
+            promo = @order.adjustments.promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
+
+            if promo.present? and promo.eligible
+              flash[:success] = t(:coupon_code_applied)
+              true
+            elsif previous_promo.present? and promo.present?
+              flash[:error] = t(:coupon_code_better_exists)
+              false
+            elsif promo.present?
+              flash[:error] = t(:coupon_code_not_eligible)
+              false
+            else
+              # if the promotion was created after the order
+              flash[:error] = t(:coupon_code_not_found)
+              false
+            end
+          else
+            flash[:error] = t(:coupon_code_not_found)
+            false
+          end
+        end
+      else
+        true
+      end
+    end
+
+end

data/app/models/spree/order_decorator.rb

@@ -1,6 +1,10 @@
 Spree::Order.class_eval do
   attr_accessible :coupon_code
-  attr_accessor :coupon_code
+  attr_reader :coupon_code
+
+  def coupon_code=(code)
+    @coupon_code = code.strip.downcase rescue nil
+  end
 
   # Tells us if there if the specified promotion is already associated with the order
   # regardless of whether or not its currently eligible.  Useful because generally
@@ -9,19 +13,6 @@ Spree::Order.class_eval do
     !! adjustments.promotion.reload.detect { |credit| credit.originator.promotion.id == promotion.id }
   end
 
-  unless self.method_defined?('update_adjustments_with_promotion_limiting')
-    def update_adjustments_with_promotion_limiting
-      update_adjustments_without_promotion_limiting
-      return if adjustments.promotion.eligible.none?
-      most_valuable_adjustment = adjustments.promotion.eligible.max{|a,b| a.amount.abs <=> b.amount.abs}
-      current_adjustments = (adjustments.promotion.eligible - [most_valuable_adjustment])
-      current_adjustments.each do |adjustment|
-        adjustment.update_attribute_without_callbacks(:eligible, false)
-      end
-    end
-    alias_method_chain :update_adjustments, :promotion_limiting
-  end
-
   def promo_total
     adjustments.eligible.promotion.map(&:amount).sum
   end

data/app/models/spree/order_updater_decorator.rb

@@ -0,0 +1,14 @@
+Spree::OrderUpdater.class_eval do
+  unless self.method_defined?('update_adjustments_with_promotion_limiting')
+    def update_adjustments_with_promotion_limiting
+      update_adjustments_without_promotion_limiting
+      return if adjustments.promotion.eligible.none?
+      most_valuable_adjustment = adjustments.promotion.eligible.max{|a,b| a.amount.abs <=> b.amount.abs}
+      current_adjustments = (adjustments.promotion.eligible - [most_valuable_adjustment])
+      current_adjustments.each do |adjustment|
+        adjustment.update_attribute_without_callbacks(:eligible, false)
+      end
+    end
+    alias_method_chain :update_adjustments, :promotion_limiting
+  end
+end

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -1,36 +1,27 @@
 module Spree
   class Promotion
     module Actions
-      # Responsible for the creation and management of an adjustment since an
-      # an adjustment uses its originator to also update its eligiblity and amount
       class CreateAdjustment < PromotionAction
         calculated_adjustments
 
-        has_many :adjustments, :as => :originator, :dependent => :destroy
-
         delegate :eligible?, :to => :promotion
 
         before_validation :ensure_action_has_calculator
 
-        # Creates the adjustment related to a promotion for the order passed
-        # through options hash
         def perform(options = {})
-          order = options[:order]
-          return if order.promotion_credit_exists?(self.promotion)
-
-          self.create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
+          return unless order = options[:order]
+          # Nothing to do if the promotion is already associated with the order
+          return if order.promotion_credit_exists?(promotion)
+
+          order.adjustments.promotion.reload.clear
+          order.update!
+          create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
+          order.update!
         end
 
-        # Override of CalculatedAdjustments#create_adjustment so promotional
-        # adjustments are added all the time. They will get their eligibility
-        # set to false if the amount is 0.
-        #
-        # Currently an adjustment is created even when its promotion is not eligible.
-        # This helps to figure out later which adjustments should be eligible
-        # as the order is being updated
-        #
-        # BTW The order is updated (through order#update) every time an adjustment
-        # is saved
+        # override of CalculatedAdjustments#create_adjustment so promotional
+        # adjustments are added all the time. They will get their eligability
+        # set to false if the amount is 0
         def create_adjustment(label, target, calculable, mandatory=false)
           amount = compute_amount(calculable)
           params = { :amount => amount,
@@ -41,8 +32,7 @@ module Spree
           target.adjustments.create(params, :without_protection => true)
         end
 
-        # Ensure a negative amount which does not exceed the sum of the order's
-        # item_total and ship_total
+        # Ensure a negative amount which does not exceed the sum of the order's item_total and ship_total
         def compute_amount(calculable)
           [(calculable.item_total + calculable.ship_total), super.to_f.abs].min * -1
         end

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -3,14 +3,12 @@ module Spree
     module Actions
       class CreateLineItems < PromotionAction
         has_many :promotion_action_line_items, :foreign_key => :promotion_action_id
+        accepts_nested_attributes_for :promotion_action_line_items
+        attr_accessible :promotion_action_line_items_attributes
 
-        delegate :eligible?, :to => :promotion
-
-        attr_accessor :line_items_string
 
         def perform(options = {})
           return unless order = options[:order]
-          return unless eligible?(order)
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
             if current_quantity < item.quantity
@@ -19,20 +17,6 @@ module Spree
             end
           end
         end
-
-        def line_items_string
-          promotion_action_line_items.map { |li| "#{li.variant_id}x#{li.quantity}" }.join(',')
-        end
-
-        def line_items_string=(value)
-          promotion_action_line_items.destroy_all
-          value.to_s.split(',').each do |str|
-            variant_id, quantity = str.split('x')
-            if variant_id && quantity && variant = Variant.find_by_id(variant_id)
-              promotion_action_line_items.create({:variant => variant, :quantity => quantity.to_i}, :without_protection => true)
-            end
-          end
-        end
       end
     end
   end

data/app/models/spree/promotion/rules/first_order.rb

@@ -2,27 +2,10 @@ module Spree
   class Promotion
     module Rules
       class FirstOrder < PromotionRule
-        attr_reader :user, :email
-
         def eligible?(order, options = {})
-          @user = order.try(:user) || options[:user]
-          @email = order.email
-
-          if user || email
-            completed_orders.blank? || (completed_orders.first == order)
-          else
-            false
-          end
+          user = order.try(:user) || options[:user]
+          !!(user && user.orders.complete.count == 0)
         end
-
-        private
-          def completed_orders
-            user ? user.orders.complete : orders_by_email
-          end
-
-          def orders_by_email
-            Spree::Order.where(:email => email).complete
-          end
       end
     end
   end

data/app/models/spree/promotion/rules/user_logged_in.rb

@@ -4,7 +4,14 @@ module Spree
       class UserLoggedIn < PromotionRule
 
         def eligible?(order, options = {})
-          return order.try(:user).try(:anonymous?) == false
+          # this is tricky.  We couldn't use any of the devise methods since we aren't in the controller.
+          # we need to rely on the controller already having done this for us.
+
+          # The thinking is that the controller should have some sense of what state
+          # we should be in before firing events,
+          # so the controller will have to set this field.
+
+          return options && options[:user_signed_in]
         end
 
       end

data/app/models/spree/promotion.rb

@@ -36,16 +36,12 @@ module Spree
       where(:advertise => true)
     end
 
-    def self.with_coupon_code(coupon_code)
-      search(:code_cont => coupon_code).result
-    end
-
     def activate(payload)
       return unless order_activatable? payload[:order]
 
       if code.present?
-        event_code = payload[:coupon_code].to_s.strip.downcase
-        return unless event_code == self.code.to_s.strip.downcase
+        event_code = payload[:coupon_code]
+        return unless event_code == self.code
       end
 
       if path.present?
@@ -101,5 +97,9 @@ module Spree
       credits.count
     end
 
+    def code=(coupon_code)
+      write_attribute(:code, (coupon_code.downcase.strip rescue nil))
+    end
+
   end
 end

data/app/models/spree/promotion_action_line_item.rb

@@ -2,5 +2,7 @@ module Spree
   class PromotionActionLineItem < ActiveRecord::Base
     belongs_to :promotion_action, :class_name => 'Spree::Promotion::Actions::CreateLineItems'
     belongs_to :variant, :class_name => "Spree::Variant"
+
+    attr_accessible :quantity, :variant_id
   end
 end

data/app/overrides/promo_admin_tabs.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "promo_admin_tabs",
                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     :text => "<%= tab(:promotions, :url => spree.admin_promotions_path) %>",
+                     :text => "<%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>",
                      :disabled => false,
                      :original => '3e847740dc3e7f924aba1ccb4cb00c7b841649e3')

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,9 +1,12 @@
 $('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
-
+$('#actions .no-objects-found').hide();
 initProductActions();
 
+<% unless Rails.env.test? %>
+  $('.type-select.select2').select2();
+<% end %>
+
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
 $('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
-$('.product_autocomplete').product_autocomplete();
-
+$('.product_autocomplete').product_autocomplete();

data/app/views/spree/admin/promotion_actions/destroy.js.erb

@@ -1,2 +1 @@
-$('#<%= dom_id @promotion_action %>').fadeOut().remove();
-
+$('#<%= dom_id @promotion_action %>').fadeOut().remove();

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -1,7 +1,13 @@
 $('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#rules .no-objects-found').hide();
+
 $('#<%= dom_id @promotion_rule %>').hide();
 $('#<%= dom_id @promotion_rule %>').fadeIn();
 $('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
 $('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
 
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
+
+<% unless Rails.env.test? %>
+  $('.select_item_total.select2, .select_product.select2').select2();
+<% end %>

data/app/views/spree/admin/promotion_rules/destroy.js.erb

@@ -1,3 +1,3 @@
 $('#<%= dom_id @promotion_rule %>').fadeOut().remove();
-$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
 
+$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,26 +1,32 @@
-<fieldset id="action_fields">
-  <legend><%= t(:promotion_actions) %></legend>
+<fieldset id="action_fields" class="eight columns omega no-border-top">
+
+  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
+    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <fieldset>
+      <legend align="center"><%= t(:promotion_actions) %></legend>
+      <div class="field">
+        <%= label_tag :action_type, t(:add_action_of_type)%>
+        <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>  
+      </div>
+      <div class="filter-actions actions">
+        <%= button t(:add), 'icon-plus', :class => 'fullwidth' %>
+      </div>
+    </fieldset>
+  <% end %>
 
   <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
     <div id="actions" class="filter_list">
       <% if @promotion.actions.any? %>
         <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
       <% else %>
-        <!-- <p><%= t(:no_actions_added) %></p> -->
+        <div class="no-objects-found">
+          <%= t(:no_actions_added) %>
+        </div>
       <% end %>
     </div>
-    <p class="form-buttons">
-      <%= button t(:update) %>
-    </p>
-  <% end %>
-
-  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
-    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
-    <p>
-      <%= label_tag :action_type, t(:add_action_of_type) %>
-      <%= select_tag 'action_type', options %>
-      <%= submit_tag t(:add) %>
-    </p>
+    <div class="filter-actions actions promotion-update">
+      <%= button t(:update), 'icon-refresh' %>
+    </div>
   <% end %>
 
 </fieldset>

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

@@ -1,52 +1,56 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
-<fieldset id="general_fields">
-  <legend><%= t(:general) %></legend>
-  <%= f.field_container :name do %>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  <% end %>
-
-  <%= f.field_container :event_name do %>
-    <%= f.label :event_name %><br />
-    <%= f.select :event_name, Spree::Activator.event_names.map{|name| [t("events.#{name}"), name] } %>
-  <% end %>
-
-  <%= f.field_container :code do %>
-    <%= f.label :code %><br />
-    <%= f.text_field :code %>
-  <% end %>
-
-  <%= f.field_container :path do %>
-    <%= f.label :path %><br />
-    <%= f.text_field :path %>
-  <% end %>
-
-  <%= f.field_container :description do %>
-    <%= f.label :description %><br />
-    <%= f.text_area :description, :style => 'height:50px;' %>
-  <% end %>
-
-  <%= f.field_container :advertise do %>
-    <%= f.check_box :advertise %>
-    <%= f.label :advertise %>
-  <% end %>
-
-</fieldset>
-
-<fieldset id="expiry_fields">
-  <legend><%= t(:expiry) %></legend>
-  <p>
-    <%= f.label :usage_limit %><br />
-    <%= f.text_field :usage_limit %><br/>
-    <%= t(:current_promotion_usage, :count => @promotion.credits_count) %>
-  </p>
-
-  <p id="starts_at_field">
-    <%= f.label :starts_at %>
-    <%= f.text_field :starts_at, :class => 'datepicker' %>
-  </p>
-  <p id="expires_at_field">
-    <%= f.label :expires_at %>
-    <%= f.text_field :expires_at, :class => 'datepicker' %>
-  </p>
-</fieldset>
+<div class="row">
+  <div id="general_fields" class="alpha thirteen columns">
+    <div class="alpha four columns">
+      <%= f.field_container :name do %>
+        <%= f.label :name %>
+        <%= f.text_field :name, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :event_name do %>
+        <%= f.label :event_name %>
+        <%= f.select :event_name, Spree::Activator.event_names.map{|name| [t("events.#{name}"), name] }, {}, {:class => 'select2 fullwidth'} %>
+      <% end %>
+
+      <%= f.field_container :code do %>
+        <%= f.label :code %>
+        <%= f.text_field :code, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :path do %>
+        <%= f.label :path %>
+        <%= f.text_field :path, :class => 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :advertise do %>
+        <%= f.check_box :advertise %>
+        <%= f.label :advertise %>
+      <% end %>
+    </div>
+
+    <div class="omega nine columns">
+      <%= f.field_container :description do %>
+        <%= f.label :description %><br />
+        <%= f.text_area :description, :rows => 7, :class => 'fullwidth' %>
+      <% end %>      
+    </div>
+  </div>
+
+  <div id="expiry_fields" class="three columns omega">
+    <%= f.field_container :usage_limit do %>
+      <%= f.label :usage_limit %><br />
+      <%= f.number_field :usage_limit, :min => 0, :class => 'fullwidth' %><br>
+      <%= t(:current_promotion_usage, :count => @promotion.credits_count) %>
+    <% end %>
+    
+    <div id="starts_at_field" class="field">
+      <%= f.label :starts_at %>
+      <%= f.text_field :starts_at, :class => 'datepicker datepicker-from fullwidth' %>
+    </div>
+
+    <div id="expires_at_field" class="field">
+      <%= f.label :expires_at %>
+      <%= f.text_field :expires_at, :class => 'datepicker datepicker-top fullwidth' %>
+    </div>  
+  </div>
+</div>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -1,11 +1,11 @@
-<div class="promotion_action <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
-  <span class="delete">
-    <%= link_to_with_icon 'cross', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete %>
-  </span>
+<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
+  <h6 class="promotion-title"><%= t("promotion_action_types.#{type_name}.description") %></h6>
+  <%= link_to_with_icon 'icon-trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
+  
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
-  <p><%= t("promotion_action_types.#{type_name}.description") %></p>
+  
   <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
              :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
 </div>