erp_commerce 3.0.4 → 3.0.5

data/app/models/payment.rb

@@ -41,7 +41,7 @@ class Payment < ActiveRecord::Base
   end
 
   aasm_event :return do
-    transitions :to => :returned, :from => [:captured]
+    transitions :to => :returned, :from => [:pending, :captured]
   end
 
 end

data/db/migrate/20101103132342_pricing_migrations.rb

@@ -36,7 +36,7 @@ class PricingMigrations < ActiveRecord::Migration
         #support for simple assignment of a single money amount
         t.boolean :is_simple_amount
         t.integer :currency_id
-        t.float   :money_amount
+        t.decimal :money_amount, :precision => 8, :scale => 2
 
         t.timestamps
       end
@@ -62,7 +62,7 @@ class PricingMigrations < ActiveRecord::Migration
         #support for simple assignment of a single money amount
         t.boolean :is_simple_amount
         t.integer :currency_id
-        t.float   :money_amount
+        t.decimal :money_amount, :precision => 8, :scale => 2
 
         t.timestamps
 

data/lib/erp_commerce/active_merchant_wrappers/brain_tree_gateway_wrapper.rb

@@ -27,7 +27,7 @@ module ErpCommerce
           })
 
         if credit_card_result.valid?
-          cents = (amount.to_f * 100)
+          cents = (amount.to_d * 100)
           response = gateway.purchase(cents, credit_card_result)
 
           if response.success?

data/lib/erp_commerce/version.rb

@@ -2,7 +2,7 @@ module ErpCommerce
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_commerce
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
-  requirement: &70354152928260 !ruby/object:Gem::Requirement
+  requirement: &70320300633860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70354152928260
+  version_requirements: *70320300633860
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70354152927760 !ruby/object:Gem::Requirement
+  requirement: &70320300633360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70354152927760
+  version_requirements: *70320300633360
 - !ruby/object:Gem::Dependency
   name: erp_orders
-  requirement: &70354152927300 !ruby/object:Gem::Requirement
+  requirement: &70320300632900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354152927300
+  version_requirements: *70320300632900
 - !ruby/object:Gem::Dependency
   name: prismpay
-  requirement: &70354152926920 !ruby/object:Gem::Requirement
+  requirement: &70320300632520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354152926920
+  version_requirements: *70320300632520
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70354152926380 !ruby/object:Gem::Requirement
+  requirement: &70320300631980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70354152926380
+  version_requirements: *70320300631980
 description: The CompassAE Commerce Engine uses the engines that implement Parties,
   Products and Orders, and adds the ability to conduct commerce. It implements a pricing
   engine, fees, payment gateways.