flowcommerce-activemerchant 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863d0652e20731cf27b0aece10bef3a84f30591c2795edf5a5e4cff849e6113c
-  data.tar.gz: c43210cb05f3edb2a374f23c84a1a1019a45fddc2b31a95961644b27f077ad94
+  metadata.gz: 12d618c04585fcb8b16b30a3f616e0244cea8a07fccb85c949c901417b912a5b
+  data.tar.gz: 7b3622aa3affacf4a4154288107409681edce9f18da5684885d48df49f01ac77
 SHA512:
-  metadata.gz: fc9e5cc9e1c7833032104308bb743fd7a01b65f6b30745f325e54502b037d703d134ec608ee7a2e18cafec488000782da97da7d028f40216e288843b0b5dfb09
-  data.tar.gz: c6655876fc5a3efd3b950b4aa89cd41e64fe49ff7469fd4274f46e8f3e6b580fedd6fd4eabc9f61999b0a007793db524836248862347ca9a56e87861a4f7f42e
+  metadata.gz: e056b9217ddff93241d438b553d3a340bd3bddb039f5d99d502e5aff9f15521dc4c5a41af3742f0b3448241be5dcf4d120f7e21a5e4a610ad09724604c75055b
+  data.tar.gz: ccc956a2df1ffd950e419899d8f42f2254c32026912eb2c25fc7173b66d9374221e4824c2dde4bc0f47682818c4ad56121319ef1f372b1ddea6581f94815ee2c

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

@@ -6,7 +6,15 @@ require 'flowcommerce-reference'
 module ActiveMerchant
   module Billing
     class FlowGateway < Gateway
-      VERSION = '0.2.0' unless defined?(::ActiveMerchant::Billing::FlowGateway::VERSION)
+      unless defined?(::ActiveMerchant::Billing::FlowGateway::VERSION)
+        VERSION = File.read(File.expand_path("../../../../.version", File.dirname(__FILE__))).chomp
+
+        FORM_TYPES = [
+          :authorization_copy_form, :direct_authorization_form, :merchant_of_record_authorization_form,
+          :paypal_authorization_form, :redirect_authorization_form, :inline_authorization_form,
+          :card_authorization_form, :ach_authorization_form
+        ]
+      end
 
       self.display_name        = 'Flow.io Pay'
       self.homepage_url        = 'https://www.flow.io/'
@@ -14,6 +22,7 @@ module ActiveMerchant
       self.supported_countries = FlowCommerce::Reference::Countries::ISO_3166_2
       self.supported_cardtypes = FlowCommerce::Reference::PaymentMethods::SUPPORTED_CREDIT_CARDS
 
+
       def initialize options = {}
         @flow_api_key      = options[:api_key]      || ENV['FLOW_API_KEY']
         @flow_organization = options[:organization] || ENV['FLOW_ORGANIZATION']
@@ -27,24 +36,28 @@ module ActiveMerchant
       # Create a new authorization.
       # https://docs.flow.io/module/payment/resource/authorizations#post-organization-authorizations
       def authorize cc_or_token, order_number, opts={}
-        return error_response('Currency is a required option') unless opts[:currency]
+        unless opts[:currency]
+          return error_response('Currency is a required option')
+        end
 
-        opts[:discriminator] ||= 'merchant_of_record'
+        unless opts[:discriminator]
+          return error_response 'Discriminator is not defined, please choose one [%s]' % FORM_TYPES.join(', ')
+        end
+
+        unless FORM_TYPES.include?(opts[:discriminator].to_sym)
+          return error_response 'Discriminator [%s] not found, please choose one [%s]' % [opts[:discriminator], FORM_TYPES.join(', ')]
+        end
 
         body = {
-          amount:       opts[:amount] || 0.0,
-          currency:     opts[:currency],
-          token:        store(cc_or_token),
-          order_number: order_number
+          amount:        opts[:amount] || 0.0,
+          currency:      opts[:currency],
+          discriminator: opts[:discriminator],
+          token:         store(cc_or_token),
+          order_number:  order_number
         }
 
-        authorization_form = if opts[:discriminator].to_s.include?('merchant')
-          ::Io::Flow::V0::Models::MerchantOfRecordAuthorizationForm.new body
-        else
-          ::Io::Flow::V0::Models::DirectAuthorizationForm.new body
-        end
+        response = flow_instance.authorizations.post @flow_organization, body
 
-        response = flow_instance.authorizations.post @flow_organization, authorization_form
         Response.new true, 'Flow authorize - Success', { response: response }
       rescue => exception
         error_response exception
@@ -54,11 +67,13 @@ module ActiveMerchant
       def flow_get_authorization order_number:
         response = flow_instance.authorizations.get @flow_organization, order_number: order_number
         response.last
+      rescue => exception
+        error_response exception
       end
 
       # https://docs.flow.io/module/payment/resource/captures#post-organization-captures
       def capture amount, authorization_key, options={}
-        options[:currency] ||= 'USD'
+        return error_response('Currency is a required option') unless options[:currency]
 
         body = {
           authorization_id: authorization_key,
@@ -128,14 +143,6 @@ module ActiveMerchant
         error_response exception
       end
 
-      # store credit card with flow and get reference token
-      def store credit_card, options={}
-        response = cc_with_token credit_card
-        Response.new true, 'Credit card stored', { response: response, token: response.token }
-      rescue Io::Flow::V0::HttpClient::ServerError => exception
-        error_response exception
-      end
-
       # stores credit card and returns credit card Flow token String id
       def store input
         credit_card =
@@ -161,6 +168,23 @@ module ActiveMerchant
         response.token
       end
 
+      # Creates and order
+      # https://docs.flow.io/module/localization/resource/orders#post-organization-orders
+      def flow_create_order body, query_string={}
+        flow_instance.orders.post @flow_organization, body, query_string
+      rescue => exception
+        error_response exception
+      end
+
+      # Submits an order and
+      # pushes all subsequent authorizations from status "review" to "authorized"
+      # takes ~ 60 seconds
+      def flow_submission_by_number order_number
+        flow_instance.orders.put_submissions_by_number @flow_organization, order_number
+      rescue => exception
+        error_response exception
+      end
+
       private
 
       def flow_instance
@@ -189,10 +213,6 @@ module ActiveMerchant
       end
 
       def assert_currency currency, amount
-        unless currency.to_s.length == 3
-          raise ArgumentError.new('Currency is required if amount is provided')
-        end
-
         FlowCommerce::Reference::Currencies.find! currency
         amount.to_f
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce-activemerchant
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant