spree_promo 0.70.7 → 1.0.0.rc1

data/app/views/{admin → spree/admin}/promotion_actions/create.js.erb

@@ -1,4 +1,4 @@
-$('#actions_container').html('<%= escape_javascript( render(:partial => 'admin/promotions/actions') ) %>');
+$('#actions_container').html('<%= escape_javascript( render(:partial => 'spree/admin/promotions/actions') ) %>');
 initProductActions();
 
 $('#<%= dom_id @promotion_action %>').hide();

data/app/views/{admin → spree/admin}/promotion_rules/create.js.erb

@@ -1,4 +1,4 @@
-$('#rules').append('<%= escape_javascript( render(:partial => 'admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
 $('#<%= dom_id @promotion_rule %>').hide();
 $('#<%= dom_id @promotion_rule %>').fadeIn();
 initProductRuleSourceField();

data/app/views/{admin → spree/admin}/promotions/_actions.html.erb

@@ -1,13 +1,13 @@
 <fieldset id="action_fields">
   <legend><%= t(:promotion_actions) %></legend>
 
-  <%= form_for @promotion, :url => admin_promotion_path(@promotion), :html => { :method => :put } do |f| %>
+  <%= form_for @promotion, :url => spree.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 %>
+          <%= render :partial => 'spree/admin/promotions/promotion_action', :locals => { :action_form => action_form } %>
         <% end %>
 
       <% else %>
@@ -19,11 +19,11 @@
     </p>
   <% end %>
 
-  <%= form_tag admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do  %>
+  <%= 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 :promotion_action_type, t(:add_action_of_type) %>
-      <%= select_tag 'promotion_action[type]', options %>
+      <%= label_tag :action_type, t(:add_action_of_type) %>
+      <%= select_tag 'action_type', options %>
       <%= submit_tag t(:add) %>
     </p>
   <% end %>

data/app/views/{admin → spree/admin}/promotions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= render 'shared/error_messages', :target => @promotion %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
 <fieldset id="general_fields">
   <legend><%= t(:general) %></legend>
   <%= f.field_container :name do %>
@@ -8,22 +8,22 @@
 
   <%= 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] } %>
+    <%= f.select :event_name, Spree::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 %>
+  <%= f.field_container :code do %>
+    <%= f.label :code, t(:code) %><br />
+    <%= f.text_field :code %>
   <% end %>
 
   <%= f.field_container :description do %>
     <%= f.label :description %><br />
-    <%= f.text_area :description, :style => "height:50px;" %>
+    <%= f.text_area :description, :style => 'height:50px;' %>
   <% end %>
 
-  <%= f.field_container :preferred_advertise do %>
-    <%= f.check_box :preferred_advertise %>
-    <%= f.label :preferred_advertise, t(:advertise) %>
+  <%= f.field_container :advertise do %>
+    <%= f.check_box :advertise %>
+    <%= f.label :advertise, t(:advertise) %>
   <% end %>
 
 </fieldset>
@@ -31,8 +31,8 @@
 <fieldset id="expiry_fields">
   <legend><%= t(:expiry) %></legend>
   <p>
-    <%= f.label :preferred_usage_limit, t(:usage_limit) %><br />
-    <%= f.text_field :preferred_usage_limit %>
+    <%= f.label :usage_limit, t(:usage_limit) %><br />
+    <%= f.text_field :usage_limit %>
   </p>
 
   <p id="starts_at_field">

data/app/views/{admin → spree/admin}/promotions/_promotion_action.html.erb

@@ -1,12 +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' %>
+    <%= link_to_with_icon 'cross', '', spree.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 %>
+  <%= render :partial => "spree/admin/promotions/actions/#{type_name}", :locals => { :action_form => action_form, :promotion_action => promotion_action, :param_prefix => param_prefix } %>
 </div>

data/app/views/{admin → spree/admin}/promotions/_promotion_rule.html.erb

@@ -1,8 +1,8 @@
 <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>
+  <span class="delete"><%= link_to_with_icon 'cross', '', spree.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 %>
   <p><%= t("promotion_rule_types.#{type_name}.description") %></p>
-  <%= render "admin/promotions/rules/#{type_name}", :promotion_rule => promotion_rule, :param_prefix => param_prefix %>
+  <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
 </div>

data/app/views/{admin → spree/admin}/promotions/_rules.html.erb

@@ -3,7 +3,7 @@
 
   <%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
     <p>
-      <% Promotion::MATCH_POLICIES.each do |policy| %>
+      <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
         <label><%= f.radio_button :preferred_match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;
       <% end %>
     </p>
@@ -19,7 +19,7 @@
     </p>
   <% end %>
 
-  <%= form_tag admin_promotion_promotion_rules_path(@promotion), :remote => true,
+  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true,
                                                                  :id => 'new_product_rule_form' do %>
     <% options = options_for_select( Rails.application.config.spree.promotions.rules.map(&:name).map {|name| [ t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <p>

data/app/views/{admin → spree/admin}/promotions/actions/_create_adjustment.html.erb

@@ -4,7 +4,7 @@
     <%= 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>
+      &nbsp; <span class="warning"><%= t(:calculator_settings_warning) %></span>
     <% end %>
   </p>
 

data/app/views/{admin → spree/admin}/promotions/actions/_create_line_items.html.erb

@@ -27,6 +27,7 @@
     <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' %>
+      <%= hidden_field_tag :add_variant_id %>
       <%= hidden_field_tag :add_line_item_variant_id %>
     </div>
     <div style="float:left; width:10%; margin-right:5%;">

data/app/views/{admin → spree/admin}/promotions/actions/_give_store_credit.html.erb

@@ -1,6 +1,6 @@
 <p class="field">
   <label for="<%= "#{param_prefix}_preferred_amount" %>">
-    <%= t('amount') %>
+    <%= t(:amount) %>
     <%= action_form.text_field :preferred_amount, :size => 10 %>
   </label>
 </p>

data/app/views/{admin → spree/admin}/promotions/edit.html.erb

@@ -2,11 +2,11 @@
 
 <%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render 'admin/shared/edit_resource_links' %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>
 
-<%= render 'rules' %>
+<%= render :partial => 'rules' %>
 
 <div id="actions_container">
-  <%= render 'actions' %>
+  <%= render :partial => 'actions' %>
 </div>

data/app/views/{admin → spree/admin}/promotions/index.html.erb

@@ -1,7 +1,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t(:new_promotion), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t(:new_promotion), spree.new_admin_promotion_path, :icon => 'add' %>
     </li>
   </ul>
   <br class="clear" />
@@ -35,4 +35,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/{admin → spree/admin}/promotions/new.html.erb

@@ -2,5 +2,5 @@
 
 <%= form_for :promotion, :url => collection_url do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'admin/shared/new_resource_links' %>
+  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/{admin → spree/admin}/promotions/rules/_item_total.html.erb

@@ -1,7 +1,7 @@
 <p class="field">
   <label for="<%= "#{param_prefix}_preferred_amount" %>">
     <%= t('promotion_rule_types.item_total.description') %>
-    <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator) %>
+    <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator) %>
     <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :size => 10 %>
   </label>
 </p>

data/app/views/{admin → spree/admin}/promotions/rules/_product.html.erb

@@ -4,7 +4,7 @@
 </p>
 <p class="field products_rule_product_group">
   <label><%= t(:product_group) %><br />
-    <%= select_tag "#{param_prefix}[product_group_id]", options_from_collection_for_select(ProductGroup.all, :id, :name, promotion_rule.product_group_id) %></label>
+    <%= select_tag "#{param_prefix}[product_group_id]", options_from_collection_for_select(Spree::ProductGroup.all, :id, :name, promotion_rule.product_group_id) %></label>
 </p>
 <p class="field products_rule_products">
   <label>
@@ -13,6 +13,6 @@
 </p>
 <p>
   <label>
-    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy))).html_safe %>
+    <%= t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy))).html_safe %>
   </label>
 </p>

data/app/views/{checkout → spree/checkout}/_coupon_code_field.html.erb

@@ -1,4 +1,4 @@
-<% if Promotion.count > 0 %>
+<% if Spree::Promotion.count > 0 %>
 <p>
   <%= form.label :coupon_code %><br />
   <%= form.text_field :coupon_code %>

data/config/locales/en.yml

@@ -15,10 +15,15 @@ en:
   coupon: Coupon
   coupon_code: Coupon code
   editing_promotion: Editing Promotion
+  events:
+    spree:
+      checkout:
+        coupon_code_added: Coupon code added
   expiry: Expiry
   free_shipping: Free Shipping
   new_promotion: New Promotion
   no_rules_added: No rules added
+  promotion_not_found: The coupon code you entered doesn't exist. Please try again.
   promotion: Promotion
   promotion_actions: Actions
   promotions: Promotions
@@ -65,6 +70,8 @@ en:
       group: From product group
       manual: Manually choose
   rules: Rules
+  spree/order:
+    coupon_code: Coupon Code
   user_rule:
     choose_users: Choose users
   item_total_rule:

data/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
   namespace :admin do
     resources :promotions do
       resources :promotion_rules

data/db/migrate/20100419190933_rename_coupons_to_promotions.rb

@@ -1,10 +1,10 @@
 class RenameCouponsToPromotions < ActiveRecord::Migration
-  def self.up
-    execute "DROP TABLE IF EXISTS promotions"
+  def up
+    drop_table :promotions if table_exists?(:promotions)
     rename_table :coupons, :promotions
   end
 
-  def self.down
+  def down
     rename_table :promotions, :coupons
   end
-end
+end

data/db/migrate/20100426100726_create_promotion_rules.rb

@@ -1,9 +1,10 @@
 class CreatePromotionRules < ActiveRecord::Migration
-  def self.up
+  def up
     create_table :promotion_rules do |t|
       t.references :promotion, :user, :product_group
-      t.timestamps
       t.string :type
+
+      t.timestamps
     end
     add_index :promotion_rules, :product_group_id
     add_index :promotion_rules, :user_id
@@ -14,10 +15,9 @@ class CreatePromotionRules < ActiveRecord::Migration
     remove_column :products_promotion_rules, :id
     add_index :products_promotion_rules, :product_id
     add_index :products_promotion_rules, :promotion_rule_id
-
   end
 
-  def self.down
+  def down
     drop_table :promotion_rules
     drop_table :products_promotion_rules
   end

data/db/migrate/20100501084722_match_policy_for_promotions.rb

@@ -1,9 +1,5 @@
 class MatchPolicyForPromotions < ActiveRecord::Migration
-  def self.up
-    add_column "promotions", "match_policy", :string, :default => 'all'
+  def change
+    add_column :promotions, :match_policy, :string, :default => 'all'
   end
-
-  def self.down
-    remove_column "promotions", "match_policy"
-  end
-end
+end

data/db/migrate/20100501095202_create_promotion_rules_users.rb

@@ -1,5 +1,5 @@
 class CreatePromotionRulesUsers < ActiveRecord::Migration
-  def self.up
+  def up
     create_table :promotion_rules_users do |t|
       t.integer :user_id, :promotion_rule_id
     end
@@ -8,7 +8,7 @@ class CreatePromotionRulesUsers < ActiveRecord::Migration
     add_index :promotion_rules_users, :promotion_rule_id
   end
 
-  def self.down
+  def down
     drop_table :promotion_rules_users
   end
-end
+end

data/db/migrate/20100502163939_name_for_promotions.rb

@@ -1,9 +1,5 @@
 class NameForPromotions < ActiveRecord::Migration
-  def self.up
-    add_column "promotions", "name", :string
+  def change
+    add_column :promotions, :name, :string
   end
-
-  def self.down
-    remove_column "promotions", "name"
-  end
-end
+end

data/db/migrate/20100923095305_update_calculable_type_for_promotions.rb

@@ -1,9 +1,9 @@
 class UpdateCalculableTypeForPromotions < ActiveRecord::Migration
-  def self.up
-    Calculator.update_all("calculable_type = 'Promotion'", "calculable_type = 'Coupon'")
+  def up
+    execute "UPDATE spree_calculators SET calculable_type = 'Promotion' WHERE calculable_type = 'Coupon'"
   end
 
-  def self.down
-    Calculator.update_all("calculable_type = 'Coupon'", "calculable_type = 'Promotion'")
+  def down
+    execute "UPDATE spree_calculators SET calculable_type = 'Coupon' WHERE calculable_type = 'Promotion'"
   end
 end

data/db/migrate/20101026184833_migrate_adjustments.rb

@@ -1,9 +1,9 @@
 class MigrateAdjustments < ActiveRecord::Migration
-  def self.up
-    execute("update adjustments set amount = 0.0 where amount is null")
-    execute("update adjustments set mandatory = 'true', locked = 'true'")
+  def up
+    execute "UPDATE spree_adjustments SET amount = 0.0 WHERE amount IS NULL"
+    execute "UPDATE spree_adjustments SET mandatory = 't' WHERE locked = 't'"
   end
 
-  def self.down
+  def down
   end
 end

data/db/migrate/20110331094351_promotion_changes_to_subclass_of_activator.rb

@@ -1,21 +1,21 @@
 class PromotionChangesToSubclassOfActivator < ActiveRecord::Migration
-  def self.up
+  def up
     drop_table :promotions
     rename_column :promotion_rules, :promotion_id, :activator_id
   end
 
-  def self.down
-    create_table "promotions", :force => true do |t|
-      t.string   "name"
-      t.string   "code"
-      t.string   "description"
-      t.integer  "usage_limit"
-      t.boolean  "combine"
-      t.datetime "expires_at"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.datetime "starts_at"
-      t.string   "match_policy", :default => "all"
+  def down
+    create_table :promotions, :force => true do |t|
+      t.string   :name
+      t.string   :code
+      t.string   :description
+      t.integer  :usage_limit
+      t.boolean  :combine
+      t.datetime :expires_at
+      t.datetime :starts_at
+      t.string   :match_policy, :default => 'all'
+
+      t.timestamps
     end
     rename_column :promotion_rules, :activator_id, :promotion_id
   end

data/db/migrate/20110404123358_create_promotion_actions.rb

@@ -1,13 +1,9 @@
 class CreatePromotionActions < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :promotion_actions do |t|
       t.integer :activator_id
       t.integer :position
-      t.string :type
+      t.string  :type
     end
   end
-
-  def self.down
-    drop_table :promotion_actions
-  end
 end

data/db/migrate/20110601202923_create_promotion_action_line_items.rb

@@ -1,12 +1,10 @@
 class CreatePromotionActionLineItems < ActiveRecord::Migration
-  def self.up
-    create_table "promotion_action_line_items" do |t|
+  def change
+    create_table :promotion_action_line_items do |t|
       t.integer :promotion_action_id, :variant_id
       t.integer :quantity, :default => 1
+      t.references :promotion_action
+      t.references :variant
     end
   end
-
-  def self.down
-    drop_table "promotion_action_line_items"
-  end
 end

data/db/migrate/20111013155037_namespace_promo_tables.rb

@@ -0,0 +1,9 @@
+class NamespacePromoTables < ActiveRecord::Migration
+  def change
+    rename_table :promotion_actions, :spree_promotion_actions
+    rename_table :promotion_rules, :spree_promotion_rules
+    rename_table :promotion_rules_users, :spree_promotion_rules_users
+    rename_table :promotion_action_line_items, :spree_promotion_action_line_items
+    rename_table :products_promotion_rules, :spree_products_promotion_rules
+  end
+end

data/lib/spree/promo/engine.rb

@@ -0,0 +1,59 @@
+module Spree
+  module Promo
+    class Engine < Rails::Engine
+      isolate_namespace Spree
+      engine_name 'spree_promo'
+
+      def self.activate
+        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+
+        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/overrides/*.rb')) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+
+        # Include list of visited paths in notification payload hash
+        Spree::Core::ControllerHelpers::InstanceMethods.class_eval do
+          def default_notification_payload
+            { :user => current_user, :order => current_order, :visited_paths => session[:visited_paths] }
+          end
+        end
+      end
+
+      config.autoload_paths += %W(#{config.root}/lib)
+      config.to_prepare &method(:activate).to_proc
+
+      initializer 'spree.promo.environment', :after => 'spree.environment' do |app|
+        app.config.spree.add_class('promotions')
+        app.config.spree.promotions = Spree::Promo::Environment.new
+      end
+
+      initializer 'spree.promo.register.promotion.calculators' do |app|
+        app.config.spree.calculators.add_class('promotion_actions_create_adjustments')
+        app.config.spree.calculators.promotion_actions_create_adjustments = [
+          Spree::Calculator::FlatPercentItemTotal,
+          Spree::Calculator::FlatRate,
+          Spree::Calculator::FlexiRate,
+          Spree::Calculator::PerItem,
+          Spree::Calculator::FreeShipping
+        ]
+      end
+
+      initializer 'spree.promo.register.promotions.rules' do |app|
+        app.config.spree.promotions.rules = [
+          Spree::Promotion::Rules::ItemTotal,
+          Spree::Promotion::Rules::Product,
+          Spree::Promotion::Rules::User,
+          Spree::Promotion::Rules::FirstOrder,
+          Spree::Promotion::Rules::LandingPage,
+          Spree::Promotion::Rules::UserLoggedIn]
+      end
+
+      initializer 'spree.promo.register.promotions.actions' do |app|
+        app.config.spree.promotions.actions = [Spree::Promotion::Actions::CreateAdjustment,
+          Spree::Promotion::Actions::CreateLineItems]
+      end
+    end
+  end
+end

data/lib/spree/promo/environment.rb

@@ -1,7 +1,7 @@
 module Spree
   module Promo
     class Environment
-      include EnvironmentExtension
+      include Core::EnvironmentExtension
 
       attr_accessor :rules, :actions
     end

data/lib/spree/promo.rb

@@ -0,0 +1,10 @@
+require 'spree/core'
+require 'spree/auth'
+
+module Spree
+  module Promo
+
+  end
+end
+
+require 'spree/promo/engine'