spree_promo 0.60.6 → 0.70.RC1

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

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

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

@@ -5,42 +5,8 @@
   <%= render "admin/shared/edit_resource_links" %>
 <% end %>
 
-<fieldset id="rule_fields">
-  <legend><%= t(:rules) %></legend>
+<%= render 'rules' %>
 
-  <%= form_for(@promotion, :url => object_url, :html => { :method => :put }) do |f| %>
-    <p>
-      <% for policy in Promotion::MATCH_POLICIES %>
-        <label><%= f.radio_button :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 %>
-      <% 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), 'data-remote' => true,
-                                                                 :id => 'new_product_rule_form') do  %>
-    <% options = options_for_select( PromotionRule.rule_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>
-
-
-
-<% content_for :head do %>
-  <%= javascript_include_tag 'admin/promotions.js' %>
-  <%= stylesheet_link_tag 'admin/promotions.css' %>
-<% end %>
+<div id="actions_container">
+  <%= render 'actions' %>
+</div>

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

@@ -12,29 +12,27 @@
 <table class="index">
   <thead>
     <tr>
+      <th><%= t("name") %></th>
       <th><%= t("code") %></th>
       <th><%= t("description") %></th>
-      <th><%= t("combine") %></th>
       <th><%= t("usage_limit") %></th>
       <th><%= t("expiration") %></th>
-      <th><%= t("calculator") %></th>     
       <th width="150"><%= t("action") %></th>
     </tr>
   </thead>
   <tbody>
     <% for promotion in @promotions %>
       <tr id="<%= dom_id promotion %>">
+        <td><%= promotion.name %></td>
         <td><%= promotion.code %></td>
         <td><%= promotion.description %></td>
-        <td><%= promotion.combine ? t(:yes) : t(:no) %></td>
         <td><%= promotion.usage_limit %></td>
         <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-        <td><%= promotion.calculator.description if promotion.calculator %></td>
         <td>
-        	<%= link_to_edit promotion %> &nbsp;
-        	<%= link_to_delete promotion %>
+          <%= link_to_edit promotion %> &nbsp;
+          <%= link_to_delete promotion %>
         </td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/admin/promotions/rules/_landing_page.html.erb

@@ -0,0 +1,8 @@
+<p class="field">
+  <label for="<%= "#{param_prefix}_preferred_path" %>">
+    User must have visited the path:
+    <%= t('landing_page_rule.must_have_visited_path') %>
+    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :size => 10 %>
+  </label>
+</p>
+

data/app/views/admin/promotions/rules/_user_logged_in.html.erb

@@ -0,0 +1,3 @@
+<%# the spree promo code requires a partial exist.  That's why there's not much here %>
+<p class="field"><label>User must be logged in</label></p>
+

data/app/views/checkout/_coupon_code_field.html.erb

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

data/config/locales/en.yml

@@ -1,6 +1,6 @@
 ---
 en:
-  activerecord:
+  activemodel:
     attributes:
       promotion:
         name: "Name"
@@ -9,22 +9,34 @@ en:
         usage_limit: "Usage limit"
         starts_at: "Starts at"
         expires_at: "Expires at"
+  add_action_of_type: Add action of type
   add_rule_of_type: Add rule of type
+  advertise: Advertise
   coupon: Coupon
   coupon_code: Coupon code
   editing_promotion: Editing Promotion
   expiry: Expiry
   free_shipping: Free Shipping
-  may_be_combined_with_other_promotions: May be combined with other promotions
   new_promotion: New Promotion
   no_rules_added: No rules added
   promotion: Promotion
+  promotion_actions: Actions
   promotions: Promotions
   promotion_form:
     match_policies:
-      all: Match any of these rules
-      any: Match all of these rules
+      all: Match all of these rules
+      any: Match any of these rules
   promotions_description: Manage offers and coupons with promotions
+  promotion_action_types:
+    create_adjustment:
+      name: Create adjustment
+      description: Creates a promotion credit adjustment on the order
+    create_line_items:
+      name: Create line items
+      description: Populates the cart with the specified variants and quantities
+    give_store_credit:
+      name: Give store credit
+      description: Gives the user store credit of the amount specified
   promotion_rule_types:
     user:
       name: User
@@ -37,7 +49,13 @@ en:
       description: Order total meets these criteria
     first_order:
       name: First order
-      description: Must be the customer's first order
+      description: "Must be the customer's first order"
+    landing_page:
+      name: Landing Page
+      description: Customer must have visited the specified page
+    user_logged_in:
+      name: User Logged In
+      description: Available only to logged in users
   product_rule:
     choose_products: Choose products
     label: "Order must contain %{select} of these products"
@@ -53,3 +71,7 @@ en:
     operators:
       gt: greater than
       gte: greater than or equal to
+  landing_page_rule:
+    path: Path
+  promotion_action: Promotion Action
+  promotion_rule: Promotion Rule

data/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   namespace :admin do
     resources :promotions do
       resources :promotion_rules
+      resources :promotion_actions
     end
   end
 end

data/db/migrate/20101026184833_migrate_adjustments.rb

@@ -0,0 +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'")
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20110331094351_promotion_changes_to_subclass_of_activator.rb

@@ -0,0 +1,22 @@
+class PromotionChangesToSubclassOfActivator < ActiveRecord::Migration
+  def self.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"
+    end
+    rename_column :promotion_rules, :activator_id, :promotion_id
+  end
+end

data/db/migrate/20110404123358_create_promotion_actions.rb

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

data/db/migrate/20110601202923_create_promotion_action_line_items.rb

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

data/lib/spree_promo.rb

@@ -1,113 +1,36 @@
 require 'spree_core'
-require 'spree_promo_hooks'
+require 'spree_auth'
 
 module SpreePromo
   class Engine < Rails::Engine
-    def self.activate
-      # put class_eval and other logic that depends on classes outside of the engine inside this block
-      Product.class_eval do
-        has_and_belongs_to_many :promotion_rules
+    engine_name 'spree_promo'
 
-        def possible_promotions
-          rules_with_matching_product_groups = product_groups.map(&:promotion_rules).flatten
-          all_rules = promotion_rules + rules_with_matching_product_groups
-          promotion_ids = all_rules.map(&:promotion_id).uniq
-          Promotion.automatic.scoped(:conditions => {:id => promotion_ids})
-        end
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+       Rails.application.config.cache_classes ? require(c) : load(c)
       end
-
-      ProductGroup.class_eval do
-        has_many :promotion_rules
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
       end
 
-      Order.class_eval do
-
-        has_many :promotion_credits, :conditions => "source_type='Promotion'", :dependent => :destroy
-
-        attr_accessible :coupon_code
-        attr_accessor :coupon_code
-        before_save :process_coupon_code, :if => "@coupon_code.present?"
-        
-        def finalized?
-          self.class.finalized_states.include?(state)
-        end
-        
-        def self.finalized_states
-          ["complete", "awaiting_return", "returned"]
-        end
-
-        def promotion_credit_exists?(credit)
-          promotion_credits.reload.detect { |c| c.source_id == credit.id }
-        end
-
-        def process_coupon_code
-          coupon = Promotion.find(:first, :conditions => ["UPPER(code) = ?", @coupon_code.upcase])
-          if coupon
-            coupon.create_discount(self)
-          end
-        end
-
-        def products
-          line_items.map {|li| li.variant.product}
-        end
-
-        def update_totals(force_adjustment_recalculation=false)
-          self.payment_total = payments.completed.map(&:amount).sum
-          self.item_total = line_items.map(&:amount).sum
-
-          process_automatic_promotions unless finalized?
-
-          if force_adjustment_recalculation
-            applicable_adjustments, adjustments_to_destroy = adjustments.partition{|a| a.applicable?}
-            self.adjustments = applicable_adjustments
-            adjustments_to_destroy.each(&:destroy)
-          end
-
-          self.adjustment_total = self.adjustments.map(&:amount).sum
-          self.total            = self.item_total   + self.adjustment_total
-        end
-
-
-        def process_automatic_promotions
-          # recalculate amount
-          self.promotion_credits.each do |credit|
-            if credit.source.eligible?(self)
-              amount = credit.source.compute(self)
-              if credit.amount != amount
-                # avoid infinite callbacks
-                PromotionCredit.update_all("amount = #{amount}", { :id => credit.id })
-              end
-            else
-              credit.destroy
-            end
-          end
-          
-          current_promotions = self.promotion_credits.map(&:source)
-          # return if current promotions can not be combined
-          return if current_promotions.any? { |promotion| !promotion.combine? }
-          
-          new_promotions = eligible_automatic_promotions - current_promotions
-          new_promotions.each do |promotion|
-            next if current_promotions.present? && !promotion.combine?
-            amount = credit.source.compute(self)
-            if amount > 0
-              self.promotion_credits.create(
-                  :source => promotion,
-                  :amount => amount,
-                  :label  => promotion.name
-                )
-            end
-          end
-        end
-
-        def eligible_automatic_promotions
-          @eligible_automatic_coupons ||= Promotion.automatic.select{|c| c.eligible?(self)}
+      # Include list of visited paths in notification payload hash
+      SpreeBase::InstanceMethods.class_eval do
+        def default_notification_payload
+          {:user => current_user, :order => current_order, :visited_paths => session[:visited_paths]}
         end
       end
 
-      if File.basename( $0 ) != "rake"
-        # register promotion rules
-        [Promotion::Rules::ItemTotal, Promotion::Rules::Product, Promotion::Rules::User, Promotion::Rules::FirstOrder].each &:register
+      if Activator.table_exists?
+        # register promotion rules and actions
+        [Promotion::Rules::ItemTotal,
+         Promotion::Rules::Product,
+         Promotion::Rules::User,
+         Promotion::Rules::FirstOrder,
+         Promotion::Rules::LandingPage,
+         Promotion::Rules::UserLoggedIn,
+         Promotion::Actions::CreateAdjustment,
+         Promotion::Actions::CreateLineItems
+        ].each &:register
 
         # register default promotion calculators
         [
@@ -118,12 +41,13 @@ module SpreePromo
           Calculator::FreeShipping
         ].each{|c_model|
           begin
-            Promotion.register_calculator(c_model) if c_model.table_exists?
+            Promotion::Actions::CreateAdjustment.register_calculator(c_model) if c_model.table_exists?
           rescue Exception => e
             $stderr.puts "Error registering promotion calculator #{c_model}"
           end
         }
       end
+
     end
 
     config.autoload_paths += %W(#{config.root}/lib)

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 227
-  prerelease: 
+  hash: 11094103
+  prerelease: 5
   segments: 
   - 0
-  - 60
-  - 6
-  version: 0.60.6
+  - 70
+  - RC
+  - 1
+  version: 0.70.RC1
 platform: ruby
 authors: 
 - David North
@@ -15,25 +16,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 227
+        hash: 11094103
         segments: 
         - 0
-        - 60
-        - 6
-        version: 0.60.6
-  version_requirements: *id001
+        - 70
+        - RC
+        - 1
+        version: 0.70.RC1
   name: spree_core
-description: Required dependancy for Spree
+  type: :runtime
+  prerelease: false
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11094103
+        segments: 
+        - 0
+        - 70
+        - RC
+        - 1
+        version: 0.70.RC1
+  name: spree_auth
+  type: :runtime
+  prerelease: false
+  requirement: *id002
+description: Required dependency for Spree
 email: david@railsdog.com
 executables: []
 
@@ -42,48 +61,78 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- LICENSE
+- app/assets/javascripts/admin/promotions.js
+- app/assets/javascripts/admin/spree_promo.js
+- app/assets/javascripts/store/spree_promo.js
+- app/assets/stylesheets/admin/promotions.css
+- app/assets/stylesheets/admin/spree_promo.css
+- app/assets/stylesheets/store/spree_promo.css
+- app/controllers/admin/promotion_actions_controller.rb
 - app/controllers/admin/promotion_rules_controller.rb
 - app/controllers/admin/promotions_controller.rb
+- app/controllers/content_controller_decorator.rb
 - app/controllers/orders_controller_decorator.rb
+- app/models/adjustment_decorator.rb
 - app/models/calculator/free_shipping.rb
+- app/models/order_decorator.rb
+- app/models/product_decorator.rb
+- app/models/product_group_decorator.rb
+- app/models/promotion/actions/create_adjustment.rb
+- app/models/promotion/actions/create_line_items.rb
 - app/models/promotion/rules/first_order.rb
 - app/models/promotion/rules/item_total.rb
+- app/models/promotion/rules/landing_page.rb
 - app/models/promotion/rules/product.rb
 - app/models/promotion/rules/user.rb
+- app/models/promotion/rules/user_logged_in.rb
 - app/models/promotion.rb
-- app/models/promotion_credit.rb
+- app/models/promotion_action.rb
+- app/models/promotion_action_line_item.rb
 - app/models/promotion_rule.rb
+- app/overrides/promo_admin_tabs.rb
+- app/overrides/promo_coupon_code_field.rb
+- app/overrides/promo_product_properties.rb
+- app/views/admin/promotion_actions/create.js.erb
+- app/views/admin/promotion_actions/destroy.js.erb
 - app/views/admin/promotion_rules/create.js.erb
 - app/views/admin/promotion_rules/destroy.js.erb
+- app/views/admin/promotions/_actions.html.erb
 - app/views/admin/promotions/_form.html.erb
+- app/views/admin/promotions/_promotion_action.html.erb
 - app/views/admin/promotions/_promotion_rule.html.erb
+- app/views/admin/promotions/_rules.html.erb
 - app/views/admin/promotions/_tab.html.erb
+- app/views/admin/promotions/actions/_create_adjustment.html.erb
+- app/views/admin/promotions/actions/_create_line_items.html.erb
+- app/views/admin/promotions/actions/_give_store_credit.html.erb
 - app/views/admin/promotions/edit.html.erb
 - app/views/admin/promotions/index.html.erb
 - app/views/admin/promotions/new.html.erb
 - app/views/admin/promotions/rules/_first_order.html.erb
 - app/views/admin/promotions/rules/_item_total.html.erb
+- app/views/admin/promotions/rules/_landing_page.html.erb
 - app/views/admin/promotions/rules/_product.html.erb
 - app/views/admin/promotions/rules/_user.html.erb
+- app/views/admin/promotions/rules/_user_logged_in.html.erb
 - app/views/checkout/_coupon_code_field.html.erb
 - app/views/products/_promotions.html.erb
 - config/cucumber.yml
 - config/locales/en.yml
 - config/routes.rb
 - lib/spree_promo.rb
-- lib/spree_promo_hooks.rb
-- lib/tasks/install.rake
 - lib/tasks/promotions.rake
 - lib/tasks/promotions_extension_tasks.rake
 - db/migrate/20100419190933_rename_coupons_to_promotions.rb
-- db/migrate/20100419194457_fix_existing_coupon_credits.rb
 - db/migrate/20100426100726_create_promotion_rules.rb
 - db/migrate/20100501084722_match_policy_for_promotions.rb
 - db/migrate/20100501095202_create_promotion_rules_users.rb
 - db/migrate/20100502163939_name_for_promotions.rb
 - db/migrate/20100923095305_update_calculable_type_for_promotions.rb
-- public/javascripts/admin/promotions.js
-- public/stylesheets/admin/promotions.css
+- db/migrate/20101026184833_migrate_adjustments.rb
+- db/migrate/20110331094351_promotion_changes_to_subclass_of_activator.rb
+- db/migrate/20110404123358_create_promotion_actions.rb
+- db/migrate/20110601202923_create_promotion_action_line_items.rb
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -106,16 +155,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: spree_promo
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.