piggybak 0.4.32 → 0.4.33

data/VERSION

@@ -1 +1 @@
-0.4.32
+0.4.33

data/app/models/piggybak/order.rb

@@ -137,12 +137,15 @@ module Piggybak
       self.total += self.tax_charge
 
       shipments.each do |shipment|
-        if !shipment._destroy && (shipment.new_record? || shipment.status != 'shipped') && shipment.shipping_method
-          calculator = shipment.shipping_method.klass.constantize
-          shipment.total = calculator.rate(shipment.shipping_method, self)
+        if !shipment._destroy
+          if (shipment.new_record? || shipment.status != 'shipped') && shipment.shipping_method
+            calculator = shipment.shipping_method.klass.constantize
+            shipment.total = calculator.rate(shipment.shipping_method, self)
+          end
+
+          shipping_cast = ((shipment.total*100).to_i).to_f/100
+          self.total += shipping_cast
         end
-        shipping_cast = ((shipment.total*100).to_i).to_f/100
-        self.total += shipping_cast
       end
 
       payments_total = self.payments.inject(0) { |s, payment| s + payment.total }

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.32"
+  s.version = "0.4.33"
 
   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.32
+  version: 0.4.33
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &25437000 !ruby/object:Gem::Requirement
+  requirement: &16368940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25437000
+  version_requirements: *16368940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25435540 !ruby/object:Gem::Requirement
+  requirement: &16368100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *25435540
+  version_requirements: *16368100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25450800 !ruby/object:Gem::Requirement
+  requirement: &16367440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *25450800
+  version_requirements: *16367440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25448020 !ruby/object:Gem::Requirement
+  requirement: &16382980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25448020
+  version_requirements: *16382980
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &25444940 !ruby/object:Gem::Requirement
+  requirement: &16381860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *25444940
+  version_requirements: *16381860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &25459580 !ruby/object:Gem::Requirement
+  requirement: &16380920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25459580
+  version_requirements: *16380920
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &25455620 !ruby/object:Gem::Requirement
+  requirement: &16379700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25455620
+  version_requirements: *16379700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &25467980 !ruby/object:Gem::Requirement
+  requirement: &16378580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25467980
+  version_requirements: *16378580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &25466640 !ruby/object:Gem::Requirement
+  requirement: &16377360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25466640
+  version_requirements: *16377360
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &25465280 !ruby/object:Gem::Requirement
+  requirement: &16376180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25465280
+  version_requirements: *16376180
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &25464140 !ruby/object:Gem::Requirement
+  requirement: &16375040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25464140
+  version_requirements: *16375040
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &25462140 !ruby/object:Gem::Requirement
+  requirement: &16387720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25462140
+  version_requirements: *16387720
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &25476060 !ruby/object:Gem::Requirement
+  requirement: &16385500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25476060
+  version_requirements: *16385500
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &25472460 !ruby/object:Gem::Requirement
+  requirement: &16383600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25472460
+  version_requirements: *16383600
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &25470520 !ruby/object:Gem::Requirement
+  requirement: &16398800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25470520
+  version_requirements: *16398800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25469740 !ruby/object:Gem::Requirement
+  requirement: &16397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25469740
+  version_requirements: *16397860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &25484600 !ruby/object:Gem::Requirement
+  requirement: &16396700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25484600
+  version_requirements: *16396700
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &25482820 !ruby/object:Gem::Requirement
+  requirement: &16394860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25482820
+  version_requirements: *16394860
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &25481440 !ruby/object:Gem::Requirement
+  requirement: &16391900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25481440
+  version_requirements: *16391900
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &25480680 !ruby/object:Gem::Requirement
+  requirement: &13219320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25480680
+  version_requirements: *13219320
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -401,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4589883472526104963
+      hash: 1073319610754569272
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: