effective_orders 4.0.0beta19 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a90107c72d72ef85dfab8a2b966f46ec314b7b
-  data.tar.gz: 6f7bec9931f8ae15798f744009ad1adfc6806dde
+  metadata.gz: 98cd0ecbc81154a3fe1f6c7f53a829298cb17c2f
+  data.tar.gz: 623c5e04730aaf7aecacb0eb0cc6c2c856079e9c
 SHA512:
-  metadata.gz: 38287717bee0633b5700b70dde6c55683c33e724c76d13a07ed1d02e4382715ec95a59eb9e6f82ae77d0ecd4ca52517dc8cb45955ab8de1c0f2e45868476fae3
-  data.tar.gz: b89ff8c3382b05081945c08497deb8c2c0b2bdb2ae3a577b0b22971e0b943ae2f94b016179025bf1e559c4afde316883778ee3188f03976de9e92c4d49966072
+  metadata.gz: 77765ad97f3e0e1792714a32cb6a6db14906d2acdec2b0e226c2a121b965a2f914505488ff10176fb2f2d275b7172b4b160f1d71678f7d957f5dff3dd7e1108d
+  data.tar.gz: c9a31baa8d288bd9b480443eacfed324208494984f363187f01a1b1c27b97465a9b7a720d1653e30c11cc0276f8899e269468892722a79c84c44c1c02c059178

data/app/controllers/effective/webhooks_controller.rb

@@ -80,6 +80,7 @@ module Effective
 
     def send_email(email, *mailer_args)
       Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+      Effective::OrdersMailer.public_send(:subscription_event_to_admin, email.to_s, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
     end
 
     def run_subscribable_buyer_callbacks!

data/app/mailers/effective/orders_mailer.rb

@@ -141,6 +141,19 @@ module Effective
       mail(to: @subscribable.subscribable_buyer.email, subject: @subject)
     end
 
+    def subscription_event_to_admin(event, customer_param)
+      return true unless EffectiveOrders.mailer[:send_subscription_event_to_admin]
+
+      @customer = (customer_param.kind_of?(Effective::Customer) ? customer_param : Effective::Customer.find(customer_param))
+      @subscriptions = @customer.subscriptions
+      @user = @customer.user
+      @event = event.to_s
+
+      @subject = subject_for(@customer, :subscription_event_to_admin, "Subscription event - @event").gsub('@event', @event)
+
+      mail(to: EffectiveOrders.mailer[:admin_email], subject: @subject)
+    end
+
     def order_error(order: nil, error: nil, to: nil, from: nil, subject: nil, template: 'order_error')
       @order = (order.kind_of?(Effective::Order) ? order : Effective::Order.find(order))
       @error = error.to_s

data/app/models/effective/customer.rb

@@ -36,6 +36,10 @@ module Effective
       user.to_s.presence || 'New Customer'
     end
 
+    def email
+      user.email if user
+    end
+
     def stripe_customer
       @stripe_customer ||= if stripe_customer_id.present?
         Rails.logger.info "[STRIPE] get customer: #{stripe_customer_id}"

data/app/views/effective/orders_mailer/subscription_event_to_admin.html.haml

@@ -0,0 +1,13 @@
+%p Hi admin,
+
+%p A <strong>#{@event}</strong> event has occurred.
+
+%p Customer: #{@customer}, #{@customer.email}, #{@customer.stripe_customer_id}
+
+- if @subscriptions.present?
+  %p Current subscriptions:
+  %ul
+    - @subscriptions.each do |subscription|
+      %li #{subscription.subscribable.to_s} - #{subscription}
+- else
+  %p This customer has no current subscriptions.

data/config/effective_orders.rb

@@ -133,6 +133,7 @@ EffectiveOrders.setup do |config|
     send_pending_order_invoice_to_buyer: true,
     send_order_receipts_when_mark_as_paid: false,
 
+    send_subscription_event_to_admin: true,
     send_subscription_created: true,
     send_subscription_updated: true,
     send_subscription_canceled: true,

data/lib/effective_orders/version.rb

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

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -47,6 +47,10 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
     Effective::OrdersMailer.subscription_trial_expired(preview_subscribable)
   end
 
+  def subscription_event_to_admin
+    Effective::OrdersMailer.subscription_event_to_admin(:subscription_updated, preview_customer)
+  end
+
   def order_error
     Effective::OrdersMailer.order_error(order: build_preview_order, error: 'Something did not work out')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta19
+  version: 4.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,6 +224,7 @@ files:
 - app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml
 - app/views/effective/orders_mailer/subscription_canceled.html.haml
 - app/views/effective/orders_mailer/subscription_created.html.haml
+- app/views/effective/orders_mailer/subscription_event_to_admin.html.haml
 - app/views/effective/orders_mailer/subscription_payment_failed.html.haml
 - app/views/effective/orders_mailer/subscription_payment_succeeded.html.haml
 - app/views/effective/orders_mailer/subscription_trial_expired.html.haml
@@ -257,9 +258,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1