effective_orders 4.0.0beta8 → 4.0.0beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66a5be43c958c2c0488de0973b4d5c30dff9bd4
-  data.tar.gz: 120bed89ab81bd1e8dc044fc39e8e6d331811032
+  metadata.gz: 0f9582922bd3c509dd18a48a2c9a0d3e7bd53103
+  data.tar.gz: 52ca7bfe3842f3862d79a847ba62112a888401ef
 SHA512:
-  metadata.gz: e17e53c655a3f620b31442b305ab5fa7c869ab11db9be8b5b135c064fabb1064ce39ad13f91468dabc9dba2bc442c39de92d6dd5a984c23d7e36e4b36daa8fbb
-  data.tar.gz: 59401e22fe8407db0efe2857131d73fcbd1f7a298413c031e6a30e66e6430c1af0e5a372ca50c4d6bcb1dd3c341b0bb983f9bac3ec5506f445e59edc78eaa6e1
+  metadata.gz: 8e0c0dc8e9eb1ad425c77bd72f018bed2a985b468228e09c40a4dca22e2035ca22c0ed572954e08b975e489924795f02f3a67cfb9bd0384fc802978493965842
+  data.tar.gz: 99d87d0dbffa152d7614621617f642dfe36a877d3bdd95ca75581f56bef932c9f413f19019f242ef50a181e919f0a7772c8aa3cea18dbe72af7921f3927c9d73

data/app/controllers/effective/webhooks_controller.rb

@@ -5,7 +5,11 @@ module Effective
 
     def stripe
       @event = (Stripe::Webhook.construct_event(request.body.read, request.env['HTTP_STRIPE_SIGNATURE'], EffectiveOrders.subscription[:webhook_secret]) rescue nil)
-      (head(:bad_request) and return) if !@event || (params[:livemode] == false && Rails.env.production?)
+      (head(:bad_request) and return) unless @event
+
+      unless EffectiveOrders.subscription[:ignore_livemode]
+        (head(:bad_request) and return) if (params[:livemode] == false && Rails.env.production?)
+      end
 
       Rails.logger.info "STRIPE WEBHOOK: #{@event.type}"
 
@@ -51,15 +55,7 @@ module Effective
     private
 
     def send_email(email, *mailer_args)
-      if EffectiveOrders.mailer[:delayed_job_deliver] && EffectiveOrders.mailer[:deliver_method] == :deliver_later
-        Effective::OrdersMailer.delay.public_send(email, *mailer_args)
-      elsif EffectiveOrders.mailer[:deliver_method].present?
-        Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
-      else
-        Effective::OrdersMailer.public_send(email, *mailer_args).deliver_now
-      end
-
-      true
+      Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
     end
 
   end

data/config/effective_orders.rb

@@ -245,7 +245,8 @@ EffectiveOrders.setup do |config|
   config.subscriptions = false
 
   # config.subscriptions = {
-  #   webhook_secret: 'whsec_xxx'
+  #   webhook_secret: 'whsec_xxx',
+  #   ignore_livemode: false        # Use this to run test mode in production. careful.
   # }
 
   # Trial

data/lib/effective_orders/version.rb

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

metadata

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