erp_commerce 3.0.2 → 3.0.3

data/app/models/accepted_credit_card.rb

@@ -0,0 +1,3 @@
+class AcceptedCreditCard < ActiveRecord::Base
+  belongs_to :organization
+end

data/app/models/credit_card_account.rb

@@ -1,6 +1,6 @@
 class CreditCardAccount < ActiveRecord::Base
   acts_as_biz_txn_account
-  
+
   belongs_to :credit_card_account_purpose
   has_one    :credit_card_account_party_role, :dependent => :destroy
   has_one    :credit_card, :through => :credit_card_account_party_role
@@ -31,7 +31,7 @@ class CreditCardAccount < ActiveRecord::Base
   #credit_card_to_use
   def authorize(financial_txn, cvv, gateway_wrapper, gateway_options={}, credit_card_to_use=nil)
     credit_card_to_use = self.credit_card unless credit_card_to_use
-    
+
     gateway_options[:debug] = true
     result = gateway_wrapper.authorize(credit_card_to_use, financial_txn.money.amount, cvv, gateway_options)
 
@@ -55,7 +55,7 @@ class CreditCardAccount < ActiveRecord::Base
   #credit_card_to_use
   def purchase(financial_txn, cvv, gateway_wrapper, gateway_options={}, credit_card_to_use=nil)
     credit_card_to_use = self.credit_card unless credit_card_to_use
-    
+
     gateway_options[:debug] = true
     result = gateway_wrapper.purchase(credit_card_to_use, financial_txn.money.amount, cvv, gateway_options)
 
@@ -85,11 +85,11 @@ class CreditCardAccount < ActiveRecord::Base
     #only capture this payment if it was authorized
     if !payment.nil? && payment.current_state.to_sym == :authorized
       gateway_options[:debug] = true
-      result = gateway_wrapper.capture(credit_card_to_use, payment, cvv,gateway_options)
+      result = gateway_wrapper.capture(credit_card_to_use, payment, cvv, gateway_options)
     end
     result
   end
-  
+
   #params
   #financial_txn
   #cvv
@@ -106,7 +106,7 @@ class CreditCardAccount < ActiveRecord::Base
     #only reverse this payment if it was authorized
     if !payment.nil? && payment.current_state.to_sym == :authorized
       gateway_options[:debug] = true
-
+      gateway_options[:amount] = financial_txn.money.amount
       result = gateway_wrapper.full_reverse_of_authorization(credit_card_to_use, payment, cvv, gateway_options)
     end
     result
@@ -115,9 +115,32 @@ class CreditCardAccount < ActiveRecord::Base
   def void
     # implement a void transaction of a transaction
   end
-  
+
   def refund
     # implement a refund on a card
   end
 
+  #params
+  #financial_txn
+  #gateway_wrapper
+  #
+  #Optional
+  #money_amount: amount to refund may be less than amount originally charged, so money_amount param is optional
+  #gateway_options
+  #credit_card_to_use
+  def void_or_return(financial_txn, gateway_wrapper, money_amount = nil, gateway_options={}, credit_card_to_use=nil)
+    credit_card_to_use = self.credit_card unless credit_card_to_use
+    result = {:success => true}
+
+    gateway_options[:debug] = true
+    if money_amount == nil
+      money_amount = financial_txn.money.amount
+    end
+    payment = Payment.where("reference_number = ? and financial_txn_id = ?",gateway_options[:ReferenceNumber], financial_txn.id).order('created_at desc').first
+    gateway_options[:debug] = true
+    result = gateway_wrapper.void_or_return(credit_card_to_use, payment, money_amount, gateway_options)
+
+    result
+  end
+
 end

data/app/models/extensions/organization.rb

@@ -0,0 +1,21 @@
+Organization.class_eval do
+  has_many :accepted_credit_cards, :dependent => :destroy
+
+  def accepted_ccs_for_select
+    #TODO fix model so the case statement below is no longer necessary
+    accepted_credit_cards = self.accepted_credit_cards
+    accepted_credit_cards_for_select = accepted_credit_cards.collect do |accepted_type|
+      case accepted_type.card_type
+      when "MC"
+        ["Mastercard", accepted_type.card_type]
+      when "VS"
+        ["Visa", accepted_type.card_type]
+      when "AM"
+        ["American Express", accepted_type.card_type]
+      when "DC"
+        ["Discover", accepted_type.card_type]
+      end
+    end
+  end
+end
+

data/app/models/payment.rb

@@ -14,6 +14,7 @@ class Payment < ActiveRecord::Base
   aasm_state :captured
   aasm_state :authorization_reversed
   aasm_state :canceled
+  aasm_state :returned
 
   aasm_event :cancel do
     transitions :to => :canceled, :from => [:pending]
@@ -38,4 +39,9 @@ class Payment < ActiveRecord::Base
   aasm_event :reverse_authorization do
       transitions :to => :authorization_reversed, :from => [:authorized]
   end
+
+  aasm_event :return do
+    transitions :to => :returned, :from => [:captured]
+  end
+
 end

data/db/migrate/20120618144337_create_accepted_credit_cards.rb

@@ -0,0 +1,11 @@
+class CreateAcceptedCreditCards < ActiveRecord::Migration
+  def change
+    create_table :accepted_credit_cards do |t|
+
+      t.references :organization
+      t.string :card_type
+
+      t.timestamps
+    end
+  end
+end

data/lib/erp_commerce/extensions/active_record/acts_as_fee.rb

@@ -1,23 +1,23 @@
 module ErpCommerce
-	module Extensions
-		module ActiveRecord
-			module ActsAsFee
-		    def self.included(base)
-          base.extend(ClassMethods)  	        	      	
+  module Extensions
+    module ActiveRecord
+      module ActsAsFee
+        def self.included(base)
+          base.extend(ClassMethods)
         end
 
-    		module ClassMethods
-      		def acts_as_fee
+        module ClassMethods
+          def acts_as_fee
             extend ActsAsFee::SingletonMethods
-    			  include ActsAsFee::InstanceMethods
-            
+            include ActsAsFee::InstanceMethods
+
             after_initialize :new_fee
             after_update     :save_fee
             after_save       :save_fee
-    				after_destroy    :destroy_fee
-            
+            after_destroy    :destroy_fee
+
             has_one :fee, :as => :fee_record
-        
+
             #from Fee
             [ :money, :money=,
               :fee_type, :fee_type=,
@@ -27,21 +27,21 @@ module ErpCommerce
               :external_identifier, :external_identifier=,
               :external_id_source, :external_id_source=,
               :created_at,
-              :updated_at 
+              :updated_at
             ].each { |m| delegate m, :to => :fee }
-											     			
-    		  end
 
-    		end
-  		
-    		module SingletonMethods			
-    		end
-				
-    		module InstanceMethods 
-          def fee
-            self.fee
           end
 
+        end
+
+        module SingletonMethods
+        end
+
+        module InstanceMethods
+          # def fee
+          #   self.fee
+          # end
+
           def new_fee
             if self.new_record? && self.fee == nil
               self.fee = Fee.new
@@ -49,16 +49,16 @@ module ErpCommerce
           end
 
           def save_fee
-          	self.fee.save_with_validation!
+            self.fee.save!
           end
 
           def destroy_fee
             if self.fee && !self.fee.frozen?
               self.fee.destroy
             end
-          end		  
-    	  end
-      end
-    end
-  end
-end
+          end
+        end #End ClassMethods module
+      end #End ActsAsFee module
+    end #End ActiveRecord module
+  end #End Extensions module
+end #End ErpCommerce module

data/lib/erp_commerce/version.rb

@@ -2,7 +2,7 @@ module ErpCommerce
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     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.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
-  requirement: &2161317020 !ruby/object:Gem::Requirement
+  requirement: &70240524474380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161317020
+  version_requirements: *70240524474380
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &2161316520 !ruby/object:Gem::Requirement
+  requirement: &70240524487240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *2161316520
+  version_requirements: *70240524487240
 - !ruby/object:Gem::Dependency
   name: erp_orders
-  requirement: &2161316060 !ruby/object:Gem::Requirement
+  requirement: &70240524483060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161316060
+  version_requirements: *70240524483060
 - !ruby/object:Gem::Dependency
   name: prismpay
-  requirement: &2161315680 !ruby/object:Gem::Requirement
+  requirement: &70240524537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161315680
+  version_requirements: *70240524537320
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &2161315140 !ruby/object:Gem::Requirement
+  requirement: &70240524534900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2161315140
+  version_requirements: *70240524534900
 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.
@@ -80,6 +80,7 @@ files:
 - app/controllers/erp_commerce/application_controller.rb
 - app/helpers/erp_commerce/application_helper.rb
 - app/mailers/checkout_mailer.rb
+- app/models/accepted_credit_card.rb
 - app/models/bank_account.rb
 - app/models/bank_account_type.rb
 - app/models/credit_card.rb
@@ -91,6 +92,7 @@ files:
 - app/models/extensions/currency.rb
 - app/models/extensions/financial_txn.rb
 - app/models/extensions/order_txn.rb
+- app/models/extensions/organization.rb
 - app/models/extensions/party.rb
 - app/models/extensions/product_instance.rb
 - app/models/extensions/product_type.rb
@@ -131,6 +133,7 @@ files:
 - db/migrate/20101103132342_pricing_migrations.rb
 - db/migrate/20110921150854_create_fees.rb
 - db/migrate/20120308220606_add_external_identifier_to_payments.rb
+- db/migrate/20120618144337_create_accepted_credit_cards.rb
 - db/migrate/upgrade/20120117170037_add_bank_account.rb
 - db/migrate/upgrade/20120117190924_add_credit_card_to_account_roles.rb
 - lib/erp_commerce/active_merchant_wrappers/bank_wrapper.rb
@@ -214,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The CompassAE Commerce Engine uses the engines that implement Parties, Products