effective_orders 6.6.0 → 6.6.2
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/effective_orders_datatable.rb +1 -1
- data/app/datatables/admin/report_transactions_datatable.rb +7 -2
- data/app/datatables/effective_orders_datatable.rb +1 -1
- data/app/views/effective/orders/_datatable_actions.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: 86a4f7535e5766ae1bff99cbabd94b9b134c381c255a8f745ef6e63f5685f7cb
|
|
4
|
+
data.tar.gz: e55dd3dd359e7e46bd5bedb251eece208e36cabefef22caaa8c57e3eb84ee9c1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 968a79995bdd6ea7bb51d170145dc375fa6db28095238fad9f18c3e18b6126b4179e692715ae02f68fa707f9c94506418039250691dbf771e690ebe6413784d1
|
|
7
|
+
data.tar.gz: 0a346ecf19463553ebf8ee7ced123067ac750809036de53ba09775fb72a8d870572bfb49d2d8a16d91a9e41c10ed3aff5bdf4d31f97861ee477cc66399688061
|
|
@@ -44,7 +44,7 @@ module Admin
|
|
|
44
44
|
order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
-
col :purchased_by, search: :string
|
|
47
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
|
48
48
|
|
|
49
49
|
if attributes[:user_id].blank?
|
|
50
50
|
col :user, search: :string
|
|
@@ -17,6 +17,12 @@ module Admin
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
col :purchased_at
|
|
20
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
|
21
|
+
|
|
22
|
+
if EffectiveOrders.organization_enabled?
|
|
23
|
+
col :organization
|
|
24
|
+
end
|
|
25
|
+
|
|
20
26
|
col :user
|
|
21
27
|
col :order_items
|
|
22
28
|
col :payment_provider, search: EffectiveOrders.payment_providers
|
|
@@ -49,10 +55,9 @@ module Admin
|
|
|
49
55
|
end
|
|
50
56
|
|
|
51
57
|
collection do
|
|
52
|
-
Effective::Order.purchased
|
|
58
|
+
Effective::Order.purchased.deep
|
|
53
59
|
.where(purchased_at: date_range)
|
|
54
60
|
.where('total != 0')
|
|
55
|
-
.includes(:user, [order_items: :purchasable])
|
|
56
61
|
end
|
|
57
62
|
end
|
|
58
63
|
end
|
|
@@ -29,7 +29,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
|
|
|
29
29
|
order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
|
|
30
30
|
end
|
|
31
31
|
|
|
32
|
-
col :purchased_by, search: :string
|
|
32
|
+
col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
if EffectiveOrders.billing_address
|
|
@@ -3,4 +3,4 @@
|
|
|
3
3
|
|
|
4
4
|
- if EffectiveResources.authorized?(controller, :send_buyer_receipt, order)
|
|
5
5
|
= dropdown_link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
|
|
6
|
-
data: { method: :post, confirm: "Send receipt to #{order.
|
|
6
|
+
data: { method: :post, confirm: "Send receipt to #{order.emails.first}?" }
|
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.6.
|
|
4
|
+
version: 6.6.2
|
|
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: 2023-08-
|
|
11
|
+
date: 2023-08-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|