effective_orders 6.9.9 → 6.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9ab6059f70c4d3a00f14475e7729a4f1a444fdbfda1e979b931b8b70dda1b1
-  data.tar.gz: 9784af2c4f2134dd5a3cf51278d0ca4c3cca2c938297aeb47f3c2ccb863e7e21
+  metadata.gz: ac026da4d01fe889cb9e9afd765b25bce3e95c8fda855888a5f76a29626fefdc
+  data.tar.gz: 15eee62b2710cff5f788f3f21a1a12e4f0391edae37c9f6d5cc452af5dd9ac8d
 SHA512:
-  metadata.gz: 8d9f5572457678473ffc196391ccc27d6742f7940449d62fa6f190d79a28d63282f748775b14a722bd87eaf86757756b64c3ccb15762b30b22cf3b5146b5b9a2
-  data.tar.gz: a9ca5ce96d0669a425a887979c6bbe0fca9ea56dbeee90bb38361e494a97ff3e05d5774ff309ff5d7dd5bf2ba3fd56dfb83bd3b797822d44685d842e891d7afd
+  metadata.gz: 8ba372d127fa4fa088f2a3c0e241dc97c37c0e41c09d4268ca991e660ac6e28fc3cc067c054df082476596c3f6d1f6724525cbeb174dbf7cf42b6b8a3f2101bd
+  data.tar.gz: 107208024d4318fb320ace396c092781f69bc0da508b15a17506666a6b720c5a948e93046e75bdce4da3215e161f80c719ef1b3448dd3ea43f84498d55e3db4c

data/app/datatables/admin/effective_orders_datatable.rb

@@ -50,25 +50,26 @@ module Admin
       col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
 
       if attributes[:user_id].blank?
-        col :user, search: :string
-
-        if defined?(EffectiveMemberships)
-          col(:member_number, label: 'Member #', sort: false) do |order|
-            order.user.try(:membership).try(:number)
-          end.search do |collection, term|
-            memberships = Effective::Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
-            collection.where(user_id: memberships.select('owner_id'))
-          end
-        end
-
-        col :billing_name, visible: false
-        col :email, visible: false
+        col :user, search: :string, visible: !EffectiveOrders.organization_enabled?
       end
 
       if attributes[:organization_id].blank?
-        col :organization, visible: EffectiveOrders.organization_enabled?
+        col :organization, search: :string, visible: EffectiveOrders.organization_enabled?
+      end
+
+      if defined?(EffectiveMemberships)
+        col(:member_number, label: 'Member #', sort: false, visible: false) do |order|
+          order.organization.try(:membership).try(:number) || order.user.try(:membership).try(:number)
+        end.search do |collection, term|
+          # TODO add organizations too
+          user_memberships = Effective::Membership.where(owner_type: current_user.class.name).where('number ILIKE ?', "%#{term}%")
+          collection.where(user_id: user_memberships.select('owner_id'))
+        end
       end
 
+      col :billing_name, visible: false
+      col :email, visible: false
+
       col :parent, visible: false, search: :string
 
       col :cc, visible: false

data/app/datatables/effective_orders_datatable.rb

@@ -23,6 +23,8 @@ class EffectiveOrdersDatatable < Effective::Datatable
     end
 
     col :parent, visible: false, search: :string
+    col :user, visible: false, search: :string
+    col :organization, search: :string, visible: false
 
     col :status
 
@@ -70,7 +72,11 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.deep.where(user: current_user)
+    scope = Effective::Order.all.deep
+
+    if attributes[:user_id].blank? && attributes[:organization_id].blank?
+      scope = scope.for(current_user)
+    end
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)

data/app/models/effective/order.rb

@@ -107,6 +107,14 @@ module Effective
       includes(:addresses, :user, :parent, :purchased_by, :organization, order_items: :purchasable) 
     }
 
+    scope :for, -> (user) {
+      if user.respond_to?(:organizations)
+        where(user: user).or(where(organization: user.organizations))
+      else
+        where(user: user)
+      end
+    }
+
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(status: :purchased) }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.9.9'.freeze
+  VERSION = '6.9.10'.freeze
 end

metadata

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