pay 2.3.0 → 2.4.4

data/lib/pay/paddle/webhooks/subscription_cancelled.rb

@@ -10,7 +10,7 @@ module Pay
 
           # User canceled subscriptions have an ends_at
           # Automatically canceled subscriptions need this value set
-          subscription.update!(ends_at: DateTime.parse(data["cancellation_effective_date"])) if subscription.ends_at.blank? && data["cancellation_effective_date"].present?
+          subscription.update!(ends_at: Time.zone.parse(data["cancellation_effective_date"])) if subscription.ends_at.blank? && data["cancellation_effective_date"].present?
         end
       end
     end

data/lib/pay/paddle/webhooks/subscription_created.rb

@@ -22,7 +22,7 @@ module Pay
               return
             end
 
-            subscription = Pay.subscription_model.new(owner: owner, name: "default", processor: "paddle", processor_id: data["subscription_id"], status: :active)
+            subscription = Pay.subscription_model.new(owner: owner, name: Pay.default_product_name, processor: "paddle", processor_id: data["subscription_id"], status: :active)
           end
 
           subscription.quantity = data["quantity"]

data/lib/pay/paddle/webhooks/subscription_payment_refunded.rb

@@ -10,9 +10,9 @@ module Pay
           notify_user(charge.owner, charge)
         end
 
-        def notify_user(user, charge)
+        def notify_user(billable, charge)
           if Pay.send_emails
-            Pay::UserMailer.refund(user, charge).deliver_later
+            Pay::UserMailer.with(billable: billable, charge: charge).refund.deliver_later
           end
         end
       end

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -21,41 +21,20 @@ module Pay
             amount: Integer(data["sale_gross"].to_f * 100),
             card_type: data["payment_method"],
             paddle_receipt_url: data["receipt_url"],
-            created_at: DateTime.parse(data["event_time"])
-          }.merge(payment_params(data["subscription_id"]))
+            created_at: Time.zone.parse(data["event_time"])
+          }
 
-          charge.update(params)
+          payment_information = user.paddle_payment_information(data["subscription_id"])
+
+          charge.update(params.merge(payment_information))
+          user.update(payment_information)
 
           charge
         end
 
-        def notify_user(user, charge)
+        def notify_user(billable, charge)
           if Pay.send_emails && charge.respond_to?(:receipt)
-            Pay::UserMailer.receipt(user, charge).deliver_later
-          end
-        end
-
-        private
-
-        def payment_params(subscription_id)
-          subscription_user = PaddlePay::Subscription::User.list({subscription_id: subscription_id}).try(:first)
-          payment_information = subscription_user ? subscription_user[:payment_information] : nil
-          return {} if payment_information.nil?
-
-          case payment_information[:payment_method]
-          when "card"
-            {
-              card_type: payment_information[:card_type],
-              card_last4: payment_information[:last_four_digits],
-              card_exp_month: payment_information[:expiry_date].split("/").first,
-              card_exp_year: payment_information[:expiry_date].split("/").last
-            }
-          when "paypal"
-            {
-              card_type: "PayPal"
-            }
-          else
-            {}
+            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/paddle/webhooks/subscription_updated.rb

@@ -7,24 +7,27 @@ module Pay
 
           return if subscription.nil?
 
-          subscription.status = data["status"] == "deleted" ? "canceled" : data["status"]
+          case data["status"]
+          when "deleted"
+            subscription.status = "canceled"
+            subscription.ends_at = Time.zone.parse(data["next_bill_date"]) || Time.zone.now if subscription.ends_at.blank?
+          when "trialing"
+            subscription.status = "trialing"
+            subscription.trial_ends_at = Time.zone.parse(data["next_bill_date"])
+          when "active"
+            subscription.status = "active"
+            subscription.paddle_paused_from = Time.zone.parse(data["paused_from"]) if data["paused_from"].present?
+          else
+            subscription.status = data["status"]
+          end
+
           subscription.quantity = data["new_quantity"]
           subscription.processor_plan = data["subscription_plan_id"]
           subscription.paddle_update_url = data["update_url"]
           subscription.paddle_cancel_url = data["cancel_url"]
 
-          subscription.trial_ends_at = DateTime.parse(data["next_bill_date"]) if data["status"] == "trialing"
-
           # If user was on trial, their subscription ends at the end of the trial
-          subscription.ends_at = if ["paused", "deleted"].include?(data["status"]) && subscription.on_trial?
-            subscription.trial_ends_at
-
-          # User wasn't on trial, so subscription ends at period end
-          elsif ["paused", "deleted"].include?(data["status"])
-            DateTime.parse(data["next_bill_date"])
-
-            # Subscription isn't marked to cancel at period end
-          end
+          subscription.ends_at = subscription.trial_ends_at if subscription.on_trial?
 
           subscription.save!
         end

data/lib/pay/receipts.rb

@@ -28,13 +28,13 @@ module Pay
 
     def line_items
       line_items = [
-        ["Date", created_at.to_s],
-        ["Account Billed", "#{owner.name} (#{owner.email})"],
-        ["Product", product],
-        ["Amount", ActionController::Base.helpers.number_to_currency(amount / 100.0)],
-        ["Charged to", charged_to]
+        [I18n.t("receipt.date"), created_at.to_s],
+        [I18n.t("receipt.account_billed"), "#{owner.name} (#{owner.email})"],
+        [I18n.t("receipt.product"), product],
+        [I18n.t("receipt.amount"), ActionController::Base.helpers.number_to_currency(amount / 100.0)],
+        [I18n.t("receipt.charged_to"), charged_to]
       ]
-      line_items << ["Additional Info", owner.extra_billing_info] if owner.extra_billing_info?
+      line_items << [I18n.t("receipt.additional_info"), owner.extra_billing_info] if owner.extra_billing_info?
       line_items
     end
   end

data/lib/pay/stripe.rb

@@ -15,6 +15,9 @@ module Pay
       ::Stripe.api_version = "2020-08-27"
       ::StripeEvent.signing_secret = signing_secret
 
+      # 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")
+
       Pay.charge_model.include Pay::Stripe::Charge
       Pay.subscription_model.include Pay::Stripe::Subscription
     end

data/lib/pay/stripe/billable.rb

@@ -17,7 +17,7 @@ module Pay
           create_stripe_customer
         end
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def create_setup_intent
@@ -47,7 +47,7 @@ module Pay
         # Create a new charge object
         Stripe::Webhooks::ChargeSucceeded.new.create_charge(self, payment_intent.charges.first)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       # Handles Billable#subscribe
@@ -80,7 +80,7 @@ module Pay
 
         subscription
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       # Handles Billable#update_card
@@ -97,7 +97,7 @@ module Pay
         update_stripe_card_on_file(payment_method.card)
         true
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def update_stripe_email!

data/lib/pay/stripe/charge.rb

@@ -14,7 +14,7 @@ module Pay
       def stripe_charge
         ::Stripe::Charge.retrieve(processor_id)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_refund!(amount_to_refund)
@@ -25,7 +25,7 @@ module Pay
 
         update(amount_refunded: amount_to_refund)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
     end
   end

data/lib/pay/stripe/subscription.rb

@@ -3,14 +3,6 @@ module Pay
     module Subscription
       extend ActiveSupport::Concern
 
-      included do
-        scope :stripe, -> { where(processor: :stripe) }
-      end
-
-      def stripe?
-        processor == "stripe"
-      end
-
       def stripe_cancel
         subscription = processor_subscription
         subscription.cancel_at_period_end = true
@@ -19,24 +11,40 @@ module Pay
         new_ends_at = on_trial? ? trial_ends_at : Time.at(subscription.current_period_end)
         update(ends_at: new_ends_at)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_cancel_now!
         processor_subscription.delete
         update(ends_at: Time.zone.now, status: :canceled)
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
+      end
+
+      def stripe_on_grace_period?
+        canceled? && Time.zone.now < ends_at
+      end
+
+      def stripe_paused?
+        false
+      end
+
+      def stripe_pause
+        raise NotImplementedError, "Stripe does not support pausing subscriptions"
       end
 
       def stripe_resume
+        unless on_grace_period?
+          raise StandardError, "You can only resume subscriptions within their grace period."
+        end
+
         subscription = processor_subscription
         subscription.plan = processor_plan
         subscription.trial_end = on_trial? ? trial_ends_at.to_i : "now"
         subscription.cancel_at_period_end = false
         subscription.save
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
 
       def stripe_swap(plan)
@@ -48,7 +56,7 @@ module Pay
         subscription.quantity = quantity if quantity?
         subscription.save
       rescue ::Stripe::StripeError => e
-        raise Error, e.message
+        raise Pay::Stripe::Error, e
       end
     end
   end

data/lib/pay/stripe/webhooks/charge_refunded.rb

@@ -12,9 +12,9 @@ module Pay
           notify_user(charge.owner, charge)
         end
 
-        def notify_user(user, charge)
+        def notify_user(billable, charge)
           if Pay.send_emails
-            Pay::UserMailer.refund(user, charge).deliver_later
+            Pay::UserMailer.with(billable: billable, charge: charge).refund.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/charge_succeeded.rb

@@ -34,7 +34,7 @@ module Pay
 
         def notify_user(billable, charge)
           if Pay.send_emails && charge.respond_to?(:receipt)
-            Pay::UserMailer.receipt(billable, charge).deliver_later
+            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/payment_action_required.rb

@@ -17,7 +17,7 @@ module Pay
 
         def notify_user(billable, payment_intent_id, subscription)
           if Pay.send_emails
-            Pay::UserMailer.payment_action_required(billable, payment_intent_id, subscription).deliver_later
+            Pay::UserMailer.with(billable: billable, payment_intent_id: payment_intent_id, subscription: subscription).payment_action_required.deliver_later
           end
         end
       end

data/lib/pay/stripe/webhooks/subscription_created.rb

@@ -18,7 +18,7 @@ module Pay
               return
             end
 
-            subscription = Pay.subscription_model.new(name: "default", owner: owner, processor: :stripe, processor_id: object.id)
+            subscription = Pay.subscription_model.new(name: Pay.default_product_name, owner: owner, processor: :stripe, processor_id: object.id)
           end
 
           subscription.quantity = object.quantity

data/lib/pay/stripe/webhooks/subscription_renewing.rb

@@ -9,12 +9,13 @@ module Pay
             processor: :stripe,
             processor_id: event.data.object.subscription
           )
-          notify_user(subscription.owner, subscription) if subscription.present?
+          date = Time.zone.at(event.data.object.next_payment_attempt)
+          notify_user(subscription.owner, subscription, date) if subscription.present?
         end
 
-        def notify_user(user, subscription)
+        def notify_user(billable, subscription, date)
           if Pay.send_emails
-            Pay::UserMailer.subscription_renewing(user, subscription).deliver_later
+            Pay::UserMailer.with(billable: billable, subscription: subscription, date: date).subscription_renewing.deliver_later
           end
         end
       end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.3.0"
+  VERSION = "2.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.4
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,33 +88,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -129,20 +121,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: standardrb
   requirement: !ruby/object:Gem::Requirement
@@ -157,48 +135,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +216,7 @@ files:
 - lib/pay/braintree/subscription.rb
 - lib/pay/engine.rb
 - lib/pay/env.rb
+- lib/pay/errors.rb
 - lib/pay/paddle.rb
 - lib/pay/paddle/billable.rb
 - lib/pay/paddle/charge.rb
@@ -328,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Ruby on Rails subscription engine.