pay 2.3.1 → 2.4.0

data/lib/pay/braintree/billable.rb

@@ -20,7 +20,7 @@ module Pay
             last_name: try(:last_name),
             payment_method_nonce: card_token
           )
-          raise BraintreeError.new(result), result.message unless result.success?
+          raise Pay::Braintree::Error, result unless result.success?
 
           update(processor: "braintree", processor_id: result.customer.id)
 
@@ -33,7 +33,7 @@ module Pay
       rescue ::Braintree::AuthorizationError
         raise BraintreeAuthorizationError
       rescue ::Braintree::BraintreeError => e
-        raise BraintreeError, e.message
+        raise Pay::Braintree::Error, e
       end
 
       # Handles Billable#charge
@@ -47,13 +47,13 @@ module Pay
         }.merge(options)
 
         result = gateway.transaction.sale(args)
-        raise BraintreeError.new(result), result.message unless result.success?
+        raise Pay::Braintree::Error, result unless result.success?
 
         save_braintree_transaction(result.transaction)
       rescue ::Braintree::AuthorizationError
-        raise BraintreeAuthorizationError
+        raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
-        raise BraintreeError, e.message
+        raise Pay::Braintree::Error, e
       end
 
       # Handles Billable#subscribe
@@ -74,13 +74,13 @@ module Pay
         )
 
         result = gateway.subscription.create(subscription_options)
-        raise BraintreeError.new(result), result.message unless result.success?
+        raise Pay::Braintree::Error, result unless result.success?
 
         create_subscription(result.subscription, "braintree", name, plan, status: :active)
       rescue ::Braintree::AuthorizationError
-        raise BraintreeAuthorizationError
+        raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
-        raise BraintreeError, e.message
+        raise Pay::Braintree::Error, e
       end
 
       # Handles Billable#update_card
@@ -95,15 +95,15 @@ module Pay
             verify_card: true
           }
         )
-        raise BraintreeError.new(result), result.message unless result.success?
+        raise Pay::Braintree::Error, result unless result.success?
 
         update_braintree_card_on_file result.payment_method
         update_subscriptions_to_payment_method(result.payment_method.token)
         true
       rescue ::Braintree::AuthorizationError
-        raise BraintreeAuthorizationError
+        raise Pay::Braintree::AuthorizationError
       rescue ::Braintree::BraintreeError => e
-        raise BraintreeError, e.message
+        raise Pay::Braintree::Error, e
       end
 
       def update_braintree_email!

data/lib/pay/braintree/charge.rb

@@ -13,8 +13,8 @@ module Pay
 
       def braintree_charge
         Pay.braintree_gateway.transaction.find(processor_id)
-      rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+      rescue ::Braintree::Braintree::Error => e
+        raise Pay::Braintree::Error, e
       end
 
       def braintree_refund!(amount_to_refund)
@@ -22,7 +22,7 @@ module Pay
 
         update(amount_refunded: amount_to_refund)
       rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+        raise Pay::Braintree::Error, e
       end
     end
   end

data/lib/pay/braintree/subscription.rb

@@ -24,14 +24,18 @@ module Pay
           update(status: :canceled, ends_at: subscription.billing_period_end_date.to_date)
         end
       rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+        raise Pay::Braintree::Error, e
       end
 
       def braintree_cancel_now!
         gateway.subscription.cancel(processor_subscription.id)
         update(status: :canceled, ends_at: Time.zone.now)
       rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+        raise Pay::Braintree::Error, e
+      end
+
+      def braintree_on_grace_period?
+        canceled? && Time.zone.now < ends_at
       end
 
       def braintree_resume
@@ -57,7 +61,7 @@ module Pay
 
         update(status: :active)
       rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+        raise Pay::Braintree::Error, e
       end
 
       def braintree_swap(plan)
@@ -96,7 +100,7 @@ module Pay
           raise Error, "Braintree failed to swap plans: #{result.message}"
         end
       rescue ::Braintree::BraintreeError => e
-        raise Error, e.message
+        raise Pay::Braintree::Error, e
       end
 
       private
@@ -174,7 +178,7 @@ module Pay
 
         cancel_now!
 
-        owner.subscribe(options.merge(name: name, plan: plan.id))
+        owner.subscribe(**options.merge(name: name, plan: plan.id))
       end
     end
   end

data/lib/pay/errors.rb

@@ -0,0 +1,73 @@
+module Pay
+  class Error < StandardError
+    attr_reader :result
+
+    def initialize(result = nil)
+      @result = result
+    end
+  end
+
+  class PaymentError < StandardError
+    attr_reader :payment
+
+    def initialize(payment)
+      @payment = payment
+    end
+  end
+
+  class ActionRequired < PaymentError
+    def message
+      I18n.t("errors.action_required")
+    end
+  end
+
+  class InvalidPaymentMethod < PaymentError
+    def message
+      I18n.t("errors.invalid_payment")
+    end
+  end
+
+  module Braintree
+    class Error < Error
+      def message
+        result.message
+      end
+    end
+
+    class AuthorizationError < Braintree::Error
+      def message
+        I18n.t("errors.braintree.authorization")
+      end
+    end
+  end
+
+  module Stripe
+    class Error < Error
+      def message
+        I18n.t("errors.stripe.#{result.code}", default: result.message)
+      end
+    end
+  end
+
+  module Paddle
+    class Error < Error
+      def message
+        I18n.t("errors.paddle.#{result.code}", default: result.message)
+      end
+    end
+  end
+
+  class BraintreeError < Braintree::Error
+    def message
+      ActiveSupport::Deprecation.warn("Pay::BraintreeError is deprecated. Instead, use `Pay::Braintree::Error`.")
+      super
+    end
+  end
+
+  class BraintreeAuthorizationError < BraintreeError
+    def message
+      ActiveSupport::Deprecation.warn("Pay::BraintreeAuthorizationError is deprecated. Instead, use `Pay::Braintree::AuthorizationError`.")
+      I18n.t("errors.braintree.authorization")
+    end
+  end
+end

data/lib/pay/paddle/billable.rb

@@ -23,11 +23,11 @@ module Pay
           amount: Integer(response[:amount].to_f * 100),
           card_type: subscription.processor_subscription.payment_information[:payment_method],
           paddle_receipt_url: response[:receipt_url],
-          created_at: DateTime.parse(response[:payment_date])
+          created_at: Time.zone.parse(response[:payment_date])
         )
         charge
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
 
       def create_paddle_subscription(name, plan, options = {})
@@ -35,7 +35,7 @@ module Pay
       end
 
       def update_paddle_card(token)
-        # pass
+        sync_payment_information_from_paddle
       end
 
       def update_paddle_email!
@@ -44,14 +44,14 @@ module Pay
 
       def paddle_trial_end_date(subscription)
         return unless subscription.state == "trialing"
-        DateTime.parse(subscription.next_payment[:date]).end_of_day
+        Time.zone.parse(subscription.next_payment[:date]).end_of_day
       end
 
       def paddle_subscription(subscription_id, options = {})
         hash = PaddlePay::Subscription::User.list({subscription_id: subscription_id}, options).try(:first)
         OpenStruct.new(hash)
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
 
       def paddle_invoice!(options = {})
@@ -61,6 +61,35 @@ module Pay
       def paddle_upcoming_invoice
         # pass
       end
+
+      def sync_payment_information_from_paddle
+        payment_information = paddle_payment_information(subscription.processor_id)
+        update!(payment_information) unless payment_information.empty?
+      rescue ::PaddlePay::PaddlePayError => e
+        raise Pay::Paddle::Error, e
+      end
+
+      def paddle_payment_information(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
+          {}
+        end
+      end
     end
   end
 end

data/lib/pay/paddle/charge.rb

@@ -19,7 +19,7 @@ module Pay
         charges = payments.select { |p| p[:id].to_s == processor_id }
         charges.try(:first)
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
 
       def paddle_refund!(amount_to_refund)
@@ -32,7 +32,7 @@ module Pay
           raise Error, "Payment not found"
         end
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
     end
   end

data/lib/pay/paddle/subscription.rb

@@ -8,6 +8,7 @@ module Pay
 
         store_accessor :data, :paddle_update_url
         store_accessor :data, :paddle_cancel_url
+        store_accessor :data, :paddle_paused_from
       end
 
       def paddle?
@@ -20,31 +21,41 @@ module Pay
         if on_trial?
           update(status: :canceled, ends_at: trial_ends_at)
         else
-          update(status: :canceled, ends_at: DateTime.parse(subscription.next_payment[:date]))
+          update(status: :canceled, ends_at: Time.zone.parse(subscription.next_payment[:date]))
         end
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
 
       def paddle_cancel_now!
         PaddlePay::Subscription::User.cancel(processor_id)
         update(status: :canceled, ends_at: Time.zone.now)
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
+      end
+
+      def paddle_on_grace_period?
+        canceled? && Time.zone.now < ends_at || paused? && Time.zone.now < paddle_paused_from
+      end
+
+      def paddle_paused?
+        paddle_paused_from.present?
       end
 
       def paddle_pause
         attributes = {pause: true}
         response = PaddlePay::Subscription::User.update(processor_id, attributes)
-        update(status: :paused, ends_at: DateTime.parse(response[:next_payment][:date]))
+        update(paddle_paused_from: Time.zone.parse(response[:next_payment][:date]))
+      rescue ::PaddlePay::PaddlePayError => e
+        raise Pay::Paddle::Error, e
       end
 
       def paddle_resume
         attributes = {pause: false}
         PaddlePay::Subscription::User.update(processor_id, attributes)
-        update(status: :active, ends_at: nil)
+        update(status: :active, paddle_paused_from: nil)
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
 
       def paddle_swap(plan)
@@ -52,7 +63,7 @@ module Pay
         attributes[:quantity] = quantity if quantity?
         PaddlePay::Subscription::User.update(processor_id, attributes)
       rescue ::PaddlePay::PaddlePayError => e
-        raise Error, e.message
+        raise Pay::Paddle::Error, e
       end
     end
   end

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