piggybak 0.4.17 → 0.4.18

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.4.18

data/app/models/piggybak/order.rb

@@ -119,7 +119,9 @@ module Piggybak
       self.total = 0
 
       self.line_items.each do |line_item|
-        self.total += line_item.total 
+        if !line_item._destroy
+          self.total += line_item.total 
+        end
       end
 
       self.tax_charge = TaxMethod.calculate_tax(self)
@@ -130,7 +132,9 @@ module Piggybak
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
         end
-        self.total += shipment.total
+        if !shipment._destroy
+          self.total += shipment.total
+        end
       end
 
       adjustments.each do |adjustment|

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.17"
+  s.version = "0.4.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-07-19"
+  s.date = "2012-07-20"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &13232420 !ruby/object:Gem::Requirement
+  requirement: &20819520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13232420
+  version_requirements: *20819520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13231660 !ruby/object:Gem::Requirement
+  requirement: &20818500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13231660
+  version_requirements: *20818500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13230400 !ruby/object:Gem::Requirement
+  requirement: &20817480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13230400
+  version_requirements: *20817480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13229000 !ruby/object:Gem::Requirement
+  requirement: &20816380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13229000
+  version_requirements: *20816380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &13227980 !ruby/object:Gem::Requirement
+  requirement: &20831860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *13227980
+  version_requirements: *20831860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &13243120 !ruby/object:Gem::Requirement
+  requirement: &20830780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13243120
+  version_requirements: *20830780
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &13241680 !ruby/object:Gem::Requirement
+  requirement: &20829880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13241680
+  version_requirements: *20829880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13240580 !ruby/object:Gem::Requirement
+  requirement: &20828840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13240580
+  version_requirements: *20828840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13239220 !ruby/object:Gem::Requirement
+  requirement: &20828080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13239220
+  version_requirements: *20828080
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &13238400 !ruby/object:Gem::Requirement
+  requirement: &20826400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13238400
+  version_requirements: *20826400
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13236840 !ruby/object:Gem::Requirement
+  requirement: &20824160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13236840
+  version_requirements: *20824160
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &13235440 !ruby/object:Gem::Requirement
+  requirement: &20837640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13235440
+  version_requirements: *20837640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13249000 !ruby/object:Gem::Requirement
+  requirement: &20835080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13249000
+  version_requirements: *20835080
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &13248220 !ruby/object:Gem::Requirement
+  requirement: &20833420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13248220
+  version_requirements: *20833420
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &13247460 !ruby/object:Gem::Requirement
+  requirement: &20832100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13247460
+  version_requirements: *20832100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13246840 !ruby/object:Gem::Requirement
+  requirement: &20842980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13246840
+  version_requirements: *20842980
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &13246280 !ruby/object:Gem::Requirement
+  requirement: &20855660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13246280
+  version_requirements: *20855660
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &13245720 !ruby/object:Gem::Requirement
+  requirement: &20851200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13245720
+  version_requirements: *20851200
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &13245040 !ruby/object:Gem::Requirement
+  requirement: &20863780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13245040
+  version_requirements: *20863780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13244480 !ruby/object:Gem::Requirement
+  requirement: &20861660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13244480
+  version_requirements: *20861660
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -399,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -676322752147894531
+      hash: 1443452007787843825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: