bankserv 0.6.4 → 0.6.5

data/.gitignore

@@ -5,3 +5,6 @@ pkg/*
 spec/internal/db/bankserv_test.sqlite
 spec/internal/config/database.yml
 *.rdb
+.rvmrc
+.ruby-version
+.ruby-gemset

data/lib/bankserv/credit.rb

@@ -41,6 +41,15 @@ module Bankserv
     def completed?
       status == "completed"
     end
+
+    def accepted?
+      status == "accepted"
+    end
+
+    def accept!
+      self.status = "accepted"
+      save!
+    end
     
     def standard?
       record_type == "standard"

data/lib/bankserv/transmission/input_document.rb

@@ -39,7 +39,7 @@ class Bankserv::InputDocument < Bankserv::Document
     document.set = Bankserv::Set.from_hash(options)
     document.set.document = document # whaaaaaa?
     document.save!
-    document      
+    document
   end
   
   def self.sets_with_work

data/lib/bankserv/transmission/output_document.rb

@@ -34,5 +34,9 @@ class Bankserv::OutputDocument < Bankserv::Document
     self.processed = true
     self.save
   end
+
+  def self.for_user_ref(user_ref)
+    where(type: 'output', user_ref: user_ref).first
+  end
   
 end

data/lib/bankserv/transmission/set/eft_output.rb

@@ -4,9 +4,44 @@ module Bankserv
   
     class EftOutput < Set
       
-     
+      def process
+        service = Bankserv::Service.active.select {|s| s.config[:user_code] == self.records.first.data[:bankserv_user_code]}.last
+
+        if !service.nil? && service.is_a?(Bankserv::CreditService)
+          self.sets.each do |set|
+            set.transactions.each do |trans|
+              ref = trans.reference.gsub(service.config[:client_abbreviated_name], "")
+              
+              credits = Bankserv::Credit.where(record_type: 'standard', action_date: trans.data[:transmission_date].to_date, 
+                amount: trans.data[:amount].to_i).where('lower(user_ref) = ?', ref.downcase).select do |credit|
+
+                # account_number = trans.data[:homing_account_number] ? 
+
+                credit.bank_account.account_number == trans.data[:homing_account_number] &&
+                credit.bank_account.account_name.downcase == trans.data[:homing_account_name].downcase
+              end
+
+              rejection_reason_description = Absa::H2h::Eft::RejectionCode.reason_for_code(trans.data[:rejection_reason]),
+              rejection_qualifier_description = Absa::H2h::Eft::RejectionCode.qualifier_for_code(trans.data[:rejection_qualifier])
+
+              if credits.count == 1
+                request_credits = Bankserv::Credit.where(bankserv_request_id: credits.first.bankserv_request_id)
+                request_credits.each do |c|
+                  c.update_attributes!({
+                    status: 'error',
+                    response: {
+                      reason: rejection_reason_description,
+                      description: rejection_qualifier_description
+                    }
+                  })
+                end
+              end
+            end
+          end
+        else
+          sets.each{|s| s.process}
+        end
+      end
     end
-   
   end
-  
-end
+end

data/lib/bankserv/transmission/set/reply.rb

@@ -6,7 +6,9 @@ module Bankserv
       
       def process
         input_document = Bankserv::InputDocument.for_user_ref(self.set.document.user_ref)
-        
+        #service = Bankserv::Service.active.select {|s| s.config[:user_code] == self.records.first.data[:user_code]}.last
+        service = Bankserv::Service.active.select {|s| s.client_code.to_i.to_s == self.records.first.data[:user_code]}.last
+
         transactions.each do |transaction|
           case transaction.record_type
           when "transmission_status"
@@ -39,6 +41,15 @@ module Bankserv
             set.save!
           when "accepted_report_reply"
             # what do we do here.. what is an accepted report reply?
+            if transaction.data[:accepted_report_transaction][4,2] == "12" # Contra record
+              if service.is_a? Bankserv::CreditService
+                user_ref = transaction.data[:accepted_report_transaction].match(/CONTRA([0-9]*)/)[1]
+                request_id = Bankserv::Credit.where(user_ref: user_ref)[0].bankserv_request_id
+                Bankserv::Credit.where(bankserv_request_id: request_id).each do |credit|
+                  credit.accept!
+                end
+              end
+            end
           when "rejected_message"
             if transaction.data[:user_sequence_number].to_i > 0
               set = input_document.set_with_generation_number(transaction.data[:user_code_generation_number])
@@ -56,4 +67,4 @@ module Bankserv
       end
     end
   end
-end
+end

data/lib/bankserv/version.rb

@@ -1,3 +1,3 @@
 module Bankserv
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/examples/empty_output.txt

@@ -0,0 +1,2 @@
+000L2012110500000RENTAL CONNECT PTY LTD        000021904136                                                                                                                                           
+999L000000002                                                                                                                                                                                         

data/spec/examples/failed_output_file.txt

@@ -0,0 +1,7 @@
+000L2014070900000RENTAL CONNECT PTY LTD        000118004136                                                                                                                                           
+010LA855000002309                                                                                                                                                                                     
+011LA85563200500000040833870010120140708                                                                                                                                                              
+013L1020140708000213000000000006235555489300000705000RAWSONPROPREFUND D ORDER      89981046000213                JOHANNES FAASEN                                                                      
+014L0000000000000000010000000623555548930000000000000000000000705000                                                                                                                                  
+019L0000000000000000010000000623555548930000000000000000000000705000                                                                                                                                  
+999L000000007                                                                                                                                                                                         

data/spec/examples/reply/accepted_reply.txt

@@ -0,0 +1,6 @@
+000L2014071200000RENTAL CONNECT PTY LTD        000119104136                                                                                                                       2349                
+900L000 TRANSMISSION 04136-0000348 ACCEPTED                                                                                                                                                           
+900L020 ACB USER SET A855-0006302-000002 ACCEPTED                                                                                                                                                     
+903L020L1063200504083414606A85500000100425500070285179100001725000140712880   RAWSONPROPDEPOSIT TO LL ALGOA THE SUNSET BEACH TRUST        00000000000000000000                21                      
+903L020L1263200504083414606A85500000263200504083414606100001725000140712100000RAWSONPROPCONTRA6378                                                                                                    
+999L000000006                                                                                                                                                                                         

data/spec/examples/simple_input_file.txt

@@ -0,0 +1,6 @@
+000L2014071204136RENTAL CONNECT PTY LTD        000034800000                                                                                                                       2349                
+020L04A8551407121407121407121407120000016302BATCH     YY                                                                                                                                              
+020L1063200504083414606A85500000100425500070285179100001725000140712880   RAWSONPROPDEPOSIT TO LL ALGOA THE SUNSET BEACH TRUST        00000000000000000000                21                          
+020L1263200504083414606A85500000263200504083414606100001725000140712100000RAWSONPROPCONTRA6378                                                                                                        
+020L92A855000001000002140712140712000001000001000001000001725000000001725000004153699785                                                                                                              
+999L000000006                                                                                                                                                                                         

data/spec/lib/bankserv/transmission/output_document_spec.rb

@@ -182,6 +182,8 @@ describe Bankserv::OutputDocument do
       @document.process!
    
       Bankserv::Debit.all.each do |debit|
+        puts debit.inspect
+
         (debit.completed? or debit.unpaid? or debit.redirect?).should be_true
      
         if debit.unpaid?
@@ -198,6 +200,41 @@ describe Bankserv::OutputDocument do
     end
 
   end
-  
-  
-end
+
+  context "Processing an output file with errors" do
+    before(:each) do
+      tear_it_down
+
+      @cs = Bankserv::CreditService.register(client_code: '04136', client_name: "RENTAL CONNECT PTY LTD", client_abbreviated_name: 'RAWSONPROP', user_code: "A855", generation_number: 6234, transmission_status: "L", transmission_number: "343")
+
+      @request = Bankserv::Request.create!({
+        type: "credit",
+        data: {
+          :type_of_service=>"BATCH", 
+          :batches=>[{
+            :debit=>{:account_number=>"4083387001", :id_number=>"", :initials=>"", :account_name=>"Blue Platinum Ventures (Busi. A/C)", :branch_code=>"632005", :account_type=>"current", 
+              :amount=>705000, :user_ref=>6231, :action_date=>"2014-07-08".to_date}, 
+            :credit=>{:account_number=>"62355554893", :id_number=>"5208105009082", :initials=>"", :account_name=>"Johannes Faasen", :branch_code=>"", :account_type=>"current", :amount=>705000, 
+              :user_ref=>"REFUND D Order", :action_date=>"2014-07-08".to_date}}]}
+      })
+
+      @request.service_id = @cs.id
+      @request.save!
+
+      Bankserv::Credit.all.each {|x| x.status="pending";x.save!}
+
+      @file_contents = File.open("./spec/examples/failed_output_file.txt", "rb").read
+      @options = Absa::H2h::Transmission::Document.hash_from_s(@file_contents, 'output')
+      
+      @document = Bankserv::OutputDocument.store(@file_contents)
+      @document.process!
+    end
+
+    it "should mark the payment as failed" do
+      Bankserv::Credit.all.each do |c|
+        c.error?.should be_true
+        c.response[:description].should == "TARGET ACCOUNT BRANCH INVALID"
+      end
+    end
+  end
+end

data/spec/lib/bankserv/transmission/reply_document_spec.rb

@@ -95,6 +95,45 @@ describe Bankserv::ReplyDocument do
       @input_document.reply_status.should == "ACCEPTED"
     end
   end
+
+  context "processing a reply file with 1 accepted transaction" do
+    before(:each) do
+      tear_it_down
+
+      @cs = Bankserv::CreditService.register(client_code: '04136', client_name: "RENTAL CONNECT PTY LTD", client_abbreviated_name: 'RAWSONPROP', user_code: "A855", generation_number: 6234, transmission_status: "L", transmission_number: "343")
+
+      @file_contents = File.open("./spec/examples/simple_input_file.txt", "rb").read
+      @input_document = Bankserv::InputDocument.store(@file_contents)
+
+      @request = Bankserv::Request.create!({
+        type: "credit",
+        data: {
+          :type_of_service=>"BATCH", 
+          :batches=>[{
+            :debit=>{:account_number=>"4083414606", :id_number=>"", :initials=>"", :account_name=>"Blue Platinum Ventures (Busi. A/C)", :branch_code=>"632005", :account_type=>"current", :amount=>1725000, :user_ref=>6378, :action_date=>"2014-07-12".to_date}, 
+            :credit=>{:account_number=>"070285179", :id_number=>"", :initials=>"", :account_name=>"The Sunset Beach Trust", :branch_code=>"004255", :account_type=>"cheque", :amount=>1725000, :user_ref=>"Deposit to LL Algoa", :action_date=>"2014-07-12".to_date}
+          }]
+        }
+      })
+
+      @request.service_id = @cs.id
+      @request.save!
+
+      Bankserv::Credit.all.each {|x| x.status="pending";x.save!}
+
+      @file_contents = File.open("./spec/examples/reply/accepted_reply.txt", "rb").read
+      #@options = Absa::H2h::Transmission::Document.hash_from_s(@file_contents, 'output')
+      
+      @document = Bankserv::ReplyDocument.store(@file_contents)
+      @document.process!
+    end
+
+    it "should mark the credit entries as accepted" do
+      Bankserv::Credit.all.each do |c|
+        c.accepted?.should be_true
+      end
+    end
+  end
   
   context "processing a reply file reporting that a transmission was rejected" do
     
@@ -141,6 +180,8 @@ describe Bankserv::ReplyDocument do
         record = @input_document.set.sets.last.transactions.first
         record.error[:code].should == "12345"
         record.error[:message].should == "HI THIS IS REJECTED MESSAGE"
+
+        puts record.inspect
       end
     end
     

metadata

@@ -1,126 +1,135 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bankserv
-version: !ruby/object:Gem::Version
-  version: 0.6.4
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 5
+  version: 0.6.5
 platform: ruby
-authors:
+authors: 
 - Jeffrey van Aswegen
 - Douglas Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-07-16 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: absa-h2h
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.6
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: absa-h2h
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 6
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: absa-esd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: absa-esd
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: absa-notify-me
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.7
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: absa-notify-me
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 7
         version: 0.0.7
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-description: ! "This engine allows users to inject requests into a queue to be processed.
-  \n    \n                    The queue handles bank account validations, credit payments,
-  debit orders\n                    and collecting bank statements/notify me statements. "
-email:
+  type: :development
+  version_requirements: *id007
+description: "This engine allows users to inject requests into a queue to be processed. \n    \n                    The queue handles bank account validations, credit payments, debit orders\n                    and collecting bank statements/notify me statements. "
+email: 
 - jeffmess@gmail.com
 - i.am.douglas.anderson@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
-- .rvmrc
 - Gemfile
 - Rakefile
 - bankserv.gemspec
@@ -173,12 +182,16 @@ files:
 - spec/examples/debit_eft_input_file.txt
 - spec/examples/eft_input_with_2_sets.txt
 - spec/examples/eft_output_file.txt
+- spec/examples/empty_output.txt
+- spec/examples/failed_output_file.txt
 - spec/examples/host2host/tmp.log
 - spec/examples/notify_me.xml
 - spec/examples/notify_me_with_one_record.xml
+- spec/examples/reply/accepted_reply.txt
 - spec/examples/reply/rejected_transmission.txt
 - spec/examples/reply/reply2.txt
 - spec/examples/reply/reply_file.txt
+- spec/examples/simple_input_file.txt
 - spec/examples/statement4_unpacked.dat
 - spec/examples/tmp/OUTPUT0412153500.txt
 - spec/examples/tmp/REPLY0412153000.txt
@@ -206,30 +219,39 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/tmp/readme
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: bankserv
-rubygems_version: 2.0.5
+rubygems_version: 1.3.7.1
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A rails 3 engine wrapped around the Absa Host 2 Host gem.
-test_files:
+test_files: 
 - spec/examples/INPUT.120410144410.txt
 - spec/examples/INPUT.120411110604.txt
 - spec/examples/INPUT.120411124123.txt
@@ -242,12 +264,16 @@ test_files:
 - spec/examples/debit_eft_input_file.txt
 - spec/examples/eft_input_with_2_sets.txt
 - spec/examples/eft_output_file.txt
+- spec/examples/empty_output.txt
+- spec/examples/failed_output_file.txt
 - spec/examples/host2host/tmp.log
 - spec/examples/notify_me.xml
 - spec/examples/notify_me_with_one_record.xml
+- spec/examples/reply/accepted_reply.txt
 - spec/examples/reply/rejected_transmission.txt
 - spec/examples/reply/reply2.txt
 - spec/examples/reply/reply_file.txt
+- spec/examples/simple_input_file.txt
 - spec/examples/statement4_unpacked.dat
 - spec/examples/tmp/OUTPUT0412153500.txt
 - spec/examples/tmp/REPLY0412153000.txt

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7124f93bcfc40e393754b61a660169bf5d01ef57
-  data.tar.gz: 2dced4072882c61b5d9b30dae0a0a9bc7dd4e2d0
-SHA512:
-  metadata.gz: e2545f4f98699249a2543555076ef822838001e079c99f05e405ee660d303d1c4943d2881e447c58d1cd31e7c987c65dafc8e75263f2b182dff48fa4318ad6c1
-  data.tar.gz: ec9b4ac02dd615e8e0a71ba61be79ad5819be6b17dd6a892979a5ad17098087497794dd3540838078969604c6e5b0892a0c6e5b882e3fbe50afb982bc3559e23

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@bankserv --create