effective_orders 4.5.5 → 4.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a671a96fc25bfd1d0bb8f45b5df4e4f764a68fc22b8d0e9fe30d762d899676
-  data.tar.gz: 1dd069a7a189dd813649db7cde82b5d6aea048a711d4282a02577587f22cbcac
+  metadata.gz: fedc9964ed35e8479f4c5d663fe37c7f76f1ebebd3a6852f880be58aa9ada488
+  data.tar.gz: 0b6e195ea558eec5b0bb5b5be2f7dd17fe769233b039c475c6c24f1136d5b144
 SHA512:
-  metadata.gz: f4c244b0f027f500a7a2a4619529498b6b64fc24d6578f2a16dc5c4471ec70c92867b8aa9ea3a7d7a073db07b47c29e262fd90f19f4cbafe6e32496fea9d04d3
-  data.tar.gz: fbf13d0a45dca91251c2b027baaed9cf8e30f406c09cc8ab3c7920045d4bb2f48335ce07b6ce71bebcce86b60e39cb1b05daa8a4d32312f57aa1baebadb197c0
+  metadata.gz: 92930b78d50b28a14afbb274fe01c9a8677541955084b19b3d3e17440dacdb00299e7462a9db6921074736e903123bee09ba5ffc2483271a89aa088ebd637285
+  data.tar.gz: c0966358967695aa5df3c62ed423123640e91e4b816e607b5e153a6a3cced73c7228d7b133e4d10e25e4243bc9470e55e35a898b24c5e41a3466cecb3f1d8b1e

data/README.md

@@ -828,6 +828,12 @@ effective_orders works around this by appending a timestamp to the order ID.
 
 Make sure `gem 'stripe'` is included in your Gemfile.
 
+Add to your application layout / header
+
+```
+= javascript_include_tag 'https://js.stripe.com/v3/'
+```
+
 First register for an account with Stripe
 
 https://manage.stripe.com/register
@@ -1001,4 +1007,3 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-

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

@@ -8,7 +8,7 @@ this.StripeForm ||= class StripeForm
     @card = null
 
   initialize: ->
-    @form = $('form[data-stripe-form]').first()
+    @form = $('form[data-stripe-form]:not(.initialized)').first()
     return false unless @form.length > 0
 
     @paymentIntent = @form.find("input[name$='[payment_intent_id]']").first()
@@ -17,6 +17,7 @@ this.StripeForm ||= class StripeForm
     @card = @stripe.elements().create('card', @style())
 
     @mount()
+    @form.addClass('initialized')
 
   style: ->
     style: {
@@ -75,3 +76,4 @@ this.StripeForm ||= class StripeForm
     EffectiveForm.invalidate(@form);
 
 $ -> (new StripeForm()).initialize()
+$(document).on 'turbolinks:load', -> (new StripeForm()).initialize()

data/app/controllers/admin/orders_controller.rb

@@ -145,7 +145,7 @@ module Admin
     end
 
     def send_payment_request
-      @order = Effective::Order.pending.find(params[:id])
+      @order = Effective::Order.not_purchased.find(params[:id])
       authorize_effective_order!
 
       if @order.send_payment_request_to_buyer!
@@ -164,7 +164,7 @@ module Admin
     end
 
     def bulk_send_payment_request
-      @orders = Effective::Order.pending.where(id: params[:ids])
+      @orders = Effective::Order.not_purchased.where(id: params[:ids])
 
       begin
         authorize_effective_order!

data/app/controllers/effective/carts_controller.rb

@@ -6,7 +6,7 @@ module Effective
 
     def show
       @cart = current_cart
-      @pending_orders = Effective::Order.pending.where(user: current_user) if current_user.present?
+      @pending_orders = Effective::Order.not_purchased.where(user: current_user) if current_user.present?
 
       @page_title ||= 'My Cart'
       EffectiveOrders.authorize!(self, :show, @cart)

data/app/models/effective/order.rb

@@ -228,7 +228,7 @@ module Effective
 
     def update_prices!
       raise('already purchased') if purchased?
-      raise('must be pending') unless pending?
+      raise('must be pending or confirmed') unless pending? || confirmed?
 
       order_items.each do |item|
         purchasable = item.purchasable
@@ -382,11 +382,11 @@ module Effective
 
       raise "Failed to purchase order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
+      run_purchasable_callbacks(:after_purchase)
+
       send_refund_notification! if email && refund?
       send_order_receipts! if email
 
-      run_purchasable_callbacks(:after_purchase)
-
       true
     end
 
@@ -538,7 +538,11 @@ module Effective
     end
 
     def send_email(email, *mailer_args)
-      Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+      begin
+        Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+      rescue => e
+        raise if Rails.env.development? || Rails.env.test?
+      end
     end
 
     def truthy?(value)

data/app/views/effective/orders/stripe/_form.html.haml

@@ -1,4 +1,4 @@
-= javascript_include_tag 'https://js.stripe.com/v3/'
+/= javascript_include_tag 'https://js.stripe.com/v3/'
 
 - stripe = stripe_payment_intent(order)
 

data/lib/effective_orders.rb

@@ -204,7 +204,7 @@ module EffectiveOrders
           currency: plan.currency,
           interval: plan.interval,
           interval_count: plan.interval_count,
-          trial_period_days: plan.trial_period_days
+          trial_period_days: (plan.trial_period_days if plan.respond_to?(: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.5.5'.freeze
+  VERSION = '4.5.10'.freeze
 end

metadata

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