shop_bunny 0.7.4.1 → 0.7.4.2

data/lib/shop_bunny/cart_controller_module.rb

@@ -11,7 +11,11 @@ module ShopBunny
     end  
     
     def add_item
-      quantity = params[:quantity].to_i || 1
+      if !params[:quantity].blank?
+        quantity = params[:quantity].to_i
+      else
+        quantity = 1
+      end
       @cart.add_item(@item, :quantity => quantity) if @item
       respond_with @cart do |format|
         format.html { redirect_to :action => :show }

data/lib/shop_bunny/cart_module.rb

@@ -30,8 +30,7 @@ module ShopBunny
       self.cart_items.inject(0) {|sum,e| sum += e.quantity*e.item.price}
     end
 
-    # Calculates the total sum and applies the coupons discount! 
-    def total
+    def items_with_coupons
       sum = item_sum
 
       absolute_discount = coupons.sum(:discount_credit)
@@ -39,10 +38,12 @@ module ShopBunny
 
       sum -= absolute_discount
       sum *= relative_discount
-      
-      sum += shipping_costs
-      
-      [0, sum].max
+    end
+
+    # Calculates the total sum and applies the coupons discount! 
+    def total
+            
+      [0, items_with_coupons + shipping_costs].max
     end
     
     #increases the quantity of an article. creates a new one if it doesn't exist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: shop_bunny
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 99
   prerelease: false
   segments: 
   - 0
   - 7
   - 4
-  - 1
-  version: 0.7.4.1
+  - 2
+  version: 0.7.4.2
 platform: ruby
 authors: 
 - kopfmaschine.com
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: []