effective_orders 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f4ecfb00c2ff8fca1e88711877ca4c4a2c5e2772857645b1793eb42d672f6d
-  data.tar.gz: 97d1e59387d065240d3b0c160f725831d808ea153d6aedce2104f277c769e005
+  metadata.gz: '09e7e3354a9268cf3f5c7f000fe685c96c63e519c37269e534fb41669654c2ac'
+  data.tar.gz: b117ad0187b25c59a496c658eee479af26bf0843951676065e7bc82633e9803f
 SHA512:
-  metadata.gz: 74166e809d54fd9b2b0f4c266e59da9b0f8ff0947ac2166f6e88686fcaecf05a1c6e520933a935568717beae55a1db032aca72902641fbd031ecf60fe0302527
-  data.tar.gz: 464f54b750a6feab8ec0ad9df11c1b8591aa70d33a58faaf0cb03eb03d584ea4362fc9247f3ad3425e3269585cb78a18529cfc28c1ae41eadc0a28d2304f1298
+  metadata.gz: 22e01baa9aeced210808a95d75fd18ef77a40d5de9f0ae34c6c6e86a42f4e51292d5dfa43d43d1647f5ba6a0dcd06532511571c6d72bd04de811294d453f1134
+  data.tar.gz: bb0995769c746838c40cd58e905f6c1079db824ab521342bd59c9b2b492c8805d7b55e2f0568cf86b2f3db14c727f61c1c97fe96831d95db359e1812e1296cb5

data/app/datatables/admin/effective_orders_datatable.rb

@@ -14,7 +14,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    if attributes[:user_id].blank? && attributes[:parent_id].blank?
+    unless attributes[:skip_filters]
       scope :purchased, default: true
       scope :deferred
       scope :refunds
@@ -84,13 +84,14 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.includes(:addresses, :order_items, :user)
+    scope = Effective::Order.all.deep
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
     if attributes[:user_id].present?
+      user = current_user.class.find(attributes[:user_id])
       scope = scope.where(user: user)
     end
 
@@ -101,8 +102,4 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= current_user.class.find(attributes[:user_id])
-  end
-
 end

data/app/datatables/effective_orders_datatable.rb

@@ -59,7 +59,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.where(user: user).includes(:addresses, :order_items, :user)
+    user = current_user.class.find(attributes[:user_id])
+
+    scope = Effective::Order.all.deep.where(user: user)
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
@@ -76,8 +78,4 @@ class EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= view.current_user.class.find(attributes[:user_id])
-  end
-
 end

data/app/models/effective/order.rb

@@ -137,7 +137,7 @@ module Effective
       validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.deferred_providers }
     end
 
-    scope :deep, -> { includes(:user, order_items: :purchasable) }
+    scope :deep, -> { includes(:addresses, :user, order_items: :purchasable) }
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(state: EffectiveOrders::PURCHASED) }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails