shop_bunny 0.7.5 → 0.8.2

data/app/models/cart_item.rb

@@ -37,6 +37,13 @@ class CartItem < ActiveRecord::Base
     @parsed_raw_item
   end
 
+  def as_json(options={})
+    {
+      :quantity => quantity,
+      :id => item.id
+    }
+  end
+
   private
   
   def set_default_quantity

data/db/migrate/20110821124655_add_max_uses_to_coupon.rb

@@ -0,0 +1,9 @@
+class AddMaxUsesToCoupon < ActiveRecord::Migration
+  def self.up
+    add_column :coupons, :max_uses, :integer
+  end
+
+  def self.down
+    remove_column :coupons, :max_uses
+  end
+end

data/lib/shop_bunny/cart_module.rb

@@ -156,7 +156,7 @@ module ShopBunny
     def update_coupons
       Array(@coupon_code).each { |code|
         coupon = Coupon.find_by_code(code)
-        coupons << coupon if coupon && !coupons.include?(coupon)
+        coupons << coupon if coupon && !coupons.include?(coupon) && (coupon.max_uses.nil? || coupon.max_uses >= coupon.coupon_uses.count)
       }
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shop_bunny
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
-  - 7
-  - 5
-  version: 0.7.5
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - kopfmaschine.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,34 +30,35 @@ extra_rdoc_files: []
 
 files: 
 - lib/shop_bunny.rb
-- lib/shop_bunny/cart_module.rb
-- lib/shop_bunny/engine.rb
-- lib/shop_bunny/cart_controller_module.rb
-- lib/shop_bunny/shipping_cost_calculator.rb
 - lib/generators/shop_bunny/install_generator.rb
 - lib/generators/shop_bunny/templates/shopbunny_controller_template.rb
 - lib/generators/shop_bunny/templates/shopbunny_model_template.rb
+- lib/shop_bunny/cart_controller_module.rb
+- lib/shop_bunny/cart_module.rb
+- lib/shop_bunny/engine.rb
+- lib/shop_bunny/shipping_cost_calculator.rb
+- app/controllers/application_controller.rb
+- app/controllers/carts_controller.rb
 - app/views/carts/show.html.erb
-- app/models/coupon_use.rb
-- app/models/coupon.rb
-- app/models/cart.rb
 - app/models/item.rb
 - app/models/cart_item.rb
-- app/controllers/application_controller.rb
-- app/controllers/carts_controller.rb
-- db/migrate/20100915093821_create_coupon_uses.rb
+- app/models/cart.rb
+- app/models/coupon.rb
+- app/models/coupon_use.rb
 - db/migrate/20101125140137_add_value_of_automatic_add_to_coupons.rb
-- db/migrate/20100915091059_create_coupons.rb
+- db/migrate/20110821124655_add_max_uses_to_coupon.rb
+- db/migrate/20110202235446_add_raw_item_to_cart_items.rb
+- db/migrate/20110203005514_remove_item_id_from_cart_items.rb
+- db/migrate/20100902115757_create_cart_items.rb
 - db/migrate/20100915162029_remove_owner_id_from_carts.rb
+- db/migrate/20100916194407_set_default_column_value_for_cart_items_quantity.rb
+- db/migrate/20100915091059_create_coupons.rb
 - db/migrate/20101125151017_change_valid_from_and_until_to_datetime_on_coupons.rb
 - db/migrate/20100902115627_create_carts.rb
-- db/migrate/20100916194407_set_default_column_value_for_cart_items_quantity.rb
-- db/migrate/20110203005514_remove_item_id_from_cart_items.rb
-- db/migrate/20110202235446_add_raw_item_to_cart_items.rb
+- db/migrate/20100915093821_create_coupon_uses.rb
 - db/migrate/20100915073016_create_items.rb
-- db/migrate/20100902115757_create_cart_items.rb
-- config/initializers/shop_bunny.rb
 - config/initializers/machinist.rb
+- config/initializers/shop_bunny.rb
 - config/initializers/add_cart_finder_to_controllers.rb
 - config/routes.rb
 has_rdoc: true
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A shop template for your needs