effective_orders 4.4.6 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a54d5be2f0c22c7b2b947e3eebda8f746025e23b743adb0b4e54a2525a83782e
-  data.tar.gz: c245ef36019bc0515c5f2928ae9bee3e32b334b67a1bc9dae88725c424a24952
+  metadata.gz: f0bcae4f96f01459844e667c3c9c426a2eac78084e2cfcccb3dc630874554bf8
+  data.tar.gz: ca5cc298e9277e80c080d743045f6ff469b50d0ba54ed6c0183d5905f7b10b0e
 SHA512:
-  metadata.gz: 2aea14e9db07efae0390ce10fa7dcbd395ce40bb5226b2cb2561dde89fc9dc8d08aa5db64ba91fb63228d9f3db2448451f9f43ae107334234ff42d7e97693eaa
-  data.tar.gz: fa126fcbe853811ff54979016c71a57712ecb4e5d252fbd4a3280cf09ab67cb290788a1a5c6d648d31766a793aa74621a7c3f2244bf3840f018e428a2dfc55bb
+  metadata.gz: 315a63864050c7dacfe06ac17dfd098bfb4d698490cb214a9293b7446b6f35061dfa1e5919b63ce1684588977ecb1258ad07d8e7d4c056b61cb457de0ac13ec2
+  data.tar.gz: 910d703ac1b4c71a4f0ae00666ea16511578c7a39f31b56348bdd34069aa82d0c07978db26d7586c3b3a545f0aa2fa242bedd8ee25d7a02ca4baff2756537162

data/app/assets/javascripts/effective_orders/providers/stripe.js.coffee

@@ -0,0 +1,77 @@
+this.StripeForm ||= class StripeForm
+  constructor: ->
+    @form = null
+    @paymentIntent = null
+
+    @data = null
+    @stripe = null
+    @card = null
+
+  initialize: ->
+    @form = $('form[data-stripe-form]').first()
+    return false unless @form.length > 0
+
+    @paymentIntent = @form.find("input[name$='[payment_intent_id]']").first()
+    @data = @form.data('stripe-form')
+    @stripe = Stripe(@data.key)
+    @card = @stripe.elements().create('card', @style())
+
+    @mount()
+
+  style: ->
+    style: {
+      base: { color: '#32325d', fontSize: '16px', },
+      invalid: { color: '#dc3545', iconColor: '#dc3545' }
+    }
+
+  mount: ->
+    @card.mount('#stripe-card-element')
+
+    @card.addEventListener('change', (error) ->
+      $('#stripe-card-errors').text(if error.message then error.message else '')
+    )
+
+    @form.on('click', '[type=submit]', (event) => @submit(event))
+
+  submit: (event) ->
+    event.preventDefault()
+
+    payment = if @shouldUseNewCard() then @useNewCard() else @useExistingCard()
+
+    $.active = $.active + 1
+
+    payment.then((result) =>
+      if result.error
+        @errorPayment(result.error)
+      else if result.paymentIntent.status == 'succeeded'
+        @submitPayment(result.paymentIntent)
+    ).then((result) =>
+      $.active = $.active - 1
+    )
+
+  shouldUseNewCard: ->
+    @form.get(0).checkValidity() &&
+    @paymentIntent.val().length == 0 &&
+    (@data.token_required || @form.children('.collapse.show').length > 0)
+
+  useNewCard: ->
+    @stripe.confirmCardPayment(@data.client_secret, {
+      payment_method: {
+        card: @card,
+        billing_details: { email: @data.email }
+      },
+      setup_future_usage: 'off_session'
+    })
+
+  useExistingCard: ->
+    @stripe.confirmCardPayment(@data.client_secret, { payment_method: @data.payment_method })
+
+  submitPayment: (payment) ->
+    @paymentIntent.val(payment['id'])
+    @form.submit()
+
+  errorPayment: (error) ->
+    $('#stripe-card-errors').text(error.message)
+    EffectiveForm.invalidate(@form);
+
+$ -> (new StripeForm()).initialize()

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/order.rb

@@ -28,6 +28,9 @@ module Effective
     attr_accessor :send_mark_as_paid_email_to_buyer  # Set by Admin::Orders#mark_as_paid
     attr_accessor :skip_buyer_validations # Set by Admin::Orders#create
 
+    # If we want to use orders in a has_many way
+    belongs_to :parent, polymorphic: true, optional: true
+
     belongs_to :user, validate: false  # This is the buyer/user of the order. We validate it below.
     has_many :order_items, -> { order(:id) }, inverse_of: :order, class_name: 'Effective::OrderItem', dependent: :delete_all
 
@@ -337,13 +340,14 @@ module Effective
 
       assign_attributes(
         state: EffectiveOrders::PURCHASED,
-        purchased_at: Time.zone.now,
         payment: payment_to_h(payment),
         payment_provider: provider,
         payment_card: (card.presence || 'none'),
         skip_buyer_validations: skip_buyer_validations
       )
 
+      self.purchased_at ||= Time.zone.now
+
       Effective::Order.transaction do
         begin
           run_purchasable_callbacks(:before_purchase)
@@ -504,7 +508,7 @@ module Effective
     end
 
     def update_purchasables_purchased_order!
-      order_items.each { |oi| oi.purchasable.update_column(:purchased_order_id, self.id) }
+      order_items.each { |oi| oi.purchasable&.update_column(:purchased_order_id, self.id) }
     end
 
     def run_purchasable_callbacks(name)

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/db/migrate/01_create_effective_orders.rb.erb

@@ -2,6 +2,10 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @orders_table_name %> do |t|
       t.integer   :user_id
+
+      t.integer   :parent_id
+      t.string    :parent_type
+
       t.string    :state
       t.datetime  :purchased_at
 

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.6'.freeze
+  VERSION = '4.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 4.5.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,7 +121,7 @@ files:
 - app/assets/images/effective_orders/stripe.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee
-- app/assets/javascripts/effective_orders/providers/stripe.js
+- app/assets/javascripts/effective_orders/providers/stripe.js.coffee
 - app/assets/javascripts/effective_orders/subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_cart.scss
@@ -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.

data/app/assets/javascripts/effective_orders/providers/stripe.js

@@ -1,97 +0,0 @@
-class StripeForm {
-  initialize() {
-    let $form = $('form[data-stripe-form]').first();
-    if ($form.length == 0) { return false; }
-
-    this.$form = $form;
-    this.$paymentIntentId = this.$form.find("input[name$='[payment_intent_id]']").first();
-
-    this.data = $form.data('stripe-form');
-    this.stripe = Stripe(this.data.key);
-    this.card = this.stripe.elements().create("card", { style: this.style() });
-
-    this.mount();
-  }
-
-  mount() {
-    this.card.mount("#stripe-card-element");
-
-    this.card.addEventListener('change', function ({ error }) {
-      if (error) {
-        $('#stripe-card-errors').text(error.message);
-      } else {
-        $('#stripe-card-errors').text('');
-      }
-    });
-
-    this.$form.on('click', '[type=submit]', (event) => { this.submit(event) });
-  }
-
-  shouldUseNewCard() {
-    let $newCardForm = this.$form.children('.collapse.show')
-
-    return (
-      this.$form.get(0).checkValidity() &&
-      (this.data.token_required || $newCardForm.length > 0) &&
-      this.$paymentIntentId.val().length == 0
-    )
-  }
-
-  submit(event) {
-    event.preventDefault();
-
-    let payment = this.shouldUseNewCard() ? this.useNewCard() : this.useExistingCard();
-
-    payment.then((result) => {
-      if (result.error) {
-        this.errorPayment(result.error)
-      } else if (result.paymentIntent.status == 'succeeded') {
-        this.submitPayment(result.paymentIntent);
-      }
-    });
-  }
-
-  useExistingCard() {
-    return this.stripe.confirmCardPayment(this.data.client_secret, {
-      payment_method: this.data.payment_method
-    });
-  }
-
-  useNewCard() {
-    return this.stripe.confirmCardPayment(this.data.client_secret, {
-      payment_method: {
-        card: this.card,
-        billing_details: {
-          email: this.data.email
-        }
-      },
-      setup_future_usage: 'off_session'
-    });
-  }
-
-  errorPayment(error) {
-    $('#stripe-card-errors').text(error.message);
-    EffectiveForm.invalidate(this.$form);
-  }
-
-  submitPayment(payment) {
-    this.$paymentIntentId.val('' + payment['id']);
-    this.$form.submit();
-  }
-
-  style() {
-    return {
-      base: {
-        color: "#32325d",
-        fontSize: "16px",
-      },
-      invalid: {
-        color: "#dc3545",
-        iconColor: "#dc3545"
-      }
-    };
-  }
-
-}
-
-$(document).ready(function () { new StripeForm().initialize(); });