pay 3.0.10 → 3.0.14

data/lib/pay/billable/sync_customer.rb

@@ -21,7 +21,7 @@ module Pay
         if saved_change_to_email?
           # Queue job to update each payment processor for this customer
           pay_customers.pluck(:id).each do |pay_customer_id|
-            CustomerSyncJob.perform_later(id)
+            CustomerSyncJob.perform_later(pay_customer_id)
           end
         end
       end

data/lib/pay/currency.rb

@@ -0,0 +1,74 @@
+module Pay
+  class Currency
+    include ActionView::Helpers::NumberHelper
+
+    attr_reader :attributes
+
+    def self.all
+      @currencies ||= begin
+        path = Engine.root.join("config", "currencies", "iso.json")
+        JSON.parse File.read(path)
+      end
+    end
+
+    # Takes an amount (in cents) and currency and returns the formatted version for the currency
+    def self.format(amount, currency:)
+      currency ||= :usd
+      new(currency).format_amount(amount)
+    end
+
+    def initialize(iso_code)
+      @attributes = self.class.all[iso_code.to_s.downcase]
+    end
+
+    def format_amount(amount, **options)
+      number_to_currency(
+        amount.to_i / subunit_to_unit.to_f,
+        {
+          precision: precision,
+          unit: unit,
+          separator: separator,
+          delimiter: delimiter,
+          format: format
+        }.compact.merge(options)
+      )
+    end
+
+    # Returns the precision to display
+    #
+    # If 1, returns 0
+    # If 100, returns 2
+    # If 1000, returns 3
+    def precision
+      subunit_to_unit.digits.count - 1
+    end
+
+    def unit
+      attributes["unit"]
+    end
+
+    def separator
+      attributes["separator"]
+    end
+
+    def delimiter
+      attributes["delimiter"]
+    end
+
+    def format
+      attributes["format"]
+    end
+
+    def subunit?
+      subunit.blank?
+    end
+
+    def subunit
+      attributes["subunit"]
+    end
+
+    def subunit_to_unit
+      attributes["subunit_to_unit"]
+    end
+  end
+end

data/lib/pay/payment.rb

@@ -2,7 +2,7 @@ module Pay
   class Payment
     attr_reader :intent
 
-    delegate :id, :amount, :client_secret, :customer, :status, :confirm, to: :intent
+    delegate :id, :amount, :client_secret, :currency, :customer, :status, :confirm, to: :intent
 
     def self.from_id(id)
       intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id) : ::Stripe::PaymentIntent.retrieve(id)
@@ -41,6 +41,10 @@ module Pay
       intent.is_a?(::Stripe::SetupIntent)
     end
 
+    def amount_with_currency
+      Pay::Currency.format(amount, currency: currency)
+    end
+
     def validate
       if requires_payment_method?
         raise Pay::InvalidPaymentMethod.new(self)

data/lib/pay/receipts.rb

@@ -1,7 +1,5 @@
 module Pay
   module Receipts
-    include ActionView::Helpers::NumberHelper
-
     def product
       Pay.application_name
     end
@@ -20,11 +18,11 @@ module Pay
         [I18n.t("pay.receipt.date"), I18n.l(created_at, format: :long)],
         [I18n.t("pay.receipt.account_billed"), "#{customer.customer_name} (#{customer.email})"],
         [I18n.t("pay.receipt.product"), product],
-        [I18n.t("pay.receipt.amount"), number_to_currency(amount / 100.0)],
+        [I18n.t("pay.receipt.amount"), Pay::Currency.format(amount, currency: currency)],
         [I18n.t("pay.receipt.charged_to"), charged_to]
       ]
       line_items << [I18n.t("pay.receipt.additional_info"), customer.owner.extra_billing_info] if customer.owner.extra_billing_info?
-      line_items << [I18n.t("pay.receipt.refunded"), number_to_currency(amount_refunded / 100.0)] if refunded?
+      line_items << [I18n.t("pay.receipt.refunded"), Pay::Currency.format(amount_refunded, currency: currency)] if refunded?
 
       defaults = {
         id: id,
@@ -50,11 +48,11 @@ module Pay
     end
 
     def invoice_pdf(**options)
-      bill_to = [owner.name]
-      bill_to += [owner.extra_billing_info] if owner.extra_billing_info?
-      bill_to += [nil, owner.email]
+      bill_to = [customer.owner.name]
+      bill_to += [customer.owner.extra_billing_info] if customer.owner.extra_billing_info?
+      bill_to += [nil, customer.owner.email]
 
-      total = ActionController::Base.helpers.number_to_currency(amount / 100.0)
+      total = Pay::Currency.format(amount, currency: currency)
 
       line_items = [
         ["<b>#{I18n.t("pay.invoice.product")}</b>", nil, "<b>#{I18n.t("pay.invoice.amount")}</b>"],

data/lib/pay/stripe/billable.rb

@@ -175,13 +175,14 @@ module Pay
       # checkout(line_items, "price_12345", allow_promotion_codes: true)
       #
       def checkout(**options)
+        customer unless processor_id?
         args = {
           customer: processor_id,
           payment_method_types: ["card"],
           mode: "payment",
           # These placeholder URLs will be replaced in a following step.
-          success_url: options.delete(:success_url) || root_url,
-          cancel_url: options.delete(:cancel_url) || root_url
+          success_url: options.delete(:success_url) || root_url(session_id: "{CHECKOUT_SESSION_ID}"),
+          cancel_url: options.delete(:cancel_url) || root_url(session_id: "{CHECKOUT_SESSION_ID}")
         }
 
         # Line items are optional
@@ -203,6 +204,7 @@ module Pay
       # checkout_charge(amount: 15_00, name: "T-shirt", quantity: 2)
       #
       def checkout_charge(amount:, name:, quantity: 1, **options)
+        customer unless processor_id?
         currency = options.delete(:currency) || "usd"
         checkout(
           line_items: {
@@ -218,6 +220,7 @@ module Pay
       end
 
       def billing_portal(**options)
+        customer unless processor_id?
         args = {
           customer: processor_id,
           return_url: options.delete(:return_url) || root_url

data/lib/pay/stripe/payment_method.rb

@@ -18,7 +18,7 @@ module Pay
         default_payment_method_id = pay_customer.customer.invoice_settings.default_payment_method
         default = (id == default_payment_method_id)
 
-        attributes = extract_attributes(object).merge(default: default)
+        attributes = extract_attributes(object).merge(default: default, stripe_account: stripe_account)
 
         pay_customer.payment_methods.update_all(default: false) if default
         pay_payment_method = pay_customer.payment_methods.where(processor_id: object.id).first_or_initialize

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

@@ -4,7 +4,7 @@ module Pay
       class ChargeRefunded
         def call(event)
           pay_charge = Pay::Stripe::Charge.sync(event.data.object.id, stripe_account: event.try(:account))
-          notify_user(pay_charge.owner, pay_charge) if pay_charge
+          notify_user(pay_charge.customer.owner, pay_charge) if pay_charge
         end
 
         def notify_user(billable, charge)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.10"
+  VERSION = "3.0.14"
 end

data/lib/pay.rb

@@ -9,6 +9,7 @@ module Pay
   autoload :NanoId, "pay/nano_id"
   autoload :Payment, "pay/payment"
   autoload :Receipts, "pay/receipts"
+  autoload :Currency, "pay/currency"
 
   # Payment processors
   autoload :Braintree, "pay/braintree"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.14
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ files:
 - app/views/pay/user_mailer/receipt.html.erb
 - app/views/pay/user_mailer/refund.html.erb
 - app/views/pay/user_mailer/subscription_renewing.html.erb
+- config/currencies/iso.json
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/1_create_pay_tables.rb
@@ -149,6 +150,7 @@ files:
 - lib/pay/braintree/webhooks/subscription_trial_ended.rb
 - lib/pay/braintree/webhooks/subscription_went_active.rb
 - lib/pay/braintree/webhooks/subscription_went_past_due.rb
+- lib/pay/currency.rb
 - lib/pay/engine.rb
 - lib/pay/env.rb
 - lib/pay/errors.rb