effective_orders 4.5.3 → 4.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2216991c7430e4902a33b35ee0d8d4ea9e637c927a587b1dbedf1eaf4cf57fe
-  data.tar.gz: a51f8b35bfebb1e375664ee006e24717cec9ddac464f17e008296a87e2883c81
+  metadata.gz: fe17b4322391ee31880303afd90c92998a86da1cb2cd0fb82fa716783e481635
+  data.tar.gz: d3370f18d4c440ffdde9aa59207f586ba38abcf73e91974ee1e7f8866ba1ab82
 SHA512:
-  metadata.gz: 7b5a07d109578b5bc7654ca5eaa6ec3f18b7cd89841b15e7f0a5a1128089e9715cd9b317c884ef0afb6cb4a9fed7f0934b7693f7e0b3ba4648544769a00ef3be
-  data.tar.gz: e94f3d309875b26bbf6f185990e80e1d1911ae0d320050550915dd7970f025a07645c402aa1b6422e114f1e1563b1d86420cba3a8d8058123ce437650c900269
+  metadata.gz: 00af503a2181c78ad3ac1d587aeda9bbc9b35bafab752cb37f28f5c64c5ba787070b6685bdb455745b16ee33fcd7940e272cdedea8b672188788bd496e21e6aa
+  data.tar.gz: eb5199b72923d9236016e2a81ed0b102d9a28b0112cba3924dc72c1dbaad1d5b1b5cc9c2ea73141af58010ab12d517de3c34b544e46e3c64b5d08c5ea18fa241

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/effective/carts_controller.rb

@@ -2,6 +2,8 @@ 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?

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,13 +228,13 @@ 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
 
         if purchasable.blank? || purchasable.marked_for_destruction?
-          item.mark_for_destruction 
+          item.mark_for_destruction
         else
           item.price = purchasable.price
         end
@@ -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
 
@@ -487,13 +487,17 @@ module Effective
 
     def get_tax
       return nil unless tax_rate.present?
-      order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
+      present_order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
     end
 
     private
 
+    def present_order_items
+      order_items.reject { |oi| oi.marked_for_destruction? }
+    end
+
     def assign_order_totals
-      self.subtotal = order_items.map { |oi| oi.subtotal }.sum
+      self.subtotal = present_order_items.map { |oi| oi.subtotal }.sum
       self.tax_rate = get_tax_rate() unless (tax_rate || 0) > 0
       self.tax = get_tax()
       self.total = subtotal + (tax || 0)
@@ -534,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.3'.freeze
+  VERSION = '4.5.8'.freeze
 end

metadata

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