piggybak 0.4.35 → 0.4.36

data/VERSION

@@ -1 +1 @@
-0.4.35
+0.4.36

data/app/models/piggybak/order.rb

@@ -209,7 +209,15 @@ module Piggybak
     end
 
     def subtotal
-      self.line_items.inject(0) { |subtotal, li| subtotal + li.total }
+      v = 0
+
+      self.line_items.each do |line_item|
+        if !line_item._destroy
+          v += line_item.total 
+        end
+      end
+
+      v
     end
   end
 end

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.35"
+  s.version = "0.4.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.35
+  version: 0.4.36
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &20229980 !ruby/object:Gem::Requirement
+  requirement: &14521420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20229980
+  version_requirements: *14521420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20228500 !ruby/object:Gem::Requirement
+  requirement: &14519060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20228500
+  version_requirements: *14519060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20225460 !ruby/object:Gem::Requirement
+  requirement: &14517720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *20225460
+  version_requirements: *14517720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20239880 !ruby/object:Gem::Requirement
+  requirement: &14516380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20239880
+  version_requirements: *14516380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20238080 !ruby/object:Gem::Requirement
+  requirement: &14531200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *20238080
+  version_requirements: *14531200
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &20236780 !ruby/object:Gem::Requirement
+  requirement: &14530480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20236780
+  version_requirements: *14530480
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &20235880 !ruby/object:Gem::Requirement
+  requirement: &14529500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20235880
+  version_requirements: *14529500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20234820 !ruby/object:Gem::Requirement
+  requirement: &14528240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20234820
+  version_requirements: *14528240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20248380 !ruby/object:Gem::Requirement
+  requirement: &14524820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20248380
+  version_requirements: *14524820
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &20246740 !ruby/object:Gem::Requirement
+  requirement: &14538240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20246740
+  version_requirements: *14538240
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &20244700 !ruby/object:Gem::Requirement
+  requirement: &14534460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20244700
+  version_requirements: *14534460
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &20243200 !ruby/object:Gem::Requirement
+  requirement: &14547500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20243200
+  version_requirements: *14547500
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &20242000 !ruby/object:Gem::Requirement
+  requirement: &14540940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20242000
+  version_requirements: *14540940
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &20256140 !ruby/object:Gem::Requirement
+  requirement: &14554100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20256140
+  version_requirements: *14554100
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &20253920 !ruby/object:Gem::Requirement
+  requirement: &14550860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20253920
+  version_requirements: *14550860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20253180 !ruby/object:Gem::Requirement
+  requirement: &14549420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20253180
+  version_requirements: *14549420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20252440 !ruby/object:Gem::Requirement
+  requirement: &14563620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20252440
+  version_requirements: *14563620
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &20251360 !ruby/object:Gem::Requirement
+  requirement: &14562620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20251360
+  version_requirements: *14562620
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &20250780 !ruby/object:Gem::Requirement
+  requirement: &14560980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20250780
+  version_requirements: *14560980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20250180 !ruby/object:Gem::Requirement
+  requirement: &14560240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20250180
+  version_requirements: *14560240
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -401,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1505451960335473857
+      hash: -802126774348267360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: