pay 3.0.19 → 3.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '093c067bb867fddfbdb00486613ad7be4b9e1d3d0d5ff1e22ec3d892b6bb76b3'
-  data.tar.gz: d4b53a841c0e7cae39f6c73786dbfbe20bc61c81dbbfe3885cbe2a0b0f830936
+  metadata.gz: 5755d6421fc4b0366728f278b32de2f9f1bf6186cafe4c62cf9c5a188204d0d6
+  data.tar.gz: 5a4cf13ffbdf85017401dd9aca4ddc3d7fd48fea249868ff10c04bfa383e39d1
 SHA512:
-  metadata.gz: cee4d5e1b4ed8954e7004b121165c5e4b4dc69f5a39a01b4f9b90197ef4a8dc04cca5660488b7b2da2975a78d9cf0e5356cd30e84923af56e2460277c6c79979
-  data.tar.gz: 261fdecca8eb33582d279ce18f76fe4c80e3efe5fb95c479549c8c4232e53b6096a69decd3915ac12fe7792035e14e88122ef35a459090b5f4e8a710588a2b80
+  metadata.gz: 966be7e8c643bb6bfa65f21d111d76e35d461a500630434f6b37907c9001f823ae3aa7193f763a7b0af76ef35806de91bd8acfaff1eef219972c8284a96835d3
+  data.tar.gz: b0dd861df1aa7cb64ab45b267de205251e4a8885a113219a0eb5c3d4fe087332fae129ca7fa1b619d7b75aef6a53698f1665d977c52a472a3d31bce90ff255d5

data/app/jobs/pay/customer_sync_job.rb

@@ -5,7 +5,7 @@ module Pay
     def perform(pay_customer_id)
       Pay::Customer.find(pay_customer_id).update_customer!
     rescue ActiveRecord::RecordNotFound
-      Rails.logger.info "Couldn't find a #{class_name} with ID = #{id}"
+      Rails.logger.info "Couldn't find a Pay::Customer with ID = #{id}"
     end
   end
 end

data/app/views/pay/payments/show.html.erb

@@ -66,7 +66,7 @@
 <script type="module">
   window.stripe = Stripe('<%= Pay::Stripe.public_key %>');
 
-  import { Application, Controller } from 'https://cdn.skypack.dev/stimulus'
+  import { Application, Controller } from 'https://cdn.skypack.dev/@hotwired/stimulus'
   const application = Application.start()
 
   application.register('payment-intent', class extends Controller {

data/app/views/pay/user_mailer/receipt.html.erb

@@ -10,7 +10,7 @@ Amount: <%= params[:charge].amount_with_currency %><br/>
 Charged to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>
 Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.extra_billing_info? %>
+<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
 <%= params[:charge].customer.owner.extra_billing_info %><br/>
 <% end %>
 <br/>

data/app/views/pay/user_mailer/refund.html.erb

@@ -11,7 +11,7 @@ Amount: <%= params[:charge].amount_refunded_with_currency %><br/>
 Refunded to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>
 Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.extra_billing_info? %>
+<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
 <%= params[:charge].customer.owner.extra_billing_info %><br/>
 <% end %>
 <br/>

data/lib/pay/braintree/billable.rb

@@ -30,7 +30,8 @@ module Pay
 
           customer
         else
-          result = gateway.customer.create(email: email, first_name: try(:first_name), last_name: try(:last_name), payment_method_nonce: payment_method_token)
+          first_name, last_name = customer_name.split(" ", 2)
+          result = gateway.customer.create(email: email, first_name: first_name, last_name: last_name, payment_method_nonce: payment_method_token)
           raise Pay::Braintree::Error, result unless result.success?
           pay_customer.update!(processor_id: result.customer.id)
 
@@ -47,6 +48,13 @@ module Pay
         raise Pay::Braintree::Error, e
       end
 
+      # Syncs name and email to Braintree::Customer
+      def update_customer!
+        return unless processor_id?
+        first_name, last_name = customer_name.split(" ", 2)
+        gateway.customer.update(processor_id, first_name: first_name, last_name: last_name, email: email)
+      end
+
       def charge(amount, options = {})
         args = {
           amount: amount.to_i / 100.0,

data/lib/pay/fake_processor/billable.rb

@@ -19,6 +19,10 @@ module Pay
         pay_customer
       end
 
+      def update_customer!
+        # pass
+      end
+
       def charge(amount, options = {})
         # Make to generate a processor_id
         customer

data/lib/pay/paddle/billable.rb

@@ -18,6 +18,10 @@ module Pay
         # pass
       end
 
+      def update_customer!
+        # pass
+      end
+
       def charge(amount, options = {})
         subscription = pay_customer.subscription
         return unless subscription.processor_id

data/lib/pay/receipts.rb

@@ -21,7 +21,7 @@ module Pay
         [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.additional_info"), customer.owner.extra_billing_info] if customer.owner.try(:extra_billing_info?)
       line_items << [I18n.t("pay.receipt.refunded"), Pay::Currency.format(amount_refunded, currency: currency)] if refunded?
 
       defaults = {
@@ -49,7 +49,7 @@ module Pay
 
     def invoice_pdf(**options)
       bill_to = [customer.owner.name]
-      bill_to += [customer.owner.extra_billing_info] if customer.owner.extra_billing_info?
+      bill_to += [customer.owner.extra_billing_info] if customer.owner.try(:extra_billing_info?)
       bill_to += [nil, customer.owner.email]
 
       total = Pay::Currency.format(amount, currency: currency)

data/lib/pay/stripe/billable.rb

@@ -44,6 +44,12 @@ module Pay
         raise Pay::Stripe::Error, e
       end
 
+      # Syncs name and email to Stripe::Customer
+      def update_customer!
+        return unless processor_id?
+        ::Stripe::Customer.update(processor_id, {name: customer_name, email: email}, stripe_options)
+      end
+
       def charge(amount, options = {})
         add_payment_method(payment_method_token, default: true) if payment_method_token?
 
@@ -181,8 +187,8 @@ module Pay
           payment_method_types: ["card"],
           mode: "payment",
           # These placeholder URLs will be replaced in a following step.
-          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}")
+          success_url: merge_session_id_param(options.delete(:success_url) || root_url),
+          cancel_url: merge_session_id_param(options.delete(:cancel_url) || root_url)
         }
 
         # Line items are optional
@@ -234,6 +240,13 @@ module Pay
       def stripe_options
         {stripe_account: stripe_account}.compact
       end
+
+      # Includes the `session_id` param for Stripe Checkout with existing params (and makes sure the curly braces aren't escaped)
+      def merge_session_id_param(url)
+        uri = URI.parse(url)
+        uri.query = URI.encode_www_form(URI.decode_www_form(uri.query.to_s).to_h.merge("session_id" => "{CHECKOUT_SESSION_ID}").to_a)
+        uri.to_s.gsub("%7BCHECKOUT_SESSION_ID%7D", "{CHECKOUT_SESSION_ID}")
+      end
     end
   end
 end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.19"
+  VERSION = "3.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.23
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,14 +123,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/1_create_pay_tables.rb
-- lib/generators/active_record/billable_generator.rb
-- lib/generators/active_record/merchant_generator.rb
-- lib/generators/active_record/templates/billable_migration.rb
-- lib/generators/active_record/templates/merchant_migration.rb
-- lib/generators/pay/billable_generator.rb
 - lib/generators/pay/email_views_generator.rb
-- lib/generators/pay/merchant_generator.rb
-- lib/generators/pay/orm_helpers.rb
 - lib/generators/pay/views_generator.rb
 - lib/pay.rb
 - lib/pay/adapter.rb

data/lib/generators/active_record/billable_generator.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/active_record"
-require "generators/pay/orm_helpers"
-
-module ActiveRecord
-  module Generators
-    class BillableGenerator < ActiveRecord::Generators::Base
-      include Pay::Generators::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_pay_billable_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "billable_migration.rb", "#{migration_path}/add_pay_billable_to_#{table_name}.rb", migration_version: migration_version
-        else
-          say "#{model_path} does not exist.", :red
-          say "⚠️  Make sure the #{name} model exists before running this generator."
-        end
-      end
-
-      # If the file already contains the contents, the user will receive this warning:
-      #
-      #   File unchanged! The supplied flag value not found!
-      #
-      # This can be ignored as it just means the contents already exist and the file is unchanged.
-      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
-      def inject_pay_billable_content
-        return unless model_exists?
-
-        content = model_contents
-        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
-        inject_into_class(model_path, class_path.last, content)
-      end
-
-      private
-
-      def model_contents
-        "  include Pay::Billable"
-      end
-    end
-  end
-end

data/lib/generators/active_record/merchant_generator.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/active_record"
-require "generators/pay/orm_helpers"
-
-module ActiveRecord
-  module Generators
-    class MerchantGenerator < ActiveRecord::Generators::Base
-      include Pay::Generators::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_pay_merchant_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "merchant_migration.rb", "#{migration_path}/add_pay_merchant_to_#{table_name}.rb", migration_version: migration_version
-        else
-          say "#{model_path} does not exist.", :red
-          say "⚠️  Make sure the #{name} model exists before running this generator."
-        end
-      end
-
-      # If the file already contains the contents, the user will receive this warning:
-      #
-      #   File unchanged! The supplied flag value not found!
-      #
-      # This can be ignored as it just means the contents already exist and the file is unchanged.
-      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
-      def inject_pay_merchant_content
-        return unless model_exists?
-
-        content = model_contents
-        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
-        inject_into_class(model_path, class_path.last, content)
-      end
-
-      private
-
-      def model_contents
-        "  include Pay::Merchant"
-      end
-    end
-  end
-end

data/lib/generators/active_record/templates/billable_migration.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
-  def change
-    change_table :<%= table_name %>, bulk: true do |t|
-      t.string :processor
-      t.string :processor_id
-      t.public_send(Pay::Adapter.json_column_type, :pay_data)
-      t.datetime :trial_ends_at
-      t.string :card_type
-      t.string :card_last4
-      t.string :card_exp_month
-      t.string :card_exp_year
-      t.text :extra_billing_info
-    end
-  end
-end

data/lib/generators/active_record/templates/merchant_migration.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class AddPayMerchantTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
-  def change
-    add_column table_name, :merchant_processor, :string
-
-    # We may already have the pay_data column if a Pay::Billable object is also a Pay::Merchant
-    unless ActiveRecord::Base.connection.column_exists?(table_name, :pay_data)
-      add_column :<%= table_name %>, :pay_data, Pay::Adapter.json_column_type
-    end
-  end
-end

data/lib/generators/pay/billable_generator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/named_base"
-
-module Pay
-  module Generators
-    class BillableGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc "Generates a migration to add Pay::Billable fields to a model."
-
-      hook_for :orm
-    end
-  end
-end

data/lib/generators/pay/merchant_generator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/named_base"
-
-module Pay
-  module Generators
-    class MerchantGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc "Generates a migration to add Pay::Merchant fields to a model."
-
-      hook_for :orm
-    end
-  end
-end

data/lib/generators/pay/orm_helpers.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Pay
-  module Generators
-    module OrmHelpers
-      private
-
-      def model_exists?
-        File.exist?(File.join(destination_root, model_path))
-      end
-
-      def migration_exists?(table_name)
-        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_devise_to_#{table_name}.rb$/).first
-      end
-
-      def migration_path
-        if Rails.version >= "5.0.3"
-          db_migrate_path
-        else
-          @migration_path ||= File.join("db", "migrate")
-        end
-      end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{file_path}.rb")
-      end
-
-      def migration_version
-        if rails5_and_up?
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
-      end
-
-      def rails5_and_up?
-        Rails::VERSION::MAJOR >= 5
-      end
-    end
-  end
-end