effective_orders 4.5.7 → 4.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af8313072b9cd7b4ab2fdac74aa083b29a0c8dbcc9e23b215aa96a771478884
-  data.tar.gz: 9a472569b70bcc8d2b2aec76e5922bc96f946df57cebd1f6a3dba055f85a1284
+  metadata.gz: 3fa2dd840713f7c176fa7a2a746da49c7ba5ea5db34d07835271706db6abd6e5
+  data.tar.gz: 05d9a0feeecb92a6c97c9d2e94f3b9bbf7c2de266b7c05370d084a678ba49b84
 SHA512:
-  metadata.gz: 5c82f040bd36057c9919a11378f6fd2c0fc4fb552c06237f6d27f4f96f20f38c43ffb5e71b2cb61c03da91f47162ff62c15458cc486e2eb6523f15941915375c
-  data.tar.gz: 8095e12ec205f3d259290058ec9650a8e8b532c2ff1dec4220354baeecf374cc875fcc7b6797d171f8dd3b3b4d32da6bbf8cb618fc0a08df557023df4beaf4ea
+  metadata.gz: 122cba6ef5b077211c21da55afa01b5771e2185cd0b5833073abf2ec291112c53bb30cd65d4a884d58a39d1b1f770343c0fd8437e45d04e3397ed30bb4988d41
+  data.tar.gz: 3fae2d2aa9e849e7b431ddd4f62238a36705bf5c624d9ebb88b7322df5bc797a742839b0ecd22fe3906c11bfd1aa678d477672c94c53d9835e13a5cb4a23d02b

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/helpers/effective_subscriptions_helper.rb

@@ -17,7 +17,7 @@ module EffectiveSubscriptionsHelper
     raise 'form object must be an acts_as_subscribable object' unless subscribable.respond_to?(:subscripter)
 
     subscripter = subscribable.subscripter
-    raise 'subscribable.subscribable_buyer must match current_user' unless subscripter.user == current_user
+    # raise 'subscribable.subscribable_buyer must match current_user' unless subscripter.user == current_user
 
     render('effective/subscripter/form', subscripter: subscripter)
   end

data/app/models/effective/subscripter.rb

@@ -31,7 +31,7 @@ module Effective
     end
 
     def customer
-      @customer ||= Effective::Customer.deep.where(user: user).first_or_initialize
+      @customer ||= Effective::Customer.deep.where(user: subscribable&.subscribable_buyer || user).first_or_initialize
     end
 
     def current_user=(user)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.5.7
+  version: 4.5.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts