effective_orders 4.5.8 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe17b4322391ee31880303afd90c92998a86da1cb2cd0fb82fa716783e481635
-  data.tar.gz: d3370f18d4c440ffdde9aa59207f586ba38abcf73e91974ee1e7f8866ba1ab82
+  metadata.gz: 045c411a2aab9746571e5633f3f42403bec134ae2305a01557c7085227dc03eb
+  data.tar.gz: 591a2893a8d22a7618d77debbcc17c03218c351bbceb0ffa8398afad4965559f
 SHA512:
-  metadata.gz: 00af503a2181c78ad3ac1d587aeda9bbc9b35bafab752cb37f28f5c64c5ba787070b6685bdb455745b16ee33fcd7940e272cdedea8b672188788bd496e21e6aa
-  data.tar.gz: eb5199b72923d9236016e2a81ed0b102d9a28b0112cba3924dc72c1dbaad1d5b1b5cc9c2ea73141af58010ab12d517de3c34b544e46e3c64b5d08c5ea18fa241
+  metadata.gz: 1d38660fcf2e7c6368e00fcfaa7eb6b0b9b113316bd1f385d119ae6ba6b450b6da7db6256cb439fceac5d2be185bf63db707729572031b41cc9a2a9005da5560
+  data.tar.gz: 53fb7453526c6184b10a0309f04f77671bd8427fbb394ae843337d6cede8cde9b1d6de87be453d1d5a48f99fddfe0a1e01bc16cf0f980e136af02d3549127b73

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/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.8'.freeze
+  VERSION = '4.6.0'.freeze
 end

metadata

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