piggybak 0.4.20 → 0.4.21

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.21

data/app/models/piggybak/order.rb

@@ -21,11 +21,12 @@ module Piggybak
     attr_accessor :recorded_changes
     attr_accessor :recorded_changer
     attr_accessor :was_new_record
+    attr_accessor :refund_amt
 
     validates_presence_of :status, :email, :phone, :total, :total_due, :tax_charge, :created_at, :ip_address, :user_agent
 
     after_initialize :initialize_nested, :initialize_request
-    before_validation :set_defaults, :manage_payment_adjustments
+    before_validation :set_defaults, :manage_adjustments
     after_validation :update_totals
     before_save :process_payments, :update_status, :set_new_record
     after_save :record_order_note
@@ -56,14 +57,12 @@ module Piggybak
       end
     end
 
-    def manage_payment_adjustments
-      payments.each do |payment|
-        if payment.refund_amt.present?
-          self.adjustments << Piggybak::Adjustment.new(:total => -1*payment.refund_amt.to_f,
-                                                       :note => "Refund against Payment ##{payment.id} given.", 
-                                                       :source_id => self.recorded_changer,
-                                                       :source_type => "User")
-        end
+    def manage_adjustments
+      if self.refund_amt.present?
+        self.adjustments << Piggybak::Adjustment.new(:total => -1*self.refund_amt.to_f,
+                                                     :note => "Refund recorded.",
+                                                     :source_id => self.recorded_changer,
+                                                     :source_type => "User")
       end
     end
 
@@ -94,9 +93,7 @@ module Piggybak
 
     def record_order_note
       if self.changed?
-        if self.was_new_record
-          self.recorded_changes << self.new_destroy_changes("created")
-        else
+        if !self.was_new_record
           self.recorded_changes << self.formatted_changes
         end
       end
@@ -154,7 +151,8 @@ module Piggybak
         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)
-          self.total += shipment.total
+          shipping_cast = ((shipment.total*100).to_i).to_f/100
+          self.total += shipping_cast
         end
       end
 

data/app/models/piggybak/payment.rb

@@ -12,7 +12,6 @@ module Piggybak
 
     attr_accessor :number
     attr_accessor :verification_value
-    attr_accessor :refund_amt
 
     def status_enum
       ["paid"]

data/lib/piggybak.rb

@@ -134,12 +134,29 @@ module Piggybak
             field :shipping_address do
               help "Required"
             end
-            field :line_items
-            field :shipments
+            field :line_items do
+              active true
+              help ""
+            end
+            field :shipments do
+              active true
+              help ""
+            end
+            field :adjustments do
+              active true
+              help ""
+            end
+            field :refund_amt do
+              label "Refund Amount"
+              visible do
+                !bindings[:object].new_record?
+              end 
+              help "This does not interact with the payment gateway."
+            end
             field :payments do
               active true
+              help ""
             end
-            field :adjustments
             field :order_notes do
               active true
             end
@@ -324,12 +341,6 @@ module Piggybak
               end
               help "This will automatically be calculated at the time of processing."
             end
-            field :refund_amt do
-              visible do
-                !bindings[:object].new_record?
-              end 
-              help "This does not interact with the payment gateway."
-            end
           end
         end
       

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.20"
+  s.version = "0.4.21"
 
   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.20
+  version: 0.4.21
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &16897980 !ruby/object:Gem::Requirement
+  requirement: &22533300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16897980
+  version_requirements: *22533300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16908660 !ruby/object:Gem::Requirement
+  requirement: &22547360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16908660
+  version_requirements: *22547360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16904040 !ruby/object:Gem::Requirement
+  requirement: &22546120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *16904040
+  version_requirements: *22546120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16911640 !ruby/object:Gem::Requirement
+  requirement: &22544860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16911640
+  version_requirements: *22544860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16924000 !ruby/object:Gem::Requirement
+  requirement: &22543840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *16924000
+  version_requirements: *22543840
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &16934680 !ruby/object:Gem::Requirement
+  requirement: &22542960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16934680
+  version_requirements: *22542960
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &16933400 !ruby/object:Gem::Requirement
+  requirement: &22542200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16933400
+  version_requirements: *22542200
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16931440 !ruby/object:Gem::Requirement
+  requirement: &22541440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16931440
+  version_requirements: *22541440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16930900 !ruby/object:Gem::Requirement
+  requirement: &22540500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16930900
+  version_requirements: *22540500
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &16930280 !ruby/object:Gem::Requirement
+  requirement: &22539560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16930280
+  version_requirements: *22539560
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16927880 !ruby/object:Gem::Requirement
+  requirement: &22554460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16927880
+  version_requirements: *22554460
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &16943060 !ruby/object:Gem::Requirement
+  requirement: &22553360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16943060
+  version_requirements: *22553360
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16942480 !ruby/object:Gem::Requirement
+  requirement: &22551700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16942480
+  version_requirements: *22551700
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &16941740 !ruby/object:Gem::Requirement
+  requirement: &22550000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16941740
+  version_requirements: *22550000
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &16940960 !ruby/object:Gem::Requirement
+  requirement: &22548840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16940960
+  version_requirements: *22548840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16940020 !ruby/object:Gem::Requirement
+  requirement: &22563100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16940020
+  version_requirements: *22563100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16938740 !ruby/object:Gem::Requirement
+  requirement: &22561740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16938740
+  version_requirements: *22561740
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &16937620 !ruby/object:Gem::Requirement
+  requirement: &22560500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16937620
+  version_requirements: *22560500
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &16936040 !ruby/object:Gem::Requirement
+  requirement: &22558980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16936040
+  version_requirements: *22558980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16950660 !ruby/object:Gem::Requirement
+  requirement: &22557620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16950660
+  version_requirements: *22557620
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -399,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1592593640259621563
+      hash: 3721385586488353139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: