piggybak 0.4.29 → 0.4.30

data/VERSION

@@ -1 +1 @@
-0.4.29
+0.4.30

data/app/models/piggybak/order.rb

@@ -68,6 +68,7 @@ module Piggybak
 
     def process_payments
       has_errors = false
+
       self.payments.each do |payment|
         if(!payment.process)
           has_errors = true
@@ -81,10 +82,12 @@ module Piggybak
         end
       end
 
+      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
+
       if adjustment_total > 0
-        self.total_due = (self.total + adjustment_total - payments.sum(:total)).round(2)
+        self.total_due = (self.total + adjustment_total - payments_total).round(2)
       else
-        self.total_due = (self.total - (adjustment_total + payments.sum(:total))).round(2)
+        self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
       end
 
       !has_errors
@@ -162,10 +165,12 @@ module Piggybak
         end
       end
 
+      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
+
       if adjustment_total > 0
-        self.total_due = (self.total + adjustment_total - payments.sum(:total)).round(2)
+        self.total_due = (self.total + adjustment_total - payments_total).round(2)
       else
-        self.total_due = (self.total - (adjustment_total + payments.sum(:total))).round(2)
+        self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
       end
     end
 

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.29"
+  s.version = "0.4.30"
 
   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.29
+  version: 0.4.30
   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: &13573800 !ruby/object:Gem::Requirement
+  requirement: &20786020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13573800
+  version_requirements: *20786020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13573000 !ruby/object:Gem::Requirement
+  requirement: &20785460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13573000
+  version_requirements: *20785460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13571640 !ruby/object:Gem::Requirement
+  requirement: &20784380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13571640
+  version_requirements: *20784380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13569920 !ruby/object:Gem::Requirement
+  requirement: &20861900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13569920
+  version_requirements: *20861900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &13569240 !ruby/object:Gem::Requirement
+  requirement: &20861240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *13569240
+  version_requirements: *20861240
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &13488640 !ruby/object:Gem::Requirement
+  requirement: &20860560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13488640
+  version_requirements: *20860560
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &13487640 !ruby/object:Gem::Requirement
+  requirement: &20859980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13487640
+  version_requirements: *20859980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13486800 !ruby/object:Gem::Requirement
+  requirement: &20857540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13486800
+  version_requirements: *20857540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13486080 !ruby/object:Gem::Requirement
+  requirement: &20854340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13486080
+  version_requirements: *20854340
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &13485460 !ruby/object:Gem::Requirement
+  requirement: &20165480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13485460
+  version_requirements: *20165480
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13484320 !ruby/object:Gem::Requirement
+  requirement: &20163780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13484320
+  version_requirements: *20163780
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &13483460 !ruby/object:Gem::Requirement
+  requirement: &20162420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13483460
+  version_requirements: *20162420
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13482620 !ruby/object:Gem::Requirement
+  requirement: &20161360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13482620
+  version_requirements: *20161360
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &13481680 !ruby/object:Gem::Requirement
+  requirement: &20947240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13481680
+  version_requirements: *20947240
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &13480980 !ruby/object:Gem::Requirement
+  requirement: &20945640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13480980
+  version_requirements: *20945640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13498760 !ruby/object:Gem::Requirement
+  requirement: &20944600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13498760
+  version_requirements: *20944600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &13496640 !ruby/object:Gem::Requirement
+  requirement: &20943180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13496640
+  version_requirements: *20943180
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &13494560 !ruby/object:Gem::Requirement
+  requirement: &20942020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13494560
+  version_requirements: *20942020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &13493040 !ruby/object:Gem::Requirement
+  requirement: &20940720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13493040
+  version_requirements: *20940720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13381560 !ruby/object:Gem::Requirement
+  requirement: &20939980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13381560
+  version_requirements: *20939980
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -400,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4416925623003314743
+      hash: 2520099593681375365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: