pay 11.2.2 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e194484cea3ae3dee4d9fdded7e5732f182a5e7699128f2f86bfa020284806f
-  data.tar.gz: 14b67bbf65d49fb2d7d73fdfbc8519baf5ddcade178ba88bd5b5b30534413d09
+  metadata.gz: 9edcf51b1a6346022cd5d504b2d6e730dadeb31580ae60da69b3f5c5414b97d8
+  data.tar.gz: 9cd3ea459bdd0f853efab3a72f32af739125740f22e78f756da1e6ea2a059a5e
 SHA512:
-  metadata.gz: b2c00bd4c90a603a91b62202ba36c5cb3cfdd99fcacdd347e274c2bf6c6cb4d813115373e23c9a3e575559d3ec0d37561c8f9a08a60e028415dace786dfcbb16
-  data.tar.gz: d62df086e5566fa6c25304c8cdbb54ef9ef401ba0a3023541085c57ab32214287c953d78f1c86be4aeaeb34cc26c29635bc00e4e4b757f7f3579d65fa2ceb02b
+  metadata.gz: 3e92c7fd1cd767d5d67160abd1bda24d1d9a9c56a4ea3ea883a1be04e65bdaf21fc5a2ad4c9268cad9d37747e6927f79bfcc4beadecbf3f6c79e499d7c890c64
+  data.tar.gz: ca5742925df0d3f6aaae8ed148a9710f5c1be43394c0918eb2f0afcba9cf3968546e9388768b98ff3181df8c8e9ddb83ad7ae8d27a5d1266100863e4dcb0b2d8

data/app/models/pay/stripe/payment_method.rb

@@ -31,7 +31,7 @@ module Pay
           return
         end
 
-        default_payment_method_id = pay_customer.api_record.invoice_settings.default_payment_method
+        default_payment_method_id = pay_customer.api_record.invoice_settings&.default_payment_method
         default = (id == default_payment_method_id)
 
         attributes = extract_attributes(object).merge(default: default, stripe_account: stripe_account)

data/app/models/pay/stripe/subscription.rb

@@ -279,7 +279,6 @@ module Pay
           unpause
         else
           @api_record = ::Stripe::Subscription.update(processor_id, {
-            plan: processor_plan,
             trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
             cancel_at_period_end: false
           }.merge(expand_options),
@@ -300,10 +299,9 @@ module Pay
           processor_id,
           {
             cancel_at_period_end: false,
-            plan: plan,
+            items: [{id: subscription_items.first.id, plan: plan, quantity: quantity}],
             proration_behavior: proration_behavior,
-            trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
-            quantity: quantity
+            trial_end: (on_trial? ? trial_ends_at.to_i : "now")
           }.merge(expand_options).merge(options),
           stripe_options
         )

data/lib/pay/attributes.rb

@@ -28,7 +28,7 @@ module Pay
       # - Finds or creates a Pay::Customer for the process and marks it as default
       # - Removes the default flag from all other Pay::Customers
       # - Removes the default flag from all Pay::PaymentMethods
-      def set_payment_processor(processor_name, allow_fake: false, **attributes)
+      def set_payment_processor(processor_name, allow_fake: false, stripe_account: nil, **attributes)
         raise Pay::Error, "Processor `#{processor_name}` is not allowed" if processor_name.to_s == "fake_processor" && !allow_fake
 
         # Safety check to make sure this is a valid Pay processor
@@ -37,7 +37,7 @@ module Pay
 
         with_lock do
           pay_customers.update_all(default: false)
-          pay_customer = pay_customers.active.where(processor: processor_name, type: klass.name).first_or_initialize
+          pay_customer = pay_customers.active.where(processor: processor_name, type: klass.name, stripe_account: stripe_account).first_or_initialize
           pay_customer.update!(attributes.merge(default: true))
         end
 
@@ -45,14 +45,14 @@ module Pay
         reload_payment_processor
       end
 
-      def add_payment_processor(processor_name, allow_fake: false, **attributes)
+      def add_payment_processor(processor_name, allow_fake: false, stripe_account: nil, **attributes)
         raise Pay::Error, "Processor `#{processor_name}` is not allowed" if processor_name.to_s == "fake_processor" && !allow_fake
 
         # Safety check to make sure this is a valid Pay processor
         klass = "Pay::#{processor_name.to_s.classify}::Customer".constantize
         raise ArgumentError, "not a valid payment processor" if klass.ancestors.exclude?(Pay::Customer)
 
-        pay_customer = pay_customers.active.where(processor: processor_name, type: klass.name).first_or_initialize
+        pay_customer = pay_customers.active.where(processor: processor_name, type: klass.name, stripe_account: stripe_account).first_or_initialize
         pay_customer.update!(attributes)
         pay_customer
       end

data/lib/pay/stripe.rb

@@ -27,7 +27,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 15"
+    REQUIRED_VERSION = "~> 17"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.2.2"
+  VERSION = "11.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.2.2
+  version: 11.3.0
 platform: ruby
 authors:
 - Jason Charnes