spree_active_sale 1.3.0 → 1.3.1

data/README.md

@@ -9,8 +9,8 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
 ## FEATURES
 
 * Provides a quick implementation of flash sales/ daily deals behavior by a easy scheduler a.k.a *ActiveSale*.
-* Provides an admin interface for creating/ scheduling, managing, or re-scheduling sale events.
-* Provides a view helper for countdown timer to show sale's ending time, which will be shown to your customers. This eventually makes a sense of urgency in your customers' mind.
+* Provides an admin interface for creating/ scheduling, managing, sorting, bundeling, or re-scheduling sale events.
+* Provides a view helper for countdown timer to show sale's ending time, which will be shown to your customers. This eventually makes a sense of urgency on your customers' mind.
 * Supplies methods for class <tt>Spree::ActiveSaleEvent</tt> like: <tt>live</tt>, <tt>active</tt>, <tt>live_active</tt>, <tt>hidden</tt>, <tt>live_active_and_hidden</tt>, <tt>upcoming_events</tt>, <tt>starting_today</tt>, <tt>ending_today</tt>.
 
 ## LINKS
@@ -18,7 +18,7 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
 * Demo application: [Spree Active Sale Demo](https://github.com/suryart/spree_active_sale_demo)
 * Dependency status: [![Dependency Status](https://gemnasium.com/suryart/spree_active_sale.png)](https://gemnasium.com/suryart/spree_active_sale)
 * Code climate: [![Code Climate](https://codeclimate.com/github/suryart/spree_active_sale.png)](https://codeclimate.com/github/suryart/spree_active_sale)
-* Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=v1.3.0)](https://travis-ci.org/suryart/spree_active_sale)
+* Build Status: [![Build Status](https://travis-ci.org/suryart/spree_active_sale.png?branch=master)](https://travis-ci.org/suryart/spree_active_sale)
 * Issues: [Project issues](https://github.com/suryart/spree_active_sale/issues)
 * Fork: [Fork this Project](https://github.com/suryart/spree_active_sale/fork_select)
 
@@ -40,7 +40,7 @@ Spree Active Sale makes it easy to handle flash sale/ daily deals behavior withi
   * Or get it from rubygems.org by mentioning the following line in your Gemfile:
     
       ```ruby 
-        gem 'spree_active_sale', '1.0.6'
+        gem 'spree_active_sale', '1.3.0'
       ```
 
 ### Then run the following commands: 
@@ -176,6 +176,15 @@ You will have to add javascript in the bottom of your **store/all.js** file as f
     # "Spree::ActiveSaleEvent", "Spree::Variant", "Spree::Product", or "Spree::Taxon" class.
     # Which simply says if sale event for that instance is accessible for users or not.
     Spree::ActiveSaleEvent.is_live?(instance)
+
+    # You can list the rows where a column, for example- :start_date, is not blank,
+    # and get it sorted using not_blank_and_sorted_by(:column_name) like this:
+    Spree::SaleEvent.not_blank_and_sorted_by(:start_date)
+    Spree::ActiveSale.not_blank_and_sorted_by(:start_date)
+    Spree::ActiveSaleEvent.not_blank_and_sorted_by(:start_date)
+
+    # Also, you can chain this method with other scopes, like this:
+    Spree::ActiveSaleEvent.live_active.not_blank_and_sorted_by(:start_date)
   ```
 
 ## Overriding countdown timer's layout differently for different events
@@ -194,7 +203,7 @@ Please visit [jQuery Countdown](http://keith-wood.name/countdown.html) for more
 
 ## Overriding configuration and preferences
 
-You can use put this at the bottom of your **application's app/config/initializers/spree.rb**:
+You can use this at the bottom of your **application's app/config/initializers/spree.rb** for configuration:
     
   ```ruby
     Spree::ActiveSale.config do |config|
@@ -211,6 +220,7 @@ Since you can not set boolean values from the block config shown above for assig
     Spree::ActiveSaleConfig[:paginate_sales_for_admin?] = true
     Spree::ActiveSaleConfig[:paginate_sale_events_for_user?] = true
     Spree::ActiveSaleConfig[:paginate_sales_for_user?] = false
+    Spree::ActiveSaleConfig[:name_with_event_position?] = true
   ```
 
 ## TODOs

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

@@ -3,15 +3,23 @@ module Spree
     class ActiveSaleEventsController < ResourceController
       belongs_to 'spree/active_sale', :find_by => :id
       before_filter :load_active_sale, :only => [:index]
+      before_filter :parent_id_for_event, :only => [:new, :edit, :create, :update]
       update.before :get_eventable
+      respond_to :json, :only => [:update_events]
 
       def show
         redirect_to( :action => :edit )
       end
 
-      def eventables
-        search = params[:eventable_type].constantize.search(:name_cont => params[:name])
-        render :json => search.result.map(&:name)
+      def destroy
+        @active_sale_event = Spree::ActiveSaleEvent.find(params[:id])
+        @active_sale_event.destroy
+        respond_with(@active_sale_event) { |format| format.json { render :json => '' } }
+      end
+
+      def update_events
+        @active_sale_event.update_attributes(params[:active_sale_event])
+        respond_with(@active_sale_event)
       end
 
       protected
@@ -37,16 +45,23 @@ module Spree
 
         def get_eventable
           object_name = params[:active_sale_event]
-          unless object_name[:eventable_type].nil?
-            eventable = "#{object_name[:eventable_type]}".constantize.find_by_name(object_name[:eventable_name])
-            object_name.delete(:eventable_name)
-            unless eventable.nil?
-              object_name.merge!(:eventable_id => eventable.id, :permalink => eventable.permalink)
-            else
-              object_name.merge!(:eventable_id => nil)
-            end
+          get_eventable_object(object_name)
+        end
+
+        def parent_id_for_event
+          params[:parent_id] ||= check_active_sale_event_params
+          @parent_id = params[:parent_id]
+          if @parent_id.blank?
+            redirect_to edit_admin_active_sale_path(params[:active_sale_id]), :notice => I18n.t('spree.active_sale.event.parent_id_cant_be_nil')
           end
         end
+
+        def check_active_sale_event_params(event = params[:active_sale_event])
+          return nil if event.nil?
+          parent_id = event[:parent_id]
+          event.delete(:parent_id) if event[:parent_id].nil? || event[:parent_id] == "nil"
+          parent_id
+        end
     end
   end
 end

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

@@ -1,6 +1,14 @@
 module Spree
   module Admin
     class ActiveSalesController < ResourceController
+      before_filter :load_active_sale_events, :only => [:new, :edit]
+      before_filter :set_active_sale, :only => [:create, :update]
+      respond_to :json, :only => [:get_children]
+
+      def get_children
+        @active_sale_events = Spree::ActiveSaleEvent.find(params[:parent_id]).children_sorted_by_position
+        respond_with(@active_sale_events)
+      end
       
       def index
         respond_with(@collection) do |format|
@@ -13,6 +21,11 @@ module Spree
         redirect_to edit_object_url(@active_sale)
       end
 
+      def eventables
+        search = params[:eventable_type].constantize.search(:name_cont => params[:name])
+        render :json => search.result.map(&:name)
+      end
+
       protected
 
         def collection
@@ -20,6 +33,23 @@ module Spree
           @search = Spree::ActiveSale.includes(:active_sale_events).ransack(params[:q])
           @collection = @search.result.page(params[:page]).per(Spree::ActiveSaleConfig[:admin_active_sales_per_page])
         end
+
+        def load_active_sale_events
+          if @active_sale.new_record?
+            @active_sale_event = @active_sale.active_sale_events.build
+          else
+            @active_sale_event = @active_sale.root
+            @active_sale_events = @active_sale.active_sale_events
+          end
+        end
+
+        def set_active_sale
+          return false if params[:active_sale_event].blank?
+          params[:active_sale] = params[:active_sale_event]
+          params[:active_sale].delete(:discount)
+          object_name = params[:active_sale]
+          get_eventable_object(object_name)
+        end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Admin
+    ResourceController.class_eval do
+
+      private
+        def get_eventable_object(object_name = {})
+          unless object_name[:eventable_type].nil?
+            eventable = "#{object_name[:eventable_type]}".constantize.find_by_name(object_name[:eventable_name])
+            object_name.delete(:eventable_name)
+            unless eventable.nil?
+              object_name.merge!(:eventable_id => eventable.id, :permalink => eventable.permalink)
+            else
+              object_name.merge!(:eventable_id => nil)
+            end
+          end
+        end
+    end
+  end
+end

data/app/controllers/spree/home_controller_decorator.rb

@@ -1,9 +1,10 @@
 module Spree
   HomeController.class_eval do
+    include Spree::ActiveSalesHelper
 
     # List live and active sales on home page
     def index
-      @sale_events = Spree::ActiveSaleEvent.live_active
+      @sale_events = all_active_sale_events
       respond_with(@sale_events)
     end
   end

data/app/helpers/spree/active_sale_events_helper.rb

@@ -4,7 +4,7 @@ module Spree
     def sale_event_timer(event = nil, layout = nil)
       return I18n.t('spree.active_sale.event.can_not_be_nil') if (event == nil) || (event.class.name != "Spree::ActiveSaleEvent")
       layout ||= '{dn} DAYS {hnn}{sep}{mnn}{sep}{snn}'
-      content_tag(:span, I18n.t('spree.active_sale.event.ending_message'), :class => 'sale_event_message') + " " + content_tag(:span, event.end_date.strftime('%Y-%m-%dT%H:%M:%S'), "data-timer" => event.end_date.strftime('%Y-%m-%dT%H:%M:%S'), "data-layout" => layout, :class => 'sale_event_message')
+      content_tag(:span, I18n.t('spree.active_sale.event.ending_message'), :class => 'sale_event_message') + " " + content_tag(:span, event.end_date.strftime('%Y-%m-%dT%H:%M:%S'), "data-timer" => event.end_date.strftime('%Y-%m-%dT%H:%M:%S'), "data-layout" => layout, :class => 'sale_event_message_timer')
     end
 
     def method_missing(method_name, *args, &block)
@@ -42,5 +42,10 @@ module Spree
         end
       end
     end
+
+    def event_js_data(event)
+      return nil if event.blank?
+      Spree::ActiveSaleConfig[:name_with_event_position?] ? "#{event.name.gsub('"','\"')} - #{I18n.t('spree.active_sale.event.active_record.position')}: #{event.position}" : event.name.gsub('"','\"')
+    end
   end
 end

data/app/helpers/spree/active_sales_helper.rb

@@ -1,4 +1,46 @@
 module Spree
   module ActiveSalesHelper
+    # Getter to load all_sale_events
+    # Get the helper and load from cache when possible
+    def all_sale_events
+      @all_sale_events ||= Spree::SaleEvent.live_active
+    end
+
+    # Setter to set all_sale_events.
+    # Set the helper and load from parameter when possible
+    def all_sale_events=(sale_events)
+      return Array.new unless sale_events.class == Array
+      @all_sale_events = sale_events
+    end
+
+    # Get the helper and load from cache when possible
+    def all_active_sale_events
+      all_sale_events.select{ |e| e.type == "Spree::ActiveSaleEvent" && e.parent != nil }
+    end
+
+    # find sale event for the product or a taxon
+    # pass taxon or product object in the argument
+    def get_sale_event(object)
+      if ["Spree::Product", "Spree::Taxon"].include? object.class.name
+        active_sale_event = all_sale_events.detect{ |sale_event| (sale_event.eventable_type == object.class.name) && (sale_event.eventable_id == object.id) }
+      end
+      active_sale_event
+    end
+
+    # helper to load current_active_sale_event
+    def current_active_sale_event
+      all_sale_events.detect{ |sale_event| current_permalink?(sale_event.permalink) }
+    end
+
+    def current_active_sale_event=(active_sale_event)
+      active_sale_event.nil? ? current_active_sale_event : active_sale_event
+    end
+
+    # check for current permalink using request
+    # split with "?" as there can be parameters
+    def current_permalink?(permalink = nil)
+      return false if permalink.blank?
+      request.path.split('/').reject(&:blank?).join('/') == permalink
+    end
   end
 end

data/app/helpers/spree/base_helper_decorator.rb

@@ -0,0 +1,3 @@
+Spree::BaseHelper.module_eval do
+  include Spree::ActiveSalesHelper
+end

data/app/models/spree/active_sale.rb

@@ -1,22 +1,50 @@
 # ActiveSales
-# Active sales represent an entity for one sale at a time.
+# Active sales represent an entity for one sale at a time, just like a taxonomy in spree.
 # For example: 'January 2013' sale, which can have many sale events in it.
 #
 module Spree
   class ActiveSale < Spree::SaleEvent
-    acts_as_nested_set :dependent => :destroy
+    validates :name, :presence => true
+    validate :start_and_end_date_presence, :start_and_end_date_range
+
     has_many :active_sale_events
+    has_one :root, :conditions => { :parent_id => nil }, :class_name => "Spree::ActiveSaleEvent",
+                   :dependent => :destroy
 
-    validates :name, :presence => true
+    after_save :set_root
 
-    accepts_nested_attributes_for :active_sale_events, :allow_destroy => true, :reject_if => lambda { |attrs| attrs.all? { |k, v| v.blank? } }
+    default_scope :order => "#{self.table_name}.position"
 
     def self.config(&block)
       yield(Spree::ActiveSaleConfig)
     end
 
-    def children_and_active_sale_events
-      ((self.descendants.map{ |child_sale| child_sale.children_and_active_sale_events } << self) + self.active_sale_events).flatten.reject(&:blank?)
-    end
+    private
+      def set_root
+        root_hash = self.serializable_hash
+        root_hash["active_sale_id"] = self.id
+        root_hash["type"] = "Spree::ActiveSaleEvent"
+        %w(id created_at updated_at lft rgt parent_id).each{ |column| root_hash.delete(column) }
+        if root
+          root.update_attributes(root_hash)
+        else
+          self.root = Spree::ActiveSaleEvent.create!(root_hash, :without_protection => true)
+        end
+      end
+
+      def start_and_end_date_presence
+        errors.add(:start_date, I18n.t('spree.active_sale.event.validation.errors.date_empty')) if self.start_date.nil?
+        errors.add(:end_date, I18n.t('spree.active_sale.event.validation.errors.date_empty')) if self.end_date.nil?
+      end
+
+      # This should validate the start and end date range between
+      # its active_sale_events. To make sure that, root lives longer.
+      def start_and_end_date_range
+        unless self.start_date.nil? || self.end_date.nil?
+          oldest_start_date = self.active_sale_events.not_blank_and_sorted_by(:start_date).first
+          latest_end_date = self.active_sale_events.not_blank_and_sorted_by(:end_date).last
+          errors.add(:start_date, I18n.t('spree.active_sale.event.validation.errors.invalid_root_dates')) if (oldest_start_date.nil? && latest_end_date.nil?) ? false : (self.start_date > oldest_start_date || self.end_date < latest_end_date)
+        end
+      end
   end
 end

data/app/models/spree/active_sale_configuration.rb

@@ -5,6 +5,7 @@ module Spree
     preference :paginate_sales_for_admin?, :boolean, :default => false
     preference :paginate_sale_events_for_user?, :boolean, :default => false
     preference :paginate_sales_for_user?, :boolean, :default => false
+    preference :name_with_event_position?, :boolean, :default => false
     preference :admin_active_sales_per_page, :integer, :default => 25
     preference :active_sales_per_page, :integer, :default => 25
     preference :admin_active_sale_events_per_page, :integer, :default => 25

data/app/models/spree/active_sale_event.rb

@@ -1,9 +1,11 @@
 # EVENTS
 # Events represent an entity for active sale in a flash sale/ daily deal.
-# There can be many events for one sale.
+# There can be many events for one sale, just like taxonomies in spree.
 #
 module Spree
   class ActiveSaleEvent < Spree::SaleEvent
+    acts_as_nested_set :dependent => :destroy, :polymorphic => true
+
     before_validation :update_permalink
     after_save :update_parent_active_sales
 
@@ -11,11 +13,12 @@ module Spree
     belongs_to :eventable, :polymorphic => true
     belongs_to :active_sale
 
-    attr_accessible :description, :end_date, :eventable_id, :eventable_type, :is_active, :is_hidden, :is_permanent, :name, :permalink, :active_sale_id, :start_date, :eventable_name, :discount
+    attr_accessible :description, :end_date, :eventable_id, :eventable_type, :is_active, :is_hidden, :is_permanent, :name, :permalink, :active_sale_id, :start_date, :eventable_name, :discount, :parent_id
 
     validates :name, :permalink, :eventable_id, :start_date, :end_date, :active_sale_id, :presence => true
     validates :eventable_type, :presence => true, :uniqueness => { :scope => :eventable_id, :message => I18n.t('spree.active_sale.event.validation.errors.live_event') }, :if => :live?
-    validate  :validate_start_and_end_date
+
+    scope :non_parents, lambda { where('parent_id IS NOT NULL') }
 
     # Spree::ActiveSaleEvent.is_live? method 
     # should only/ always represents live and active events and not just live events.
@@ -33,10 +36,10 @@ module Spree
     # This callback basically makes sure that parents for an event lives longer.
     # Or at least parents live for the time when event is live.
     def update_parent_active_sales
-      active_sale_events = self.active_sale.children_and_active_sale_events
-      parents = self.active_sale.self_and_ancestors.flatten
-      oldest_start_date = active_sale_events.map(&:start_date).reject(&:blank?).sort.first
-      latest_end_date = active_sale_events.map(&:end_date).reject(&:blank?).sort.last
+      active_sale_events = self.self_and_ancestors
+      parents = self.ancestors
+      oldest_start_date = active_sale_events.not_blank_and_sorted_by(:start_date).first
+      latest_end_date = active_sale_events.not_blank_and_sorted_by(:end_date).last
       parents.each{ |parent| 
         parent.update_attributes(:start_date => oldest_start_date) if parent.start_date.nil? ? true : (parent.start_date > oldest_start_date) 
         parent.update_attributes(:end_date => latest_end_date) if parent.end_date.nil? ? true : (parent.end_date < latest_end_date)
@@ -54,5 +57,9 @@ module Spree
     def eventable_image_available?
       !!eventable.try(:image_available?)
     end
+
+    def children_sorted_by_position
+      self.children.sort_by{ |child| child.position.nil? ? 0 : child.position }
+    end
   end
 end

data/app/models/spree/product_decorator.rb

@@ -1,14 +1,21 @@
 Spree::Product.class_eval do
+  include Spree::ActiveSalesHelper
+
   has_many :active_sale_events, :as => :eventable
 
   # Find live and active taxons for a product.
   def find_live_taxons
-    Spree::ActiveSaleEvent.live_active.where(:eventable_type => "Spree::Taxon", :eventable_id => self.taxons.map(&:id))
+    all_sale_events.select{ |sale_event| (sale_event.eventable_type == "Spree::Taxon") && (self.taxons.map(&:id).include?(sale_event.eventable_id)) }
+  end
+
+  # product.live_active_sale_event gets first active sale event which is live and active
+  def live_active_sale_event
+    get_sale_event(self)
   end
 
   # if there is at least one active sale event which is live and active.
   def live?
-    !self.active_sale_events.detect{ |event| event.live_and_active? }.nil? || !self.find_live_taxons.blank?
+    !self.live_active_sale_event.nil? || !self.find_live_taxons.blank?
   end
 
   # Check if image is available for this.

data/app/models/spree/sale_event.rb

@@ -20,45 +20,48 @@ module Spree
     scope :starting_today, lambda { where(:start_date => zone_time..zone_time.end_of_day) }
     scope :ending_today, lambda { where(:end_date => zone_time..zone_time.end_of_day) }
 
-
-    def validate_start_and_end_date
-      errors.add(:start_date, I18n.t('spree.active_sale.event.validation.errors.invalid_dates')) if invalid_dates?
-    end
+    validate :validate_start_and_end_date
 
     def live?(moment=nil)
       moment ||= object_zone_time
-      (self.start_date <= moment and self.end_date >= moment) or self.is_permanent? if start_and_dates_available?
+      (self.start_date <= moment and self.end_date >= moment) or self.is_permanent? if start_and_end_dates_available?
     end
 
     def upcoming?
       current_time = object_zone_time
-      (self.start_date >= current_time and self.end_date > self.start_date) if start_and_dates_available?
+      (self.start_date >= current_time and self.end_date > self.start_date) if start_and_end_dates_available?
     end
 
     def past?
       current_time = object_zone_time
-      (self.start_date < current_time and self.end_date > self.start_date and self.end_date < current_time) if start_and_dates_available?
+      (self.start_date < current_time and self.end_date > self.start_date and self.end_date < current_time) if start_and_end_dates_available?
     end
 
     def live_and_active?(moment=nil)
       self.live?(moment) and self.is_active?
     end
 
-    def start_and_dates_available?
+    def start_and_end_dates_available?
       self.start_date and self.end_date
     end
 
     def invalid_dates?
-      self.start_and_dates_available? and (self.start_date >= self.end_date)
+      self.start_and_end_dates_available? and (self.start_date >= self.end_date)
     end
 
+    # Class methods
     class << self
-      # Class methods
       def paginate(objects_per_page, options = {})
         options = prepare_pagination(objects_per_page, options)
         self.page(options[:page]).per(options[:per_page])
       end
 
+      def not_blank_and_sorted_by(column)
+        return nil if column.blank? 
+        column = column.to_sym
+        self.select(&column).map(&column).reject(&:blank?).sort
+      end
+
       private
         def valid_argument args
           (args.first == nil || args.first == true)
@@ -82,5 +85,9 @@ module Spree
       def object_zone_time
         Time.zone.now
       end
+
+      def validate_start_and_end_date
+        errors.add(:start_date, I18n.t('spree.active_sale.event.validation.errors.invalid_dates')) if invalid_dates?
+      end
   end
 end

data/app/models/spree/sale_image.rb

@@ -47,5 +47,9 @@ module Spree
         false
       end
     end
+
+    def viewable_type=(event_type)
+      super event_type.to_s.classify.constantize.base_class.to_s
+    end
   end
 end

data/app/models/spree/taxon_decorator.rb

@@ -1,9 +1,16 @@
 Spree::Taxon.class_eval do
+  include Spree::ActiveSalesHelper
+  
   has_many :active_sale_events, :as => :eventable
 
+  # taxon.live_active_sale_event gets first active sale event which is live and active
+  def live_active_sale_event
+    get_sale_event(self)
+  end
+
   # if there is at least one active sale event which is live and active.
   def live?
-    !self.active_sale_events.detect{ |event| event.live_and_active? }.nil?
+    !self.live_active_sale_event.nil?
   end
 
   def image_available?

data/app/models/spree/variant_decorator.rb

@@ -1,7 +1,21 @@
+# This decorator is created by keeping that in mind
+# what is when a user may need or want a sale event on 
+# an SKU or a Variant level. Variant needs to reflect the 
+# same on admin dashboard for selection from dropdrown in
+# edit and new view pages.
+#
+
 Spree::Variant.class_eval do
+  include Spree::ActiveSalesHelper
+  
   has_many :active_sale_events, :as => :eventable
 
+  # variant.live_active_sale_event gets first active sale event which is live and active
+  def live_active_sale_event
+    get_sale_event(self)
+  end
+
   def live?
-    !self.active_sale_events.detect{ |event| event.live_and_active? }.nil? || self.product.live?
+    !self.live_active_sale_event.nil? || self.product.live?
   end
 end

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

@@ -2,96 +2,96 @@
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @active_sale_event } %>
 <% end %>
 
-<%= form_for [:admin, @active_sale, @active_sale_event], :html => { :id => 'admin_active_sale_event', :multipart => true } do |f| %>
   <fieldset data-hook="admin_active_sale_event_form_fields">
 
+    <%= form.hidden_field :parent_id, :value => @parent_id %>
+
     <div class="clearfix">
       <div class="left eight columns alpha" data-hook="admin_active_sale_event_form_left">
-          <%= f.field_container :name do %>
-            <%= f.label :name, raw(t('spree.active_sale.event.active_record.name') + content_tag(:span, ' *', :class => 'required')) %>
-            <%= f.text_field :name, :class => 'fullwidth' %>
-            <%= f.error_message_on :name %>
-          <% end %>
-          <%= f.field_container :description do %>
-            <%= f.label :description, t('spree.active_sale.event.active_record.description') %>
-            <%= f.text_area :description, {:cols => 60, :rows => 10, :class => 'fullwidth'} %>
-            <%= f.error_message_on :description %>
-          <% end %>
+        <%= form.field_container :name do %>
+          <%= form.label :name, raw(t('spree.active_sale.event.active_record.name') + content_tag(:span, ' *', :class => 'required')) %>
+          <%= form.text_field :name, :class => 'fullwidth' %>
+          <%= form.error_message_on :name %>
+        <% end %>
+        <%= form.field_container :description do %>
+          <%= form.label :description, t('spree.active_sale.event.active_record.description') %>
+          <%= form.text_area :description, {:cols => 60, :rows => 10, :class => 'fullwidth'} %>
+          <%= form.error_message_on :description %>
+        <% end %>
       </div>
 
       <div class="right eight columns omega" data-hook="admin_active_sale_event_form_right">
         <div class="row">
           <div class="alpha four columns">
-  
-            <%= f.field_container :start_date do %>
-              <%= f.label :start_date, t('spree.active_sale.event.active_record.start_date') %>
-              <%= f.error_message_on :start_date %>
+            <%= form.field_container :start_date do %>
+              <%= form.label :start_date, t('spree.active_sale.event.active_record.start_date') %>
+              <%= form.error_message_on :start_date %>
               <% if @active_sale_event.start_date? %>
                 <% start_date = l(@active_sale_event.start_date, :format => t('spree.active_sale.event.datetimepicker.format')) %>
               <% else %>
                 <% start_date = l(Time.zone.now, :format => t('spree.active_sale.event.datetimepicker.format')) %>
               <% end %>
-              <%= f.text_field :start_date, :value => start_date, :class => 'timepicker' %>
+              <%= form.text_field :start_date, :value => start_date, :class => 'timepicker' %>
             <% end %>
           </div>
   
           <div class="omega four columns">
-            <%= f.field_container :end_date do %>
-              <%= f.label :end_date, t('spree.active_sale.event.active_record.end_date') %>
-              <%= f.error_message_on :end_date %>
+            <%= form.field_container :end_date do %>
+              <%= form.label :end_date, t('spree.active_sale.event.active_record.end_date') %>
+              <%= form.error_message_on :end_date %>
               <% end_date = l((@active_sale_event.end_date? ? @active_sale_event.end_date : Time.zone.now+1.day), :format => t('spree.active_sale.event.datetimepicker.format')) %>
-              <%= f.text_field :end_date, :value => end_date, :class => 'timepicker' %>
+              <%= form.text_field :end_date, :value => end_date, :class => 'timepicker' %>
             <% end %>
           </div>
         </div>
         <div class="row">
           <div class="alpha four columns">
-            <%= f.label :eventable, t('spree.active_sale.event.active_record.eventable_type', :default => :evenetable) %>
+            <%= form.label :eventable, t('spree.active_sale.event.active_record.eventable_type', :default => :evenetable) %>
             <p class='hint'><%= t('spree.active_sale.event.eventable_hint') %></p>
-            <%= f.select :eventable_type, [["Product","Spree::Product"], ["Taxon","Spree::Taxon"]], { :include_blank => false }, { :class => 'select2' } %>
-            <%= f.error_message_on :eventable %>
+            <%= form.select :eventable_type, [["Product","Spree::Product"], ["Taxon","Spree::Taxon"]], { :include_blank => false }, { :class => 'select2' } %>
+            <%= form.error_message_on :eventable %>
           </div>
   
           <div class="omega four columns">
-            <%= f.label :eventable_name, t('spree.active_sale.event.active_record.eventable_name', :default => :eventable_name) %>
+            <%= form.label :eventable_name, t('spree.active_sale.event.active_record.eventable_name', :default => :eventable_name) %>
             <p class='hint'><%= t('spree.active_sale.event.eventable_name_hint') %></p>
-            <%= f.error_message_on :eventable_name %>
-            <%= f.text_field :eventable_name, :class => 'autocomplete', :data => { :auto_complete_url => eventables_admin_active_sale_active_sale_events_url(:active_sale_id => @active_sale.id) } %>
+            <%= form.error_message_on :eventable_name %>
+            <%= form.text_field :eventable_name, :class => 'autocomplete', :data => { :auto_complete_url => eventables_admin_active_sales_url } %>
           </div>
         </div>
         <div class="row">
           <div class="alpha four columns clearfix">
-            <%= f.field_container :is_active, :class => ['checkbox'] do %>
+            <%= form.field_container :is_active, :class => ['checkbox'] do %>
               <label>
-                <%= f.check_box :is_active %>
+                <%= form.check_box :is_active %>
                 <%= t('spree.active_sale.event.active_record.is_active') %>
-                <%= f.error_message_on :is_active %>
+                <%= form.error_message_on :is_active %>
               </label>
             <% end %>
   
-            <%= f.field_container :is_hidden, :class => ['checkbox'] do %>
+            <%= form.field_container :is_hidden, :class => ['checkbox'] do %>
               <label>
-                <%= f.check_box :is_hidden %>
+                <%= form.check_box :is_hidden %>
                 <%= t('spree.active_sale.event.active_record.is_hidden') %>
-                <%= f.error_message_on :is_hidden %>
+                <%= form.error_message_on :is_hidden %>
               </label>
             <% end %>
   
-            <%= f.field_container :is_permanent, :class => ['checkbox'] do %>
+            <%= form.field_container :is_permanent, :class => ['checkbox'] do %>
               <label>
-                <%= f.check_box :is_permanent %>
+                <%= form.check_box :is_permanent %>
                 <%= t('spree.active_sale.event.active_record.is_permanent') %>
-                <%= f.error_message_on :is_permanent %>
+                <%= form.error_message_on :is_permanent %>
               </label>
             <% end %>
           </div>
   
           <div class="omega four columns">
-          <%= f.field_container :discount do %>
-            <%= f.label :discount, t('spree.active_sale.event.active_record.discount', :default => :discount) %>
+          <%= form.field_container :discount do %>
+            <%= form.label :discount, t('spree.active_sale.event.active_record.discount', :default => :discount) %>
             <p class='hint'><%= t('spree.active_sale.event.discount_hint') %></p>
-            <%= f.error_message_on :discount %>
-            <%= f.text_field :discount, :size => 2, :maxlength => 2 %>
+            <%= form.error_message_on :discount %>
+            <%= form.text_field :discount, :size => 2, :maxlength => 2 %>
           <% end %>
           </div>
         </div>
@@ -116,12 +116,11 @@
       <% end %>
     </p>
   </fieldset>
-<% end %>
 
 <%= javascript_tag do -%>
   var properties = "<%= raw(@properties.to_json) %>";
 
-  $("#admin_active_sale_event input.autocomplete").live("keydown", function(){
+  $("#admin_active_sale_event input.autocomplete").on("keydown", function(){
     var eventable_type = $('#active_sale_event_eventable_type :selected').val();
     var eventable_name = $('#active_sale_event_eventable_name').val();
     var url = $(this).data('auto-complete-url')

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

@@ -4,14 +4,14 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t('spree.active_sale.event.link.back'), [:admin, @active_sale, :active_sale_events], :icon => 'icon-arrow-left', :id => 'admin_active_sale_events_link' %>
-    <%= button_link_to t('spree.active_sale.event.link.new'), new_object_url, :icon => 'icon-plus', :id => 'new_admin_active_sale_event_link' %>
-    <%= button_link_to t('spree.active_sale.link.edit'), [:edit, :admin, @active_sale], :icon => 'icon-edit', :id => 'admin_active_sale_events_link' %>
+    <%= button_link_to t('spree.active_sale.link.edit'), [:edit, :admin, @active_sale], :icon => 'icon-arrow-left', :id => 'admin_active_sales_link' %>
   </li>
 <% end %>
 
 <div data-hook="admin_active_sale_event_edit_form">
   <div id="active-sale-event-form-wrapper">
-    <%= render :partial => 'form' %>
+    <%= form_for [:admin, @active_sale, @active_sale_event], :html => { :id => 'admin_active_sale_event', :multipart => true } do |form| %>
+      <%= render :partial => 'form', :locals => { :form => form } %>
+    <% end %>
   </div>
 </div>

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

@@ -1,12 +1 @@
-<% content_for :page_title do %>
-  <%= @active_sale.name %> > <%= t('spree.active_sale.event.title.list') %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to t('spree.active_sale.link.edit'), [:admin, @active_sale], :icon => 'icon-arrow-left', :id => 'admin_active_sale_events_link' %>
-    <%= button_link_to t('spree.active_sale.event.link.new'), new_object_url, :icon => 'icon-plus', :id => 'admin_new_active_sale_event_link' %>
-  </li>
-<% end %>
-
-<%= render :partial => "spree/admin/shared/list_events", :locals => { :active_sale_events => @active_sale_events } %>
+<%= render :partial => 'spree/admin/shared/list_events', :locals => { :active_sale => @active_sale, :active_sale_events => @active_sale_events } %>

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

@@ -10,6 +10,8 @@
 
 <div data-hook="admin_active_sale_event_edit_form">
   <div id="active-sale-event-form-wrapper">
-    <%= render :partial => 'form' %>
+    <%= form_for [:admin, @active_sale, @active_sale_event], :html => { :id => 'admin_active_sale_event', :multipart => true } do |form| %>
+      <%= render :partial => 'form', :locals => { :form => form } %>
+    <% end %>
   </div>
 </div>

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

@@ -1,17 +1 @@
-<% content_for :page_title do %>
-  <%= t('spree.active_sale.title.edit') %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <% @event = Spree::ActiveSaleEvent.new %>
-    <%= button_link_to t('spree.active_sale.link.back'), collection_url, :icon => 'icon-arrow-left', :id => 'admin_new_active_sale_link' %>
-    <%= button_link_to t('spree.active_sale.event.link.new'), [:new, :admin, @active_sale, :active_sale_event], :icon => 'icon-plus', :id => 'admin_new_active_sale_link' %>
-  </li>
-<% end %>
-
-<div data-hook="admin_active_sale_edit_form">
-  <div id="active-sale-form-wrapper">
-    <%= render :partial => 'form' %>
-  </div>
-</div>
+<%= render :partial => 'spree/admin/shared/list_events', :locals => { :active_sale => @active_sale, :active_sale_events => @active_sale_events } %>

data/app/views/spree/admin/active_sales/get_children.json.erb

@@ -0,0 +1,9 @@
+[<% @active_sale_events.each_with_index do |t,i| %>
+  { "attr" :
+    { "id" : "<%= t.id %>", "parent_id" : "<%= t.parent_id %>" },
+    "data" : "<%= raw(event_js_data(t)) %>"
+    <% unless t.children.empty? %>
+      ,"state" : "closed"
+    <% end %>
+  }<%= "," if i < (@active_sale_events.size - 1) %>
+<% end %>]

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

@@ -10,26 +10,27 @@
 
 <div id="new_active_sale" data-hook></div>
 
-<table class="index" id="listing_active_sales" data-hook>
+<table class="index sortable" id='listing_active_sales' data-hook data-sortable-link="<%= update_positions_admin_active_sales_url %>">
   <colgroup>
     <col style="width: 85%">
     <col style="width: 15%">
   </colgroup>
   <thead>
-    <tr data-hook="admin_active_sales_index_headers">
-      <th><%= sort_link @search, :name, t('spree.active_sale.active_record.name'), {}, { :title => 'active_sales_name_title' } %></th>
-      <th data-hook="admin_active_sales_index_header_actions" class="actions"></th>
+    <tr data-hook="active_sales_header">
+      <th><%= t(:name) %></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @active_sales.each do |active_sale| %>
-      <tr id="<%= spree_dom_id active_sale %>" data-hook="admin_active_sales_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class='active_sale_name'><%= link_to active_sale.name, object_url(active_sale) %></td>
-        <td class="actions" data-hook="admin_active_sales_index_row_actions">
-          <p class="actions" data-hook="actions">
-            <%= link_to_edit active_sale, :no_text => true %>
-            <%= link_to_delete active_sale, :no_text => true %>
-          </p>
+      <tr id="<%= spree_dom_id active_sale %>" data-hook="active_sales_row" class="<%= cycle('odd', 'even')%>">
+        <td>
+          <span class="handle"></span>&nbsp;
+          <%= active_sale.name %>
+        </td>
+        <td class="actions">
+          <%= link_to_edit active_sale.id, :no_text => true %>
+          <%= link_to_delete active_sale, :no_text => true %>
         </td>
       </tr>
     <% end %>

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

@@ -10,6 +10,15 @@
 
 <div data-hook="admin_active_sale_new_form">
   <div id="active-sale-form-wrapper">
-    <%= render :partial => 'form' %>
+    
+    <% if @active_sale.try(:errors).present? %>
+      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @active_sale } %>
+    <% end %>
+
+    <%= form_for [:admin, @active_sale], :html => { :id => 'admin_active_sale_event' } do |form| %>
+      <%= fields_for @active_sale_event do |event_form| %>
+        <%= render :partial => 'spree/admin/active_sale_events/form', :locals => { :form => event_form } %>
+      <% end %>
+    <% end %>
   </div>
 </div>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_image_form_fields">
   <div class="four columns alpha">
     <div data-hook="file" class="field">
-      <%= f.label t(:filename) %><br>
+      <%= f.label :attachment, t(:filename) %><br>
       <%= f.file_field :attachment %>
     </div>
   </div>

data/app/views/spree/admin/shared/_js_head.html.erb

@@ -0,0 +1,8 @@
+<% content_for :head do %>
+  <%= javascript_tag "var active_sale_id = #{@active_sale.id};
+    var loading = '#{escape_javascript t(:loading)}';
+    var new_active_sale_event = '#{escape_javascript t(:new_active_sale_event)}';
+    var server_error = '#{escape_javascript t(:server_error)}';
+    var active_sale_tree_error = '#{escape_javascript t(:active_sale_tree_error)}';"
+  %>
+<% end %>

data/app/views/spree/admin/shared/_list_events.html.erb

@@ -1,32 +1,53 @@
+<%= render :partial => 'spree/admin/shared/js_head' %>
 
-<div id="new_active_sale_event" data-hook></div>
+<% content_for :page_title do %>
+  <%= t('spree.active_sale.title.edit') %> &#62; <%= @active_sale.name %>
+<% end %>
 
-<table class="index" id="listing_active_sale_events" data-hook>
-  <thead>
-    <tr data-hook="admin_active_sale_events_index_headers">
-      <th><%= t('spree.active_sale.event.active_record.name') %></th>
-      <th><%= t('spree.active_sale.event.active_record.start_date') %></th>
-      <th><%= t('spree.active_sale.event.active_record.end_date') %></th>
-      <th><%= t('spree.active_sale.event.active_record.is_live') %></th>
-      <th data-hook="admin_active_sale_events_index_header_actions" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @active_sale_events.each do |event| %>
-      <tr id="<%= spree_dom_id event %>" data-hook="admin_active_sales_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class='active_sale_name'><%= link_to event.name, [:admin, @active_sale, event] %></td>
-        <td class='active_sale_start_date'><%= event.start_date %></td>
-        <td class='active_sale_end_date'><%= event.end_date %></td>
-        <td class='active_sale_is_live'><%= event.live? ? t('spree.active_sale.event.boolean.yes') : t('spree.active_sale.event.boolean.no') %></td>
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t('spree.active_sale.link.back'), collection_url, :icon => 'icon-arrow-left', :id => 'admin_new_active_sale_link' %>
+  </li>
+<% end %>
 
-        <td class="actions" data-hook="admin_active_sale_events_index_row_actions">
-          <p class="actions" data-hook="actions">
-            <%= link_to_edit_url [:edit, :admin, @active_sale, event], :no_text => true %>
-            &nbsp;
-            <%= link_to_delete event, { :url => [:admin, @active_sale, event], :no_text => true } %>
-          </p>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<div id="ajax_error" class="errorExplanation" style="display:none;"></div>
+
+<fieldset class="no-border-top">
+  <div>
+    <%= label_tag nil, t(:tree) %><br />
+    <div id="active_sale_tree" class="tree" data-url="<%= admin_active_sale_active_sale_events_path @active_sale %>"></div>
+  </div>
+  <div id="progress" style="display:none;">
+    <%= image_tag 'spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= t(:updating) %>..
+  </div>
+
+  <p class='hint info'>
+    <%= t('spree.active_sale.event.active_sale_tree_hint') %>
+  </p>
+
+  <br>
+</fieldset>
+
+<% content_for :head do %>
+  <%= javascript_tag do -%>
+    var initial = [
+      { "attr" :
+      { "id" : "<%= @active_sale.root.id %>", "rel" : "root", "parent_id" : "nil" },
+      "data" : "<%= escape_javascript(raw(@active_sale.root.name)) %>",
+      "state" : "open",
+      "children" : [
+        <% @active_sale.root.children_sorted_by_position.each_with_index do |event,i| %>
+          {
+            "attr" :
+            { "id" : "<%= event.id %>", "parent_id" : "<%= event.parent_id %>" },
+            "data" : "<%= escape_javascript(raw(event_js_data(event))) %>"
+            <% unless event.children.empty? %>
+              ,"state" : "closed"
+            <% end %>
+          }<%= ',' if i < (@active_sale.root.children.size - 1) %>
+        <% end %>
+      ]
+        }
+    ];
+  <% end -%>
+<% end %>

data/config/locales/active_sales_en.yml

@@ -7,6 +7,7 @@ en:
       active_record:
         name: "Sale name"
       event:
+        active_sale_tree_hint: "Right click on any row in the tree to access the menu for adding, deleting or sorting products in a sale. Drag and drop to change their positions."
         active_record:
           description: "Event Description"
           is_active: "Active?"
@@ -20,6 +21,7 @@ en:
           eventable_name: "Add the name to add type in event"
           eventable_type: "Add a type for event"
           permalink: "Type the name or permalink"
+          position: "Position"
         boolean:
           yes: "Yes"
           no: "No"
@@ -57,8 +59,11 @@ en:
           list: "Listing events"
         validation:
           errors:
+            date_empty: "can't be left empty."
             invalid_dates: "can not be greater than or equal to the end date."
+            invalid_root_dates: "and end date should be in between it's sub sales' start and end dates range."
             live_event: "already running and live."
+        parent_id_cant_be_nil: "Parent can not be null"
       events_not_found: "There are no sales available at this moment. Try later?"
       link:
         new: "New active sale"

data/config/locales/active_sales_es.yml

@@ -23,8 +23,8 @@ es:
         boolean:
           yes: "Sí"
           no: "No"
-        can_not_be_nil: "Argument can not be nil or instance of any other class than Spree::ActiveSaleEvent"
-        create_if_no_record: "You don't have any event in this active sale, let's create an event?"
+        can_not_be_nil: "El argumento no puede ser nulo y debe ser una instancia de la clase Spree::ActiveSaleEvent"
+        create_if_no_record: "Todavía no tienes creada ningún evento, ¿lo creamos ya?"
         datetimepicker:
           format: ! '%d/%m/%Y %H:%M:%S %z'
           js_format: 'HH:mm:ss z'

data/config/routes.rb

@@ -2,8 +2,17 @@ Spree::Core::Engine.routes.draw do
   # Add this extension's routes here
   namespace :admin do
     resources :active_sales do
+      collection do
+        get  :eventables
+        post :update_positions
+      end
+      member do
+        get :get_children
+      end
       resources :active_sale_events do
-        get 'eventables', :on => :collection
+        member do
+          put :update_events
+        end
         resources :sale_images do
           collection do
             post :update_positions

data/lib/spree_active_sale/engine.rb

@@ -6,7 +6,7 @@ module SpreeActiveSale
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    initializer "spree_active_sale.environment", :after => "spree.environment" do |app|
+    initializer "spree_active_sale.environment", :before => "spree.environment" do |app|
       Spree::ActiveSaleConfig = Spree::ActiveSaleConfiguration.new
       %w(ActionController::Base Spree::BaseController).each { |controller| controller.constantize.send(:helper, Spree::ActiveSaleEventsHelper) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_active_sale
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -181,14 +181,15 @@ files:
 - app/models/spree/active_sale_event.rb
 - app/models/spree/sale_event.rb
 - app/views/spree/home/index.html.erb
-- app/views/spree/admin/active_sales/_form.html.erb
 - app/views/spree/admin/active_sales/new.html.erb
+- app/views/spree/admin/active_sales/get_children.json.erb
 - app/views/spree/admin/active_sales/index.html.erb
 - app/views/spree/admin/active_sales/edit.html.erb
 - app/views/spree/admin/active_sale_events/_form.html.erb
 - app/views/spree/admin/active_sale_events/new.html.erb
 - app/views/spree/admin/active_sale_events/index.html.erb
 - app/views/spree/admin/active_sale_events/edit.html.erb
+- app/views/spree/admin/shared/_js_head.html.erb
 - app/views/spree/admin/shared/_translations.html.erb
 - app/views/spree/admin/shared/_list_events.html.erb
 - app/views/spree/admin/shared/_sale_images.html.erb
@@ -197,6 +198,7 @@ files:
 - app/views/spree/admin/sale_images/edit.html.erb
 - app/views/spree/shared/_sale_events.html.erb
 - app/controllers/spree/admin/sale_images_controller.rb
+- app/controllers/spree/admin/resource_controller_decorator.rb
 - app/controllers/spree/admin/active_sales_controller.rb
 - app/controllers/spree/admin/active_sale_events_controller.rb
 - app/controllers/spree/home_controller_decorator.rb
@@ -205,6 +207,7 @@ files:
 - app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/store_controller_decorator.rb
 - app/controllers/spree/taxons_controller_decorator.rb
+- app/helpers/spree/base_helper_decorator.rb
 - app/helpers/spree/active_sale_events_helper.rb
 - app/helpers/spree/active_sales_helper.rb
 - app/overrides/admin_active_sales_tab.rb
@@ -241,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3636572579804555877
+      hash: -430475808815195775
 requirements:
 - none
 rubyforge_project: 

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

@@ -1,35 +0,0 @@
-<% if @active_sale.try(:errors).present? %>
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @active_sale } %>
-<% end %>
-
-<%= form_for [:admin, @active_sale] do |f| %>
-
-  <fieldset data-hook="new_active_sale">
-
-    <%= f.field_container :name do %>
-      <%= f.label :name, t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth title' %>
-      <%= f.error_message_on :name %>
-    <% end %>
-
-    <p class="form-buttons" data-hook="admin_active_sale_form_buttons">
-      <% if @active_sale.new_record? %>
-        <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-      <% else %>
-        <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-      <% end %>
-    </p>
-
-  </fieldset>
-<% end %>
-
-<% unless @active_sale.new_record? %>
-  <% if @active_sale.active_sale_events.blank? %>
-    <% @active_sale_event = @active_sale.active_sale_events.build %>
-    <h4><%= t('spree.active_sale.event.create_if_no_record') %></h4>
-    <%= render :partial => "spree/admin/active_sale_events/form", :locals => { :events => @active_sale_event } %>
-  <% else %>
-    <% @active_sale_events = @active_sale.active_sale_events %>
-    <%= render :partial => "spree/admin/shared/list_events", :locals => { :events => @active_sale_events } %>
-  <% end %>
-<% end %>