portmone 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe495560f190d3a31fb237722ead6975acee2d8460705856a3a17d00f4b09c0
-  data.tar.gz: 3f5bda3441a40f2f0ce357f2f6a1133955e07af80f7949abca07288f13884084
+  metadata.gz: 980c91387f0773f49b389434c6f23f1b6bc55d6ae06add5eca674a63f1f8c5dc
+  data.tar.gz: fc5894354208ecc4cd0c0f69958bcfbd61098b1c05efd0611d18c8e35889feb0
 SHA512:
-  metadata.gz: 8a4146876d8bf77f951d9a8723c09cd6b8fa16d825b6e4c292df138734b6548b8db2956fdd88facd40e9c3502ecffafb88aa93113066222411194eea3c7e62cd
-  data.tar.gz: 3ab543099ef5d69655a92ba9090b4aadfff063d83cca7d23f78d7f57e0fcfc20e51fcb36d3157b074b9e71cf92041d2a4137717fd16c541c2048e2b4d9edcf0d
+  metadata.gz: ccbbdf16e717828a105bdcbc40b1a46eeff82aaf00427b508e45f468e72d3f14839af92e4cfac3584f95d394d58a34471099b678fdc8d5892b14ba782c21adf0
+  data.tar.gz: b0834fa442c79c4fa22df054432e6cb18c99f1ab44636660c21daace7310f6dbae545ba75e52c717ea2ad1067a5e507298b96737d9b5401820250f10eeac94d4

data/Gemfile.lock

@@ -1,37 +1,41 @@
 PATH
   remote: .
   specs:
-    portmone (0.0.11)
+    portmone (0.0.15)
       activesupport
       faraday (~> 0.9)
+      faraday-detailed_logger
       money (~> 6.0)
       multi_xml (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
-    faraday (0.15.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
+    faraday-detailed_logger (2.3.0)
+      faraday (>= 0.8, < 2)
     hashdiff (0.3.7)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
-    money (6.13.4)
+    money (6.13.7)
       i18n (>= 0.6.4, <= 2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -61,7 +65,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     vcr (2.9.3)
@@ -69,6 +73,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/lib/portmone.rb

@@ -13,5 +13,6 @@ require 'portmone/responses/base_response'
 require 'portmone/responses/generate_url'
 require 'portmone/responses/order_status'
 require 'portmone/responses/refund_order_status'
-require 'portmone/responses/mobile_pay_response'
+require 'portmone/responses/mobile_pay'
+require 'portmone/responses/finish_3ds'
 require 'portmone/client'

data/lib/portmone/client.rb

@@ -42,10 +42,11 @@ module Portmone
 
     def order_status(shop_order_number, created_date: nil)
       if created_date
-        date = format_date(created_date)
+        start_date = created_date - 1.day
+        end_date = created_date + 1.day
         generic_report(shop_order_number: shop_order_number,
-                       start_date: date,
-                       end_date: date)
+                       start_date: format_date(start_date),
+                       end_date: format_date(end_date))
       else
         generic_report(shop_order_number: shop_order_number)
       end
@@ -83,6 +84,15 @@ module Portmone
       mobile_pay('APay', apple_pay_params, amount: amount, order_id: order_id, currency: currency)
     end
 
+    def finish_3ds(md:, pa_res:, shop_bill_id:)
+      params = {
+        method: 'confirmMpi',
+        params: { data: { 'MD': md.to_s, 'PaRes': pa_res.to_s, 'shopBillId': shop_bill_id.to_s } },
+        id: '1',
+      }
+      make_json_request(MOBILE_API_URL, params, Portmone::Responses::Finish3DS)
+    end
+
     private
 
     def mobile_pay(payment_method, payment_system_params, amount:, order_id:, currency:)
@@ -98,7 +108,7 @@ module Portmone
         .keep_if { |_, v| v.present? }
       params = { params: { data: data }, method: payment_method, id: 1 }
 
-      make_json_request(MOBILE_API_URL, params, Portmone::Responses::MobilePayResponse)
+      make_json_request(MOBILE_API_URL, params, Portmone::Responses::MobilePay)
     end
 
     def base_params
@@ -162,7 +172,7 @@ module Portmone
 
     def make_json_request(url, params, response_class)
       conn = Faraday.new(url: url) do |builder|
-        builder.response(:detailed_logger, @logger)
+        builder.response(:detailed_logger, @logger) if @logger
         builder.adapter Faraday.default_adapter
       end
 

data/lib/portmone/responses/finish_3ds.rb

@@ -0,0 +1,50 @@
+class Portmone::Responses::Finish3DS
+  SUCCESS_STATUS = 'PAYED'.freeze
+
+  attr_reader :response
+
+  def initialize(faraday_response, currency:, timezone:)
+    @response = faraday_response
+    @currency = currency
+    @timezone = timezone
+    @response_body = @response.body.present? ? JSON.parse(@response.body) : { 'result' => {} }
+  end
+
+  def http_status
+    response.status
+  end
+
+  def success?
+    result['status'] == SUCCESS_STATUS && !required_3ds?
+  end
+
+  def error_code
+    result['errorCode']
+  end
+
+  def error_description
+    result['error']
+  end
+
+  def required_3ds?
+    result['isNeed3DS'] == 'Y'
+  end
+
+  def acs_url
+    result['actionMPI']
+  end
+
+  def md
+    result['md']
+  end
+
+  def pa_req
+    result['pareq']
+  end
+
+  private
+
+  def result
+    @result ||= @response_body['result']
+  end
+end

data/lib/portmone/responses/mobile_pay.rb

@@ -0,0 +1,59 @@
+class Portmone::Responses::MobilePay
+  SUCCESS_STATUS = 'PAYED'.freeze
+  CREATED_STATUS = 'CREATED'.freeze
+
+  attr_reader :response
+
+  def initialize(faraday_response, currency:, timezone:)
+    @response = faraday_response
+    @response_body = JSON.parse(@response.body)
+    @currency = currency
+    @timezone = timezone
+  end
+
+  def http_status
+    response.status
+  end
+
+  def success?
+    result['status'] == SUCCESS_STATUS
+  end
+
+  def created?
+    result['status'] == CREATED_STATUS
+  end
+
+  def error_code
+    result['errorCode']
+  end
+
+  def error_description
+    result['error']
+  end
+
+  def required_3ds?
+    created? && result['isNeed3DS'] == 'Y'
+  end
+
+  def acs_url
+    result['actionMPI'] if required_3ds?
+  end
+
+  def md
+    result['md'] if required_3ds?
+  end
+
+  def pa_req
+    result['pareq'] if required_3ds?
+  end
+
+  def shop_bill_id
+    result['shopBillId']
+  end
+
+  private
+
+  def result
+    @result ||= @response_body['result']
+  end
+end

data/lib/portmone/version.rb

@@ -1,3 +1,3 @@
 module Portmone
-  VERSION = '0.0.11'
+  VERSION = '0.0.16'
 end

data/portmone.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '~> 0.9'
   spec.add_dependency 'money', '~> 6.0'
   spec.add_dependency 'multi_xml', '~> 0.5'
+  spec.add_dependency 'faraday-detailed_logger'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'minitest', '~> 5.0'
@@ -35,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.14'
   spec.add_development_dependency 'vcr', '~> 2.9'
   spec.add_development_dependency 'webmock', '~> 3.0'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portmone
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Alexander Sviridov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: faraday-detailed_logger
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -191,8 +205,9 @@ files:
 - lib/portmone.rb
 - lib/portmone/client.rb
 - lib/portmone/responses/base_response.rb
+- lib/portmone/responses/finish_3ds.rb
 - lib/portmone/responses/generate_url.rb
-- lib/portmone/responses/mobile_pay_response.rb
+- lib/portmone/responses/mobile_pay.rb
 - lib/portmone/responses/order_status.rb
 - lib/portmone/responses/refund_order_status.rb
 - lib/portmone/transaction.rb

data/lib/portmone/responses/mobile_pay_response.rb

@@ -1,28 +0,0 @@
-class Portmone::Responses::MobilePayResponse
-  SUCCESS_STATUS = 'PAYED'.freeze
-
-  attr_reader :response
-
-  def initialize(faraday_response, currency:, timezone:)
-    @response = faraday_response
-    @response_body = JSON.parse(@response.body)
-    @currency = currency
-    @timezone = timezone
-  end
-
-  def http_status
-    response.status
-  end
-
-  def success?
-    @response_body['result']['status'] == SUCCESS_STATUS
-  end
-
-  def error_code
-    @response_body['result']['errorCode']
-  end
-
-  def error_description
-    @response_body['result']['error']
-  end
-end