spree_promo 0.60.6 → 0.70.RC1

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

@@ -0,0 +1,28 @@
+class Promotion::Actions::CreateAdjustment < PromotionAction
+
+  calculated_adjustments
+
+  before_create do |a|
+    c = a.build_calculator
+    c.type = Promotion::Actions::CreateAdjustment.calculators.first.to_s
+  end
+
+  def perform(options = {})
+    return unless order = options[:order]
+    return if order.promotion_credit_exists?(promotion)
+    if amount = calculator.compute(order)
+      amount = order.item_total if amount > order.item_total
+      order.adjustments.promotion.reload.clear
+      order.update!
+      create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
+    end
+  end
+
+  # 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
+
+  delegate :eligible?, :to => :promotion
+
+end

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

@@ -0,0 +1,29 @@
+class Promotion::Actions::CreateLineItems < PromotionAction
+
+  has_many :promotion_action_line_items, :foreign_key => 'promotion_action_id'
+
+  attr_accessor :line_items_string
+
+  def perform(options = {})
+    return unless order = options[:order]
+    promotion_action_line_items.each do |item|
+      order.add_variant(item.variant, item.quantity)
+    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)
+      end
+    end
+  end
+
+end
+

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

@@ -1,6 +1,6 @@
 class Promotion::Rules::FirstOrder < PromotionRule
 
-  def eligible?(order)
+  def eligible?(order, options = {})
     order.user && order.user.orders.complete.count == 0
   end
 

data/app/models/promotion/rules/item_total.rb

@@ -6,7 +6,8 @@ class Promotion::Rules::ItemTotal < PromotionRule
 
   OPERATORS = ['gt', 'gte']
 
-  def eligible?(order)
-    order.item_total.send(preferred_operator == 'gte' ? :>= : :>, preferred_amount)
+  def eligible?(order, options = {})
+    item_total = order.line_items.map(&:amount).sum
+    item_total.send(preferred_operator == 'gte' ? :>= : :>, preferred_amount)
   end
 end

data/app/models/promotion/rules/landing_page.rb

@@ -0,0 +1,17 @@
+# A rule to limit a promotion to a specific user.
+class Promotion::Rules::LandingPage < PromotionRule
+
+  preference :path, :string
+
+  def eligible?(order, options = {})
+    if options.has_key?(:visited_paths)
+      options[:visited_paths].to_a.any? do |path|
+        path.gsub(/^\//, '') == preferred_path.gsub(/^\//, '')
+      end
+    else
+      true
+    end
+  end
+
+end
+

data/app/models/promotion/rules/product.rb

@@ -14,7 +14,7 @@ class Promotion::Rules::Product < PromotionRule
     product_group ? product_group.products : products
   end
 
-  def eligible?(order)
+  def eligible?(order, options = {})
     return true if eligible_products.empty?
     if preferred_match_policy == 'all'
       eligible_products.all? {|p| order.products.include?(p) }

data/app/models/promotion/rules/user.rb

@@ -2,7 +2,7 @@ class Promotion::Rules::User < PromotionRule
   belongs_to :user
   has_and_belongs_to_many :users, :class_name => '::User', :join_table => 'promotion_rules_users', :foreign_key => 'promotion_rule_id'
 
-  def eligible?(order)
+  def eligible?(order, options = {})
     users.none? or users.include?(order.user)
   end
 

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

@@ -0,0 +1,13 @@
+class Promotion::Rules::UserLoggedIn < PromotionRule
+  def eligible?(order, options = {})
+
+    # 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/promotion_action.rb

@@ -0,0 +1,19 @@
+# Base class for all types of promotion action.
+# PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
+class PromotionAction < ActiveRecord::Base
+  include SubclassRegistration
+
+  belongs_to :promotion, :foreign_key => 'activator_id'
+
+  scope :of_type, lambda {|t| {:conditions => {:type => t}}}
+
+  # This method should be overriden in subclass
+  # Updates the state of the order or performs some other action depending on the subclass
+  # options will contain the payload from the event that activated the promotion. This will include
+  # the key :user which allows user based actions to be performed in addition to actions on the order
+  def perform(options = {})
+    raise 'perform should be implemented in a sub-class of PromotionAction'
+  end
+
+end
+

data/app/models/promotion_action_line_item.rb

@@ -0,0 +1,6 @@
+class PromotionActionLineItem < ActiveRecord::Base
+
+  belongs_to :promotion_action, :class_name => 'Promotion::Actions::CreateLineItems'
+  belongs_to :variant
+
+end

data/app/models/promotion_rule.rb

@@ -1,26 +1,13 @@
 # Base class for all promotion rules
 class PromotionRule < ActiveRecord::Base
+  include SubclassRegistration
 
-  belongs_to :promotion
+  belongs_to :promotion, :foreign_key => 'activator_id'
 
   scope :of_type, lambda {|t| {:conditions => {:type => t}}}
 
-  def eligible?(order)
+  def eligible?(order, options = {})
     raise 'eligible? should be implemented in a sub-class of Promotion::PromotionRule'
   end
 
-  @rule_classes = nil
-  @@rule_classes = Set.new
-  def self.register
-    @@rule_classes.add(self)
-  end
-
-  def self.rule_classes
-    @@rule_classes.to_a
-  end
-
-  def self.rule_class_names
-    PromotionRule.rule_classes.map(&:name)
-  end
-
 end

data/app/overrides/promo_admin_tabs.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "layouts/admin",
+                     :name => "promo_admin_tabs",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :text => "<%= tab(:promotions) %>",
+                     :disabled => false)

data/app/overrides/promo_coupon_code_field.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "checkout/_payment",
+                     :name => "promo_coupon_code_field",
+                     :replace => "[data-hook='coupon_code_field'], #coupon_code_field[data-hook]",
+                     :partial => "checkout/coupon_code_field",
+                     :disabled => false)

data/app/overrides/promo_product_properties.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path => "products/show",
+                     :name => "promo_product_properties",
+                     :insert_after => "[data-hook='product_properties'], #product_properties[data-hook]",
+                     :partial => "products/promotions",
+                     :disabled => false)

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

@@ -0,0 +1,7 @@
+jQuery('#actions_container').html('<%= escape_javascript( render(:partial => 'admin/promotions/actions') ) %>');
+initProductActions();
+
+jQuery('#<%= dom_id @promotion_action %>').hide();
+jQuery('#<%= dom_id @promotion_action %>').fadeIn();
+jQuery('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
+

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

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

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

@@ -0,0 +1,32 @@
+<fieldset id="action_fields">
+  <legend><%= t(:promotion_actions) %></legend>
+
+  <%= form_for(@promotion, :url => admin_promotion_path(@promotion), :html => { :method => :put }) do |f| %>
+    <div id="actions" class="filter_list">
+      <% if @promotion.actions.any? %>
+        <%#= render :partial => 'promotion_action', :collection => @promotion.actions, :locals => {:f => f} %>
+
+        <%= f.fields_for :promotion_actions do |action_form| %>
+          <%= render 'admin/promotions/promotion_action', :action_form => action_form %>
+        <% end %>
+
+      <% else %>
+        <!-- <p><%= t('no_actions_added') %></p> -->
+      <% end %>
+    </div>
+    <p class="form-buttons">
+      <%= button t("update") %>
+    </p>
+  <% end %>
+
+  <%= form_tag(admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form') do  %>
+    <% options = options_for_select( PromotionAction.registered_class_names.map {|name| [ t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <p>
+      <label for="promotion_action_type"><%= t('add_action_of_type') %></label>
+      <%= select_tag("promotion_action[type]", options) %>
+      <input type="submit" value="<%= t('add') %>" />
+    </p>
+  <% end %>
+
+</fieldset>
+

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

@@ -6,21 +6,24 @@
     <%= f.text_field :name %>
   <% end %>
 
+  <%= f.field_container :event_name do %>
+    <%= f.label :event_name, t(:event) %><br />
+    <%= f.select :event_name, Activator.event_names.map{|name| [t("events.#{name}"), name] } %>
+  <% end %>
+
+  <%= f.field_container :preferred_code do %>
+    <%= f.label :preferred_code, t(:code) %><br />
+    <%= f.text_field :preferred_code %>
+  <% end %>
+
   <%= f.field_container :description do %>
     <%= f.label :description %><br />
     <%= f.text_area :description, :style => "height:50px" %>
   <% end %>
 
-  <%= f.field_container :code do %>
-    <%= f.label :code %><br />
-    <%= f.text_field :code %>
-  <% end %>
-
-  <%= f.field_container :combine do %>
-    <label>
-      <%= f.check_box :combine %> 
-      <%= t(:may_be_combined_with_other_promotions) %>
-    </label>
+  <%= f.field_container :preferred_advertise do %>
+    <%= f.check_box :preferred_advertise %>
+    <%= f.label :preferred_advertise, t('advertise') %>
   <% end %>
 
 </fieldset>
@@ -28,19 +31,16 @@
 <fieldset id="expiry_fields">
   <legend><%= t(:expiry) %></legend>
   <p>
-    <%= f.label :usage_limit %><br />
-    <%= f.text_field :usage_limit %>
+    <%= f.label :preferred_usage_limit, t(:usage_limit) %><br />
+    <%= f.text_field :preferred_usage_limit %>
   </p>
 
   <p id="starts_at_field">
     <%= f.label :starts_at %>
-    <%= f.spree_date_picker :starts_at, :prompt => true, :use_month_numbers => true %>
+    <%= f.text_field :starts_at, :class => 'datepicker' %>
   </p>
   <p id="expires_at_field">
     <%= f.label :expires_at %>
-    <%= f.spree_date_picker :expires_at, :prompt => true, :use_month_numbers => true %>
+    <%= f.text_field :expires_at, :class => 'datepicker' %>
   </p>
 </fieldset>
-
-<hr />
-<%= render "admin/shared/calculator_fields", :f => f %>

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

@@ -0,0 +1,12 @@
+<% promotion_action = action_form.object %>
+<div class="promotion_action <%= promotion_action.type.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
+  <span class="delete">
+    <%= link_to_with_icon 'cross', '', admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => 'delete' %>
+  </span>
+  <% type_name = promotion_action.class.name.demodulize.underscore %>
+  <% 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 "admin/promotions/actions/#{type_name}", :action_form => action_form, :promotion_action => promotion_action, :param_prefix => param_prefix %>
+</div>

data/app/views/admin/promotions/_promotion_rule.html.erb

@@ -1,5 +1,5 @@
-<div class="promotion-rule" id="<%= dom_id promotion_rule %>">
-  <span class="delete"><%= link_to_with_icon 'cross', '', admin_promotion_promotion_rule_path(@promotion, promotion_rule), 'data-remote' => true, 'data-method' => 'delete' %></span>
+<div class="promotion_rule" id="<%= dom_id promotion_rule %>">
+  <span class="delete"><%= link_to_with_icon 'cross', '', admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => 'delete' %></span>
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>

data/app/views/admin/promotions/_rules.html.erb

@@ -0,0 +1,32 @@
+<fieldset id="rule_fields">
+  <legend><%= t(:rules) %></legend>
+
+  <%= form_for(@promotion, :url => object_url, :html => { :method => :put }) do |f| %>
+    <p>
+      <% for policy in Promotion::MATCH_POLICIES %>
+        <label><%= f.radio_button :preferred_match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;
+      <% end %>
+    </p>
+    <div id="rules" class="filter_list">
+      <% if @promotion.rules.any? %>
+        <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+      <% else %>
+        <!-- <p><%= t('no_rules_added') %></p> -->
+      <% end %>
+    </div>
+    <p class="form-buttons">
+      <%= button t("update") %>
+    </p>
+  <% end %>
+
+  <%= form_tag(admin_promotion_promotion_rules_path(@promotion), :remote => true,
+                                                                 :id => 'new_product_rule_form') do  %>
+    <% options = options_for_select( PromotionRule.registered_class_names.map {|name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <p>
+      <label for="promotion_rule_type"><%= t('add_rule_of_type') %></label>
+      <%= select_tag("promotion_rule[type]", options) %>
+      <input type="submit" value="<%= t('add') %>" />
+    </p>
+  <% end %>
+
+</fieldset>

data/app/views/admin/promotions/actions/_create_adjustment.html.erb

@@ -0,0 +1,19 @@
+<div class="calculator-fields">
+
+  <p class="field">
+    <%= action_form.label :calculator_type, t("calculator") %>
+    <%= action_form.collection_select :calculator_type, @calculators, :to_s, :description, {}, {:class => 'type-select'} %>
+    <% if promotion_action.calculator.respond_to?(:preferences) %>
+      &nbsp; <span class="warning"><%= t('calculator_settings_warning')%></span>
+    <% end %>
+  </p>
+
+  <% unless promotion_action.new_record? %>
+    <div class="settings">
+      <%= action_form.fields_for :calculator, promotion_action.calculator do |calculator_form| %>
+        <%= preference_fields(promotion_action.calculator, calculator_form) %>
+      <% end %>
+    </div>
+  <% end %>
+
+</div>

data/app/views/admin/promotions/actions/_create_line_items.html.erb

@@ -0,0 +1,52 @@
+<table class="index">
+  <tr>
+    <th>Product</th>
+    <th>Variant</th>
+    <th>Quantity</th>
+    <th>&nbsp;</th>
+  </tr>
+  <% for item in promotion_action.promotion_action_line_items %>
+    <tr>
+      <td>
+        <%= item.variant.product.name %>
+      </td>
+      <td>
+        <%= item.variant.options_text.presence || t("master") %>
+      </td>
+      <td>
+        <%= item.quantity %>
+      </td>
+      <td>
+        <img src='/admin/images/icons/cross.png' />
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+
+
+<%= action_form.hidden_field :line_items_string %>
+
+
+<div class="add-line-item">
+  <fieldset>
+    <legend><%= t('add_product') %></legend>
+    <div style="float:left;width:50%;margin-right:5%;">
+      <%= label_tag :add_product_name, t("name_or_sku") %>
+      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth' %>
+    </div>
+    <div style="float:left;width:10%;margin-right:5%;">
+      <%= label_tag :add_line_item_variant_id, t("variant") %><br />
+      <select name="add_line_item_variant_id" class="fullwidth"></select>
+    </div>
+    <div style="float:left;width:10%;margin-right:5%;">
+      <%= label_tag :add_quantity, t("qty") %>
+      <%= text_field_tag :add_quantity, 1 %>
+    </div>
+    <div style="float:left;width:j0%">
+      &nbsp;<br />
+      <button class="add small"> <%= t("add") %></button>
+    </div>
+
+  </fieldset>
+</div>