effective_orders 6.22.0 → 6.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7355efac3dc644c7345ef82d62786ebfc6224047d8a67d81c14778fcc490b0ac
-  data.tar.gz: 23ac4db7e268dbb3927bd19ce650d52585cdf8821ef0ae0462ccb61cdd93f8de
+  metadata.gz: aacbf648e88be000dccd67b2eaf3b5f659f58ce5d04238cc2ce06cf38abb496f
+  data.tar.gz: 88fe0446cc0a7788a199e63020db3605cd165b407836e51e963fafcb8ea4ab64
 SHA512:
-  metadata.gz: c6434225d448689ff1eb02e4b3db328c29ab23f1e000726e65b76cd9556f1f521f58c7eb1f1fa91755ef074485caabb228321e934ff7f27c9c3e3448bb5e6508
-  data.tar.gz: d918d1edbb87a1444c6c306627d11f20a7e881ae12527e8d1adcc28eb49f5f47c13de1d3d95811df5f58cb26af6b0f45561823e94b5efbd36317070f6e723255
+  metadata.gz: 18343e5fbc7c8d6462f40800078f02228afa29a983f1bab6ed5e6ce4c1b7ac7c824a60e30fdd93a9c0767dc1e9960b049fdfa3e9b22dc37925f7d6d7c20b14ba
+  data.tar.gz: 461cb7c6788cff12420017d6d1f4c0358f41131bc76500f92408b75e309a671c8e5baa0e221708a21a1843c4b4df859cc33a213316b5bcf2fbb5c29b7512387f

data/app/datatables/admin/effective_customers_datatable.rb

@@ -4,7 +4,7 @@ module Admin
 
       col :id, visible: false
 
-      col :user, search: :string
+      col :user
 
       col :email do |customer|
         customer.user.email

data/app/datatables/admin/effective_order_items_datatable.rb

@@ -0,0 +1,33 @@
+module Admin
+  class EffectiveOrderItemsDatatable < Effective::Datatable
+    datatable do
+      order :created_at
+
+      col :id, visible: false
+      col :created_at, visible: false
+      col :updated_at, visible: false
+
+      col :order
+
+      col :order_status, search: Effective::Order.new.all_statuses do |order_item|
+        order_item.order.status
+      end
+
+      col :purchasable, visible: false
+
+      col :name
+      col :quantity
+      col :price, as: :price
+
+      col :total, as: :price
+
+      col :qb_item_name, label: qb_item_name_label, search: Effective::ItemName.sorted.map(&:to_s)
+
+      actions_col
+    end
+
+    collection do
+      Effective::OrderItem.all.includes(:order)
+    end
+  end
+end

data/app/datatables/admin/effective_orders_datatable.rb

@@ -47,14 +47,14 @@ module Admin
         order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
       end
 
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
 
       if attributes[:user_id].blank?
-        col :user, search: :string, visible: !EffectiveOrders.organization_enabled?
+        col :user, visible: !EffectiveOrders.organization_enabled?
       end
 
       if attributes[:organization_id].blank?
-        col :organization, search: :string, visible: EffectiveOrders.organization_enabled?
+        col :organization, visible: EffectiveOrders.organization_enabled?
       end
 
       if defined?(EffectiveMemberships)
@@ -70,7 +70,7 @@ module Admin
       col :billing_name, visible: false
       col :email, visible: false
 
-      col :parent, visible: false, search: :string
+      col :parent, visible: false
 
       col :cc, visible: false
 
@@ -82,7 +82,7 @@ module Admin
         col :shipping_address, visible: false
       end
 
-      col(:order_items, search: :string).search do |collection, term|
+      col(:order_items).search do |collection, term|
         collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
       end
 

data/app/datatables/admin/report_transactions_datatable.rb

@@ -17,7 +17,7 @@ module Admin
       end
 
       col :purchased_at
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
 
       if EffectiveOrders.organization_enabled?
         col :organization

data/app/datatables/effective_orders_datatable.rb

@@ -22,9 +22,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
       '#' + order.to_param
     end
 
-    col :parent, visible: false, search: :string
-    col :user, visible: false, search: :string
-    col :organization, search: :string, visible: false
+    col :parent, visible: false
+    col :user, visible: false
+    col :organization, visible: false
 
     col :status
 
@@ -33,7 +33,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
         order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
       end
 
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
     end
 
     if EffectiveOrders.billing_address
@@ -44,7 +44,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
       col :shipping_address, visible: false
     end
 
-    col(:order_items, search: :string).search do |collection, term|
+    col(:order_items).search do |collection, term|
       collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
     end
 

data/app/helpers/effective_acts_as_purchasable_helper.rb

@@ -12,12 +12,21 @@ module EffectiveActsAsPurchasableHelper
 
     options = options.reverse_merge(
       label: (EffectiveOrders.quickbooks? ? "Quickbooks #{etd(Effective::ItemName)}" : et(Effective::ItemName)),
-      hint: "Can't find the #{etd(Effective::ItemName)} you need? #{link_to('Click here to add one', effective_orders.admin_item_names_path, target: '_blank')}"
+      hint: "Can't find the #{etd(Effective::ItemName)} you need? #{link_to('Click here to add one', effective_orders.admin_item_names_path, target: '_blank')}",
+      required: EffectiveOrders.require_item_names?
     )
     
     form.select :qb_item_name, collection, options
   end
 
+  def qb_item_name_label
+    EffectiveOrders.quickbooks? ? "Quickbooks #{etd(Effective::ItemName)}" : et(Effective::ItemName)
+  end
+
+  def qb_item_names_label
+    EffectiveOrders.quickbooks? ? "Quickbooks #{etsd(Effective::ItemName)}" : ets(Effective::ItemName)
+  end
+
   # This is called on the My Sales Page and is intended to be overridden in the app if needed
   def acts_as_purchasable_path(purchasable, action = :show)
     polymorphic_path(purchasable)

data/app/models/concerns/acts_as_purchasable.rb

@@ -49,6 +49,10 @@ module ActsAsPurchasable
       validates_with Effective::SoldOutValidator, on: :create
     end
 
+    with_options(if: -> { EffectiveOrders.require_item_names? }) do
+      validates :qb_item_name, presence: true
+    end
+
     scope :purchased, -> { 
       if respond_to?(:unarchived)
         unarchived.where.not(purchased_order_id: nil) 

data/config/effective_orders.rb

@@ -26,6 +26,9 @@ EffectiveOrders.setup do |config|
   # Display the item name field on the orders#new screen
   config.use_item_names = true
 
+  # Require item names throughout
+  config.require_item_names = false
+
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false
   config.collect_note_required = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.22.0'.freeze
+  VERSION = '6.23.1'.freeze
 end

data/lib/effective_orders.rb

@@ -19,7 +19,7 @@ module EffectiveOrders
       :customers_table_name, :subscriptions_table_name, :products_table_name, :item_names_table_name,
       :layout,
       :orders_collection_scope, :order_tax_rate_method,
-      :obfuscate_order_ids, :use_item_names,
+      :obfuscate_order_ids, :use_item_names, :require_item_names,
       :use_effective_qb_sync, :use_effective_qb_online, 
       :tax_label,
       :billing_address, :shipping_address,
@@ -218,6 +218,10 @@ module EffectiveOrders
     use_item_names != false
   end
 
+  def self.require_item_names?
+    require_item_names == true
+  end
+
   def self.tax_label
     config[:tax_label].presence || "Tax"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.22.0
+  version: 6.23.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,6 +228,7 @@ files:
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/admin/effective_customers_datatable.rb
 - app/datatables/admin/effective_item_names_datatable.rb
+- app/datatables/admin/effective_order_items_datatable.rb
 - app/datatables/admin/effective_orders_datatable.rb
 - app/datatables/admin/report_payment_providers_datatable.rb
 - app/datatables/admin/report_transactions_datatable.rb