pay 11.3.0 → 11.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9edcf51b1a6346022cd5d504b2d6e730dadeb31580ae60da69b3f5c5414b97d8
-  data.tar.gz: 9cd3ea459bdd0f853efab3a72f32af739125740f22e78f756da1e6ea2a059a5e
+  metadata.gz: 91779791c74af77a8ab63818f20a4edc7793cf6c1aab3fbf579448d417ae15e9
+  data.tar.gz: f85d015b0ff83469bdec0157c72cc35345459eb7ae919c8459de553d9edfc60c
 SHA512:
-  metadata.gz: 3e92c7fd1cd767d5d67160abd1bda24d1d9a9c56a4ea3ea883a1be04e65bdaf21fc5a2ad4c9268cad9d37747e6927f79bfcc4beadecbf3f6c79e499d7c890c64
-  data.tar.gz: ca5742925df0d3f6aaae8ed148a9710f5c1be43394c0918eb2f0afcba9cf3968546e9388768b98ff3181df8c8e9ddb83ad7ae8d27a5d1266100863e4dcb0b2d8
+  metadata.gz: 735bd7fe2149a54795de3f60fbbcacaa8597bbdced88e7f4ae7f03d9051fe6e0af600aa9cce321f6554b98d996a75a8b9cda1da58f7ac8fe29d82d37079b8281
+  data.tar.gz: 266b0aa2699a0bbfff739937032f7692dd616ee976d50e2b56aaadf3bb281093146aceab949c3c3af474ead2322c0b0e2d790f30f5bedb3de37cef5a6c15ce22

data/Rakefile

@@ -19,8 +19,6 @@ end
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
-load "rails/tasks/statistics.rake"
-
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|

data/app/models/pay/braintree/payment_method.rb

@@ -10,10 +10,16 @@ module Pay
         pay_customer.save_payment_method(object, default: object.default?)
       end
 
-      # Sets payment method as default on Stripe
+      # Sets payment method as default
       def make_default!
+        return if default?
+
         result = gateway.customer.update(customer.processor_id, default_payment_method_token: processor_id)
         raise Pay::Braintree::Error, result unless result.success?
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
+
         result.success?
       end
 

data/app/models/pay/fake_processor/payment_method.rb

@@ -2,6 +2,10 @@ module Pay
   module FakeProcessor
     class PaymentMethod < Pay::PaymentMethod
       def make_default!
+        return if default?
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
       end
 
       def detach

data/app/models/pay/lemon_squeezy/payment_method.rb

@@ -18,6 +18,10 @@ module Pay
       end
 
       def make_default!
+        return if default?
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
       end
 
       def detach

data/app/models/pay/paddle_billing/payment_method.rb

@@ -36,6 +36,10 @@ module Pay
       end
 
       def make_default!
+        return if default?
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
       end
 
       def detach

data/app/models/pay/paddle_classic/payment_method.rb

@@ -41,6 +41,10 @@ module Pay
       end
 
       def make_default!
+        return if default?
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
       end
 
       def detach

data/app/models/pay/payment_method.rb

@@ -21,19 +21,6 @@ module Pay
     def self.pay_processor_for(name)
       "Pay::#{name.to_s.classify}::PaymentMethod".constantize
     end
-
-    def payment_processor
-      @payment_processor ||= self.class.pay_processor_for(customer.processor).new(self)
-    end
-
-    def make_default!
-      return if default?
-
-      payment_processor.make_default!
-
-      customer.payment_methods.update_all(default: false)
-      update!(default: true)
-    end
   end
 end
 

data/app/models/pay/stripe/charge.rb

@@ -48,8 +48,9 @@ module Pay
 
         # Associate charge with subscription if we can
         if object.payment_intent.present?
-          invoice_payments = ::Stripe::InvoicePayment.list({payment: {type: :payment_intent, payment_intent: object.payment_intent}, status: :paid, expand: ["data.invoice.total_discount_amounts.discount"]}, {stripe_account: stripe_account}.compact)
-          if invoice_payments.any? && (invoice = invoice_payments.first.invoice)
+          invoice_payments = ::Stripe::InvoicePayment.list({payment: {type: :payment_intent, payment_intent: object.payment_intent}, status: :paid}, {stripe_account: stripe_account}.compact)
+          if invoice_payments.any?
+            invoice = ::Stripe::Invoice.retrieve({id: invoice_payments.first.invoice, expand: ["total_discount_amounts.discount.source.coupon"]}, {stripe_account: stripe_account}.compact)
             attrs[:stripe_invoice] = invoice.to_hash
             attrs[:subtotal] = invoice.subtotal
             attrs[:tax] = invoice.total - invoice.total_excluding_tax.to_i

data/app/models/pay/stripe/payment_method.rb

@@ -67,7 +67,12 @@ module Pay
 
       # Sets payment method as default
       def make_default!
+        return if default?
+
         ::Stripe::Customer.update(customer.processor_id, {invoice_settings: {default_payment_method: processor_id}}, stripe_options)
+
+        customer.payment_methods.update_all(default: false)
+        update!(default: true)
       end
 
       # Remove payment method

data/app/models/pay/stripe/subscription.rb

@@ -140,6 +140,7 @@ module Pay
       end
 
       def stripe_object
+        sync! if object.nil?
         ::Stripe::Subscription.construct_from(object)
       end
 

data/lib/pay/receipts.rb

@@ -70,8 +70,8 @@ module Pay
       items
     end
 
-    def discount_description(discount)
-      coupon = discount.discount.coupon
+    def discount_description(total_discount_amount)
+      coupon = total_discount_amount.discount.try(:source).try(:coupon) || total_discount_amount.discount.try(:coupon)
       name = coupon.name
 
       if (percent = coupon.percent_off)

data/lib/pay/stripe.rb

@@ -27,7 +27,7 @@ module Pay
 
     extend Env
 
-    REQUIRED_VERSION = "~> 17"
+    REQUIRED_VERSION = "~> 18"
 
     # A list of database model names that include Pay
     # Used for safely looking up models with client_reference_id

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.3.0"
+  VERSION = "11.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.3.0
+  version: 11.4.0
 platform: ruby
 authors:
 - Jason Charnes