active_merchant-epsilon 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 796c4a13b9c534627b19fe2d6a4dd453fffc8e7f1f6c7fc52711d6c69d08d068
-  data.tar.gz: cdc35c37a721d174bcb4baaae539b7181d431c4542ea38787f6809af8dcc65c7
+  metadata.gz: a0e846e512a231038d3e3d1c9c873fbd143f9273b5300408a7eb01ea567db19f
+  data.tar.gz: be1757162ec55305ba5e37faf1f78a26164cb73a5207d5395a81da6e85346535
 SHA512:
-  metadata.gz: 825d06fe57d653ab355a609b7bc911da06064331c0cfde751bbad17d8712faf9b1a84cc1e3d5edced495c5e27d6120034c878b7f6cab4d29e554f625fb3cddb0
-  data.tar.gz: ae1f17b24a9605299929af24ce84fe78531f372dacfd7e721252bd2dc7d68e853e65e361e747334d3192fe3558fbbd5e5def50e9293305783b991bdd02a391ef
+  metadata.gz: 02e58bc1a1452e386fe6ffff3eb0fed57e6bd14791969c2449e7ef86f855b3fca0ea81571d02af544554d27de66a9eeb4dab8f120e0b55727666f9ec69c5287a
+  data.tar.gz: bebcb439e9eb71793f08faea283f15686c662062aaa222bf14ae75961cc812c3624e7959f61da87e7ee10241b5e55bf1440f851b85d113622bd894e3429a6149

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### 0.10.0
+
+* [Capture authorized payments](https://github.com/pepabo/active_merchant-epsilon/pull/112)
+
 ### 0.9.4
 
 * [Support Epsilon Link Payment instead of GMO Payment After Delivery](https://github.com/pepabo/active_merchant-epsilon/pull/110)

data/lib/active_merchant/billing/gateways/epsilon.rb

@@ -19,6 +19,7 @@ module ActiveMerchant #:nodoc:
         find_user:               'get_user_info.cgi',
         change_recurring_amount: 'change_amount_payment.cgi',
         find_order:              'getsales2.cgi',
+        capture:                 'sales_payment.cgi',
       }.freeze
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -51,6 +52,7 @@ module ActiveMerchant #:nodoc:
 
         params[:memo1] = detail[:memo1] if detail.has_key?(:memo1)
         params[:memo2] = detail[:memo2] if detail.has_key?(:memo2)
+        params[:kari_flag] = detail[:capture] ? 2 : 1 if detail.has_key?(:capture)
 
         commit(PATHS[:registered_purchase], params)
       end
@@ -83,6 +85,7 @@ module ActiveMerchant #:nodoc:
 
         params[:memo1] = detail[:memo1] if detail.has_key?(:memo1)
         params[:memo2] = detail[:memo2] if detail.has_key?(:memo2)
+        params[:kari_flag] = detail[:capture] ? 2 : 1 if detail.has_key?(:capture)
 
         commit(PATHS[:registered_recurring], params)
       end
@@ -182,6 +185,15 @@ module ActiveMerchant #:nodoc:
         commit(PATHS[:find_order], params, response_keys)
       end
 
+      def capture(order_number)
+        params = {
+          contract_code: self.contract_code,
+          order_number:  order_number,
+        }
+
+        commit(PATHS[:capture], params)
+      end
+
       private
 
       def billing_params(amount, payment_method, detail)
@@ -208,6 +220,7 @@ module ActiveMerchant #:nodoc:
 
         params[:memo1] = detail[:memo1] if detail.has_key?(:memo1)
         params[:memo2] = detail[:memo2] if detail.has_key?(:memo2)
+        params[:kari_flag] = detail[:capture] ? 2 : 1 if detail.has_key?(:capture)
 
         if detail.has_key?(:token)
           params[:token] = detail[:token]

data/lib/active_merchant/billing/gateways/epsilon/epsilon_base.rb

@@ -49,7 +49,8 @@ module ActiveMerchant #:nodoc:
         :acs_url,
         :pa_req,
         :receipt_number,
-        :receipt_date
+        :receipt_date,
+        :captured,
       ].freeze
 
       private

data/lib/active_merchant/billing/gateways/response_parser.rb

@@ -123,6 +123,10 @@ module ActiveMerchant #:nodoc:
         uri_decode(@xml.xpath(ResponseXpath::REDIRECT).to_s)
       end
 
+      def captured
+        @xml.xpath(ResponseXpath::CAPTURED).to_s != '1'
+      end
+
       def uri_decode(string)
         CGI.unescape(string).encode(Encoding::UTF_8, Encoding::CP932)
       end
@@ -153,6 +157,7 @@ module ActiveMerchant #:nodoc:
         PAYMENT_CODE                       = '//Epsilon_result/result[@payment_code]/@payment_code'
         AMOUNT                             = '//Epsilon_result/result[@amount]/@amount'
         REDIRECT                           = '//Epsilon_result/result[@redirect]/@redirect'
+        CAPTURED                           = '//Epsilon_result/result[@kari_flag]/@kari_flag'
       end
 
       module ResultCode

data/lib/active_merchant/epsilon/version.rb

@@ -1,5 +1,5 @@
 module ActiveMerchant
   module Epsilon
-    VERSION = "0.9.4"
+    VERSION = "0.10.0"
   end
 end

data/test/fixtures/vcr_cassettes/capture_failure.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/sales_payment.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&order_number=1234567890
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 12 Jun 2020 11:00:12 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml; charset=CP932
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="x-sjis-cp932"?>
+        <Epsilon_result>
+          <result err_code="810" />
+          <result err_detail="%91%CE%8F%DB%8E%E6%88%F8%82%CD%82%A0%82%E8%82%DC%82%B9%82%F1" />
+          <result result="9" />
+        </Epsilon_result>
+  recorded_at: Fri, 12 Jun 2020 11:00:14 GMT
+recorded_with: VCR 6.0.0

data/test/fixtures/vcr_cassettes/capture_success.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/sales_payment.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&order_number=O14289569
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 12 Jun 2020 11:00:16 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml; charset=CP932
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="x-sjis-cp932"?>
+        <Epsilon_result>
+          <result err_code="" />
+          <result err_detail="" />
+          <result result="1" />
+        </Epsilon_result>
+  recorded_at: Fri, 12 Jun 2020 11:00:17 GMT
+recorded_with: VCR 6.0.0

data/test/fixtures/vcr_cassettes/capture_success_authorize.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/direct_card_payment.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=U1591959614&user_name=YAMADA+Taro&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O14289569&st_code=10000-0000-0000&mission_code=1&kari_flag=1&item_price=100&process_code=1&card_number=4242424242424242&expire_y=2021&expire_m=10&card_st_code=&pay_time=&tds_check_code=&user_agent=ActiveMerchant%3A%3AEpsilon-0.9.4&memo1=memo1&memo2=memo2
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 12 Jun 2020 11:00:15 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml; charset=CP932
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="x-sjis-cp932"?>
+        <Epsilon_result>
+          <result acsurl="" />
+          <result err_code="" />
+          <result err_detail="" />
+          <result kari_flag="1" />
+          <result pareq="" />
+          <result result="1" />
+          <result trans_code="1362118" />
+        </Epsilon_result>
+  recorded_at: Fri, 12 Jun 2020 11:00:16 GMT
+recorded_with: VCR 6.0.0

data/test/fixtures/vcr_cassettes/purchase_with_capture_false_successful.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/direct_card_payment.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=U1591960355&user_name=YAMADA+Taro&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O35284193&st_code=10000-0000-0000&mission_code=1&item_price=1000&process_code=1&card_number=4242424242424242&expire_y=2021&expire_m=10&card_st_code=&pay_time=&tds_check_code=&user_agent=ActiveMerchant%3A%3AEpsilon-0.9.4&memo1=memo1&memo2=memo2&kari_flag=1
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 12 Jun 2020 11:12:35 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml; charset=CP932
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="x-sjis-cp932"?>
+        <Epsilon_result>
+          <result acsurl="" />
+          <result err_code="" />
+          <result err_detail="" />
+          <result kari_flag="1" />
+          <result pareq="" />
+          <result result="1" />
+          <result trans_code="1362123" />
+        </Epsilon_result>
+  recorded_at: Fri, 12 Jun 2020 11:12:37 GMT
+recorded_with: VCR 6.0.0

data/test/fixtures/vcr_cassettes/purchase_with_capture_true_successful.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://beta.epsilon.jp/cgi-bin/order/direct_card_payment.cgi
+    body:
+      encoding: UTF-8
+      string: contract_code=[CONTRACT_CODE]&user_id=U1591960357&user_name=YAMADA+Taro&user_mail_add=yamada-taro%40example.com&item_code=ITEM001&item_name=Greate+Product&order_number=O37368550&st_code=10000-0000-0000&mission_code=1&item_price=1000&process_code=1&card_number=4242424242424242&expire_y=2021&expire_m=10&card_st_code=&pay_time=&tds_check_code=&user_agent=ActiveMerchant%3A%3AEpsilon-0.9.4&memo1=memo1&memo2=memo2&kari_flag=2
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Connection:
+      - close
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 12 Jun 2020 11:12:37 GMT
+      Server:
+      - Apache
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - text/xml; charset=CP932
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="x-sjis-cp932"?>
+        <Epsilon_result>
+          <result acsurl="" />
+          <result err_code="" />
+          <result err_detail="" />
+          <result kari_flag="0" />
+          <result pareq="" />
+          <result result="1" />
+          <result trans_code="1362124" />
+        </Epsilon_result>
+  recorded_at: Fri, 12 Jun 2020 11:12:39 GMT
+recorded_with: VCR 6.0.0

data/test/remote/gateways/remote_epsilon_test.rb

@@ -72,6 +72,24 @@ class RemoteEpsilonGatewayTest < MiniTest::Test
     end
   end
 
+  def test_purchase_with_capture_true_successful
+    VCR.use_cassette(:purchase_with_capture_true_successful) do
+      response = gateway.purchase(1000, valid_credit_card, purchase_detail.merge(capture: true))
+
+      assert_equal true, response.success?
+      assert_equal true, response.params['captured']
+    end
+  end
+
+  def test_purchase_with_capture_false_successful
+    VCR.use_cassette(:purchase_with_capture_false_successful) do
+      response = gateway.purchase(1000, valid_credit_card, purchase_detail.merge(capture: false))
+
+      assert_equal true, response.success?
+      assert_equal false, response.params['captured']
+    end
+  end
+
   def test_purchase_fail
     VCR.use_cassette(:purchase_fail) do
       response = gateway.purchase(10000, invalid_credit_card, purchase_detail)
@@ -286,4 +304,27 @@ class RemoteEpsilonGatewayTest < MiniTest::Test
       assert_equal false, response.success?
     end
   end
+
+  def test_capture_success
+    detail = purchase_detail
+
+    VCR.use_cassette(:capture_success_authorize) do
+      purchase_response = gateway.purchase(100, valid_credit_card, detail.merge(capture: false))
+
+      assert_equal true, purchase_response.success?
+      assert_equal false, purchase_response.params['captured']
+    end
+
+    VCR.use_cassette(:capture_success) do
+      response = gateway.capture(detail[:order_number])
+      assert_equal true, response.success?
+    end
+  end
+
+  def test_capture_failure
+    VCR.use_cassette(:capture_failure) do
+      response = gateway.capture('1234567890')
+      assert_equal false, response.success?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_merchant-epsilon
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Kenichi TAKAHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -181,6 +181,9 @@ files:
 - test/fixtures/vcr_cassettes/autheticate_three_d_secure_card_successful.yml
 - test/fixtures/vcr_cassettes/cancel_recurring_fail.yml
 - test/fixtures/vcr_cassettes/cancel_recurring_successful.yml
+- test/fixtures/vcr_cassettes/capture_failure.yml
+- test/fixtures/vcr_cassettes/capture_success.yml
+- test/fixtures/vcr_cassettes/capture_success_authorize.yml
 - test/fixtures/vcr_cassettes/change_recurring_amount_failure.yml
 - test/fixtures/vcr_cassettes/change_recurring_amount_successful.yml
 - test/fixtures/vcr_cassettes/convenience_store_purchase_fail.yml
@@ -198,6 +201,8 @@ files:
 - test/fixtures/vcr_cassettes/installment_purchase_successful.yml
 - test/fixtures/vcr_cassettes/purchase_fail.yml
 - test/fixtures/vcr_cassettes/purchase_successful.yml
+- test/fixtures/vcr_cassettes/purchase_with_capture_false_successful.yml
+- test/fixtures/vcr_cassettes/purchase_with_capture_true_successful.yml
 - test/fixtures/vcr_cassettes/purchase_with_three_d_secure_card_successful.yml
 - test/fixtures/vcr_cassettes/purchase_with_verification_value.yml
 - test/fixtures/vcr_cassettes/recurring_fail.yml
@@ -252,6 +257,9 @@ test_files:
 - test/fixtures/vcr_cassettes/autheticate_three_d_secure_card_successful.yml
 - test/fixtures/vcr_cassettes/cancel_recurring_fail.yml
 - test/fixtures/vcr_cassettes/cancel_recurring_successful.yml
+- test/fixtures/vcr_cassettes/capture_failure.yml
+- test/fixtures/vcr_cassettes/capture_success.yml
+- test/fixtures/vcr_cassettes/capture_success_authorize.yml
 - test/fixtures/vcr_cassettes/change_recurring_amount_failure.yml
 - test/fixtures/vcr_cassettes/change_recurring_amount_successful.yml
 - test/fixtures/vcr_cassettes/convenience_store_purchase_fail.yml
@@ -269,6 +277,8 @@ test_files:
 - test/fixtures/vcr_cassettes/installment_purchase_successful.yml
 - test/fixtures/vcr_cassettes/purchase_fail.yml
 - test/fixtures/vcr_cassettes/purchase_successful.yml
+- test/fixtures/vcr_cassettes/purchase_with_capture_false_successful.yml
+- test/fixtures/vcr_cassettes/purchase_with_capture_true_successful.yml
 - test/fixtures/vcr_cassettes/purchase_with_three_d_secure_card_successful.yml
 - test/fixtures/vcr_cassettes/purchase_with_verification_value.yml
 - test/fixtures/vcr_cassettes/recurring_fail.yml