pay 6.1.2 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863cb9c39a6232694d37073f367ebc22f78a0fc7c4c775e9f0b9b64555fc5534
-  data.tar.gz: 0c2bae743a6e14f8f3608e76f7d515e3411d1d417e74e7e1a1a5dc8a99ec2b07
+  metadata.gz: 9d8242bdc260e76f9e9c077f041ee09da8fded112a04fc89f2974976b92e7406
+  data.tar.gz: 87b7f3b72d0b2b1340a4403405ad3b64139e93e524d73ed5335e3e6ad3a67778
 SHA512:
-  metadata.gz: 9af822c88226e681feb85f173a9eb15ab161926be39b08d6e4944b50db67f4b5dcf95b6fa443b3dd460b592627539cdc9769fccd82552ee36c90735201411782
-  data.tar.gz: a81b84cc6fe417b823b7b109066b0ed39da420fe2fe611b28e87feaff7ffb084b1c2fd8b65b163317fc033911277d070f73c33edf122c00aff89031a9644d633
+  metadata.gz: ea09e83ce4431f9653b9c3d97a5cb2dbdde7e19cc2d38bd6e074ad01519e5d3c4ecdd1eabfbb985e05981c7d706f8ba37e5563901cf93693f9da0f0ef4afba68
+  data.tar.gz: 9f3500262f3bc1686f0620f7b10e69b562fb983113cd9c6213a1b75868d72b2c6aa1da27b4f15dda3a964e028d892c3e66daef029816860c79c7a2fd8863759a

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,48 @@ 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,
+          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)
+        }
+
+        # Set ends at to paid through date
+        # On trial, paid through date is nil, so fallback to updated_at
+        if object.status == "Canceled"
+          attributes[:ends_at] = object.paid_through_date&.end_of_day || object.updated_at
+        end
+
+        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/version.rb

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

metadata

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