spree_promo 0.40.4 → 0.50.0

data/app/controllers/admin/promotion_rules_controller.rb

@@ -1,27 +1,27 @@
 class Admin::PromotionRulesController < Admin::BaseController
-  resource_controller         
+  resource_controller
   belongs_to :promotion
-  
-  create.response do |wants| 
+
+  create.response do |wants|
     wants.html { redirect_to edit_admin_promotion_path(parent_object) }
     wants.js { render :action => 'create', :layout => false}
   end
-  destroy.response do |wants| 
+  destroy.response do |wants|
     wants.html { redirect_to edit_admin_promotion_path(parent_object) }
     wants.js { render :action => 'destroy', :layout => false}
   end
 
   private
-  
+
     def build_object
       return @object if @object.present?
   		if params[:promotion_rule] && params[:promotion_rule][:type]
-  			@object = params[:promotion_rule][:type].constantize.new(object_params) 
+  			@object = params[:promotion_rule][:type].constantize.new(object_params)
   			@object.promotion = parent_object
   		else
   			@object = end_of_association_chain.build(object_params)
   		end
   		@object
     end
-  
+
 end

data/app/controllers/admin/promotions_controller.rb

@@ -1,18 +1,18 @@
 class Admin::PromotionsController < Admin::BaseController
-  resource_controller         
+  resource_controller
   before_filter :load_data
 
   update.wants.html { redirect_to edit_object_url }
   create.wants.html { redirect_to edit_object_url }
   destroy.success.wants.js { render_js_for_destroy }
 
-  private       
+  private
   def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params 
+    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
     @object.calculator = params[:promotion][:calculator_type].constantize.new if params[:promotion]
   end
-  
-  def load_data     
+
+  def load_data
     @calculators = Promotion.calculators
-  end  
+  end
 end

data/app/models/calculator/free_shipping.rb

@@ -19,6 +19,6 @@ class Calculator::FreeShipping < ::Calculator
 
     order.ship_total
   end
-  
+
 end
 

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

@@ -9,5 +9,4 @@ class Promotion::Rules::ItemTotal < PromotionRule
   def eligible?(order)
     order.item_total.send(preferred_operator == 'gte' ? :>= : :>, preferred_amount)
   end
-
 end

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

@@ -1,6 +1,6 @@
 # A rule to limit a promotion based on products in the order.
 # Can require all or any of the products to be present.
-# Valid products either come from assigned product group or are assingned directly to the rule. 
+# Valid products either come from assigned product group or are assingned directly to the rule.
 class Promotion::Rules::Product < PromotionRule
 
   belongs_to :product_group
@@ -13,7 +13,7 @@ class Promotion::Rules::Product < PromotionRule
   def eligible_products
     product_group ? product_group.products : products
   end
-  
+
   def eligible?(order)
     return true if eligible_products.empty?
     if preferred_match_policy == 'all'
@@ -22,19 +22,19 @@ class Promotion::Rules::Product < PromotionRule
       order.products.any? {|p| eligible_products.include?(p) }
     end
   end
-  
+
 
   def products_source=(source)
     if source.to_s == 'manual'
       self.product_group_id = nil
     end
   end
-  
+
   def product_ids_string
     product_ids.join(',')
   end
   def product_ids_string=(s)
     self.product_ids = s.to_s.split(',').map(&:strip)
   end
-    
+
 end

data/app/models/promotion.rb

@@ -3,12 +3,20 @@ class Promotion < ActiveRecord::Base
   calculated_adjustments
   alias credits promotion_credits
 
-  has_many :promotion_rules
+  has_many :promotion_rules, :autosave => true
   accepts_nested_attributes_for :promotion_rules
   alias_method :rules, :promotion_rules
 
   validates :name, :code, :presence => true
 
+  # TODO: Remove that after fix for https://rails.lighthouseapp.com/projects/8994/tickets/4329-has_many-through-association-does-not-link-models-on-association-save
+  # is provided
+  def save(*)
+    if super
+      promotion_rules.each { |p| p.save }
+    end
+  end
+
   MATCH_POLICIES = %w(all any)
 
   scope :automatic, where("code IS NULL OR code = ''")
@@ -41,12 +49,13 @@ class Promotion < ActiveRecord::Base
     if eligible?(order) and amount = calculator.compute(order)
       amount = order.item_total if amount > order.item_total
       order.promotion_credits.reload.clear unless combine? and order.promotion_credits.all? { |credit| credit.source.combine? }
-      order.promotion_credits.create({
+      order.update!
+      PromotionCredit.create!({
           :label => "#{I18n.t(:coupon)} (#{code})",
           :source => self,
-          :amount => -amount.abs
+          :amount => -amount.abs,
+          :order => order
         })
-      order.update!
     end
   end
 

data/app/models/promotion_credit.rb

@@ -23,7 +23,7 @@ class PromotionCredit < ::Adjustment
     amount = order.item_total if amount > order.item_total
     -1 * amount
   end
-  
+
   def total
     map(&:amount).sum
   end

data/app/models/promotion_rule.rb

@@ -2,9 +2,9 @@
 class PromotionRule < ActiveRecord::Base
 
   belongs_to :promotion
-  
+
   scope :of_type, lambda {|t| {:conditions => {:type => t}}}
-  
+
   def eligible?(order)
     raise 'eligible? should be implemented in a sub-class of Promotion::PromotionRule'
   end
@@ -18,9 +18,9 @@ class PromotionRule < ActiveRecord::Base
   def self.rule_classes
     @@rule_classes.to_a
   end
-  
+
   def self.rule_class_names
     PromotionRule.rule_classes.map(&:name)
   end
-  
+
 end

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

@@ -1 +1 @@
-jQuery('#<%= dom_id object %>').fadeOut();
+jQuery('#<%= dom_id object %>').fadeOut().remove();

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

@@ -1,6 +1,6 @@
 <%= render "shared/error_messages", :target => @promotion %>
 <fieldset id="general_fields">
-  <legend>General</legend>
+  <legend><%= t(:general) %></legend>
   <%= f.field_container :name do %>
     <%= f.label :name %><br />
     <%= f.text_field :name %>
@@ -19,14 +19,14 @@
   <%= f.field_container :combine do %>
     <label>
       <%= f.check_box :combine %> 
-      May be combined with other promotions
+      <%= t(:may_be_combined_with_other_promotions) %>
     </label>
   <% end %>
 
 </fieldset>
 
 <fieldset id="expiry_fields">
-  <legend>Expiry</legend>
+  <legend><%= t(:expiry) %></legend>
   <p>
     <%= f.label :usage_limit %><br />
     <%= f.text_field :usage_limit %>
@@ -34,11 +34,11 @@
 
   <p id="starts_at_field">
     <%= f.label :starts_at %>
-    <%= date_select :promotion, :starts_at, :prompt => true, :use_month_numbers => true %>
+    <%= f.spree_date_picker :starts_at, :prompt => true, :use_month_numbers => true %>
   </p>
   <p id="expires_at_field">
     <%= f.label :expires_at %>
-    <%= date_select :promotion, :expires_at, :prompt => true, :use_month_numbers => true %>
+    <%= f.spree_date_picker :expires_at, :prompt => true, :use_month_numbers => true %>
   </p>
 </fieldset>
 

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

@@ -6,8 +6,8 @@
 <% end %>
 
 <fieldset id="rule_fields">
-  <legend>Rules</legend>
-    
+  <legend><%= t(:rules) %></legend>
+
   <%= form_for(@promotion, :url => object_url, :html => { :method => :put }) do |f| %>
     <p>
       <% for policy in Promotion::MATCH_POLICIES %>
@@ -26,7 +26,8 @@
     </p>
   <% end %>
 
-  <%= form_tag(admin_promotion_promotion_rules_path(@promotion), 'data-remote' => true, :id => 'new_product_rule_form') do |f| %>
+  <%= 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>
@@ -34,7 +35,7 @@
       <input type="submit" value="<%= t('add') %>" />
     </p>
   <% end %>
-  
+
 </fieldset>
 
 

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

@@ -1,7 +1,7 @@
 <p class="field">
-  <label>
+  <label for="<%= "#{param_prefix}_preferred_amount" %>">
     Item total must be
     <%= 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) %>
     <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :size => 10 %>
   </label>
-</p>
+</p>

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

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

data/config/cucumber.yml

@@ -0,0 +1,10 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+ci_opts = "--format progress --strict"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+ci: <%= ci_opts %> features CI=true
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/config/locales/en.yml

@@ -4,7 +4,9 @@ en:
   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
   promotions: Promotions
@@ -34,6 +36,7 @@ en:
     product_source:
       group: From product group
       manual: Manually choose
+  rules: Rules
   user_rule:
     choose_users: Choose users
   item_total_rule:

data/db/migrate/20100426100726_create_promotion_rules.rb

@@ -3,11 +3,11 @@ class CreatePromotionRules < ActiveRecord::Migration
     create_table :promotion_rules do |t|
       t.references :promotion, :user, :product_group
       t.timestamps
-      t.string :type      
+      t.string :type
     end
     add_index :promotion_rules, :product_group_id
     add_index :promotion_rules, :user_id
-    
+
     create_table :products_promotion_rules do |t|
       t.integer :product_id, :promotion_rule_id
     end

data/db/migrate/20100501095202_create_promotion_rules_users.rb

@@ -5,7 +5,7 @@ class CreatePromotionRulesUsers < ActiveRecord::Migration
     end
     remove_column :promotion_rules_users, :id
     add_index :promotion_rules_users, :user_id
-    add_index :promotion_rules_users, :promotion_rule_id    
+    add_index :promotion_rules_users, :promotion_rule_id
   end
 
   def self.down

data/lib/spree_promo_hooks.rb

@@ -1,4 +1,4 @@
-class PromoHooks < Spree::ThemeSupport::HookListener
+class SpreePromoHooks < Spree::ThemeSupport::HookListener
 
   insert_after :admin_tabs do
     %(<%= tab(:promotions) %>)
@@ -6,4 +6,6 @@ class PromoHooks < Spree::ThemeSupport::HookListener
 
   insert_after :product_properties, 'products/promotions'
 
+  replace :coupon_code_field, 'checkout/coupon_code_field'
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 183
-  prerelease: 
+  hash: 215
+  prerelease: false
   segments: 
   - 0
-  - 40
-  - 4
-  version: 0.40.4
+  - 50
+  - 0
+  version: 0.50.0
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-03-23 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -64,7 +65,9 @@ files:
 - app/views/admin/promotions/rules/_item_total.html.erb
 - app/views/admin/promotions/rules/_product.html.erb
 - app/views/admin/promotions/rules/_user.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
@@ -81,6 +84,7 @@ files:
 - db/migrate/20100923095305_update_calculable_type_for_promotions.rb
 - public/javascripts/admin/promotions.js
 - public/stylesheets/admin/promotions.css
+has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -112,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_promo
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.