effective_orders 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/effective/datatables/orders.rb +1 -3
- data/lib/effective_orders/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 774850d182ebadfca0aa4eebd1ec345be944bb07
|
|
4
|
+
data.tar.gz: 1d6112128a019ec2818e210b99a98f97e6cf8dba
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9a495e6eb97854c65a7911314278c973ba376f99489add1aa6071745a1ae3071ac89ccfa215f93f1b2569b8e7b0cccfb7b0c14603b098724828a2177476e895d
|
|
7
|
+
data.tar.gz: 8d26c685de6888af50e3820b2f439a3989f59c1c80b44b9c6a85ef2875c82df3a861fcd8ef7b5ac0fa93ce47688c2fbd0529bcf3919b5d10864bc14251050f7f
|
|
@@ -27,8 +27,6 @@ if defined?(EffectiveDatatables)
|
|
|
27
27
|
end
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
-
table_column(:subtotal) { |order| price_to_currency(order[:subtotal].to_i) }
|
|
31
|
-
table_column(:tax) { |order| price_to_currency(order[:tax].to_i) }
|
|
32
30
|
table_column(:total) { |order| price_to_currency(order[:total].to_i) }
|
|
33
31
|
|
|
34
32
|
table_column :created_at, :visible => false
|
|
@@ -43,7 +41,7 @@ if defined?(EffectiveDatatables)
|
|
|
43
41
|
.joins(:user, :order_items)
|
|
44
42
|
.group('users.email, orders.id')
|
|
45
43
|
.select('orders.*, users.email AS email')
|
|
46
|
-
.select("#{
|
|
44
|
+
.select("#{query_total} AS total")
|
|
47
45
|
.select("string_agg(order_items.title, '!!SEP!!') AS order_items")
|
|
48
46
|
|
|
49
47
|
if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
|