killbill-paypal-express 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 970b025716dc5389cd01ac25702ce931e3686296
-  data.tar.gz: faf8930e662f33a926a06c8d81c64740aa7c6d3c
+  metadata.gz: 913eedcc9a3244894dd570f66b759d51108ba7c6
+  data.tar.gz: dd6bfb8b20f9d073d4e001588bd7c0d10a0646f2
 SHA512:
-  metadata.gz: 3d3fbf7d32ed777c35a0da4d056a0bb2bbb0b328f3551d1381f1d8feb60cb96726051730cadec9321d345ce93f0fc57b52a5ea3ab8dc1eb8867c453454445fa1
-  data.tar.gz: 63c0b6a1eeeb30c105e2200b67394213a5d9f52bffe3e467bfcb2f2efbf3853132853ba01fe9b6ed398a66e9e7f27962bac5147d9e4ef8b1902405204684c1f1
+  metadata.gz: d90e70548f11dc0881ed4005f8e254a1c1f72a0eea876d20e6fe635cbfd15519d91891f94b2bb0abd1f505356eb9e025275281750d235160995c39c950b8813d
+  data.tar.gz: 93a62549de619d9d5bae207e1afaeb93080d5c6547436d21a964256cf936b28d514039e2b4f183eab4b328b8f6b6475ffc860471afd030aa21d9d701e87f7f13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-paypal-express (5.0.1)
+    killbill-paypal-express (5.0.2)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.53.0)

data/NEWS

@@ -1,3 +1,6 @@
+5.0.2
+    Make text on checkout button configurable (through review plugin property)
+
 5.0.1
     Always issue GetExpressCheckoutDetails during authorize or purchase to store payer info
     Store PayPal error codes

data/README.md

@@ -262,3 +262,4 @@ Below is a list of optional parameters for build_form_descriptor call. More deta
 | invoice_id                   | Your own invoice or tracking number. This will be overridden by order_id. |
 | notify_url                   | Your URL for receiving Instant Payment Notification (IPN) about this transaction. If you do not specify this value in the request, the notification URL from your Merchant Profile is used, if one exists.|
 | items                        | This parameter must be a JSON Array that contains a list of Hashes with keys of `name`, `number`, `quantity`, `amount`, `description`, `url` and `category`. |
+| review                       | If false, checkout button is set to Pay now. |

data/VERSION

@@ -1 +1 @@
-5.0.1
+5.0.2

data/lib/paypal_express/api.rb

@@ -263,12 +263,6 @@ module Killbill #:nodoc:
         end
       end
 
-      def to_express_checkout_url(response, kb_tenant_id, options = {})
-        payment_processor_account_id = options[:payment_processor_account_id] || :default
-        gateway                      = lookup_gateway(payment_processor_account_id, kb_tenant_id)
-        gateway.redirect_url_for(response.token)
-      end
-
       protected
 
       def get_active_merchant_module

data/lib/paypal_express/private_api.rb

@@ -34,7 +34,8 @@ module Killbill #:nodoc:
       def to_express_checkout_url(response, kb_tenant_id = nil, options = {})
         payment_processor_account_id = options[:payment_processor_account_id] || :default
         gateway                      = gateway(payment_processor_account_id, kb_tenant_id)
-        gateway.redirect_url_for(response.token)
+        review                       = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :review)
+        gateway.redirect_url_for(response.token, :review => review)
       end
 
       def get_external_keys_for_accounts(kb_account_ids, kb_tenant_id)

data/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing Paypal Express Checkout as a payment gateway</description>

data/spec/paypal_express/remote/baid_spec_helpers.rb

@@ -17,11 +17,13 @@ module Killbill
         kb_account_id = SecureRandom.uuid
         external_key, kb_account_id = create_kb_account(kb_account_id, @plugin.kb_apis.proxied_services[:account_user_api])
 
+        @private_plugin = ::Killbill::PaypalExpress::PrivatePaymentPlugin.new
+
         # Initiate the setup process
         response = create_token(kb_account_id, @call_context.tenant_id, options)
         token = response.token
 
-        login_and_confirm @plugin.to_express_checkout_url(response, @call_context.tenant_id)
+        login_and_confirm @private_plugin.to_express_checkout_url(response, @call_context.tenant_id)
 
         # Complete the setup process
         @properties = []
@@ -34,8 +36,7 @@ module Killbill
       private
 
       def create_token(kb_account_id, kb_tenant_id, options)
-        private_plugin = ::Killbill::PaypalExpress::PrivatePaymentPlugin.new
-        response = private_plugin.initiate_express_checkout(kb_account_id, kb_tenant_id, @amount, @currency, true, options)
+        response = @private_plugin.initiate_express_checkout(kb_account_id, kb_tenant_id, @amount, @currency, true, options)
         response.success.should be_true
         response
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement