effective_orders 4.5.6 → 4.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 108bf2867a6343e481d8e492c4e86fe7e3b1548594441c0b87a95b4a8181047a
-  data.tar.gz: 9d7b4cb4ca78ed441b178e613eb610ec2270a52e56d970683a74fab2b0b21aa2
+  metadata.gz: f1e00998a7bf70939f686faf24ecf1ad4248f232bca18bfd1abb1074cadf4881
+  data.tar.gz: 2ee502e056f89522b4a88480fe2d4a8995a70d6bcbeb7abecfd41a09a85f6862
 SHA512:
-  metadata.gz: 581d284694814a347ec8b5f9839e17778927dce8a9be9cbf310ef350fa8cd4f3551ea6190de14720c17be63a0e99a928717bbc64b31bdf58331938729e76a56f
-  data.tar.gz: 1a8d09ecfc10fde8c7ff8524d2b34b30d01348c33d1d06999852638bbb806de98bacbb9aa510fc065b642e2597bfbc08e42fa8bfd3eedeb3328d29f86285b507
+  metadata.gz: 0f0b25a0e32aea32cd5b66a521509181b347ce58c4a6e858064de8fc7192796456d1ac49c5e96515a8b442d8958e7398490ffbc165fb4cc853c83ab1650eba8b
+  data.tar.gz: 6ef0bedaa012be759e8645296eb6c0aae894b815c92ec7964e5d6dc712eb9139bab52c0d9a9bcee0f661a174fcb7c8c9d1754e5a9f817742020f68b9d07f7043

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

@@ -76,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/controllers/effective/providers/mark_as_paid.rb

@@ -24,7 +24,8 @@ module Effective
 
       def mark_as_paid_params
         params.require(:effective_order).permit(
-          :payment, :payment_provider, :payment_card, :note_to_buyer, :send_mark_as_paid_email_to_buyer
+          :purchased_at, :payment, :payment_provider, :payment_card,
+          :note_to_buyer, :send_mark_as_paid_email_to_buyer
         )
       end
 

data/app/models/effective/order.rb

@@ -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/mark_as_paid/_form.html.haml

@@ -3,6 +3,8 @@
     %h2 Admin: Mark as Paid
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
+      = f.date_field :purchased_at, required: true
+
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 
       = f.text_field :payment_card,
@@ -20,4 +22,3 @@
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
       = f.submit order_checkout_label(:mark_as_paid), center: true
-

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

metadata

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