2026.3.12

init.rb

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_lineitems do
   name 'Redmine QBO Line Items plugin'
   author 'Rick Barrette'
   description 'A plugin for Redmine to extend the capabilitys of the Redmine QuickBooks Online plugin to attach billable line items to an isuue'
-  version '2026.3.11'
+  version '2026.3.12'
   url 'https://github.com/rickbarrette/redmine_qbo_lineitems'
   author_url 'https://barrettefabrication.com'
   requires_redmine version_or_higher: '6.1.0'
@@ -39,10 +39,4 @@ Redmine::MenuManager.map :admin_menu do |menu|
             html: { class: 'icon icon-list' }
 end
 
-# Dynamically load all Hooks & Patches recursively
-base_dir = File.join(File.dirname(__FILE__), 'lib')
-
-# '**' looks inside subdirectories, '*.rb' matches Ruby files
-Dir.glob(File.join(base_dir, '**', '*.rb')).sort.each do |file|
-  require file
-end
+RedmineQboLineItems.setup

lib/line_items/hooks/issues_save_hook_listener.rb

@@ -8,10 +8,10 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module RedmineQboLineItems
+module LineItems
   module Hooks
 
-    class IssuesSaveHookListener < Redmine::Hook::ViewListener
+    class IssuesSaveHookListener < Redmine::Hook::Listener
 
       # Called After Issue Saved
       def controller_issues_edit_after_save(context={})

lib/line_items/hooks/qbo_hook_listener.rb

@@ -8,10 +8,10 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module RedmineQboLineItems
+module LineItems
   module Hooks
 
-    class QboHookListener < Redmine::Hook::ViewListener
+    class QboHookListener < Redmine::Hook::Listener
 
       # Called by WebhookProcessJob
       def qbo_additional_entities(context={})

lib/line_items/hooks/view_hook_listener.rb

@@ -8,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module RedmineQboLineItems
+module LineItems
   module Hooks
 
     class ViewHookListener < Redmine::Hook::ViewListener

lib/line_items/patches/issue_patch.rb

@@ -8,35 +8,17 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require_dependency 'issue'
-
-module RedmineQboLineItems
+module LineItems
   module Patches
     module IssuePatch
+      extend ActiveSupport::Concern
       
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-
-        base.class_eval do
+      prepended do
         has_many :line_items, dependent: :destroy
         accepts_nested_attributes_for :line_items, 
           allow_destroy: true, 
           reject_if: proc { |attrs| attrs['description'].blank? }
       end
-        
     end
-
-      module ClassMethods
-
-      end
-
-      module InstanceMethods
-
-      end
-
-    end
-
-    Issue.send(:include, IssuePatch)
   end
 end

lib/redmine_qbo_line_items.rb

@@ -0,0 +1,21 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module RedmineQboLineItems
+
+  def self.setup
+   unless Issue.ancestors.include?(LineItems::Patches::IssuePatch)
+      Issue.prepend LineItems::Patches::IssuePatch
+      LineItems::Hooks::IssuesSaveHookListener
+      LineItems::Hooks::QboHookListener
+      LineItems::Hooks::ViewHookListener
+    end
+  end
+end