pay 2.6.6 → 2.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab238996fb28cf924267575d0af02c0efce2a41a44571aced25144547c92cac
-  data.tar.gz: 3f038c66725ccee4d08be97baebed65ec51b9dbf5ae731970a4319334a7093b0
+  metadata.gz: c258d50a32d486777f2439f2fd2cd75e6cac1adba558afe630b9eda760c87717
+  data.tar.gz: 1f079e5382a0f8c3cda2e7b70b56c36162bc32926dae8b9c5226ed1c2e508160
 SHA512:
-  metadata.gz: 84d80003f9e6102750529c35618d1b7602c8361015dc61a32f361c22ae62f02384d60e2fc59ec04df8264e8a27e90bcd0a8381516db61a17b3bf3dcf39d7c4f7
-  data.tar.gz: 283b1e89926cd377b8204d96ca01cb4646e2cead0342ea212292731d7f22864799e1f7ed0c311afc4f5ba93781092820d36578c8a52767c0ad134b943f390b26
+  metadata.gz: ad9e9b98b5ed50f2e0f6599742b70f3c274afdc994949b445d921a5ae4451fbbaf2afcbad47e8d7d2a2c1b382fbb3ab3f97a85b2640048b937fab4d8dca10920
+  data.tar.gz: 21eaa1e667271af7f64e3e1f4544c8f1f6e11e32d3dec80e9e70b05159ac0a4ae9dba390b1e4f1a6cac6b8223df547ec8bc87bb7505425a365fe7a06b713c3ea

data/app/models/pay/subscription.rb

@@ -94,6 +94,11 @@ module Pay
       past_due? || incomplete?
     end
 
+    def change_quantity(quantity)
+      payment_processor.change_quantity(quantity)
+      update(quantity: quantity)
+    end
+
     def resume
       payment_processor.resume
       update(ends_at: nil, status: "active")
@@ -110,8 +115,8 @@ module Pay
       owner.invoice!(subscription_id: processor_id)
     end
 
-    def processor_subscription(options = {})
-      owner.processor_subscription(processor_id, options)
+    def processor_subscription(**options)
+      payment_processor.subscription(**options)
     end
 
     def latest_payment

data/app/views/pay/stripe/_checkout_button.html.erb

@@ -13,7 +13,7 @@
         sessionId: '<%= session.id %>'
       }).then(function (result) {
         if (result.error) {
-            document.getElementById('error-message').innerText = result.error.message;
+            document.getElementById("error-for-#{session.id}").innerText = result.error.message;
           }
       });
     });

data/db/migrate/20210423235138_add_currency_to_pay_charges.rb

@@ -0,0 +1,5 @@
+class AddCurrencyToPayCharges < ActiveRecord::Migration[6.1]
+  def change
+    add_column :pay_charges, :currency, :string
+  end
+end

data/lib/generators/active_record/templates/migration.rb

@@ -2,7 +2,7 @@
 
 class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    change_table :<%= table_name %> do |t|
+    change_table :<%= table_name %>, bulk: true do |t|
 <%= migration_data -%>
     end
   end

data/lib/pay/braintree/billable.rb

@@ -19,7 +19,9 @@ module Pay
       # Returns Braintree::Customer
       def customer
         if processor_id?
-          gateway.customer.find(processor_id)
+          customer = gateway.customer.find(processor_id)
+          update_card card_token if card_token.present?
+          customer
         else
           result = gateway.customer.create(
             email: email,

data/lib/pay/braintree/subscription.rb

@@ -23,6 +23,10 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        gateway.subscription.find(processor_id)
+      end
+
       def cancel
         subscription = processor_subscription
 

data/lib/pay/fake_processor/subscription.rb

@@ -19,6 +19,10 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        pay_subscription
+      end
+
       def cancel
         pay_subscription.update(ends_at: Time.current.end_of_month)
       end

data/lib/pay/paddle.rb

@@ -44,6 +44,13 @@ module Pay
       options.merge(owner_sgid: owner.to_sgid.to_s).to_json
     end
 
+    def self.owner_from_passthrough(passthrough)
+      passthrough_json = JSON.parse(passthrough)
+      GlobalID::Locator.locate_signed(passthrough_json["owner_sgid"])
+    rescue JSON::ParserError
+      nil
+    end
+
     def self.configure_webhooks
       Pay::Webhooks.configure do |events|
         events.subscribe "paddle.subscription_created", Pay::Paddle::Webhooks::SubscriptionCreated.new

data/lib/pay/paddle/subscription.rb

@@ -24,6 +24,13 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        hash = PaddlePay::Subscription::User.list({subscription_id: processor_id}, options).try(:first)
+        OpenStruct.new(hash)
+      rescue ::PaddlePay::PaddlePayError => e
+        raise Pay::Paddle::Error, e
+      end
+
       def cancel
         subscription = processor_subscription
         PaddlePay::Subscription::User.cancel(processor_id)

data/lib/pay/paddle/webhooks/subscription_created.rb

@@ -13,7 +13,7 @@ module Pay
             owner = Pay.find_billable(processor: :paddle, processor_id: event["user_id"])
 
             if owner.nil?
-              owner = owner_by_passtrough(event["passthrough"], event["subscription_plan_id"])
+              owner = Pay::Paddle.owner_from_passthrough(event["passthrough"])
               owner&.update!(processor: "paddle", processor_id: event["user_id"])
             end
 
@@ -44,15 +44,6 @@ module Pay
 
           subscription.save!
         end
-
-        private
-
-        def owner_by_passtrough(passthrough, product_id)
-          passthrough_json = JSON.parse(passthrough)
-          GlobalID::Locator.locate_signed(passthrough_json["owner_sgid"])
-        rescue JSON::ParserError
-          nil
-        end
       end
     end
   end

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -4,7 +4,17 @@ module Pay
       class SubscriptionPaymentSucceeded
         def call(event)
           billable = Pay.find_billable(processor: :paddle, processor_id: event["user_id"])
-          return unless billable.present?
+
+          if billable.nil?
+            billable = Pay::Paddle.owner_from_passthrough(event["passthrough"])
+            billable&.update!(processor: "paddle", processor_id: event["user_id"])
+          end
+
+          if billable.nil?
+            Rails.logger.error("[Pay] Unable to find Pay::Billable with owner: '#{event["passthrough"]}'. Searched these models: #{Pay.billable_models.join(", ")}")
+            return
+          end
+
           return if billable.charges.where(processor_id: event["subscription_payment_id"]).any?
 
           charge = create_charge(billable, event)

data/lib/pay/stripe.rb

@@ -11,6 +11,7 @@ module Pay
       autoload :CustomerDeleted, "pay/stripe/webhooks/customer_deleted"
       autoload :CustomerUpdated, "pay/stripe/webhooks/customer_updated"
       autoload :PaymentActionRequired, "pay/stripe/webhooks/payment_action_required"
+      autoload :PaymentIntentSucceeded, "pay/stripe/webhooks/payment_intent_succeeded"
       autoload :PaymentMethodUpdated, "pay/stripe/webhooks/payment_method_updated"
       autoload :SubscriptionCreated, "pay/stripe/webhooks/subscription_created"
       autoload :SubscriptionDeleted, "pay/stripe/webhooks/subscription_deleted"
@@ -50,6 +51,8 @@ module Pay
         events.subscribe "stripe.charge.succeeded", Pay::Stripe::Webhooks::ChargeSucceeded.new
         events.subscribe "stripe.charge.refunded", Pay::Stripe::Webhooks::ChargeRefunded.new
 
+        events.subscribe "stripe.payment_intent.succeeded", Pay::Stripe::Webhooks::PaymentIntentSucceeded.new
+
         # Warn user of upcoming charges for their subscription. This is handy for
         # notifying annual users their subscription will renew shortly.
         # This probably should be ignored for monthly subscriptions.

data/lib/pay/stripe/billable.rb

@@ -26,23 +26,22 @@ module Pay
       #
       # Returns Stripe::Customer
       def customer
-        if processor_id?
+        stripe_customer = if processor_id?
           ::Stripe::Customer.retrieve(processor_id)
         else
-          stripe_customer = ::Stripe::Customer.create(email: email, name: customer_name)
-          billable.update(processor: :stripe, processor_id: stripe_customer.id)
-
-          # Update the user's card on file if a token was passed in
-          if card_token.present?
-            payment_method = ::Stripe::PaymentMethod.attach(card_token, {customer: stripe_customer.id})
-            stripe_customer.invoice_settings.default_payment_method = payment_method.id
-            stripe_customer.save
-
-            update_card_on_file ::Stripe::PaymentMethod.retrieve(card_token).card
-          end
+          sc = ::Stripe::Customer.create(email: email, name: customer_name)
+          billable.update(processor: :stripe, processor_id: sc.id)
+          sc
+        end
 
-          stripe_customer
+        # Update the user's card on file if a token was passed in
+        if card_token.present?
+          payment_method = ::Stripe::PaymentMethod.attach(card_token, customer: stripe_customer.id)
+          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, invoice_settings: {default_payment_method: payment_method.id})
+          update_card_on_file(payment_method.card)
         end
+
+        stripe_customer
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -84,6 +83,7 @@ module Pay
         # Inherit trial from plan unless trial override was specified
         opts[:trial_from_plan] = true unless opts[:trial_period_days]
 
+        # Load the Stripe customer to verify it exists and update card if needed
         opts[:customer] = customer.id
 
         stripe_sub = ::Stripe::Subscription.create(opts)
@@ -198,8 +198,8 @@ module Pay
           payment_method_types: ["card"],
           mode: "payment",
           # These placeholder URLs will be replaced in a following step.
-          success_url: root_url,
-          cancel_url: root_url
+          success_url: options.delete(:success_url) || root_url,
+          cancel_url: options.delete(:cancel_url) || root_url
         }
 
         # Line items are optional
@@ -221,10 +221,11 @@ module Pay
       # checkout_charge(amount: 15_00, name: "T-shirt", quantity: 2)
       #
       def checkout_charge(amount:, name:, quantity: 1, **options)
+        currency = options.delete(:currency) || "usd"
         checkout(
           line_items: {
             price_data: {
-              currency: options[:currency] || "usd",
+              currency: currency,
               product_data: {name: name},
               unit_amount: amount
             },
@@ -237,7 +238,7 @@ module Pay
       def billing_portal(**options)
         args = {
           customer: processor_id,
-          return_url: options[:return_url] || root_url
+          return_url: options.delete(:return_url) || root_url
         }
         ::Stripe::BillingPortal::Session.create(args.merge(options))
       end

data/lib/pay/stripe/charge.rb

@@ -10,7 +10,7 @@ module Pay
       end
 
       def charge
-        ::Stripe::Charge.retrieve(processor_id)
+        ::Stripe::Charge.retrieve(id: processor_id, expand: ["customer", "invoice.subscription"])
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end

data/lib/pay/stripe/subscription.rb

@@ -23,6 +23,10 @@ module Pay
         @pay_subscription = pay_subscription
       end
 
+      def subscription(**options)
+        ::Stripe::Subscription.retrieve(options.merge(id: processor_id))
+      end
+
       def cancel
         subscription = processor_subscription
         subscription.cancel_at_period_end = true
@@ -41,6 +45,12 @@ module Pay
         raise Pay::Stripe::Error, e
       end
 
+      def change_quantity(quantity)
+        ::Stripe::Subscription.update(processor_id, quantity: quantity)
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
       def on_grace_period?
         canceled? && Time.zone.now < ends_at
       end

data/lib/pay/stripe/webhooks/payment_intent_succeeded.rb

@@ -0,0 +1,27 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentIntentSucceeded
+        def call(event)
+          object = event.data.object
+          billable = Pay.find_billable(processor: :stripe, processor_id: object.customer)
+
+          return unless billable.present?
+
+          object.charges.data.each do |charge|
+            next if billable.charges.where(processor_id: charge.id).any?
+
+            charge = Pay::Stripe::Billable.new(billable).save_pay_charge(charge)
+            notify_user(billable, charge)
+          end
+        end
+
+        def notify_user(billable, charge)
+          if Pay.send_emails && charge.respond_to?(:receipt)
+            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.6.6"
+  VERSION = "2.6.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.11
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - db/migrate/20170727235816_create_pay_charges.rb
 - db/migrate/20190816015720_add_status_to_pay_subscriptions.rb
 - db/migrate/20200603134434_add_data_to_pay_models.rb
+- db/migrate/20210423235138_add_currency_to_pay_charges.rb
 - lib/generators/active_record/pay_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/pay/email_views_generator.rb
@@ -188,13 +189,13 @@ files:
 - lib/pay/stripe/billable.rb
 - lib/pay/stripe/charge.rb
 - lib/pay/stripe/error.rb
-- lib/pay/stripe/merchant.rb
 - lib/pay/stripe/subscription.rb
 - lib/pay/stripe/webhooks/charge_refunded.rb
 - lib/pay/stripe/webhooks/charge_succeeded.rb
 - lib/pay/stripe/webhooks/customer_deleted.rb
 - lib/pay/stripe/webhooks/customer_updated.rb
 - lib/pay/stripe/webhooks/payment_action_required.rb
+- lib/pay/stripe/webhooks/payment_intent_succeeded.rb
 - lib/pay/stripe/webhooks/payment_method_updated.rb
 - lib/pay/stripe/webhooks/subscription_created.rb
 - lib/pay/stripe/webhooks/subscription_deleted.rb

data/lib/pay/stripe/merchant.rb

@@ -1,28 +0,0 @@
-module Pay
-  module Stripe
-    module Merchant
-      included do
-        store_accessor :stripe_connect_account_id
-      end
-
-      def create_account(**options)
-        defaults = {
-          type: "standard"
-        }
-
-        stripe_account = ::Stripe::Account.create(defaults.merge(options))
-        update(stripe_connect_account_id: stripe_account.id)
-        stripe_account
-      end
-
-      def account_link(refresh_url:, return_url:, type: "account_onboarding", **options)
-        Stripe::AccountLink.create({
-          account: stripe_connect_account_id,
-          refresh_url: refresh_url,
-          return_url: return_url,
-          type: type
-        })
-      end
-    end
-  end
-end