pay 12.2.0 → 12.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c2b44409eb406bf144f15e922e863e8265c0d65bba50141928da748ed0d0f0
-  data.tar.gz: c9dbd51994ab4747a672905bb3b6a0fadf9060ef46ebaaf5edd6acd3f4569197
+  metadata.gz: f77372d0f6b47b272a614d14cd91183c86b56dd02d2ecea25fd99ebccde3ec7b
+  data.tar.gz: 7c6c0b2196445b486b0519a14c1fe1a1123c81316822af0cc2fea3c891c731dd
 SHA512:
-  metadata.gz: b1ab458e90aaede5cdc5bb5418917c4084736bc4c48544b3d360ee4e0fac8975db1b24e363e218e2b2986837c7c97ea9724011b3196f00f9e85e9a7b0a26dce6
-  data.tar.gz: 744063befa0467573287d6264a87419018d63fd845a4cdd307f0cb0ecc08bb4570eb839524f9b225c3aeda0e7fdb1a1c095321e4090222c3f29d5355043e7d42
+  metadata.gz: e30e10e229a3af4a2dea25d532c209831c9388222226d97b1c576e4ddf3aee7509da290a2fa6f762dd6a687bea07962e5c309c22ce1cca84a337d6edc979057c
+  data.tar.gz: 4878549cc6eb89db69734ae9bbec6d2e9fa4d6027322af4e266e89c5a026ebb19c946a202b63327f55c3b3da8b9384112ace9310effe1c9552a4ede2efef0516

data/app/models/pay/paddle_billing/customer.rb

@@ -27,7 +27,7 @@ module Pay
           update!(processor_id: pc.id)
           pc
         end
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -55,7 +55,7 @@ module Pay
         charge = charges.find_or_initialize_by(processor_id: transaction.id)
         charge.update(attrs)
         charge
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 

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

@@ -88,7 +88,7 @@ module Pay
           status: response.status,
           ends_at: response.scheduled_change&.effective_at || Time.current
         )
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -108,7 +108,7 @@ module Pay
           proration_billing_mode: options.delete(:proration_billing_mode) || "prorated_immediately"
         )
         update(quantity: quantity)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -131,7 +131,7 @@ module Pay
       def pause
         response = ::Paddle::Subscription.pause(id: processor_id)
         update!(status: response.status, pause_starts_at: response.scheduled_change.effective_at)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 
@@ -152,7 +152,7 @@ module Pay
         end
 
         update(ends_at: nil, status: :active, pause_starts_at: nil)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::ErrorGenerator => e
         raise Pay::PaddleBilling::Error, e
       end
 

data/app/models/pay/paddle_classic/customer.rb

@@ -30,7 +30,7 @@ module Pay
         charge = charges.find_or_initialize_by(processor_id: response[:invoice_id])
         charge.update(attributes)
         charge
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 

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

@@ -13,7 +13,7 @@ module Pay
 
         payment_method.update!(attributes)
         payment_method
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 

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

@@ -54,7 +54,7 @@ module Pay
 
       def api_record(**options)
         PaddleClassic.client.users.list(subscription_id: processor_id).data.try(:first)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -78,7 +78,7 @@ module Pay
 
         # Remove payment methods since customer cannot be reused after cancelling
         Pay::PaymentMethod.where(customer_id: customer_id).destroy_all
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -90,7 +90,7 @@ module Pay
 
         # Remove payment methods since customer cannot be reused after cancelling
         Pay::PaymentMethod.where(customer_id: customer_id).destroy_all
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -111,7 +111,7 @@ module Pay
       def pause
         response = PaddleClassic.client.users.pause(subscription_id: processor_id)
         update(status: :paused, pause_starts_at: Time.zone.parse(response.dig(:next_payment, :date)))
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -126,7 +126,7 @@ module Pay
 
         PaddleClassic.client.users.unpause(subscription_id: processor_id)
         update(ends_at: nil, status: :active, pause_starts_at: nil)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
 
@@ -138,7 +138,7 @@ module Pay
         PaddleClassic.client.users.update(subscription_id: processor_id, **attributes)
 
         update(processor_plan: plan, ends_at: nil, status: :active)
-      rescue ::Paddle::Error => e
+      rescue ::Paddle::Classic::Error => e
         raise Pay::PaddleClassic::Error, e
       end
     end

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

@@ -133,7 +133,7 @@ module Pay
 
       # 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"))
+        create_payment_intent(amount, options.merge(allowed_payment_method_types: ["card_present"], capture_method: "manual"))
       end
 
       def create_setup_intent(options = {})

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

@@ -305,6 +305,11 @@ module Pay
         prorate = options.delete(:prorate) { true }
         proration_behavior = options.delete(:proration_behavior) || (prorate ? "always_invoice" : "none")
 
+        # Stripe 20 takes billing_cycle_anchor as {type: "now"} on updates, so convert the old "now" / "unchanged" form
+        if options[:billing_cycle_anchor].is_a?(String) || options[:billing_cycle_anchor].is_a?(Symbol)
+          options[:billing_cycle_anchor] = {type: options[:billing_cycle_anchor].to_s}
+        end
+
         @api_record = ::Stripe::Subscription.update(
           processor_id,
           {

data/lib/pay/paddle_billing.rb

@@ -14,11 +14,13 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 3"
+
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:paddle_billing) && defined?(::Paddle)
 
-      Pay::Engine.version_matches?(required: "~> 2.5",
-        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version ~> 2.5")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION,
+        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.setup

data/lib/pay/paddle_classic.rb

@@ -18,11 +18,13 @@ module Pay
 
     extend Env
 
+    REQUIRED_VERSION = "~> 3"
+
     def self.enabled?
       return false unless Pay.enabled_processors.include?(:paddle_classic) && defined?(::Paddle)
 
-      Pay::Engine.version_matches?(required: "~> 2.5",
-        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version ~> 2.5")
+      Pay::Engine.version_matches?(required: REQUIRED_VERSION,
+        current: ::Paddle::VERSION) || (raise "[Pay] paddle gem must be version #{REQUIRED_VERSION}")
     end
 
     def self.client

data/lib/pay/stripe.rb

@@ -28,7 +28,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 19"
+    REQUIRED_VERSION = "~> 20"
 
     # 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 = "12.2.0"
+  VERSION = "12.3.0"
 end

metadata

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