spree_promo 1.0.4 → 1.0.6

data/app/models/spree/promotion.rb

@@ -14,6 +14,11 @@ module Spree
     alias_method :actions, :promotion_actions
     accepts_nested_attributes_for :promotion_actions
 
+    attr_accessible :name, :event_name, :code, :match_policy,
+                :path, :advertise, :description, :usage_limit,
+                :starts_at, :expires_at, :promotion_rules_attributes,
+                :promotion_actions_attributes
+
     # TODO: This shouldn't be necessary with :autosave option but nested attribute updating of actions is broken without it
     after_save :save_rules_and_actions
     def save_rules_and_actions

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

@@ -21,11 +21,13 @@ module Spree
     # set to false if the amount is 0
     def create_adjustment(label, target, calculable, mandatory=false)
       amount = compute_amount(calculable)
-      target.adjustments.create(:amount => amount,
-                                :source => calculable,
-                                :originator => self,
-                                :label => label,
-                                :mandatory => mandatory)
+      target.adjustments.create({
+        :amount => amount,
+        :source => calculable,
+        :originator => self,
+        :label => label,
+        :mandatory => mandatory
+      }, :without_protection => true)
     end
 
     # Ensure a negative amount which does not exceed the sum of the order's item_total and ship_total

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

@@ -23,7 +23,10 @@ module Spree
       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)
+          promotion_action_line_items.create({
+            :variant => variant,
+            :quantity => quantity.to_i,
+          }, :without_protection => true)
         end
       end
     end

data/app/models/spree/promotion_action.rb

@@ -6,6 +6,8 @@ module Spree
 
     scope :of_type, lambda {|t| {:conditions => {:type => t}}}
 
+    attr_accessible :line_items_string, :calculator_type, :calculator_attributes
+
     # 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

data/app/models/spree/promotion_rule.rb

@@ -8,6 +8,8 @@ module Spree
     validate :promotion, :presence => true
     validate :unique_per_activator, :on => :create
 
+    attr_accessible :preferred_operator, :preferred_amount, :product, :product_ids_string, :preferred_match_policy
+
     def eligible?(order, options = {})
       raise 'eligible? should be implemented in a sub-class of Promotion::PromotionRule'
     end

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

@@ -36,8 +36,9 @@
       <%= text_field_tag :add_quantity, 1 %>
     </div>
     <div style="float:left; width:j0%">
-      &nbsp;<br />
-      <button class="add small"> <%= t(:add) %></button>
+      <button class="add small">
+        <span><%= t(:add) %></span>
+      </button>
     </div>
   </fieldset>
 </div>

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

@@ -4,12 +4,13 @@
 </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(Spree::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), { :include_blank => true } %></label>
 </p>
 <p class="field products_rule_products">
   <label>
     <%= t('product_rule.choose_products') %><br />
     <%= product_picker_field "#{param_prefix}[product_ids_string]", promotion_rule.product_ids_string %>
+  </label>
 </p>
 <p>
   <label>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70274021833360 !ruby/object:Gem::Requirement
+  requirement: &70126384777340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70274021833360
+  version_requirements: *70126384777340
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70274021832260 !ruby/object:Gem::Requirement
+  requirement: &70126384776440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70274021832260
+  version_requirements: *70126384776440
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1715588756916719145
+      hash: -3655872745788768709
 requirements:
 - none
 rubyforge_project: