effective_orders 6.8.0 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83eb44947b1c5f4f906f04822df9860f892727a02146f33e03eb468ffe65ea6
-  data.tar.gz: 726acb095ff327c25c438eacaec1db6cfa551207582a4d82a7a677e809b5087f
+  metadata.gz: 3564d400d398b71b8799a81b8668ba35aee5e69e222d3849ff4903e94338de67
+  data.tar.gz: 9905c4d6d0364f2b0b30e5752de9809fb2fd765124ac61d9f2f79e7c753e6bd6
 SHA512:
-  metadata.gz: 0cc47f00733d0927470036ec6d9d2ef434945204426692ac26858e64a88d0b38e3a57396f64d2c1980152a8924d174cbd014dde7cc4245c2e8bcdf1922f7eb22
-  data.tar.gz: 3e6d4ee0aa861c39ec8f11e55879201908b3c6c62910e47631e69ab8662966eaef265e51906a8a954a806a7cec9020c13c6eb1123b26c11669d3c44137172cfc
+  metadata.gz: 6d7eba677128528f63a37143ada91e7c501aeb52a0a90715acf6615543e420309bfcf02df64e68cecdefe9847db022bdf2750cac8d4dcc2e046e61e78c6ee834
+  data.tar.gz: 3fa0dad90dc8ea85190b1f234f5ba717ba14520e1956468cfafa94e182ae253213e9dc181a15d7124733b18ea642d5af0c80893ea6fdc097c865d9524c2ce1e5

data/app/datatables/admin/effective_orders_datatable.rb

@@ -55,6 +55,10 @@ module Admin
         col :email, visible: false
       end
 
+      if attributes[:organization_id].blank?
+        col :organization
+      end
+
       col :parent, visible: false, search: :string
 
       col :cc, visible: false
@@ -111,10 +115,14 @@ module Admin
         user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
         user_klass ||= current_user.class
 
-        user = user_klass.find(attributes[:user_id])
+        user = user_klass.where(id: attributes[:user_id]).first!
         scope = scope.where(user: user)
       end
 
+      if attributes[:organization_id].present? && attributes[:organization_type].present?
+        scope = scope.where(organization_id: attributes[:organization_id], organization_type: attributes[:organization_type])
+      end
+
       if attributes[:parent_id].present? && attributes[:parent_type].present?
         scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
       end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.8.0'.freeze
+  VERSION = '6.8.2'.freeze
 end

data/lib/generators/effective_orders/install_generator.rb

@@ -47,15 +47,7 @@ module EffectiveOrders
       end
 
       def create_migration_file
-        @orders_table_name = ':' + EffectiveOrders.orders_table_name.to_s
-        @order_items_table_name = ':' + EffectiveOrders.order_items_table_name.to_s
-        @carts_table_name = ':' + EffectiveOrders.carts_table_name.to_s
-        @cart_items_table_name = ':' + EffectiveOrders.cart_items_table_name.to_s
-        @customers_table_name = ':' + EffectiveOrders.customers_table_name.to_s
-        @subscriptions_table_name = ':' + EffectiveOrders.subscriptions_table_name.to_s
-        @products_table_name = ':' + EffectiveOrders.products_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_orders.rb.erb', 'db/migrate/create_effective_orders.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_orders.rb', 'db/migrate/create_effective_orders.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails