moneytree-rails 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93dc9ca7a7f7c33bb6866abec9c4ef68038d5c9c542a92ea20d890086ab4369
-  data.tar.gz: ab099aef15f26a36c21934d1a70d39e8641db9fee2feb88107681b3f72b5f890
+  metadata.gz: 0a606a849682a4f6127da7dfbb4a9d0606f315c819207653084088a3b230c179
+  data.tar.gz: d682ed115c7159fbbb81276b63b5e9d94b8e43032a201cb088bb2cf1e8b495a9
 SHA512:
-  metadata.gz: c76a4655eb8f63a3c7643b95b595e8cbe7484ff5a92642ca28e1947225ed6ebce4be3bf80cb620bc1ace05450b308a976901f4f3415fcfce2083dd4f475453fd
-  data.tar.gz: ddb835e4f3a5113752ca9929a4fd0788565729a8881a7c917bbb13548bdc856e025e0b7def3c0647d6e5314bf4e0670ce70036355be1a21a77439002cb786699
+  metadata.gz: 6b9e27ae3746b2d400e3810ff71717e676d546aed60235fc3a1f0b0f81cce6b9fcaf70b5b3ccf0bdceb3f0b3070bfba018363a8b163ec2db311b687c4e259ed7
+  data.tar.gz: 9cd9a4892e98f7e6d4acad9fa9a026dda236215c3830576d3cd1ee3b779dfc4377c82226e333de0833272c962f39e8914b3aaa9f3789ce21945f5751d5e98a81

data/app/controllers/moneytree/oauth/square_controller.rb

@@ -1,6 +1,6 @@
 module Moneytree
   module Oauth
-    class SquareController < ApplicationController
+    class SquareController < Moneytree::ApplicationController
       def new
         redirect_to current_account.oauth_link
       end

data/app/controllers/moneytree/oauth/stripe_controller.rb

@@ -1,6 +1,6 @@
 module Moneytree
   module Oauth
-    class StripeController < ApplicationController
+    class StripeController < Moneytree::ApplicationController
       def new
         redirect_to stripe_oauth_url
       end
@@ -27,7 +27,7 @@ module Moneytree
           query: {
             response_type: :code,
             client_id: Moneytree.stripe_credentials[:client_id],
-            scope: PaymentProvider::Stripe::PERMISSION,
+            scope: Moneytree::PaymentProvider::Stripe::PERMISSION,
             redirect_uri: oauth_stripe_callback_url,
             'stripe_user[email]': current_account.email,
             'stripe_user[url]': current_account.website,

data/app/controllers/moneytree/webhooks/square_controller.rb

@@ -1,6 +1,6 @@
 module Moneytree
   module Webhooks
-    class SquareController < ApplicationController
+    class SquareController < Moneytree::ApplicationController
       def create
         # Do some callback magic here
       end

data/app/controllers/moneytree/webhooks/stripe_controller.rb

@@ -1,6 +1,6 @@
 module Moneytree
   module Webhooks
-    class StripeController < ApplicationController
+    class StripeController < Moneytree::ApplicationController
       skip_before_action :verify_authenticity_token
 
       def create
@@ -29,7 +29,7 @@ module Moneytree
         return if transaction.completed?
 
         transaction.process_response(
-          TransactionResponse.new(:success, '', { charge_id: stripe_object.id })
+          Moneytree::TransactionResponse.new(:success, '', { charge_id: stripe_object.id })
         )
 
         if Moneytree.order_status_trigger_method
@@ -47,7 +47,7 @@ module Moneytree
           next if refund.completed?
 
           refund.process_response(
-            TransactionResponse.new(:success, '')
+            Moneytree::TransactionResponse.new(:success, '')
           )
           if Moneytree.order_status_trigger_method
             transaction.order.send(Moneytree.order_status_trigger_method, transaction)
@@ -56,7 +56,7 @@ module Moneytree
       end
 
       def transaction
-        @transaction ||= Transaction.find(stripe_object.metadata[:moneytree_transaction_id])
+        @transaction ||= Moneytree::Transaction.find(stripe_object.metadata[:moneytree_transaction_id])
       end
 
       def stripe_object

data/app/models/moneytree/card.rb

@@ -0,0 +1,15 @@
+module Moneytree
+  class Card
+    include ActiveModel::Model
+
+    attr_accessor(
+      :last4,
+      :exp_month,
+      :exp_year,
+      :fingerprint,
+      :brand,
+      :address_zip,
+      :country
+    )
+  end
+end

data/app/models/moneytree/payment.rb

@@ -1,6 +1,6 @@
 module Moneytree
-  class Payment < Transaction
-    has_many :refunds, class_name: 'Refund'
+  class Payment < Moneytree::Transaction
+    has_many :refunds, class_name: 'Moneytree::Refund'
 
     validates_absence_of :payment_id
 

data/app/models/moneytree/payment_gateway.rb

@@ -8,10 +8,7 @@ module Moneytree
     # FIXME: enable https://github.com/ankane/lockbox
     delegate :oauth_link, :scope_correct?, :charge, :refund, to: :payment_provider
 
-    # has_many :orders
-    # has_many :transactions
-    # has_many :customers
-    # has_many :cards
+    has_many :transactions
 
     def oauth_callback(params)
       update! psp_credentials: payment_provider.get_access_token(params)
@@ -30,8 +27,6 @@ module Moneytree
       psp_credentials[:scope] == payment_provider.scope
     end
 
-    private
-
     def payment_provider
       @payment_provider ||=
         case psp

data/app/models/moneytree/refund.rb

@@ -1,5 +1,5 @@
 module Moneytree
-  class Refund < Transaction
+  class Refund < Moneytree::Transaction
     belongs_to :payment, class_name: 'Moneytree::Payment'
 
     before_validation :set_order, :set_payment_gateway

data/app/models/moneytree/transaction.rb

@@ -1,5 +1,5 @@
 module Moneytree
-  class Transaction < ApplicationRecord
+  class Transaction < Moneytree::ApplicationRecord
     belongs_to :payment_gateway
     belongs_to :order, polymorphic: true
 
@@ -9,8 +9,14 @@ module Moneytree
 
     serialize :details
 
+    delegate :payment_provider, to: :payment_gateway
+
     after_create_commit :execute_transaction
 
+    def card
+      payment_provider.card_for(self)
+    end
+
     def process_response(response)
       if response.success?
         update!(

data/lib/moneytree/order.rb

@@ -9,7 +9,9 @@ module Moneytree
     end
 
     def new_payment(*args)
-      moneytree_transactions << Payment.new(*args)
+      payment = Payment.new(*args)
+      moneytree_transactions << payment
+      payment
     end
   end
 end

data/lib/moneytree/payment_provider/stripe.rb

@@ -26,7 +26,7 @@ module Moneytree
         PERMISSION.to_s
       end
 
-      def charge(amount, details, app_fee_amount: 0, description: "Charge for #{account.name}", metadata:)
+      def charge(amount, details, metadata:, app_fee_amount: 0, description: "Charge for #{account.name}")
         # `source` is obtained with Stripe.js; see https://stripe.com/docs/payments/accept-a-payment-charges#web-create-token
         response = ::Stripe::Charge.create(
           {
@@ -43,7 +43,11 @@ module Moneytree
         TransactionResponse.new(
           { succeeded: :success, pending: :pending, failed: :failed }[response[:status].to_sym],
           response[:failure_message],
-          { charge_id: response[:id] }
+          {
+            charge_id: response[:id],
+            card: response[:payment_method_details][:card],
+            has_application_fee: !app_fee_amount.zero?
+          }
         )
       rescue ::Stripe::StripeError => e
         TransactionResponse.new(:failed, e.message)
@@ -55,7 +59,7 @@ module Moneytree
             charge: details[:charge_id],
             amount: (-amount * 100).to_i,
             metadata: metadata,
-            refund_application_fee: Moneytree.refund_application_fee
+            refund_application_fee: details[:has_application_fee] && Moneytree.refund_application_fee
           },
           stripe_account: payment_gateway.psp_credentials[:stripe_user_id]
         )
@@ -70,6 +74,18 @@ module Moneytree
         TransactionResponse.new(:failed, e.message)
       end
 
+      def card_for(transaction)
+        Card.new(
+          last4: transaction.details[:card][:last4],
+          exp_month: transaction.details[:card][:exp_month],
+          exp_year: transaction.details[:card][:exp_year],
+          fingerprint: transaction.details[:card][:fingerprint],
+          brand: transaction.details[:card][:brand],
+          address_zip: transaction.details[:card][:address_zip],
+          country: transaction.details[:card][:country]
+        )
+      end
+
       private
 
       def credentitals

data/lib/moneytree/version.rb

@@ -1,3 +1,3 @@
 module Moneytree
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moneytree-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Kieran Klaassen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,7 @@ files:
 - app/jobs/moneytree/application_job.rb
 - app/mailers/moneytree/application_mailer.rb
 - app/models/moneytree/application_record.rb
+- app/models/moneytree/card.rb
 - app/models/moneytree/payment.rb
 - app/models/moneytree/payment_gateway.rb
 - app/models/moneytree/refund.rb