pay 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1005b0ddaa3f5c9f23ab4b6b81620b261331445fc1d3c865240351490d6d897f
-  data.tar.gz: 16531ff0cf034283445a6ce27ed950166f366db58fc89f152e9482b0385fa20c
+  metadata.gz: 300877c7b5a4a24f3796a7fe32c6deff0c2851a9a43d2c30ea86b69892384865
+  data.tar.gz: 6c6a7b986a3fe4fd2731dcf21ee9d3adb1a4fb05f6cc07060b51a0aa50566459
 SHA512:
-  metadata.gz: 44f3034d0afca7fe1bf8f2bb657a573fc4fd93376a24106d1f7f7872215fd6e35f7b3a4ce5e67f5a62355445f19f3edda55bd4a43c9d289f654c42088f10602a
-  data.tar.gz: 3f14506cdbf220dd09ef1b3d1a72008f50e0963208e24807bad8382725c0c74ff8f4f06f02b18f84a43036d362c6a180d934c51d1664c6c3df91e0efce50bdd6
+  metadata.gz: 2b0b709fb6e3a3f51b3f74774908775af8a9ef3ab71ca8b2981c9fc010ede85cf0b71d779659e0e3dfb185ba20dcc16d90b71140992bc5e7241711be9334add2
+  data.tar.gz: e22547e8e914cb70cc75d95bfd8414d1c5ca203e2cc7a8717416296c538b2123762499841b34aff655d74d7c7548a71d3f5de9f467af91acf6ee36d223f3b7d1

data/README.md

@@ -20,7 +20,7 @@ Want to add a new payment provider? Contributions are welcome and the instructio
 Add these lines to your application's Gemfile:
 
 ```ruby
-gem 'pay'
+gem 'pay', '~> 2.0'
 
 # To use Stripe, also include:
 gem 'stripe', '< 6.0', '>= 2.8'
@@ -30,7 +30,7 @@ gem 'stripe_event', '~> 2.3'
 gem 'braintree', '< 3.0', '>= 2.92.0'
 
 # To use Receipts
-gem 'receipts', '~> 0.2.2'
+gem 'receipts', '~> 1.0.0'
 ```
 
 And then execute:
@@ -100,6 +100,17 @@ you plan on doing more complex payments. It would be best to stick with
 a single payment provider in that case so you don't run into
 discrepancies.
 
+#### Braintree
+
+```yaml
+development:
+  braintree:
+    private_key: xxxx
+    public_key: yyyy
+    merchant_id: zzzz
+    environment: sandbox
+```
+
 #### Stripe
 
 You'll need to add your private Stripe API key to your Rails secrets `config/secrets.yml`, credentials `rails credentials:edit`
@@ -132,6 +143,10 @@ stripe listen --forward-to localhost:3000/pay/webhooks/stripe
 
 You should use `stripe.handleCardSetup` on the client to collect card information anytime you want to save the card and charge them later (adding a card, then charging them on the next page for example). Use `stripe.handleCardPayment` if you'd like to charge the customer immediately (think checking out of a shopping cart).
 
+The Javascript will now need to use createPaymentMethod instead of createToken. https://stripe.com/docs/js/payment_intents/create_payment_method
+
+The Javascript also needs to have a PaymentIntent or SetupIntent created server-side and the ID passed into the Javascript to do this. That way it knows how to safely handle the card tokenization if it meets the SCA requirements.
+
 **Payment Confirmations**
 
 Sometimes you'll have a payment that requires extra authentication. In this case, Pay provides a webhook and action for handling these payments. It will automatically email the customer and provide a link with the PaymentIntent ID in the url where the customer will be asked to fill out their name and card number to confirm the payment. Once done, they'll be redirected back to your application.
@@ -179,8 +194,8 @@ Pay.setup do |config|
 
   config.send_emails = true
 
-  config.automount_webhook_routes = true
-  config.routes_path = "/pay" # Only when automount_webhook_routes is true
+  config.automount_routes = true
+  config.routes_path = "/pay" # Only when automount_routes is true
 end
 ```
 
@@ -211,9 +226,12 @@ development:
   braintree:
     private_key: xxxx
     public_key: yyyy
+    merchant_id: aaaa
+    environment: sandbox
 ```
 
-You can also use the `STRIPE_PUBLIC_KEY`, `STRIPE_PRIVATE_KEY` and `STRIPE_SIGNING_SECRET` environment variables.
+For Stripe, you can also use the `STRIPE_PUBLIC_KEY`, `STRIPE_PRIVATE_KEY` and `STRIPE_SIGNING_SECRET` environment variables.
+For Braintree, you can also use `BRAINTREE_MERCHANT_ID`, `BRAINTREE_PUBLIC_KEY`, `BRAINTREE_PRIVATE_KEY`, and `BRAINTREE_ENVIRONMENT` environment variables.
 
 ### Generators
 

data/app/models/pay/subscription.rb

@@ -17,9 +17,9 @@ module Pay
 
     # Scopes
     scope :for_name, ->(name) { where(name: name) }
-    scope :on_trial, -> { where.not(trial_ends_at: nil).where("trial_ends_at > ?", Time.zone.now) }
+    scope :on_trial, -> { where.not(trial_ends_at: nil).where("#{table_name}.trial_ends_at > ?", Time.zone.now) }
     scope :cancelled, -> { where.not(ends_at: nil) }
-    scope :on_grace_period, -> { cancelled.where("ends_at > ?", Time.zone.now) }
+    scope :on_grace_period, -> { cancelled.where("#{table_name}.ends_at > ?", Time.zone.now) }
     scope :active, -> { where(ends_at: nil).or(on_grace_period).or(on_trial) }
     scope :incomplete, -> { where(status: :incomplete) }
     scope :past_due, -> { where(status: :past_due) }
@@ -82,7 +82,7 @@ module Pay
 
       send("#{processor}_resume")
 
-      update(ends_at: nil)
+      update(ends_at: nil, status: "active")
       self
     end
 

data/db/migrate/20170727235816_create_pay_charges.rb

@@ -1,4 +1,4 @@
-class CreatePayCharges < ActiveRecord::Migration[5.1]
+class CreatePayCharges < ActiveRecord::Migration[4.2]
   def change
     create_table :pay_charges do |t|
       t.references :owner

data/db/migrate/20190816015720_add_status_to_pay_subscriptions.rb

@@ -1,4 +1,4 @@
-class AddStatusToPaySubscriptions < ActiveRecord::Migration[5.2]
+class AddStatusToPaySubscriptions < ActiveRecord::Migration[4.2]
   def self.up
     add_column :pay_subscriptions, :status, :string
 

data/lib/pay/env.rb

@@ -13,10 +13,10 @@ module Pay
     # 3. Check unscoped credentials, then secrets
     def find_value_by_name(scope, name)
       ENV["#{scope.upcase}_#{name.upcase}"] ||
-        credentials.dig(env, scope, name) ||
-        secrets.dig(env, scope, name) ||
-        credentials.dig(scope, name) ||
-        secrets.dig(scope, name)
+        credentials&.dig(env, scope, name) ||
+        secrets&.dig(env, scope, name) ||
+        credentials&.dig(scope, name) ||
+        secrets&.dig(scope, name)
     end
 
     def env
@@ -28,7 +28,7 @@ module Pay
     end
 
     def credentials
-      Rails.application.credentials
+      Rails.application.credentials if Rails.application.respond_to?(:credentials)
     end
   end
 end

data/lib/pay/stripe/billable.rb

@@ -139,8 +139,8 @@ module Pay
 
         # Update the user's card on file if a token was passed in
         if card_token.present?
-          ::Stripe::PaymentMethod.attach(card_token, {customer: customer.id})
-          customer.invoice_settings.default_payment_method = card_token
+          payment_method = ::Stripe::PaymentMethod.attach(card_token, {customer: customer.id})
+          customer.invoice_settings.default_payment_method = payment_method.id
           customer.save
 
           update_stripe_card_on_file ::Stripe::PaymentMethod.retrieve(card_token).card

data/lib/pay/stripe/subscription.rb

@@ -11,7 +11,7 @@ module Pay
         subscription.save
 
         new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
-        update(ends_at: new_ends_at, status: :canceled)
+        update(ends_at: new_ends_at)
       rescue ::Stripe::StripeError => e
         raise Error, e.message
       end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby on Rails subscription engine.