offsite_payments 2.7.15 → 2.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08eae660757656fe9f67b2c2cc31dd8812bd20bb655f0f0a99d98a5ec15ed25
-  data.tar.gz: 3f660794dae2b6ae8c6a0584d22f1c47e21bf609863ef65c3ab720b383d65737
+  metadata.gz: a2e0672a8e0a12267fc92fcc1657e123f0aa8d94fd5304e63b582b3c59d80c81
+  data.tar.gz: 66da21cdb630a27b398df38c11e969af216c37010474d24d490d35b27a9f8f75
 SHA512:
-  metadata.gz: 37ea3d57a832e4c077445054584b61ad32e7860835beebd79dcf703a5bd8db0938f7aaf9f1bb3313a710f11aca6fba929ce10590f678f793d8215babb202946d
-  data.tar.gz: 2771bd599f5642e9353668d8190c5869a8b7b48ebded85cc3bc23df7c37c0312d5c07899429574c3795194f85c0186e922c9726582c55830829d6efd8d500977
+  metadata.gz: 8c0ef98cf6af576f7cc57121980b2b0fdb56017dc3124607db61d3f686cd5b49c4cf2604b7bfb59f8e50b92e4bd456b4d70426bdfc37d8f2378aee48f293487d
+  data.tar.gz: 5568e66d35842b06feb8a359d6c690ceb1d5a3c6621b289d38987122956ab1e0e812df5b224b6c93b22828df6531a3539921ed0f8ebcb4a703ac983c7a5f08ec

data/lib/offsite_payments/integrations/bit_pay.rb

@@ -71,7 +71,7 @@ module OffsitePayments #:nodoc:
 
           raise ActionViewHelperError, "Invalid response while retrieving BitPay Invoice ID. Please try again." unless invoice
 
-          {"id" => invoice['id']}
+          { "id" => extract_invoice_id(invoice) }
         end
 
         private
@@ -85,7 +85,7 @@ module OffsitePayments #:nodoc:
           request.content_type = "application/json"
           request.body = @fields.to_json
 
-          unless v2_api_token?(@account)
+          unless BitPay.v2_api_token?(@account)
             request.add_field("x-bitpay-plugin-info", "BitPay_Shopify_Client_v2.0.1906")
             request.basic_auth @account, ''
           end
@@ -93,6 +93,14 @@ module OffsitePayments #:nodoc:
           response = http.request(request)
           JSON.parse(response.body)
         end
+
+        def extract_invoice_id(invoice)
+          if BitPay.v2_api_token?(@account)
+            invoice['data']['id']
+          else
+            invoice['id']
+          end
+        end
       end
 
       class Notification < OffsitePayments::Notification

data/lib/offsite_payments/version.rb

@@ -1,3 +1,3 @@
 module OffsitePayments
-  VERSION = "2.7.15"
+  VERSION = "2.7.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offsite_payments
 version: !ruby/object:Gem::Version
-  version: 2.7.15
+  version: 2.7.16
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport