effective_orders 6.14.5 → 6.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c14a71184f0f26d2fedfda94481247d0e86b4e5fa1a7e36112e9d50db58655e1
-  data.tar.gz: 8217ba0469e9633e4ad9fe3c920a13579c002a60bc418150e8bdc0232aecba97
+  metadata.gz: 0b08f45584d4d140c41e019bde939d75ae38b5e95bc0ae46da885f2209b9ee0b
+  data.tar.gz: e20642203408a7b2549ff3407c5a20ca955d0bbd3fb76db696ee397307426792
 SHA512:
-  metadata.gz: fad58aa3a38cb6c495ff49218116c0b962afd924eb22291242be65bb373cd20049c531ee399db93d77beaf91f0a97fa1bded143bf903ca2c51a9f140e52fb034
-  data.tar.gz: 688fc081887fa4ff17297d7db8f69e3ab54d96c0e30f33555cc69761c55d25ccc4491b7491c29f908a757823d64407d3ba5a6627be125c1fcd513210a5a2589e
+  metadata.gz: 42bcfa092afb097f92f949ac8bd7aa61fc623a1b5b3b857410d696bcb02bb1911a78eadbd222365e1e5e8b56a6b302e6038e81a4c5d2f0d9b3606bf5c5e3b4cf
+  data.tar.gz: 9f0e6c8f7de1243e537186ba8f78bbc89d0c096d2d84eb5340fc1d1757083fdfe8e1e91423cb627193960e8f92919bf3061810143ea1d1b08d6e953c0c4641a2

data/app/controllers/effective/concerns/purchase.rb

@@ -6,20 +6,19 @@ module Effective
       protected
 
       def admin_checkout?(payment_params)
-        payment_params[:purchased_url].to_s.include?('/admin/')
+        (payment_params[:purchased_url] || payment_params[:deferred_url]).to_s.include?('/admin/')
       end
 
-      def order_purchased(payment:, provider:, card: 'none', email: true, skip_buyer_validations: false, purchased_url: nil, current_user: nil)
+      def order_purchased(payment:, provider:, card: 'none', email: true, skip_buyer_validations: false, purchased_url: nil)
         @order.purchase!(
           payment: payment, 
           provider: provider, 
           card: card, 
           email: email, 
-          skip_buyer_validations: skip_buyer_validations, 
-          current_user: current_user
+          skip_buyer_validations: skip_buyer_validations
         )
 
-        Effective::Cart.where(user: current_user).destroy_all if current_user.present?
+        Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?
 
         if flash[:success].blank?
           if email && @order.send_order_receipt_to_buyer?
@@ -36,7 +35,7 @@ module Effective
       def order_deferred(provider:, email: true, deferred_url: nil)
         @order.defer!(provider: provider, email: email)
 
-        Effective::Cart.where(user: current_user).destroy_all if current_user.present?
+        Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?
 
         if flash[:success].blank?
           if email
@@ -50,10 +49,10 @@ module Effective
         redirect_to deferred_url.gsub(':id', @order.to_param.to_s)
       end
 
-      def order_delayed(payment:, payment_intent:, provider:, card: 'none', deferred_url: nil, email: false)
+      def order_delayed(payment:, payment_intent:, provider:, card: 'none', email: false, deferred_url: nil)
         @order.delay!(payment: payment, payment_intent: payment_intent, provider: provider, card: card, email: email)
 
-        Effective::Cart.where(user: current_user).destroy_all if current_user.present?
+        Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?
 
         if flash[:success].blank?
           if email

data/app/controllers/effective/providers/cheque.rb

@@ -7,6 +7,7 @@ module Effective
         raise('cheque provider is not available') unless EffectiveOrders.cheque?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(cheque_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/deluxe.rb

@@ -7,6 +7,7 @@ module Effective
         raise('deluxe provider is not available') unless EffectiveOrders.deluxe?
 
         @order = Effective::Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(deluxe_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -39,7 +40,12 @@ module Effective
 
         if purchased == false
           flash[:danger] = "Payment was unsuccessful. The credit card payment failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}. Please try again."
-          return order_declined(payment: payment, provider: 'deluxe', card: payment['card'], declined_url: deluxe_params[:declined_url])
+          return order_declined(
+            payment: payment, 
+            provider: 'deluxe', 
+            card: payment['card'], 
+            declined_url: deluxe_params[:declined_url]
+          )
         end
 
         # Valid Authorized and Completed Payment
@@ -47,8 +53,7 @@ module Effective
           payment: payment,
           provider: 'deluxe',
           card: payment['card'],
-          purchased_url: deluxe_params[:purchased_url],
-          current_user: (current_user unless admin_checkout?(deluxe_params))
+          purchased_url: deluxe_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/providers/deluxe_delayed.rb

@@ -8,6 +8,7 @@ module Effective
         raise('deluxe_delayed provider is not available') unless EffectiveOrders.deluxe_delayed?
 
         @order = Effective::Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(deluxe_delayed_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -30,12 +31,23 @@ module Effective
         valid = payment_intent['status'] == 'success'
 
         if valid == false
-          return order_declined(payment: card_info, provider: 'deluxe_delayed', card: card_info['card'], declined_url: deluxe_delayed_params[:declined_url])
+          return order_declined(
+            payment: card_info, 
+            provider: 'deluxe_delayed', 
+            card: card_info['card'], 
+            declined_url: deluxe_delayed_params[:declined_url]
+          )
         end
 
         flash[:success] = EffectiveOrders.deluxe_delayed[:success]
 
-        order_delayed(payment: card_info, payment_intent: payment_intent_payload, provider: 'deluxe_delayed', card: card_info['card'], deferred_url: deluxe_delayed_params[:deferred_url])
+        order_delayed(
+          payment: card_info, 
+          payment_intent: payment_intent_payload, 
+          provider: 'deluxe_delayed', 
+          card: card_info['card'], 
+          deferred_url: deluxe_delayed_params[:deferred_url]
+        )
       end
 
       private

data/app/controllers/effective/providers/deluxe_delayed_purchase.rb

@@ -8,6 +8,7 @@ module Effective
         raise('deluxe_delayed_purchase provider is not available') unless EffectiveOrders.deluxe_delayed?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = nil # Admin action, we don't want to assign current_user to the order
 
         EffectiveResources.authorize!(self, :update, @order)
         EffectiveResources.authorize!(self, :admin, :effective_orders)
@@ -22,7 +23,13 @@ module Effective
 
         if purchased == false
           flash[:danger] = "Payment was unsuccessful. The credit card payment failed with message: #{Array(payment['responseMessage']).to_sentence.presence || 'none'}. Please try again."
-          return order_declined(payment: payment, provider: 'deluxe_delayed', card: payment['card'], declined_url: deluxe_delayed_purchase_params[:declined_url])
+
+          return order_declined(
+            payment: payment, 
+            provider: 'deluxe_delayed', 
+            card: payment['card'], 
+            declined_url: deluxe_delayed_purchase_params[:declined_url]
+          )
         end
 
         @order.assign_attributes(deluxe_delayed_purchase_params.except(:purchased_url, :declined_url, :id))
@@ -33,8 +40,7 @@ module Effective
           card: payment['card'],
           email: @order.send_mark_as_paid_email_to_buyer?,
           skip_buyer_validations: true,
-          purchased_url: effective_orders.admin_order_path(@order),
-          current_user: nil # Admin action, we don't want to assign current_user to the order
+          purchased_url: effective_orders.admin_order_path(@order)
         )
       end
 

data/app/controllers/effective/providers/etransfer.rb

@@ -7,6 +7,7 @@ module Effective
         raise('etransfer provider is not available') unless EffectiveOrders.etransfer?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(etransfer_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/free.rb

@@ -7,6 +7,7 @@ module Effective
         raise('free provider is not available') unless EffectiveOrders.free?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(free_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -20,8 +21,7 @@ module Effective
           payment: 'free order. no payment required.',
           provider: 'free',
           card: 'none',
-          purchased_url: free_params[:purchased_url],
-          current_user: current_user
+          purchased_url: free_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/providers/mark_as_paid.rb

@@ -7,6 +7,7 @@ module Effective
         raise('mark_as_paid provider is not available') unless EffectiveOrders.mark_as_paid?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = nil # Admin action, we don't want to assign current_user to the order
 
         EffectiveResources.authorize!(self, :update, @order)
         EffectiveResources.authorize!(self, :admin, :effective_orders)
@@ -19,8 +20,7 @@ module Effective
           card: mark_as_paid_params[:payment_card],
           email: @order.send_mark_as_paid_email_to_buyer?,
           skip_buyer_validations: true,
-          purchased_url: effective_orders.admin_order_path(@order),
-          current_user: nil # Admin action, we don't want to assign current_user to the order
+          purchased_url: effective_orders.admin_order_path(@order)
         )
       end
 

data/app/controllers/effective/providers/moneris.rb

@@ -13,6 +13,7 @@ module Effective
         raise('moneris provider is not available') unless EffectiveOrders.moneris?
 
         @order ||= Effective::Order.deep.find(params[:response_order_id])
+        @order.current_user = current_user unless admin_checkout?(moneris_params)
 
         # We do this even if we're not authorized
         EffectiveResources.authorized?(self, :update, @order)
@@ -35,14 +36,28 @@ module Effective
         valid = (1..49).include?(payment[:response_code].to_i)  # Must be > 0 and < 50 to be valid. Sometimes we get the string 'null'
 
         if valid == false
-          return order_declined(payment: payment, provider: 'moneris', card: params[:card], declined_url: declined_url)
+          return order_declined(
+            payment: payment, 
+            provider: 'moneris', 
+            card: params[:card], 
+            declined_url: declined_url
+          )
         end
 
-        order_purchased(payment: payment, provider: 'moneris', card: params[:card], purchased_url: purchased_url, current_user: current_user)
+        order_purchased(
+          payment: payment, 
+          provider: 'moneris', 
+          card: params[:card], 
+          purchased_url: purchased_url
+        )
       end
 
       private
 
+      def moneris_params
+        { purchased_url: params[:rvar_purchased_url] }
+      end
+
       def verify_moneris_transaction(transactionKey)
         # Send a verification POST request
         uri = URI.parse(EffectiveOrders.moneris[:verify_url])

data/app/controllers/effective/providers/moneris_checkout.rb

@@ -7,6 +7,7 @@ module Effective
         raise('moneris_checkout provider is not available') unless EffectiveOrders.moneris_checkout?
 
         @order = Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(moneris_checkout_params)
 
         # We do this even if we're not authorized.
         EffectiveResources.authorized?(self, :update, @order)
@@ -31,8 +32,7 @@ module Effective
           payment: payment,
           provider: 'moneris_checkout',
           card: payment['card_type'],
-          purchased_url: moneris_checkout_params[:purchased_url],
-          current_user: current_user
+          purchased_url: moneris_checkout_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/providers/paypal.rb

@@ -13,6 +13,7 @@ module Effective
         raise('paypal provider is not available') unless EffectiveOrders.paypal?
 
         @order ||= Effective::Order.deep.where(id: (params[:invoice].to_i rescue 0)).first
+        @order.current_user = current_user unless admin_checkout?(paypal_params)
 
         # We do this even if we're not authorized
         EffectiveResources.authorized?(self, :update, @order)
@@ -21,7 +22,7 @@ module Effective
           if @order.purchased?
             order_purchased(payment: params, provider: 'paypal', card: params[:payment_type])
           elsif (params[:payment_status] == 'Completed' && params[:custom] == EffectiveOrders.paypal[:secret])
-            order_purchased(payment: params, provider: 'paypal', card: params[:payment_type], current_user: current_user)
+            order_purchased(payment: params, provider: 'paypal', card: params[:payment_type])
           else
             order_declined(payment: params, provider: 'paypal', card: params[:payment_type])
           end
@@ -30,6 +31,10 @@ module Effective
         head(:ok)
       end
 
+      def paypal_params
+        {}
+      end
+
     end
   end
 end

data/app/controllers/effective/providers/phone.rb

@@ -7,6 +7,7 @@ module Effective
         raise('phone provider is not available') unless EffectiveOrders.phone?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(phone_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/pretend.rb

@@ -7,6 +7,7 @@ module Effective
         raise('pretend provider is not available') unless EffectiveOrders.pretend?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(pretend_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -22,8 +23,7 @@ module Effective
             payment: 'for pretend', 
             provider: 'pretend', 
             card: 'none', 
-            purchased_url: pretend_params[:purchased_url],
-            current_user: (current_user unless admin_checkout?(pretend_params))
+            purchased_url: pretend_params[:purchased_url]
           )
         end
       end

data/app/controllers/effective/providers/refund.rb

@@ -8,6 +8,7 @@ module Effective
         raise('refund provider is not configured for buyer purchase') unless EffectiveOrders.buyer_purchases_refund?
 
         @order ||= Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(refund_params)
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/stripe.rb

@@ -7,6 +7,8 @@ module Effective
         raise('stripe provider is not available') unless EffectiveOrders.stripe?
 
         @order = Order.deep.find(params[:id])
+        @order.current_user = current_user unless admin_checkout?(stripe_params)
+
         @customer = Effective::Customer.for_user(@order.user || current_user)
 
         EffectiveResources.authorize!(self, :update, @order)
@@ -21,7 +23,11 @@ module Effective
         payment = validate_stripe_payment(payment_intent_id)
 
         if payment.blank?
-          return order_declined(payment: payment, provider: 'stripe', declined_url: stripe_params[:declined_url])
+          return order_declined(
+            payment: payment, 
+            provider: 'stripe', 
+            declined_url: stripe_params[:declined_url]
+          )
         end
 
         # Update the customer payment fields
@@ -33,8 +39,7 @@ module Effective
           payment: payment,
           provider: 'stripe',
           card: payment[:card],
-          purchased_url: stripe_params[:purchased_url],
-          current_user: (current_user unless admin_checkout?(stripe_params))
+          purchased_url: stripe_params[:purchased_url]
         )
       end
 

data/app/models/concerns/acts_as_purchasable.rb

@@ -139,6 +139,20 @@ module ActsAsPurchasable
     purchased_orders.any? { |order| order.purchased_by_id == user.id }
   end
 
+  def purchased_before?(date)
+    return false unless purchased?
+    return false unless purchased_at.present?
+
+    purchased_at < date
+  end
+
+  def purchased_after?(date)
+    return false unless purchased?
+    return false unless purchased_at.present?
+
+    purchased_at >= date
+  end
+
   def purchased_download_url # Override me if this is a digital purchase.
     false
   end

data/app/models/effective/order.rb

@@ -37,6 +37,8 @@ module Effective
     # Effective Reports
     acts_as_reportable if respond_to?(:acts_as_reportable)
 
+    attr_accessor :current_user # Set by the checkout controller for non-admin users
+
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
     attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
 
@@ -684,12 +686,12 @@ module Effective
     # Call this as a way to skip over non consequential orders
     # And mark some purchasables purchased
     # This is different than the Mark as Paid payment processor
-    def mark_as_purchased!(current_user: nil)
-      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true, current_user: current_user)
+    def mark_as_purchased!
+      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true)
     end
 
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
-    def purchase!(payment: nil, provider: nil, card: nil, email: true, skip_buyer_validations: false, skip_quickbooks: false, current_user: nil)
+    def purchase!(payment: nil, provider: nil, card: nil, email: true, skip_buyer_validations: false, skip_quickbooks: false)
       return true if purchased?
 
       raise('unable to purchase voided order') if voided?

data/app/views/effective/orders/_checkout_step2.html.haml

@@ -37,7 +37,7 @@
     - if EffectiveOrders.stripe?
       = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.deferred? && order.user == current_user && !local_assigns[:skip_deferred]
+    - if EffectiveOrders.deferred? && !controller_path.include?('admin/') && !local_assigns[:skip_deferred]
       %p.my-4.text-center - or -
       = render partial: '/effective/orders/deferred/form', locals: provider_locals
 

data/config/locales/effective_orders.en.yml

@@ -10,7 +10,7 @@ en:
         send_buyer_receipt_confirm: 'Send receipt to @resource.emails_send_to?'
 
   datatables:
-    admin/report_transactions_datatable: 'Individual Transactions'
-    admin/report_transactions_grouped_by_name_datatable: 'Transactions Grouped By Name'
-    admin/report_transactions_grouped_by_qb_name_datatable: 'Transactions Grouped By Quickbooks Name'
-    admin/report_payment_providers_datatable: 'Payment Providers'
+    admin/report_transactions_datatable: 'Report: Individual Transactions'
+    admin/report_transactions_grouped_by_name_datatable: 'Report: Transactions By Name'
+    admin/report_transactions_grouped_by_qb_name_datatable: 'Report: Transactions By Quickbooks Name'
+    admin/report_payment_providers_datatable: 'Report: Payment Providers'

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.14.5'.freeze
+  VERSION = '6.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.14.5
+  version: 6.15.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-03 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails