effective_orders 4.5.4 → 4.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0144e9b8480285f5329cdb80f310ae893afc715ef1515a9d466d19075e5f0795
-  data.tar.gz: c4f7848248c853fc25f8123113cb863087ed92b0cfc01b78f85892ea09bb24ea
+  metadata.gz: 59043240411738af58cfc47af461408a055e6c5b14cb972bfe2813e6406ff33f
+  data.tar.gz: 2984831a23addc106308001ebd736ddc549575b9af42062d2328633050e9a9c3
 SHA512:
-  metadata.gz: 06ed32afc06143accff761edb35b4018196558a9f3a76e6817be18e772f746acc84ec7ddc202f13713fc66316c64040518748116b2c68011d5d2358e5ad6be74
-  data.tar.gz: 11ffb123b02a984def655fae15a9c35a3f7f6266f7245faea219169090839683b7c17509295c99450443faa0cbb66ceb1b01a742008cab9b7e641ccb01990579
+  metadata.gz: 65434ddd798e864809733e292b6dddd6bf57b20d0c336d44558e1dd80c5c2b9893d3c1e797c54cbbf6f8583188022c75c1c1e5baff7f7c2ee5e4fca150bb2d81
+  data.tar.gz: '0939ceffcb5d665ef932ce414c425c11b8e10f697abdce2bbd5c24335c1b438c3753a8c2a5223060f81872d8402f77f48a7178c492501b7a286f30893a71bb31'

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

@@ -2,9 +2,11 @@ module Effective
   class CartsController < ApplicationController
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 
+    before_action :authenticate_user!
+
     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/controllers/effective/customers_controller.rb

@@ -4,6 +4,8 @@ module Effective
 
     include Effective::CrudController
 
+    before_action :authenticate_user!
+
     submit :save, 'Save', success: -> { 'Successfully updated card.' }
     page_title 'Customer Settings'
 

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

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.5.4'.freeze
+  VERSION = '4.5.9'.freeze
 end

metadata

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