pay 6.7.1 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c599414b39eb92d44ee17f7ccb9de063c15eed29b0ea42d404f600df9966a8
-  data.tar.gz: 9d74f8b7307dfb0f5236c07356227dfb3f51dfa90e2e20a98beefa9a70d362a6
+  metadata.gz: de3a99204ee0e081f59774da0369b8e820a8d1fb33d810871dbc62ec009012c1
+  data.tar.gz: 19bbcd3c80230b270b2fc60338d410d6ceb37e2dc9466d1674f8552ecbdf46e9
 SHA512:
-  metadata.gz: b9b66934a36fedbd9bba2bbf01d3d4c97f32bf561d391919a980b3c95aa6ab59abcb0bf972c3f283707e8f578c329025525396f50a85e39a74572b7623467484
-  data.tar.gz: 7720adbb3990da1bb586a0be8f53d071ebce4bca693f37213b56a0987b8ecc865495abb56ad6ada95472e8af272bb07c407d14becdc346b16d9160358d76be78
+  metadata.gz: 0f504f26b84e856d1fd241e61537f1203539b76f58f9af69a768316e97e710ff24b5a79ac2179a1c335d5691283dc9e097476e696b1551ec212046f8dd97f026
+  data.tar.gz: 87e4ae3cc89868ed3faa76e3a73b0aaba568c87d33e7c1c003619c4fc69887edcce7fab67f3c40cb57924423a4f9c0b2328cebf1491164ae975c79f586fa7cb9

data/db/migrate/1_create_pay_tables.rb

@@ -1,7 +1,9 @@
 class CreatePayTables < ActiveRecord::Migration[6.0]
   def change
-    create_table :pay_customers do |t|
-      t.belongs_to :owner, polymorphic: true, index: false
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :pay_customers, id: primary_key_type do |t|
+      t.belongs_to :owner, polymorphic: true, index: false, type: foreign_key_type
       t.string :processor, null: false
       t.string :processor_id
       t.boolean :default
@@ -12,8 +14,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     add_index :pay_customers, [:owner_type, :owner_id, :deleted_at, :default], name: :pay_customer_owner_index
     add_index :pay_customers, [:processor, :processor_id], unique: true
 
-    create_table :pay_merchants do |t|
-      t.belongs_to :owner, polymorphic: true, index: false
+    create_table :pay_merchants, id: primary_key_type do |t|
+      t.belongs_to :owner, polymorphic: true, index: false, type: foreign_key_type
       t.string :processor, null: false
       t.string :processor_id
       t.boolean :default
@@ -22,8 +24,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_merchants, [:owner_type, :owner_id, :processor]
 
-    create_table :pay_payment_methods do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
+    create_table :pay_payment_methods, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
       t.string :processor_id, null: false
       t.boolean :default
       t.string :type
@@ -32,8 +34,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_payment_methods, [:customer_id, :processor_id], unique: true
 
-    create_table :pay_subscriptions do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
+    create_table :pay_subscriptions, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
       t.string :name, null: false
       t.string :processor_id, null: false
       t.string :processor_plan, null: false
@@ -56,9 +58,9 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     add_index :pay_subscriptions, [:metered]
     add_index :pay_subscriptions, [:pause_starts_at]
 
-    create_table :pay_charges do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
-      t.belongs_to :subscription, foreign_key: {to_table: :pay_subscriptions}, null: true
+    create_table :pay_charges, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
+      t.belongs_to :subscription, foreign_key: {to_table: :pay_subscriptions}, null: true, type: foreign_key_type
       t.string :processor_id, null: false
       t.integer :amount, null: false
       t.string :currency
@@ -70,11 +72,21 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_charges, [:customer_id, :processor_id], unique: true
 
-    create_table :pay_webhooks do |t|
+    create_table :pay_webhooks, id: primary_key_type do |t|
       t.string :processor
       t.string :event_type
       t.public_send Pay::Adapter.json_column_type, :event
       t.timestamps
     end
   end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
 end

data/lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb

@@ -5,11 +5,11 @@ module Pay
     module Webhooks
       class SubscriptionChargedUnsuccessfully
         def call(event)
-          subscription = event.subscription
-          return if subscription.nil?
+          # subscription = event.subscription
+          # return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
+          # pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
+          # return unless pay_subscription.present?
 
           # pay_customer = pay_subscription.customer
           # pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)

data/lib/pay/stripe/billable.rb

@@ -77,20 +77,17 @@ module Pay
         )
       end
 
+      # Charges an amount to the customer's default payment method
       def charge(amount, options = {})
         add_payment_method(payment_method_token, default: true) if payment_method_token?
 
         payment_method = pay_customer.default_payment_method
         args = {
-          amount: amount,
           confirm: true,
-          currency: "usd",
-          customer: processor_id,
-          expand: ["latest_charge.refunds"],
           payment_method: payment_method&.processor_id
         }.merge(options)
 
-        payment_intent = ::Stripe::PaymentIntent.create(args, stripe_options)
+        payment_intent = create_payment_intent(amount, args)
         Pay::Payment.new(payment_intent).validate
 
         charge = payment_intent.latest_charge
@@ -99,6 +96,24 @@ module Pay
         raise Pay::Stripe::Error, e
       end
 
+      # Creates and returns a Stripe::PaymentIntent
+      def create_payment_intent(amount, options = {})
+        args = {
+          amount: amount,
+          currency: "usd",
+          customer: processor_id,
+          expand: ["latest_charge.refunds"],
+          return_url: root_url
+        }.merge(options)
+
+        ::Stripe::PaymentIntent.create(args, stripe_options)
+      end
+
+      # Used for creating Stripe Terminal charges
+      def terminal_charge(amount, options = {})
+        create_payment_intent(amount, options.merge(payment_method_types: ["card_present"], capture_method: "manual"))
+      end
+
       def subscribe(name: Pay.default_product_name, plan: Pay.default_plan_name, **options)
         quantity = options.delete(:quantity)
         opts = {
@@ -209,12 +224,15 @@ module Pay
         customer unless processor_id?
         args = {
           customer: processor_id,
-          mode: "payment",
-          # These placeholder URLs will be replaced in a following step.
-          success_url: merge_session_id_param(options.delete(:success_url) || root_url),
-          cancel_url: merge_session_id_param(options.delete(:cancel_url) || root_url)
+          mode: "payment"
         }
 
+        # Embedded checkouts cannot use URLs
+        if options[:ui_mode] != "embedded"
+          args[:success_url] = merge_session_id_param(options.delete(:success_url) || root_url)
+          args[:cancel_url] = merge_session_id_param(options.delete(:cancel_url) || root_url)
+        end
+
         # Line items are optional
         if (line_items = options.delete(:line_items))
           quantity = options.delete(:quantity) || 1

data/lib/pay/stripe.rb

@@ -30,6 +30,8 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 9"
+
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id
     mattr_accessor :model_names, default: Set.new
@@ -37,12 +39,12 @@ module Pay
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:stripe) && defined?(::Stripe)
 
-      Pay::Engine.version_matches?(required: "~> 8", current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version ~> 8")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION, current: ::Stripe::VERSION) || (raise "[Pay] stripe gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.setup
       ::Stripe.api_key = private_key
-      ::Stripe.api_version = "2022-11-15"
+      ::Stripe.api_version ||= "2023-08-16"
 
       # Used by Stripe to identify Pay for support
       ::Stripe.set_app_info("PayRails", partner_id: "pp_partner_IqhY0UExnJYLxg", version: Pay::VERSION, url: "https://github.com/pay-rails/pay")

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.7.1"
+  VERSION = "6.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.7.1
+  version: 6.8.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails