effective_orders 6.21.4 → 6.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ce34f3c38a2b137ae5d6277b766bab2215e1ef14271dc9ae26ced61897216a
-  data.tar.gz: b27f892799caee6f152f14f6dc3757ca910a1db2568b146736c3aa877c226f15
+  metadata.gz: 260c5da1c1e8d7f330a0cedc2ea511227b3e4f633f8d8c5cde9ee7517fff4010
+  data.tar.gz: 27fcfffdff8dd456095775a285ff8dcb26f26de4a5fd1d5cc0f1954f9266a035
 SHA512:
-  metadata.gz: 496a570f6ce2aa2fa1182c5b341761abb9183ea2da79e6d1e465b8c81bab11590edb529c385c825407258827ab703dfaba7c63da6d8680ccd6e607b2550bff90
-  data.tar.gz: c26a9381da40a34dcfc49dd08c933dc86caf75bc29a80876905081806e04df5ea31b7af64abb9c74aa446cefe1adbf328817b91c4c17f2d458aa5d89a24b6c93
+  metadata.gz: 2db38d74a702dcda44d80c041a1e6fb8eeb02b16db406685d8404f09d4bc975f1254f615c3bdcca1a3147b3fcaf45b7dbd91ed54fc556cd0293c13951317164e
+  data.tar.gz: cece056c424e1ddbc810a24a549c13f9355dad85dc78611242df7c41df575c2ee86d42f3a50517a12e28826e3bf04e3f6b922bf6bf0214c02c36ff7e9e16ff45

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/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/app/models/effective/order.rb

@@ -880,7 +880,7 @@ module Effective
 
     def skip_order_emails?
       return true if purchased? && free? && !EffectiveOrders.send_order_receipts_when_free
-      return true if purchased? && free? && OrderEmail.new(self).event_all_waitlisted?
+      return true if purchased? && free? && OrderEmail.new(self).event_all_waitlisted_or_archived?
       false
     end
 

data/app/models/effective/order_email.rb

@@ -99,5 +99,9 @@ module Effective
       event_registrants.all? { |er| er.waitlisted_not_promoted? }
     end
 
+    def event_all_waitlisted_or_archived?
+      return false unless event_registrants.present?
+      event_registrants.all? { |er| er.waitlisted_not_promoted? || er.archived? }
+    end
   end
 end

data/app/models/effective/order_item.rb

@@ -93,5 +93,9 @@ module Effective
       (qb_order_item || build_qb_order_item(name: purchasable.try(:qb_item_name))).name
     end
 
+    def archived?
+      purchasable.try(:archived?) == true && price.to_i == 0
+    end
+
   end
 end

data/app/views/effective/orders/_order_items.html.haml

@@ -1,13 +1,15 @@
 .effective-order-items
+  - present_order_items = order.order_items.reject(&:archived?)
+
   %table.table{style: "margin-bottom: 20px;"}
     %thead
       %tr
         %th.quantity Qty
-        %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
+        %th.item= present_order_items.length > 1 ? 'Items' : 'Item'
         %th.price Price
 
     %tbody
-      - order.order_items.each do |item|
+      - present_order_items.each do |item|
         %tr
           %td.quantity= item.quantity
 

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.21.4'.freeze
+  VERSION = '6.23.0'.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.21.4
+  version: 6.23.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-06 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