effective_orders 6.9.7 → 6.9.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/datatables/admin/report_payment_providers_datatable.rb +1 -1
- data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb +1 -2
- data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb +1 -1
- data/app/helpers/effective_orders_helper.rb +4 -4
- data/app/views/effective/orders/_checkout_step2.html.haml +1 -1
- data/lib/effective_orders/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0b9ab6059f70c4d3a00f14475e7729a4f1a444fdbfda1e979b931b8b70dda1b1
|
|
4
|
+
data.tar.gz: 9784af2c4f2134dd5a3cf51278d0ca4c3cca2c938297aeb47f3c2ccb863e7e21
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8d9f5572457678473ffc196391ccc27d6742f7940449d62fa6f190d79a28d63282f748775b14a722bd87eaf86757756b64c3ccb15762b30b22cf3b5146b5b9a2
|
|
7
|
+
data.tar.gz: a9ca5ce96d0669a425a887979c6bbe0fca9ea56dbeee90bb38361e494a97ff3e05d5774ff309ff5d7dd5bf2ba3fd56dfb83bd3b797822d44685d842e891d7afd
|
|
@@ -48,7 +48,7 @@ module Admin
|
|
|
48
48
|
end
|
|
49
49
|
|
|
50
50
|
def payment_providers
|
|
51
|
-
@payment_providers ||=
|
|
51
|
+
@payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
|
|
52
52
|
end
|
|
53
53
|
|
|
54
54
|
end
|
|
@@ -66,8 +66,7 @@ module Admin
|
|
|
66
66
|
end
|
|
67
67
|
|
|
68
68
|
def payment_providers
|
|
69
|
-
@payment_providers ||=
|
|
69
|
+
@payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
|
|
70
70
|
end
|
|
71
|
-
|
|
72
71
|
end
|
|
73
72
|
end
|
|
@@ -66,7 +66,7 @@ module Admin
|
|
|
66
66
|
end
|
|
67
67
|
|
|
68
68
|
def payment_providers
|
|
69
|
-
@payment_providers ||=
|
|
69
|
+
@payment_providers ||= Effective::Order.purchased.group(:payment_provider).pluck(:payment_provider) - ['free', 'pretend', '', nil]
|
|
70
70
|
end
|
|
71
71
|
|
|
72
72
|
end
|
|
@@ -115,13 +115,13 @@ module EffectiveOrdersHelper
|
|
|
115
115
|
end
|
|
116
116
|
end
|
|
117
117
|
|
|
118
|
-
def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
|
|
119
|
-
locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
|
|
118
|
+
def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
|
|
119
|
+
locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
|
|
120
120
|
render(partial: 'effective/orders/checkout_step1', locals: locals)
|
|
121
121
|
end
|
|
122
122
|
|
|
123
|
-
def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
|
|
124
|
-
locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
|
|
123
|
+
def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil, skip_deferred: false)
|
|
124
|
+
locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace, skip_deferred: skip_deferred }
|
|
125
125
|
render(partial: 'effective/orders/checkout_step2', locals: locals)
|
|
126
126
|
end
|
|
127
127
|
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
- if EffectiveOrders.stripe?
|
|
31
31
|
= render partial: '/effective/orders/stripe/form', locals: provider_locals
|
|
32
32
|
|
|
33
|
-
- if EffectiveOrders.deferred? && order.user == current_user
|
|
33
|
+
- if EffectiveOrders.deferred? && order.user == current_user && !local_assigns[:skip_deferred]
|
|
34
34
|
%p.my-4.text-center - or -
|
|
35
35
|
= render partial: '/effective/orders/deferred/form', locals: provider_locals
|
|
36
36
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_orders
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.9.
|
|
4
|
+
version: 6.9.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-04-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|