pay 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b424cae3cd4905b55f734e86687c12fba5972aeade9dc81f430d364d29bd9ea6
-  data.tar.gz: 709ca786d171e5b5652fb1a4de5206b2564155a0adabfb02476282eefbfe473a
+  metadata.gz: cfd57b19e4d88a7b44ce680b18018fb9f6d623a98354d3858f10ac97ec87711a
+  data.tar.gz: f18db44917f38b0d97f7907fe22c46e4408afa7acea95468381bfaab58b7c66e
 SHA512:
-  metadata.gz: d153b66802f9ffea402b973ea2420f2cbb9ae6666dfe4c81d49457ac11045c06ee2e54f2ea3410fd5a7b3452461ca580e1cf52cde6831ab9238c624862cbe831
-  data.tar.gz: 2c22450d862a9d39d6abed5b3cc1454c657e15ab92399f64d2c306b69cf600fb2cf838d8d2080d285d42d62b0554de526a72bb7602b342eeecdeff4b49670cbd
+  metadata.gz: 2e34a3196a14ee151faf1ff5a6f7c69360e035f6d74374b91f2502225b3bdf93c2db05e44569a0939514b3aabb42e497a2064a9c2294d1220279d755c87da206
+  data.tar.gz: a20484911fb6f1e173a9f92af70ec44a7c9fad2f31b5486538079232d2cae92dc789949201fdbbe8060835c59ad91f7b4e5d1f435e5678c73d444758d2f67a90

data/app/models/pay/subscription.rb

@@ -11,7 +11,9 @@ module Pay
     scope :on_trial, -> { where.not(trial_ends_at: nil).where("#{table_name}.trial_ends_at > ?", Time.zone.now) }
     scope :cancelled, -> { where.not(ends_at: nil) }
     scope :on_grace_period, -> { cancelled.where("#{table_name}.ends_at > ?", Time.zone.now) }
-    scope :active, -> { where(status: ["trialing", "active"], ends_at: nil).or(on_grace_period).or(on_trial) }
+    # Stripe considers paused subscriptions to be active, therefore we reflect that in this scope and
+    # make it consistent across all processors
+    scope :active, -> { where(status: ["trialing", "active", "paused"], ends_at: nil).or(on_grace_period).or(on_trial) }
     scope :incomplete, -> { where(status: :incomplete) }
     scope :past_due, -> { where(status: :past_due) }
     scope :with_active_customer, -> { joins(:customer).merge(Customer.active) }
@@ -49,6 +51,18 @@ module Pay
       scope processor_name, -> { joins(:customer).where(pay_customers: {processor: processor_name}) }
     end
 
+    def self.active_without_paused
+      case Pay::Adapter.current_adapter
+      when "postgresql", "postgis"
+        active.where("data->>'pause_behavior' IS NULL AND status != 'paused'")
+      when "mysql2"
+        active.where("data->>'$.pause_behavior' IS NULL AND status != 'paused'")
+      when "sqlite3"
+        # sqlite 3.38 supports ->> syntax, however, sqlite 3.37 is what ships with Ubuntu 22.04.
+        active.where("json_extract(data, '$.pause_behavior') IS NULL AND status != 'paused'")
+      end
+    end
+
     def self.with_metered_items
       case Pay::Adapter.current_adapter
       when "sqlite3"
@@ -108,7 +122,7 @@ module Pay
     end
 
     def active?
-      ["trialing", "active"].include?(status) && (ends_at.nil? || on_grace_period? || on_trial?)
+      ["trialing", "active", "paused"].include?(status) && (ends_at.nil? || on_grace_period? || on_trial?)
     end
 
     def past_due?

data/lib/pay/paddle/subscription.rb

@@ -107,13 +107,13 @@ module Pay
       end
 
       def paused?
-        paddle_paused_from.present?
+        pay_subscription.status == "paused"
       end
 
       def pause
         attributes = {pause: true}
         response = PaddlePay::Subscription::User.update(processor_id, attributes)
-        pay_subscription.update(paddle_paused_from: Time.zone.parse(response.dig(:next_payment, :date)))
+        pay_subscription.update(status: :paused, paddle_paused_from: Time.zone.parse(response.dig(:next_payment, :date)))
       rescue ::PaddlePay::PaddlePayError => e
         raise Pay::Paddle::Error, e
       end

data/lib/pay/stripe/billable.rb

@@ -178,6 +178,7 @@ module Pay
       end
 
       def create_setup_intent(options = {})
+        customer unless processor_id?
         ::Stripe::SetupIntent.create({
           customer: processor_id,
           usage: :off_session

data/lib/pay/stripe/subscription.rb

@@ -100,7 +100,15 @@ module Pay
 
       # Common expand options for all requests that create, retrieve, or update a Stripe Subscription
       def self.expand_options
-        {expand: ["pending_setup_intent", "latest_invoice.payment_intent", "latest_invoice.charge"]}
+        {
+          expand: [
+            "pending_setup_intent",
+            "latest_invoice.payment_intent",
+            "latest_invoice.charge",
+            "latest_invoice.total_discount_amounts.discount",
+            "latest_invoice.total_tax_amounts.tax_rate"
+          ]
+        }
       end
 
       def initialize(pay_subscription)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "4.1.0"
+  VERSION = "4.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails