spree_promo 0.50.4 → 0.60.0.RC1

data/app/controllers/admin/promotion_rules_controller.rb

@@ -1,27 +1,26 @@
 class Admin::PromotionRulesController < Admin::BaseController
-  resource_controller
-  belongs_to :promotion
-
-  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|
-    wants.html { redirect_to edit_admin_promotion_path(parent_object) }
-    wants.js { render :action => 'destroy', :layout => false}
+  def create
+    @promotion = Promotion.find(params[:promotion_id])
+    @promotion_rule = params[:promotion_rule][:type].constantize.new(params[:promotion_rule])
+    @promotion_rule.promotion = @promotion
+    if @promotion_rule.save
+      flash[:notice] = I18n.t(:successfully_created, :resource => I18n.t(:promotion_rule))
+    end
+    respond_to do |format|
+      format.html { redirect_to edit_admin_promotion_path(@promotion)}
+      format.js   { render :layout => false }
+    end
   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.promotion = parent_object
-  		else
-  			@object = end_of_association_chain.build(object_params)
-  		end
-  		@object
+  
+  def destroy
+    @promotion = Promotion.find(params[:promotion_id])
+    @promotion_rule = @promotion.promotion_rules.find(params[:id])
+    if @promotion_rule.destroy
+      flash[:notice] = I18n.t(:successfully_removed, :resource => I18n.t(:promotion_rule))
     end
-
+    respond_to do |format|
+      format.html { redirect_to edit_admin_promotion_path(@promotion)}
+      format.js   { render :layout => false }
+    end  
+  end
 end

data/app/controllers/admin/promotions_controller.rb

@@ -1,15 +1,18 @@
-class Admin::PromotionsController < Admin::BaseController
-  resource_controller
+class Admin::PromotionsController < Admin::ResourceController
   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 }
+  protected
 
-  private
-  def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
-    @object.calculator = params[:promotion][:calculator_type].constantize.new if params[:promotion]
+  def build_resource
+    @promotion = Promotion.new(params[:promotion])
+    if params[:promotion] && params[:promotion][:calculator_type]
+      @promotion.calculator = params[:promotion][:calculator_type].constantize.new
+    end
+    @promotion
+  end
+  
+  def location_after_save
+    edit_admin_promotion_url(@promotion)
   end
 
   def load_data

data/app/controllers/orders_controller_decorator.rb

@@ -0,0 +1,10 @@
+OrdersController.class_eval do
+  after_filter :clear_promotions
+
+  private
+  def clear_promotions
+    current_order.promotion_credits.destroy_all if current_order
+  end
+
+end
+

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

@@ -1,6 +1,6 @@
-jQuery('#rules').append('<%= escape_javascript( render(:partial => 'admin/promotions/promotion_rule', :object => object) ) %>');
-jQuery('#<%= dom_id object %>').hide();
-jQuery('#<%= dom_id object %>').fadeIn();
+jQuery('#rules').append('<%= escape_javascript( render(:partial => 'admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+jQuery('#<%= dom_id @promotion_rule %>').hide();
+jQuery('#<%= dom_id @promotion_rule %>').fadeIn();
 initProductRuleSourceField();
-jQuery('#<%= dom_id object %> .tokeninput.products').productPicker();
-jQuery('#<%= dom_id object %> .tokeninput.users').userPicker();
+jQuery('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
+jQuery('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();

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

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

data/config/locales/en.yml

@@ -18,6 +18,7 @@ en:
   may_be_combined_with_other_promotions: May be combined with other promotions
   new_promotion: New Promotion
   no_rules_added: No rules added
+  promotion: Promotion
   promotions: Promotions
   promotion_form:
     match_policies:
@@ -39,7 +40,7 @@ en:
       description: Must be the customer's first order
   product_rule:
     choose_products: Choose products
-    label: "Order must contain {{select}} of these products"
+    label: "Order must contain %{select} of these products"
     match_any: at least one
     match_all: all
     product_source:

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 223
-  prerelease: 
+  hash: 11094359
+  prerelease: 7
   segments: 
   - 0
-  - 50
-  - 4
-  version: 0.50.4
+  - 60
+  - 0
+  - RC
+  - 1
+  version: 0.60.0.RC1
 platform: ruby
 authors: 
 - David North
@@ -15,24 +17,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-05-03 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: spree_core
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id001
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   type: :runtime
-  prerelease: false
-  name: spree_core
+  version_requirements: *id001
 description: Required dependancy for Spree
 email: david@railsdog.com
 executables: []
@@ -44,6 +49,7 @@ extra_rdoc_files: []
 files: 
 - app/controllers/admin/promotion_rules_controller.rb
 - app/controllers/admin/promotions_controller.rb
+- app/controllers/orders_controller_decorator.rb
 - app/models/calculator/free_shipping.rb
 - app/models/promotion/rules/first_order.rb
 - app/models/promotion/rules/item_total.rb
@@ -83,6 +89,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: []
 
@@ -105,16 +112,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.4.2
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.