effective_orders 6.14.6 → 6.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08de0ca2663c0056e1333cd3b84053de84ebcc259c633d6456ad550560d9b8f
-  data.tar.gz: d46ec9f6a3f9820d56d8743db2a3dcd69cf518caabe7d65e881eee4c9a8d1236
+  metadata.gz: 0c33107747aca735bb6baa8b845f15c0a1ccb438ca7c25ca58b31e9ab230f1de
+  data.tar.gz: 24a3f7e86c1d95ddfe3bb20d794e495b29c4cf83ffa4b3a3c0c63a333a7166e3
 SHA512:
-  metadata.gz: fa17f89db73c185e09a8eb5611733c7bcac269196b5994ddfe656a2a3f64d212d3fe9b93b3a3d90fbc6d72be776fe64b3b929e81d7e0000ef20b1b599c01051e
-  data.tar.gz: 3bf57c8be6cfad3887b9f943a32d9300487b7bfae3ae34f898d0f148a06c2eab5294933b6c7b62e016542952b7e78c9478400e757ea99b7992a93ecd4e534102
+  metadata.gz: c350776105133c3382b9b51c4bc139895df6acbec242bf351fe379cdbd5cf8b9d1fffe13f662123aaa29d075f385b4675aced7af5ce81bd8996ab67c120ceb0a
+  data.tar.gz: 13e0b330ed878ad9d6daeadcac913fbc51fac9dff3019bdfe96d604913afa6964402dc3c5c62092602d0de03a697107395a12579e73c37741bcbed0126ba87db

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/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/admin/orders/_form_order.html.haml

@@ -1,7 +1,7 @@
 = effective_form_with(model: [:admin, order], engine: true) do |f|
   -# User
   - klass = (f.object.user || current_user).class
-  - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
 
   = f.hidden_field :user_type, value: klass.name
   = f.select :user_id, klass.all, ajax_url: ajax_url
@@ -9,7 +9,7 @@
   -# Organization
   - if EffectiveOrders.organization_enabled?
     - klass = (f.object.organization || EffectiveOrders.Organization.new).class
-    - ajax_url = (@select2_organizations_ajax_path || effective_resources.organizations_admin_select2_ajax_index_path) unless Rails.env.test?
+    - ajax_url = (effective_resources.organizations_effective_ajax_index_path unless Rails.env.test?)
 
     = f.hidden_field :organization_type, value: klass.name
     = f.select :organization_id, klass.all, ajax_url: ajax_url

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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.14.6'.freeze
+  VERSION = '6.16.0'.freeze
 end

metadata

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