effective_orders 6.9.7 → 6.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2063836a32b538b9bee6a34796df7cd23d64bee507637d074ecd41bb78504968
-  data.tar.gz: 3ee226b5149fa4e756471741e39ff95414a165b3d4a759d7255f2b4d9795bb67
+  metadata.gz: 0b9ab6059f70c4d3a00f14475e7729a4f1a444fdbfda1e979b931b8b70dda1b1
+  data.tar.gz: 9784af2c4f2134dd5a3cf51278d0ca4c3cca2c938297aeb47f3c2ccb863e7e21
 SHA512:
-  metadata.gz: b50ab28975dfb6f9ce7ab958323c90c62a81e7678e20926e4c8a043970b24950eade8d46b6d838729bb40d2eb9a80ea4eeb7fca38deb9c04ce0b5d4d20589b31
-  data.tar.gz: ac6a85948f4d0d4cc00205531f4ff134335ef84ebc2225704b89baea7dcc2189084738b0e09e9626387e790d8aeaf822d2e6c31fdab48c86f349dece946fa308
+  metadata.gz: 8d9f5572457678473ffc196391ccc27d6742f7940449d62fa6f190d79a28d63282f748775b14a722bd87eaf86757756b64c3ccb15762b30b22cf3b5146b5b9a2
+  data.tar.gz: a9ca5ce96d0669a425a887979c6bbe0fca9ea56dbeee90bb38361e494a97ff3e05d5774ff309ff5d7dd5bf2ba3fd56dfb83bd3b797822d44685d842e891d7afd

data/app/datatables/admin/report_payment_providers_datatable.rb

@@ -48,7 +48,7 @@ module Admin
     end
 
     def payment_providers
-      @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
+      @payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
     end
 
   end

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -66,8 +66,7 @@ module Admin
     end
 
     def payment_providers
-      @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
+      @payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
     end
-
   end
 end

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -66,7 +66,7 @@ module Admin
     end
 
     def payment_providers
-      @payment_providers ||= EffectiveOrders.payment_providers - ['free', 'pretend']
+      @payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
     end
 
   end

data/app/helpers/effective_orders_helper.rb

@@ -115,13 +115,13 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
     render(partial: 'effective/orders/checkout_step1', locals: locals)
   end
 
-  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
     render(partial: 'effective/orders/checkout_step2', locals: locals)
   end
 

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

@@ -30,7 +30,7 @@
     - if EffectiveOrders.stripe?
       = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.deferred? && order.user == current_user
+    - if EffectiveOrders.deferred? && order.user == current_user && !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.9.7'.freeze
+  VERSION = '6.9.9'.freeze
 end

metadata

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