effective_orders 6.9.4 → 6.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1d61e78a85291932aa271496555a4f921c7a6f4072fd8fa7df79de63a5819c
-  data.tar.gz: f86548d4c8394454827087482fcfea9c85904438c46ed42ce3bb90bf802fe52d
+  metadata.gz: 955f5276e4dadfc9a09d834e891473907954108356e1bc3df0d9ac4c6032293a
+  data.tar.gz: a818f4aa9ed8d42aeb6f6fd39d7ebe318ac3b0a0fbc6fd096af721fdc265a28b
 SHA512:
-  metadata.gz: 0caa231c98f73d140c8ec80afa49ab81ffb13ddcc40b985b6880d5783b97383640afb8ccf8a8a19c5e4ec0f4e98876c3cd3e9012ac99b6f6512ed3d79f24839d
-  data.tar.gz: 86b4e0c077a9a3fff64259e785b7e9d95bb58e87d0c692713ceeeb180aa80a5f93364ea89690b66836eeffda3d8b2d73edf4101cc591627ece3947fd8a9de022
+  metadata.gz: 81652ea7eaaac44fbabf4834720e1c1052324dac30ecd9cf378bdf616adec172b8707b21cba29d2fc0fb0f97735c655e2ace5bf0d0534d6ca312fa5094c4e19d
+  data.tar.gz: 83dcca873a4b99b5901f0fd4cc124054edcd3a18cbb74cbf00a71d85f164cc4c2dd6390103fadeefe951c91aeb00202f8043d602f2361990df315a2e3985a6db

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

@@ -5,8 +5,19 @@ module Effective
 
       protected
 
+      def admin_checkout?(payment_params)
+        payment_params[:purchased_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)
-        @order.purchase!(payment: payment, provider: provider, card: card, email: email, skip_buyer_validations: skip_buyer_validations, current_user: current_user)
+        @order.purchase!(
+          payment: payment, 
+          provider: provider, 
+          card: card, 
+          email: email, 
+          skip_buyer_validations: skip_buyer_validations, 
+          current_user: current_user
+        )
 
         Effective::Cart.where(user: current_user).destroy_all if current_user.present?
 

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

@@ -23,7 +23,7 @@ module Effective
             provider: 'pretend', 
             card: 'none', 
             purchased_url: pretend_params[:purchased_url],
-            current_user: current_user
+            current_user: (current_user unless admin_checkout?(pretend_params))
           )
         end
       end

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

@@ -7,7 +7,7 @@ module Effective
         raise('stripe provider is not available') unless EffectiveOrders.stripe?
 
         @order = Order.deep.find(params[:id])
-        @customer = Effective::Customer.for_user(current_user)
+        @customer = Effective::Customer.for_user(@order.user || current_user)
 
         EffectiveResources.authorize!(self, :update, @order)
 
@@ -34,7 +34,7 @@ module Effective
           provider: 'stripe',
           card: payment[:card],
           purchased_url: stripe_params[:purchased_url],
-          current_user: current_user
+          current_user: (current_user unless admin_checkout?(stripe_params))
         )
       end
 

data/app/datatables/admin/report_transactions_datatable.rb

@@ -23,9 +23,9 @@ module Admin
         col :organization
       end
 
-      col :user
-      col :order_items
-      col :payment_provider, search: EffectiveOrders.payment_providers
+      col :user, visible: false
+      col :order_items, visible: false
+      col :payment_provider, search: EffectiveOrders.payment_providers, visible: false
       col :payment_method
 
       col :subtotal, as: :price

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -15,13 +15,13 @@ module Admin
       col :total, as: :price
 
       payment_providers.each do |provider|
-        col(provider, as: :price)
+        col("p - #{provider}", as: :price, visible: false)
       end
 
       col :orders_count
 
-      col :orders
-      col :users
+      col :orders, visible: false
+      col :users, visible: false
 
       col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -15,13 +15,13 @@ module Admin
       col :total, as: :price
 
       payment_providers.each do |provider|
-        col(provider, as: :price)
+        col("p - #{provider}", as: :price, visible: false)
       end
 
       col :orders_count
 
-      col :orders
-      col :users
+      col :orders, visible: false
+      col :users, visible: false
 
       col :start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')

data/app/helpers/effective_stripe_helper.rb

@@ -46,7 +46,7 @@ module EffectiveStripeHelper
   end
 
   def stripe_payment_intent(order)
-    customer = Effective::Customer.for_user(order.user)
+    customer = Effective::Customer.for_user(order.user || current_user)
 
     begin
       stripe_payment_intent_payload(order, customer)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.9.4'.freeze
+  VERSION = '6.9.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.9.4
+  version: 6.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails