pay 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a91b33a5c76733e60014f15e285b51e77d1d4794456afba359691edc4e44c2
-  data.tar.gz: f7b991d7a54f7fa57a54a56571f2ee4badeeb1aaaa62dc5f2cc6f889254818d3
+  metadata.gz: 9b9bea4dde4674321c5fcc0315db2fbd79afa882e329b6ba922aa0cc01c1a91e
+  data.tar.gz: 0fe8b739284c825223d0ec377407ddf2f3fef5f846a5b11e57cf80ea144de2a8
 SHA512:
-  metadata.gz: 5ef34ddc4e6b0ba75abab2577d216a85af478fa22c0bc8a16d312b5979e782fac467204e66ac72f7fa4f9e0b4dfa16f879aad82b27251ed290e05353c48df92c
-  data.tar.gz: e8dd4dbbdc01aa58ce21228b84a69bb70df05a814ab306b9e2b417b3e178bf50732117b73cad0f01dbb04035bbeb834f2aa2052b010c042b1d5e1f7660149188
+  metadata.gz: 54184916de0ec236cdfb4eef54ff62add646b7ddc1f4cb43fa150e5b7ef517f1a780603a63807c626ef41567522d765cce9a15390b728f98a2701e3b3ddd44ea
+  data.tar.gz: 256c12615777ed0933b41290e7f33a52e155e9be192f034ad9e95a1ae301198e1f8c3d4ceae6568e021612981b8c32de1cae80a65a15f548bc41b68c318dd4b1

data/lib/pay/braintree/billable.rb

@@ -108,7 +108,7 @@ module Pay
         result = gateway.subscription.create(subscription_options)
         raise Pay::Braintree::Error, result unless result.success?
 
-        pay_customer.subscriptions.create!(
+        subscription = pay_customer.subscriptions.create!(
           name: name,
           processor_id: result.subscription.id,
           processor_plan: plan,
@@ -117,6 +117,12 @@ module Pay
           ends_at: nil,
           metadata: metadata
         )
+
+        if (charge = result.subscription.transactions.first)
+          save_transaction(charge)
+        end
+
+        subscription
       rescue ::Braintree::AuthorizationError => e
         raise Pay::Braintree::AuthorizationError, e
       rescue ::Braintree::BraintreeError => e
@@ -268,6 +274,7 @@ module Pay
           {
             payment_method_type: :paypal,
             brand: "PayPal",
+            email: transaction.paypal_details.payer_email,
             last4: transaction.paypal_details.payer_email,
             exp_month: nil,
             exp_year: nil
@@ -277,6 +284,7 @@ module Pay
           {
             payment_method_type: :venmo,
             brand: "Venmo",
+            username: transaction.venmo_account_details.username,
             last4: transaction.venmo_account_details.username,
             exp_month: nil,
             exp_year: nil

data/lib/pay/braintree/charge.rb

@@ -5,6 +5,23 @@ module Pay
 
       delegate :processor_id, to: :pay_charge
 
+      def self.sync(charge_id, object: nil, try: 0, retries: 1)
+        object ||= Pay.braintree_gateway.transaction.find(charge_id)
+
+        pay_customer = Pay::Customer.find_by(processor: :braintree, processor_id: object.customer_details.id)
+        return unless pay_customer
+
+        pay_customer.save_transaction(object)
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
+      end
+
       def initialize(pay_charge)
         @pay_charge = pay_charge
       end

data/lib/pay/braintree/subscription.rb

@@ -20,6 +20,43 @@ module Pay
         :trial_ends_at,
         to: :pay_subscription
 
+      def self.sync(subscription_id, object: nil, name: nil, try: 0, retries: 1)
+        object ||= Pay.braintree_gateway.subscription.find(subscription_id)
+
+        # Retrieve Pay::Customer
+        payment_method = Pay.braintree_gateway.payment_method.find(object.payment_method_token)
+        pay_customer = Pay::Customer.find_by(processor: :braintree, processor_id: payment_method.customer_id)
+        return unless pay_customer
+
+        attributes = {
+          created_at: object.created_at,
+          current_period_end: object.billing_period_end_date,
+          current_period_start: object.billing_period_start_date,
+          ends_at: (object.updated_at if object.status == "Canceled"),
+          processor_plan: object.plan_id,
+          status: object.status.underscore,
+          trial_ends_at: (object.created_at + object.trial_duration.send(object.trial_duration_unit) if object.trial_period)
+        }
+
+        pay_subscription = pay_customer.subscriptions.find_by(processor_id: object.id)
+        if pay_subscription
+          pay_subscription.with_lock { pay_subscription.update!(attributes) }
+        else
+          name ||= Pay.default_product_name
+          pay_subscription = pay_customer.subscriptions.create!(attributes.merge(name: name, processor_id: object.id))
+        end
+
+        pay_subscription
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
+      end
+
       def initialize(pay_subscription)
         @pay_subscription = pay_subscription
       end

data/lib/pay/braintree/webhooks/subscription_canceled.rb

@@ -8,15 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
-
-          ends_at = Time.current
-          pay_subscription.update!(
-            status: :canceled,
-            trial_ends_at: (ends_at if pay_subscription.trial_ends_at?),
-            ends_at: ends_at
-          )
+          Pay::Braintree::Subscription.sync(subscription.id)
         end
       end
     end

data/lib/pay/braintree/webhooks/subscription_charged_successfully.rb

@@ -11,11 +11,11 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
           return unless pay_subscription.present?
 
-          pay_customer = pay_subscription.customer
-          pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
+          charge = subscription.transactions.first
+          pay_charge = Pay::Braintree::Charge.sync(charge.id, object: charge)
 
           if pay_charge && Pay.send_email?(:receipt, pay_charge)
-            Pay.mailer.with(pay_customer: pay_customer, pay_charge: pay_charge).receipt.deliver_later
+            Pay.mailer.with(pay_customer: pay_subscription.customer, pay_charge: pay_charge).receipt.deliver_later
           end
         end
       end

data/lib/pay/braintree/webhooks/subscription_expired.rb

@@ -8,10 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
-
-          pay_subscription.update!(ends_at: Time.current, status: :canceled)
+          Pay::Braintree::Subscription.sync(subscription.id)
         end
       end
     end

data/lib/pay/braintree/webhooks/subscription_trial_ended.rb

@@ -8,10 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
-
-          pay_subscription.update!(trial_ends_at: Time.current)
+          Pay::Braintree::Subscription.sync(subscription.id)
         end
       end
     end

data/lib/pay/braintree/webhooks/subscription_went_active.rb

@@ -8,10 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
-
-          pay_subscription.update!(status: :active)
+          Pay::Braintree::Subscription.sync(subscription.id)
         end
       end
     end

data/lib/pay/braintree/webhooks/subscription_went_past_due.rb

@@ -8,10 +8,7 @@ module Pay
           subscription = event.subscription
           return if subscription.nil?
 
-          pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          return unless pay_subscription.present?
-
-          pay_subscription.update!(status: :past_due)
+          Pay::Braintree::Subscription.sync(subscription.id)
         end
       end
     end

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

@@ -6,8 +6,8 @@ module Pay
           locate_owner(event.data.object)
 
           if (payment_intent_id = event.data.object.payment_intent)
-            payment_intent = ::Stripe::PaymentIntent.retrieve({id: payment_intent_id, expand: ["latest_charge"]}, {stripe_account: event.try(:account)}.compact)
-            Pay::Stripe::Charge.sync(payment_intent.latest_charge.id, object: payment_intent.latest_charge, stripe_account: event.try(:account))
+            payment_intent = ::Stripe::PaymentIntent.retrieve({id: payment_intent_id}, {stripe_account: event.try(:account)}.compact)
+            Pay::Stripe::Charge.sync(payment_intent.latest_charge, stripe_account: event.try(:account))
           end
 
           if (subscription_id = event.data.object.subscription)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails