pay 3.0.7 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278b92c6de6eddff30a1e3ad856ea137b7c020570b89ceb2898396d97b94da8a
-  data.tar.gz: 28bb9062e581cb49f36b518a5fe47a1dd7ba248e1c868664881687aa5f0932c9
+  metadata.gz: 7f81b673f2ce37840c025f8fea1838e0d66625a5bc5d14017a40ed5333268076
+  data.tar.gz: '087f55457dc4be6158e9b5ae3a1fa750b62712e906801cfee9a11b2764744aeb'
 SHA512:
-  metadata.gz: 2e69eb63bbeb02bf4df7633bee6158b1f5ae21c5606a8807a1a3bc5f39ee9c8d01dae7939583ec00ce6f63d06962ae6b755a4700c14a209ffa4951be17d10015
-  data.tar.gz: bc5b4888956b0cd12de949cd2ebff34f0808b5e1fdd0e81f499ed7680c185cea911becefb201aefcd90e18fd2b6bc33db2f4f9ea1ecd1b6487dac010efdaa4c2
+  metadata.gz: 6d0f622daa0f6698de1b2a7537e0bc85852331c20acace7a3bb7b6730d185dcf5088d47064adb2d0935fcc44d01663da2fb044a526ab0eb22f02bceff227b100
+  data.tar.gz: 2a2767806fa3a492a7f87fa11dd9bac57e2be68a776703e4d6560fdd5b24ed837f6aab635110ff3e0147ee29554213f52ba99d53f0b526076a011eb3cc3f5dbd

data/README.md

@@ -49,7 +49,7 @@ Want to add a new payment provider? Contributions are welcome.
 * **Marketplaces**
   * [Stripe Connect](docs/marketplaces/stripe_connect.md)
 * **Contributing**
-  * [Adding A Payment Processor](docs/contributing/adding_a_payment_processor.md)
+  * [Adding A Payment Processor](docs/contributing/8_adding_a_payment_processor.md)
 
 ## 🙏 Contributing
 

data/app/models/pay/charge.rb

@@ -10,7 +10,6 @@ module Pay
     scope :sorted, -> { order(created_at: :desc) }
     scope :with_active_customer, -> { joins(:customer).merge(Customer.active) }
     scope :with_deleted_customer, -> { joins(:customer).merge(Customer.deleted) }
-    default_scope -> { sorted }
 
     # Validations
     validates :amount, presence: true

data/app/models/pay/subscription.rb

@@ -4,7 +4,7 @@ module Pay
 
     # Associations
     belongs_to :customer
-    has_many :charges, class_name: "Pay::Charge", foreign_key: :pay_subscription_id
+    has_many :charges
 
     # Scopes
     scope :for_name, ->(name) { where(name: name) }
@@ -135,7 +135,7 @@ module Pay
         cancel_now!
       end
     rescue => e
-      Rails.logger.info "[Pay] Unable to automatically cancel subscription `#{processor} #{id}`: #{e.message}"
+      Rails.logger.info "[Pay] Unable to automatically cancel subscription `#{customer.processor} #{id}`: #{e.message}"
     end
   end
 end

data/config/locales/en.yml

@@ -25,6 +25,13 @@ en:
       additional_info: Additional Info
       refunded: Refunded
       paid: Paid
+    invoice:
+      amount: "Amount"
+      product: "Product"
+      quantity: "Quantity"
+      subtotal: "Subtotal"
+      total: "Total"
+      unit_price: "Unit Price"
     errors:
       action_required: "This payment attempt failed because additional action is required before it can be completed."
       invalid_payment: "This payment attempt failed because of an invalid payment method."

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/braintree/authorization_error.rb

@@ -2,7 +2,7 @@ module Pay
   module Braintree
     class AuthorizationError < Braintree::Error
       def message
-        I18n.t("errors.braintree.authorization")
+        I18n.t("pay.errors.braintree.authorization")
       end
     end
   end

data/lib/pay/receipts.rb

@@ -16,6 +16,16 @@ module Pay
     end
 
     def receipt_pdf(**options)
+      line_items = [
+        [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.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?
+
       defaults = {
         id: id,
         product: product,
@@ -40,15 +50,25 @@ 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]
+
+      total = ActionController::Base.helpers.number_to_currency(amount / 100.0)
+
+      line_items = [
+        ["<b>#{I18n.t("pay.invoice.product")}</b>", nil, "<b>#{I18n.t("pay.invoice.amount")}</b>"],
+        [product, nil, total],
+        [nil, I18n.t("pay.invoice.subtotal"), total],
+        [nil, I18n.t("pay.invoice.total"), total]
+      ]
+
       defaults = {
         id: id,
         issue_date: I18n.l(created_at, format: :long),
         due_date: I18n.l(created_at, format: :long),
         status: "<b><color rgb='#5eba7d'>#{I18n.t("pay.receipt.paid").upcase}</color></b>",
-        bill_to: [
-          customer.customer_name,
-          customer.email
-        ].compact,
+        bill_to: bill_to,
         product: product,
         company: {
           name: Pay.business_name,
@@ -63,15 +83,6 @@ module Pay
     end
 
     def line_items
-      line_items = [
-        [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.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
     end
   end

data/lib/pay/stripe/billable.rb

@@ -175,6 +175,7 @@ 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"],
@@ -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/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.7"
+  VERSION = "3.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.11
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails