effective_orders 4.0.0beta10 → 4.0.0beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9a4a2c292d467b812005f7f1d9c0574e9ac2d2
-  data.tar.gz: 9f1803e3217276a89b2089e30ee71aed6667784c
+  metadata.gz: fe4a98dd89d5ffe64e9984a2f474d5d68ce02a45
+  data.tar.gz: d80c7ea4416f68d30a11ad80e5aa22555fa510da
 SHA512:
-  metadata.gz: fb91eb87e7faa70156723d2021ef78a499cd4543d869705d13f94d6540acdec71f3ba798cf49c76d33c11368b95474ca970cca54a8720eb2269e56dd8c6c5913
-  data.tar.gz: 00174cfdcd998155d3b20fc19aeedad1f206588c24971270ccddfa2f0a298cb68cb9122d79a1afd2672f82df5a8d654c6c39d236ad3e9de7943fcc5d3ab0a95e
+  metadata.gz: 4c40948325d0ef895a19aaa982343f09e4195ceb220399522a9f2759678394d479a90ef6d5ed4cae1d6c9eea34c415cd94901a74343e386b69138d41d445a051
+  data.tar.gz: 4d3928148ff0b56537f61eb0e06d0c1441171b0b7ee6b118973272118a69195096785a875ed7cbb007012783304c4a123a1613bdbaf6d26a2d7bc706aea7fb5e

data/app/controllers/effective/webhooks_controller.rb

@@ -1,10 +1,20 @@
+# New workflow is:
+# customer.updated
+# customer.created
+# customer.subscription.created
+# customer.updated
+# customer.source.created
+# charge.succeeded
+# invoice.created
+# invoice.payment_succeeded
+
 module Effective
   class WebhooksController < ApplicationController
     protect_from_forgery except: [:stripe]
     skip_authorization_check if defined?(CanCan)
 
     def stripe
-      @event = (Stripe::Webhook.construct_event(request.body.read, request.env['HTTP_STRIPE_SIGNATURE'], EffectiveOrders.subscription[:webhook_secret]) rescue nil)
+      @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
 
       unless EffectiveOrders.subscriptions[:ignore_livemode]

data/app/models/concerns/acts_as_subscribable.rb

@@ -21,7 +21,7 @@ module ActsAsSubscribable
     has_one :customer, through: :subscription, class_name: 'Effective::Customer'
 
     before_validation(if: -> { trialing_until.blank? && EffectiveOrders.trial? }) do
-      self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).end_of_day
+      self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).beginning_of_day
     end
 
     before_destroy(if: -> { subscribed? }) do

data/app/models/effective/subscripter.rb

@@ -134,12 +134,16 @@ module Effective
         return
       end
 
-      # Update stripe subscription items
+      # Update stripe subscription items. Keep track if quantity changed here or not
+      quantity_increased = false
+
       customer.stripe_subscription.items.each do |stripe_item|
         item = items.find { |item| item[:plan] == stripe_item['plan']['id'] }
 
         next if item.blank? || item[:quantity] == stripe_item['quantity']
 
+        quantity_increased ||= (item[:quantity] > stripe_item['quantity']) # Any quantity increased
+
         stripe_item.quantity = item[:quantity]
         stripe_item.metadata = item[:metadata]
 
@@ -171,10 +175,10 @@ module Effective
       end
 
       # When upgrading a plan, invoice immediately.
-      # if current_plan && current_plan[:id] != 'trial' && plan[:amount] > current_plan[:amount]
-      #   Rails.logger.info " -> INVOICE GENERATED"
-      #   Stripe::Invoice.create(customer: customer.stripe_customer_id).pay rescue false
-      # end
+      if quantity_increased
+        Rails.logger.info " -> QUANTITY INCREASED SO INVOICE GENERATED"
+        Stripe::Invoice.create(customer: customer.stripe_customer_id).pay
+      end
 
       customer.status = customer.stripe_subscription.status
     end

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

@@ -1,6 +1,6 @@
 %p.effective-orders-receipt-info Trial expiring
 
-%p Your trial for #{@subscribable} expires on #{@subscribable.trial_expires_at.strftime('%F')}.
+%p Your trial for #{@subscribable} expires on #{@subscribable.trialing_until.strftime('%F')}.
 
 %p Please upgrade to a paid plan before your trial expires.
 

data/config/effective_orders.rb

@@ -256,7 +256,7 @@ EffectiveOrders.setup do |config|
   #   name: 'Free Trial',
   #   description: '45-Day Free Trial',
   #   length: 45.days,
-  #   remind_at: [1.day, 3.days, 7.days],  # Send email notification to trialing users 1, 3 and 7 days before expiring. false to disable.
+  #   remind_at: [1.day, 3.days, 7.days, 40.days, 44.days],  # Send email notification to trialing owners on day 1, 3, 7 40 and 44. false to disable
   # }
 
 end

data/lib/effective_orders/version.rb

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

data/lib/tasks/effective_orders_tasks.rake

@@ -43,17 +43,19 @@ namespace :effective_orders do
     begin
       ActsAsSubscribable.descendants.each do |klass|
         klass.trialing.find_each do |subscribable|
-          if subscribable.trial_expires_at == today
+          if subscribable.trialing_until == today
             puts "sending trial expired to #{subscribable}"
             Effective::OrdersMailer.subscription_trial_expired(subscribable).deliver_now
           end
 
-          next if subscribable.trial_expired? # We already notified them
+          next if subscribable.trial_past_due? # We already notified them
 
           reminders.each do |remind_at|
-            next unless subscribable.trial_expires_at == (today + remind_at)
+            date = (subscribable.trialing_until - EffectiveOrders.trial.fetch(:length)) # Should be same as created_at.beginning_of_day
 
-            puts "sending trial expiring to #{subscribable}. expires in #{(subscribable.trial_expires_at - today) / 1.day.to_i} days."
+            next unless date == (today + remind_at)
+
+            puts "sending trial expiring to #{subscribable}. expires in #{(subscribable.trialing_until - today) / 1.day.to_i} days."
             Effective::OrdersMailer.subscription_trial_expiring(subscribable).deliver_now
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta10
+  version: 4.0.0beta11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails