effective_orders 4.5.2 → 4.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b254eb8e99a4c04b3b63135b2b1caa15f5a8d7803bcad0fff8323b0aab957a
-  data.tar.gz: 699ccd522afef972528e9dcee5b5eae8abad124cf11e0002f84e5c7a06bf0e8b
+  metadata.gz: d2216991c7430e4902a33b35ee0d8d4ea9e637c927a587b1dbedf1eaf4cf57fe
+  data.tar.gz: a51f8b35bfebb1e375664ee006e24717cec9ddac464f17e008296a87e2883c81
 SHA512:
-  metadata.gz: 784ec95030d906ab226f26d7f50651062979a3e50fdf286135fc81e3907d6bc23a93c77e1504433012ea59e49bcb4613702723b69a9fe58b858fd36a15ae1590
-  data.tar.gz: 7f1cf4534c235f84a025a040b2988fcfa8664046d7026de8665f4c14b139afdbd570a4491ffb46ade0d5ba40f80bd6403064f6de6aa5fa4e3ace5e1032331f83
+  metadata.gz: 7b5a07d109578b5bc7654ca5eaa6ec3f18b7cd89841b15e7f0a5a1128089e9715cd9b317c884ef0afb6cb4a9fed7f0934b7693f7e0b3ba4648544769a00ef3be
+  data.tar.gz: e94f3d309875b26bbf6f185990e80e1d1911ae0d320050550915dd7970f025a07645c402aa1b6422e114f1e1563b1d86420cba3a8d8058123ce437650c900269

data/app/models/concerns/acts_as_subscribable.rb

@@ -67,6 +67,12 @@ module ActsAsSubscribable
     subscribed? && subscription_status == EffectiveOrders::PAST_DUE
   end
 
+  # If we do use stripe
+  def subscription_trialing?
+    subscribed? && subscription_status == EffectiveOrders::TRIALING
+  end
+
+  # If we don't use stripe
   def trialing?
     subscription_status.blank?
   end

data/app/models/effective/subscripter.rb

@@ -126,7 +126,13 @@ module Effective
       return false unless subscription.stripe_subscription.blank?
 
       Rails.logger.info "[STRIPE] create subscription: #{items}"
-      stripe_subscription = Stripe::Subscription.create(customer: customer.stripe_customer_id, items: items, metadata: metadata)
+
+      stripe_subscription = Stripe::Subscription.create(
+        customer: customer.stripe_customer_id,
+        items: items,
+        metadata: metadata,
+        trial_from_plan: true
+      )
 
       subscription.update!(
         stripe_subscription: stripe_subscription,

data/app/models/effective/subscription.rb

@@ -79,6 +79,10 @@ module Effective
       name.to_s <=> other&.name.to_s
     end
 
+    def trialing?
+      status == 'trialing'
+    end
+
     def active?
       status == 'active'
     end

data/lib/effective_orders.rb

@@ -14,9 +14,10 @@ module EffectiveOrders
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'.freeze
   PAST_DUE = 'past_due'.freeze
+  TRIALING = 'trialing'.freeze
   CANCELED = 'canceled'.freeze
 
-  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED }
+  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED, TRIALING => TRIALING }
 
   # The following are all valid config keys
   mattr_accessor :orders_table_name

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.5.2'.freeze
+  VERSION = '4.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails