effective_orders 4.4.9 → 4.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f309d8560e78018e04639fa0e733cc40632b33048b22b30458e888216420d9
-  data.tar.gz: 6562b45ee4e8e400d94d85e568126ad67648eda2525bdc7fdbfefa6b78bc3ab1
+  metadata.gz: c92ae430fbce8f9ee7692d921653fffda8419a6d76eb2a4b43f3efcc932b7902
+  data.tar.gz: 9ce838e457cb9a3d365641b1d6d975f55fa118eed1df7be6d8071044a845fc38
 SHA512:
-  metadata.gz: c15aa6b827a544df46d52c2fff312a7dd4500bfd2e5c94cd3a59a88687ef29e053555038685601d578e92c385b00a3e253daec03b7893405adb21d75dad54a80
-  data.tar.gz: 39eabeb2eacc02d433ea2eb2545bb007d56d3cc96e0868f87febd719903dbb574c776c197ab301216c1f994c81619fb2d71fd26b6c26d843ffdad3086de20a6a
+  metadata.gz: 4f2999ad4d947a2f3623d4dfa82aa6f9a31daabef750715bc2d4671dae7f64e3dee7076e26dd6e678b4e1ecc394ea96f4a37f241fc258eea53f533e7040a1216
+  data.tar.gz: 825f4065b65081552b68d6228c5c7d72e96d60cc6967e1789485df31366aa9f6ce5e09c2508604e697180ef7ccd7b9c5e5b75bc94ee9c954cb7dce091c885a5d

data/app/models/concerns/acts_as_purchasable.rb

@@ -5,15 +5,15 @@ module ActsAsPurchasable
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
 
-      if table_exists?
-        instance = new()
-        raise 'must respond_to price' unless instance.respond_to?(:price)
-        raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
-
-        if defined?(EffectiveQbSync)
-          raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
-        end
-      end
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond_to price' unless instance.respond_to?(:price)
+      #   raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
+
+      #   if defined?(EffectiveQbSync)
+      #     raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
+      #   end
+      # end
 
       include ::ActsAsPurchasable
     end

data/app/models/concerns/acts_as_subscribable.rb

@@ -7,9 +7,11 @@ module ActsAsSubscribable
     def acts_as_subscribable(*options)
       @acts_as_subscribable = options || []
 
-      instance = new()
-      raise 'must respond to trialing_until' unless instance.respond_to?(:trialing_until)
-      raise 'must respond to subscription_status' unless instance.respond_to?(:subscription_status)
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond to trialing_until' unless instance.respond_to?(:trialing_until) || !EffectiveOrders.trial?
+      #   raise 'must respond to subscription_status' unless instance.respond_to?(:subscription_status)
+      # end
 
       include ::ActsAsSubscribable
       (ActsAsSubscribable.descendants ||= []) << self
@@ -20,7 +22,7 @@ module ActsAsSubscribable
     has_one :subscription, as: :subscribable, class_name: 'Effective::Subscription', inverse_of: :subscribable
     has_one :customer, through: :subscription, class_name: 'Effective::Customer'
 
-    before_validation(if: -> { trialing_until.blank? && EffectiveOrders.trial? }) do
+    before_validation(if: -> { EffectiveOrders.trial? && trialing_until.blank? }) do
       self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).beginning_of_day
     end
 
@@ -28,7 +30,10 @@ module ActsAsSubscribable
       raise :abort unless (subscripter.destroy! rescue false)
     end
 
-    validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
+    if EffectiveOrders.trial?
+      validates :trialing_until, presence: true
+    end
+
     validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
 
     scope :trialing, -> { where(subscription_status: nil).where('trialing_until > ?', Time.zone.now) }

data/app/models/effective/customer.rb

@@ -51,6 +51,13 @@ module Effective
       end
     end
 
+    def invoices
+      @invoices ||= if stripe_customer_id.present?
+        Rails.logger.info "[STRIPE] list invoices: #{stripe_customer_id}"
+        ::Stripe::Invoice.list(customer: stripe_customer_id) rescue nil
+      end
+    end
+
     def upcoming_invoice
       @upcoming_invoice ||= if stripe_customer_id.present?
         Rails.logger.info "[STRIPE] get upcoming invoice: #{stripe_customer_id}"

data/app/models/effective/subscription.rb

@@ -56,6 +56,10 @@ module Effective
 
     validates :status, inclusion: { in: EffectiveOrders::STATUSES.keys }
 
+    before_validation do
+      self.name ||= EffectiveOrders.stripe_plans.find { |plan| plan[:id] == stripe_plan_id }&[:name] || 'Subscribed Plan'
+    end
+
     def to_s
       name || 'New Subscription'
     end

data/app/views/effective/customers/_customer.html.haml

@@ -15,7 +15,7 @@
               %td= sub.quantity
               %td= sub.interval
 
-- if customer.stripe_customer.invoices.present?
+- if customer.invoices.present?
   .card.my-4
     .card-header Invoices
     .card-body
@@ -26,7 +26,7 @@
             %th Invoice
             %th Total
         %tbody
-          - customer.stripe_customer.invoices.each do |invoice|
+          - customer.invoices.each do |invoice|
             - date_method = [(:date if invoice.respond_to?(:date)), (:period_start if invoice.respond_to?(:period_start)), :created].compact.first
             %tr
               %td= link_to Time.zone.at(invoice.public_send(date_method)).strftime('%F'), invoice.invoice_pdf

data/lib/effective_orders.rb

@@ -183,7 +183,7 @@ module EffectiveOrders
       Rails.logger.info '[STRIPE] index plans'
 
       plans = begin
-        Stripe::Plan.all
+        Stripe::Plan.respond_to?(:all) ? Stripe::Plan.all : Stripe::Plan.list
       rescue => e
         raise e if Rails.env.production?
         Rails.logger.info "[STRIPE ERROR]: #{e.message}"
@@ -192,15 +192,18 @@ module EffectiveOrders
       end
 
       plans = plans.map do |plan|
+        description = ("$#{'%0.2f' % (plan.amount / 100.0)}" + ' ' + plan.currency.upcase + '/' +  plan.interval.to_s)
+
         {
           id: plan.id,
           product_id: plan.product,
-          name: plan.nickname,
+          name: plan.nickname || description,
+          description: description,
           amount: plan.amount,
           currency: plan.currency,
-          description: ("$#{'%0.2f' % (plan.amount / 100.0)}" + ' ' + plan.currency.upcase + '/' +  plan.interval.to_s),
           interval: plan.interval,
-          interval_count: plan.interval_count
+          interval_count: plan.interval_count,
+          trial_period_days: plan.trial_period_days
         }
       end.sort do |x, y|
         val ||= (x[:interval] <=> y[:interval])

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.9'.freeze
+  VERSION = '4.4.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.9
+  version: 4.4.10
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,7 +253,7 @@ homepage: https://github.com/code-and-effect/effective_orders
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,8 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.