piggybak 0.4.27 → 0.4.28

data/VERSION

@@ -1 +1 @@
-0.4.27
+0.4.28

data/app/models/piggybak/order.rb

@@ -78,15 +78,11 @@ module Piggybak
 
       adjustments.each do |adjustment|
         if !adjustment._destroy
-          self.total_due += adjustment.total
+          self.total_due -= adjustment.total
         end
       end
 
-      payments_total = payments.inject(0) do |payments_total, payment|
-        payments_total += payment.total 
-        payments_total
-      end 
-      self.total_due -= payments_total
+      self.total_due -= payments.sum(:total)
 
       !has_errors
     end
@@ -148,25 +144,23 @@ module Piggybak
       self.total += self.tax_charge
 
       shipments.each do |shipment|
-        if !shipment._destroy && (shipment.new_record? || shipment.status != "shipped") && shipment.shipping_method
+        if !shipment._destroy && shipment.new_record? && shipment.shipping_method
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
-          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
 
       self.total_due = self.total
 
       adjustments.each do |adjustment|
         if !adjustment._destroy
-          self.total_due += adjustment.total.to_f
+          self.total_due -= adjustment.total.to_f
         end
       end
 
-      payments.each do |payment|
-        self.total_due -= payment.total
-      end
+      self.total_due -= payments.sum(:total)
     end
 
     def update_status

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.27"
+  s.version = "0.4.28"
 
   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.27
+  version: 0.4.28
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &10549060 !ruby/object:Gem::Requirement
+  requirement: &20528960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10549060
+  version_requirements: *20528960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10546300 !ruby/object:Gem::Requirement
+  requirement: &20528160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10546300
+  version_requirements: *20528160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10899280 !ruby/object:Gem::Requirement
+  requirement: &20599940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *10899280
+  version_requirements: *20599940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10897760 !ruby/object:Gem::Requirement
+  requirement: &20598860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10897760
+  version_requirements: *20598860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &10896580 !ruby/object:Gem::Requirement
+  requirement: &20598000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *10896580
+  version_requirements: *20598000
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &10894860 !ruby/object:Gem::Requirement
+  requirement: &20595620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10894860
+  version_requirements: *20595620
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &10893000 !ruby/object:Gem::Requirement
+  requirement: &20593980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10893000
+  version_requirements: *20593980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &10873780 !ruby/object:Gem::Requirement
+  requirement: &20608320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10873780
+  version_requirements: *20608320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10883400 !ruby/object:Gem::Requirement
+  requirement: &20607340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10883400
+  version_requirements: *20607340
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &10880660 !ruby/object:Gem::Requirement
+  requirement: &20606260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10880660
+  version_requirements: *20606260
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &10580300 !ruby/object:Gem::Requirement
+  requirement: &20605340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10580300
+  version_requirements: *20605340
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &10579180 !ruby/object:Gem::Requirement
+  requirement: &20604600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10579180
+  version_requirements: *20604600
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &10576840 !ruby/object:Gem::Requirement
+  requirement: &20603780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10576840
+  version_requirements: *20603780
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &10587540 !ruby/object:Gem::Requirement
+  requirement: &20602920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10587540
+  version_requirements: *20602920
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &10591440 !ruby/object:Gem::Requirement
+  requirement: &20602180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10591440
+  version_requirements: *20602180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10610600 !ruby/object:Gem::Requirement
+  requirement: &21274380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10610600
+  version_requirements: *21274380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &10644820 !ruby/object:Gem::Requirement
+  requirement: &21272200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10644820
+  version_requirements: *21272200
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &10672420 !ruby/object:Gem::Requirement
+  requirement: &21269660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10672420
+  version_requirements: *21269660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &11087420 !ruby/object:Gem::Requirement
+  requirement: &21283920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11087420
+  version_requirements: *21283920
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11084200 !ruby/object:Gem::Requirement
+  requirement: &21282500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11084200
+  version_requirements: *21282500
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -400,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -207423252475420412
+      hash: -1406403027406831156
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: