effective_orders 4.0.0beta7 → 4.0.0beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18089b6f65a77083a900dfbbcc8cdb54e17b8b38
-  data.tar.gz: caaf724407161e9323c9ba948787a5b1a0a8b242
+  metadata.gz: c66a5be43c958c2c0488de0973b4d5c30dff9bd4
+  data.tar.gz: 120bed89ab81bd1e8dc044fc39e8e6d331811032
 SHA512:
-  metadata.gz: 4ce26f7074fec26063a6b47d2588be94b7fbacf1358cc69b48a4c64d05aeb92728134330382d09efab59d4fe7afd4aa5a1a8043673cf3befcd6931974dc74b9b
-  data.tar.gz: 20d6236ddd583e61d50ee2f5f82bc20f63e2adc0e7d61c5b009682171f1d748e6ba6bbb7d97ee67d272095c9de5c2a96dd4b2f52ef69775ab49ca255411f757c
+  metadata.gz: e17e53c655a3f620b31442b305ab5fa7c869ab11db9be8b5b135c064fabb1064ce39ad13f91468dabc9dba2bc442c39de92d6dd5a984c23d7e36e4b36daa8fbb
+  data.tar.gz: 59401e22fe8407db0efe2857131d73fcbd1f7a298413c031e6a30e66e6430c1af0e5a372ca50c4d6bcb1dd3c341b0bb983f9bac3ec5506f445e59edc78eaa6e1

data/app/controllers/effective/webhooks_controller.rb

@@ -36,7 +36,6 @@ module Effective
           send_email(:subscription_payment_failed, customer)
         when 'customer.subscription.deleted'
           customer = Effective::Customer.where(stripe_customer_id: @event.data.object.customer).first!
-          Effective::Subscription.where(customer: customer).destroy_all
           customer.update_attributes!(stripe_subscription_id: nil, status: nil, active_card: nil)
           customer.subscriptions.delete_all
 

data/app/models/concerns/acts_as_subscribable.rb

@@ -24,6 +24,10 @@ module ActsAsSubscribable
       self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).end_of_day
     end
 
+    before_destroy(if: -> { subscribed? }) do
+      raise :abort unless (subscripter.destroy! rescue false)
+    end
+
     validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
     validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
 

data/app/models/effective/customer.rb

@@ -20,7 +20,7 @@ module Effective
 
     scope :deep, -> { includes(subscriptions: :subscribable) }
 
-    after_commit(if: -> { stripe_subscription_id.present? }) do
+    after_commit do
       subscriptions.each { |subscription| subscription.subscribable.update_column(:subscription_status, status) }
     end
 

data/app/models/effective/subscripter.rb

@@ -61,6 +61,15 @@ module Effective
       true
     end
 
+    def destroy!
+      return true unless plan
+
+      subscribable.subscription.destroy!
+      subscribable.update_column(:subscription_status, nil)
+      sync_subscription!
+      true
+    end
+
     protected
 
     # This should work even if the rest of the form doesn't. Careful with our transactions...
@@ -175,17 +184,6 @@ module Effective
       save!
     end
 
-    # def destroy!
-    #   return true unless subscription && subscription.persisted? && customer.stripe_subscription.present?
-
-    #   raise 'is invalid' unless valid?
-
-    #   subscription.destroy!
-    #   customer.subscriptions.reload
-
-    #   sync! && customer.save!
-    # end
-
     private
 
     def subscription

data/lib/effective_orders/version.rb

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

metadata

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