effective_orders 4.4.4 → 4.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c9cb84422232f69446f9612ffa08cebcdc62b85430377f42a7da21c716d10e
-  data.tar.gz: c72f1703bc93f608862bd55b093fb3fe0d2e239b5030ab43ccd90df616c7ed89
+  metadata.gz: 91f309d8560e78018e04639fa0e733cc40632b33048b22b30458e888216420d9
+  data.tar.gz: 6562b45ee4e8e400d94d85e568126ad67648eda2525bdc7fdbfefa6b78bc3ab1
 SHA512:
-  metadata.gz: e28e1ffc282e08b81a2f85407fb084d4117ed0744a55f7b85e78c1dbe62711f04c80d6aee7cc814e4b1ef167edf4d21da88232a1b07023dc6af2f8ec8af1bce2
-  data.tar.gz: ed68a2d78bcae4af39223adb8ec445f9d7ccbc61a891717018e166021fa0f5f9ed193aba08c265cc998335438acf05b58f3619d82529233530e366488493d60e
+  metadata.gz: c15aa6b827a544df46d52c2fff312a7dd4500bfd2e5c94cd3a59a88687ef29e053555038685601d578e92c385b00a3e253daec03b7893405adb21d75dad54a80
+  data.tar.gz: 39eabeb2eacc02d433ea2eb2545bb007d56d3cc96e0868f87febd719903dbb574c776c197ab301216c1f994c81619fb2d71fd26b6c26d843ffdad3086de20a6a

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

@@ -1,7 +1,7 @@
 module ActsAsPurchasable
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
 

data/app/models/concerns/acts_as_subscribable.rb

@@ -3,7 +3,7 @@ module ActsAsSubscribable
 
   mattr_accessor :descendants
 
-  module ActiveRecord
+  module Base
     def acts_as_subscribable(*options)
       @acts_as_subscribable = options || []
 

data/app/models/concerns/acts_as_subscribable_buyer.rb

@@ -1,7 +1,7 @@
 module ActsAsSubscribableBuyer
   extend ActiveSupport::Concern
 
-  module ActiveRecord
+  module Base
     def acts_as_subscribable_buyer(*options)
       include ::ActsAsSubscribableBuyer
     end

data/app/models/effective/order.rb

@@ -337,13 +337,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 +505,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/views/admin/orders/_form.html.haml

@@ -3,7 +3,7 @@
     = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s },
       label: 'Buyer', required: true, hint: 'The user that should purchase this order.'
 
-    = f.cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
+    = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
     %h2 Order Items
     .order_items

data/lib/effective_orders/engine.rb

@@ -5,9 +5,9 @@ module EffectiveOrders
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_orders.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(ActsAsPurchasable::ActiveRecord)
-        ActiveRecord::Base.extend(ActsAsSubscribable::ActiveRecord)
-        ActiveRecord::Base.extend(ActsAsSubscribableBuyer::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsPurchasable::Base)
+        ActiveRecord::Base.extend(ActsAsSubscribable::Base)
+        ActiveRecord::Base.extend(ActsAsSubscribableBuyer::Base)
       end
     end
 

data/lib/effective_orders/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-26 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

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(); });