pay 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8242bdc260e76f9e9c077f041ee09da8fded112a04fc89f2974976b92e7406
-  data.tar.gz: 87b7f3b72d0b2b1340a4403405ad3b64139e93e524d73ed5335e3e6ad3a67778
+  metadata.gz: 10e2efeb851c80d2bb81878942929c95411fa43a781bfdfee41f3d9b99da61b4
+  data.tar.gz: 7080610378fd2efa259611084f41160143186ef06fb1c9d997e7d1cee72eb74d
 SHA512:
-  metadata.gz: ea09e83ce4431f9653b9c3d97a5cb2dbdde7e19cc2d38bd6e074ad01519e5d3c4ecdd1eabfbb985e05981c7d706f8ba37e5563901cf93693f9da0f0ef4afba68
-  data.tar.gz: 9f3500262f3bc1686f0620f7b10e69b562fb983113cd9c6213a1b75868d72b2c6aa1da27b4f15dda3a964e028d892c3e66daef029816860c79c7a2fd8863759a
+  metadata.gz: 4d3032094987e54cf1834619b96064cf77335f03b2e45555de4eb059cee0c6b1e0783abb6077621fe138301dd5fe29b415a3cd4e829c63bf55493208275e0025
+  data.tar.gz: 6331154cae0f9f1c99a63b57c92e0b82e9197247ead694e9854a081eea19a2ff2859eef07d839b10b1d7204c00e42694ffce25e3f4f54f1e984e9f333dadc96e

data/app/models/pay/subscription.rb

@@ -11,7 +11,7 @@ module Pay
     scope :on_trial, -> { where.not(trial_ends_at: nil).where("#{table_name}.trial_ends_at > ?", Time.current) }
     scope :cancelled, -> { where.not(ends_at: nil) }
     scope :on_grace_period, -> { cancelled.where("#{table_name}.ends_at > ?", Time.current) }
-    scope :active, -> { where(status: ["trialing", "active"], ends_at: nil).pause_not_started.or(on_grace_period).or(on_trial) }
+    scope :active, -> { where(status: ["trialing", "active", "canceled"], ends_at: nil).pause_not_started.or(on_grace_period).or(on_trial) }
     scope :paused, -> { where(status: "paused").or(where("pause_starts_at <= ?", Time.current)) }
     scope :pause_not_started, -> { where("pause_starts_at IS NULL OR pause_starts_at > ?", Time.current) }
     scope :active_or_paused, -> { active.or(paused) }
@@ -98,6 +98,10 @@ module Pay
       canceled?
     end
 
+    def ended?
+      ends_at? && Time.current.after?(ends_at)
+    end
+
     def on_grace_period?
       (ends_at? && Time.current < ends_at) ||
         ((status == "paused" || pause_behavior == "void") && will_pause?)
@@ -108,11 +112,19 @@ module Pay
     end
 
     def pause_active?
-      (status == "paused" || pause_behavior == "void") && (pause_starts_at.nil? || pause_starts_at >= Time.current)
+      if status == "paused" # Paddle
+        true
+      elsif pause_behavior == "void"
+        pause_starts_at.nil? || Time.current.after?(pause_starts_at)
+      end
     end
 
+    # If you cancel during a trial, you should still retain access until the end of the trial
+    # Otherwise a subscription is active unless it has ended or is currently paused
+    # Check the subscription status so we don't accidentally consider "incomplete", "past_due", or other statuses as active
     def active?
-      ["trialing", "active"].include?(status) && (!(canceled? || paused?) || on_trial? || on_grace_period?)
+      ["trialing", "active", "canceled"].include?(status) &&
+        (!(canceled? || paused?) || on_trial? || on_grace_period?)
     end
 
     def past_due?

data/lib/pay/braintree/subscription.rb

@@ -37,10 +37,13 @@ module Pay
           trial_ends_at: (object.created_at + object.trial_duration.send(object.trial_duration_unit) if object.trial_period)
         }
 
-        # Set ends at to paid through date
-        # On trial, paid through date is nil, so fallback to updated_at
+        # Canceled subscriptions should have access through the paid_through_date or updated_at
         if object.status == "Canceled"
-          attributes[:ends_at] = object.paid_through_date&.end_of_day || object.updated_at
+          attributes[:ends_at] = object.updated_at
+
+        # Set grace period for subscriptions that are marked to be canceled
+        elsif object.status == "Active" && object.number_of_billing_cycles
+          attributes[:ends_at] = object.paid_through_date.end_of_day
         end
 
         pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id)
@@ -71,29 +74,21 @@ module Pay
       end
 
       def cancel(**options)
-        subscription = processor_subscription
-
-        if on_trial?
-          gateway.subscription.cancel(processor_subscription.id)
-          pay_subscription.update(status: :canceled, ends_at: trial_ends_at)
+        result = if on_trial?
+          gateway.subscription.cancel(processor_id)
         else
           gateway.subscription.update(subscription.id, {
             number_of_billing_cycles: subscription.current_billing_cycle
           })
-          pay_subscription.update(status: :canceled, ends_at: subscription.billing_period_end_date.to_date)
         end
+        pay_subscription.sync!(object: result.subscription)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
 
       def cancel_now!(**options)
-        gateway.subscription.cancel(processor_subscription.id)
-        ends_at = Time.current
-        pay_subscription.update!(
-          status: :canceled,
-          trial_ends_at: (ends_at if pay_subscription.trial_ends_at?),
-          ends_at: ends_at
-        )
+        result = gateway.subscription.cancel(processor_id)
+        pay_subscription.sync!(object: result.subscription)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
@@ -102,10 +97,6 @@ module Pay
         raise NotImplementedError, "Braintree does not support setting quantity on subscriptions"
       end
 
-      def on_grace_period?
-        canceled? && Time.current < ends_at
-      end
-
       def paused?
         false
       end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.2.1"
+  VERSION = "6.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails