diff --git a/config/locales/en.yml b/config/locales/en.yml
index 64308da..c6cebfd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -99,4 +99,5 @@ en:
notice_invoice_not_found: "Invoice not found"
notice_forbidden: "You do not have permission to access this resource"
notice_issue_not_found: "Issue not found"
- customer_details: "Customer Details"
\ No newline at end of file
+ customer_details: "Customer Details"
+ notice_error_project_nil: "The issue's project is nil, set project to: "
\ No newline at end of file
diff --git a/init.rb b/init.rb
index ecc776b..8248fa5 100644
--- a/init.rb
+++ b/init.rb
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
name 'Redmine QBO plugin'
author 'Rick Barrette'
description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed'
- version '2026.1.9'
+ version '2026.2.1'
url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'https://barrettefabrication.com'
settings default: {empty: true}, partial: 'qbo/settings'
diff --git a/lib/redmine_qbo/hooks/issues_form_hook_listener.rb b/lib/redmine_qbo/hooks/issues_hook_listener.rb
similarity index 63%
rename from lib/redmine_qbo/hooks/issues_form_hook_listener.rb
rename to lib/redmine_qbo/hooks/issues_hook_listener.rb
index 926be14..91568ce 100644
--- a/lib/redmine_qbo/hooks/issues_form_hook_listener.rb
+++ b/lib/redmine_qbo/hooks/issues_hook_listener.rb
@@ -10,10 +10,21 @@
module RedmineQbo
module Hooks
+ class IssuesHookListener < Redmine::Hook::ViewListener
- class IssuesFormHookListener < Redmine::Hook::ViewListener
+ include IssuesHelper
- include IssuesHelper
+ # Check the new issue form for a valid project.
+ # This is added to help prevent 422 unprocessable entity errors when creating an issue
+ # See https://github.com/redmine/redmine/blob/84483d63828d0cb2efbf5bd786a2f0d22e34c93d/app/controllers/issues_controller.rb#L179
+ def controller_issues_new_before_save(context={})
+ if context[:issue].project.nil?
+ context[:issue].project = projects_for_select(context[:issue]).first
+ context[:controller].flash[:error] = I18n.t(:notice_error_project_nil) + context[:issue].project.to_s
+ end
+
+ return context
+ end
# Edit Issue Form
# Here we build the required form components before passing them to a partial view formatting.
@@ -54,7 +65,31 @@ module RedmineQbo
}
)
end
- end
- end
+ # View Issue
+ # Displays the quickbooks customer, estimate, & invoices attached to the issue
+ def view_issues_show_details_bottom(context={})
+ issue = context[:issue]
+
+ # Build a list of invoice links
+ invoice_link = ""
+ if issue.invoices
+ issue.invoices.each do |i|
+ invoice_link += "#{link_to i, i, target: :_blank}
"
+ end
+ end
+
+ context[:controller].send(:render_to_string, {
+ partial: 'issues/show_details',
+ locals: {
+ customer: issue.customer ? link_to(issue.customer) : nil,
+ estimate_link: issue.estimate ? link_to(issue.estimate, issue.estimate, target: :_blank) : nil,
+ invoice_link: invoice_link.html_safe,
+ issue: issue
+ }
+ })
+ end
+
+ end
+ end
end
\ No newline at end of file
diff --git a/lib/redmine_qbo/hooks/issues_show_hook_listener.rb b/lib/redmine_qbo/hooks/issues_show_hook_listener.rb
deleted file mode 100644
index ee59966..0000000
--- a/lib/redmine_qbo/hooks/issues_show_hook_listener.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 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 RedmineQbo
- module Hooks
-
- class IssuesShowHookListener < Redmine::Hook::ViewListener
-
- # View Issue
- # Displays the quickbooks customer, estimate, & invoices attached to the issue
- def view_issues_show_details_bottom(context={})
- issue = context[:issue]
-
- # Build a list of invoice links
- invoice_link = ""
- if issue.invoices
- issue.invoices.each do |i|
- invoice_link += "#{link_to i, i, target: :_blank}
"
- end
- end
-
- context[:controller].send(:render_to_string, {
- partial: 'issues/show_details',
- locals: {
- customer: issue.customer ? link_to(issue.customer) : nil,
- estimate_link: issue.estimate ? link_to(issue.estimate, issue.estimate, target: :_blank) : nil,
- invoice_link: invoice_link.html_safe,
- issue: issue
- }
- })
- end
-
- end
-
- end
-end
\ No newline at end of file
diff --git a/lib/redmine_qbo/patches/issue_patch.rb b/lib/redmine_qbo/patches/issue_patch.rb
index a5f743e..26e5949 100644
--- a/lib/redmine_qbo/patches/issue_patch.rb
+++ b/lib/redmine_qbo/patches/issue_patch.rb
@@ -43,7 +43,7 @@ module RedmineQbo
# Create billable time entries
def bill_time
- logger.debug "QBO: Billing time for issue ##{id} - #{subject}"
+ logger.debug "QBO: Billing time for issue ##{id}"
return unless status.is_closed?
return if assigned_to.nil?
return unless Qbo.first
@@ -110,11 +110,21 @@ module RedmineQbo
CustomerToken.get_token self
end
- # Titleize the subject before save
+ # Titleize the subject before save , but keep words containing numbers mixed with letters capitalized
def titlize_subject
- self.subject = self.subject.titleize
+ logger.debug "QBO: Titlizing subject for issue ##{self.id}"
+ self.subject = self.subject.split(/\s+/).map do |word|
+ # If word is NOT purely alphanumeric (contains special chars),
+ # or is all upper/lower, we can handle it.
+ # excluding alphanumeric strings with mixed case and numbers (e.g., "ID555ABC") from being altered.
+ if word =~ /[A-Z]/ && word =~ /[0-9]/
+ word
+ else
+ word.downcase
+ word.capitalize
+ end
+ end.join(' ')
end
-
end
# Add module to Issue
diff --git a/lib/redmine_qbo/patches/issues_controller_patch.rb b/lib/redmine_qbo/patches/issues_controller_patch.rb
index 1a6496b..a7b4da2 100644
--- a/lib/redmine_qbo/patches/issues_controller_patch.rb
+++ b/lib/redmine_qbo/patches/issues_controller_patch.rb
@@ -15,22 +15,18 @@ module RedmineQbo
module Helper
def watcher_link(issue, user)
- link = +''
- link << link_to(I18n.t(:label_bill_time), bill_path( issue.id ), method: :get, class: 'icon icon-email-add') if user.admin?
+ link = link_to(I18n.t(:label_bill_time), bill_path( issue.id ), method: :get, class: 'icon icon-email-add') if user.admin?
link << link_to(I18n.t(:label_share), share_path( issue.id ), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
link.html_safe + super
end
end
def self.included(base)
-
base.class_eval do
helper Helper
end
-
- end
-
- end
+ end
+ end
# Add module to IssuessController
IssuesController.send(:include, IssuesControllerPatch)