effective_orders 4.0.0beta16 → 4.0.0beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfed4c5207c463fed6c3d0adfe543cdf6d7179b0
-  data.tar.gz: 34169145a782863e3714d19c623b023b8e93cd6c
+  metadata.gz: c31920616d5695fbd44ffee53ce1528e1e9f0826
+  data.tar.gz: 8aaa54b4c98ed47cf86a8502f7e697d0c4e3b1a1
 SHA512:
-  metadata.gz: 4c6b21fb32445e76d6d8b4921d6f15923f8cd1c60c2aa969b605735d38ab3a95aed776ea3bc1c17cdcf95798a794ed0dfd7efabcc5662e13965f8c698ba30dfe
-  data.tar.gz: f219625d20fda0dbc0f2b8d1b085f9dc1a04391cfdeb8753dd8b1947ca58cb3c91126a540947d0f33697b923195003796a78719436350d02223e278017ebd136
+  metadata.gz: e6d8e03922d776a594b302a0e5ffafcc7ffba9370d5bf8506af0e3411f2c39a073ec1731c0c6acc42459d295724d0d1b0a75cc0bb8f709c76e7fb11ecb2f2829
+  data.tar.gz: 88b80cc28b73baf51057c91c99d090c1d4fc8e4809632c35aa9132ab48edf8639ebe3faa303c6ec5b13d675b399c408c0fc71d383241c5c0e12a8d1610307bf4

data/README.md

@@ -588,6 +588,31 @@ Create a Product with the name you want customers to see on their receipts
 Yearly and a Monthly per team
 
 
+#### Callbacks
+
+The event is the Stripe event JSON.
+
+```ruby
+after_invoice_payment_succeeded do |event|
+end
+
+after_invoice_payment_failed do |event|
+end
+
+after_customer_subscription_created do |event|
+end
+
+after_customer_subscription_updated do |event|
+end
+
+after_customer_subscription_deleted do |event|
+end
+
+after_customer_updated do |event|
+end
+```
+
+
 ### Admin Screen
 
 To use the Admin screen, please also install the effective_datatables gem:

data/app/controllers/effective/webhooks_controller.rb

@@ -13,6 +13,8 @@ module Effective
     protect_from_forgery except: [:stripe]
     skip_authorization_check if defined?(CanCan)
 
+    after_action :run_subscribable_buyer_callbacks!
+
     def stripe
       @event = (Stripe::Webhook.construct_event(request.body.read, request.env['HTTP_STRIPE_SIGNATURE'], EffectiveOrders.subscriptions[:webhook_secret]) rescue nil)
       (head(:bad_request) and return) unless @event
@@ -21,7 +23,7 @@ module Effective
         (head(:bad_request) and return) if (params[:livemode] == false && Rails.env.production?)
       end
 
-      Rails.logger.info "[STRIPE] webhook received: #{@event.type}"
+      Rails.logger.info "[STRIPE] webhook received: #{@event.type} for #{customer || 'unknown customer'}" # Customer must be called here
 
       Effective::Customer.transaction do
         case @event.type
@@ -66,12 +68,30 @@ module Effective
     private
 
     def customer
-      @customer ||= Effective::Customer.where(stripe_customer_id: @event.data.object.customer).first!
+      return unless @event.respond_to?(:data)
+
+      @customer ||= (
+        stripe_customer_id = @event.data.object.customer if @event.data.object.respond_to?(:customer)
+        stripe_customer_id = @event.data.object.id if @event.data.object.object == 'customer'
+
+        Effective::Customer.where(stripe_customer_id: stripe_customer_id || 'unknown').first!
+      )
     end
 
     def send_email(email, *mailer_args)
       Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
     end
 
+    def run_subscribable_buyer_callbacks!
+      return if @event.blank? || @customer.blank?
+
+      name = ('after_' + @event.type.to_s.gsub('.', '_')).to_sym
+      buyer = @customer.user
+
+      buyer.public_send(name, @event) if buyer.respond_to?(name)
+
+      true
+    end
+
   end
 end

data/app/models/concerns/acts_as_subscribable_buyer.rb

@@ -18,5 +18,32 @@ module ActsAsSubscribableBuyer
     end
   end
 
+  module ClassMethods
+    def after_invoice_payment_succeeded(&block)
+      send :define_method, :after_invoice_payment_succeeded do |event| self.instance_exec(event, &block) end
+    end
+
+    def after_invoice_payment_failed(&block)
+      send :define_method, :after_invoice_payment_failed do |event| self.instance_exec(event, &block) end
+    end
+
+    def after_customer_subscription_created(&block)
+      send :define_method, :after_customer_subscription_created do |event| self.instance_exec(event, &block) end
+    end
+
+    def after_customer_subscription_updated(&block)
+      send :define_method, :after_customer_subscription_updated do |event| self.instance_exec(event, &block) end
+    end
+
+    def after_customer_subscription_deleted(&block)
+      send :define_method, :after_customer_subscription_deleted do |event| self.instance_exec(event, &block) end
+    end
+
+    def after_customer_updated(&block)
+      send :define_method, :after_customer_updated do |event| self.instance_exec(event, &block) end
+    end
+
+  end
+
 end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta16'.freeze
+  VERSION = '4.0.0beta17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta16
+  version: 4.0.0beta17
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails