removed comment

Note: breaking change, need to update settings

Gemfile

@@ -4,11 +4,5 @@ gem 'quickbooks-ruby'
 gem 'oauth2'
 gem 'roxml'
 gem 'will_paginate'
-gem 'rails-jquery-autocomplete'
-gem 'jquery-ui-rails'
 gem 'rexml'
 gem 'combine_pdf'
-
-group :assets do
-  gem 'coffee-rails'
-end

README.md

@@ -89,17 +89,6 @@ Supported automation:
 
 Invoices containing an Issue reference (e.g. `#123`) automatically attach to the corresponding Issue.
 
-### Custom Field Synchronization
-
-Invoice custom fields can be mapped to Issue custom fields.
-
-Example use case:
-
-*   Mileage In/Out recorded in Redmine
-    
-*   Automatically synchronized to the QuickBooks invoice.
-    
-
 ### Customer Synchronization
 
 Customer records are automatically updated in the local database when changes occur in QuickBooks.
@@ -121,7 +110,6 @@ Available hooks:
 |--|--|--|
 View Hook|:pdf_left, { issue: issue }  | Used to add text to left side of PDF
 View Hook|:pdf_right, { issue: issue }  | Used to add text to right side of PDF
-Hook|process_invoice_custom_fields, { issue: issue, invoice: invoice }  | Used to process invoice custom fields
 View Hook|:show_customer_view_right, { customer: customer } | Used to show partials on right side of customer view
 Hook| :qbo_additional_entities | Used to add additional entites to be processed by the WebhookProcessJob
 Hook| :qbo_full_sync | Used to add a Class to be called by the QboSyncDispatcher

app/controllers/customers_controller.rb

@@ -30,8 +30,6 @@ class CustomersController < ApplicationController
   before_action :view_customer, except: [:new, :view]
   skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:view]
 
-  autocomplete :customer, :name, full: true, extra_data: [:id]
-
   def address_to_s(address)
     return if address.nil?
 
@@ -62,6 +60,19 @@ class CustomersController < ApplicationController
     params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
   end
 
+  # Used for autocomplete form
+  def autocomplete
+    term = ActiveRecord::Base.sanitize_sql_like(params[:q].to_s)
+
+    items = Customer.where("name LIKE :t OR phone_number LIKE :t OR mobile_phone_number LIKE :t", t: "%#{term}%")
+      .order(:name)
+      .limit(20)
+
+    render json: items.map { |i|
+      { id: i.id, name: i.name, phone_number: i.phone_number, mobile_phone_number: i.mobile_phone_number }
+    }
+  end
+
   def create
     @customer = Customer.new(allowed_params)
     @customer.save

app/controllers/employees_controller.rb

@@ -7,32 +7,20 @@
 #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.
+class EmployeesController < ApplicationController
+  include AuthHelper
 
-class InvoicePushService
+  before_action :require_user, unless: -> { session[:token].nil? }
 
-  def initialize(invoice)
+  def sync
-    @invoice = invoice
+    Employee.sync
-  end
+    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
-
-  # Push invoice changes to QBO if the invoice is linked to any issues with custom field changes that need to be synced
-  def push
-    return if @invoice.qbo_sync_locked?
-    log "Pushing invoice ##{@invoice.id} to QBO due to linked issue custom field changes"
-    @invoice.update_column(:qbo_sync_locked, true)
-    remote = QboConnectionService.with_qbo_service(entity: Invoice) do |service|
-      remote = service.fetch_by_id(@invoice.id)
-      # modify remote object here if needed
-      service.update(remote)
-    end
-  rescue => e
-    Rails.logger.error "[InvoicePushService] #{e.message}"
-  ensure
-    @invoice.update_column(:qbo_sync_locked, false)
   end
 
   private
 
+  # Logs messages with a consistent prefix for easier debugging.
   def log(msg)
-    Rails.logger.info "[InvoicePushService] #{msg}"
+    Rails.logger.info "[EmployeeController] #{msg}"
   end
 end

app/controllers/estimates_controller.rb

@@ -7,7 +7,7 @@
 #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.
-class EstimateController < ApplicationController
+class EstimatesController < ApplicationController
   include AuthHelper
 
   before_action :require_user, unless: -> { session[:token].nil? }
@@ -24,6 +24,11 @@ class EstimateController < ApplicationController
     render_pdf(@estimate)
   end
 
+  def sync
+    Estimate.sync
+    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
+  end
+
   private
 
   # Loads the estimate based on ID or doc number, with a fallback to sync if not found locally.
@@ -72,13 +77,6 @@ class EstimateController < ApplicationController
     redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_estimate_not_found) }
   end
 
-  def sync
-    Estimate.sync
-    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
-  end
-
-  private
-
   # Logs messages with a consistent prefix for easier debugging.
   def log(msg)
     Rails.logger.info "[EstimateController] #{msg}"

app/controllers/invoices_controller.rb

@@ -7,7 +7,7 @@
 #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.
-class InvoiceController < ApplicationController
+class InvoicesController < ApplicationController
   include AuthHelper
 
   before_action :require_user, unless: -> { session[:token].nil? }

app/jobs/qbo_sync_dispatcher.rb

@@ -33,8 +33,10 @@ class QboSyncDispatcher
     # Allow other plugins to add addtional sync jobs via Hooks
     Redmine::Hook.call_hook( :qbo_full_sync ).each do |context|
         next unless context
-        jobs.push context
+        Array(context).each do |entity|
-        log "Added additionals QBO Sync Job for #{context.to_s}"
+          jobs.push(entity)
+          log "Added additional QBO Sync Job for #{entity.to_s}"
+        end
     end
 
     jobs.each { |job| QboSyncJob.perform_later(entity: job, full_sync: full_sync) }

app/jobs/qbo_webhook_processor.rb

@@ -14,7 +14,7 @@ class QboWebhookProcessor
   def self.process!(request:)
     body = request.raw_post
     signature = request.headers['intuit-signature']
-    secret = Setting.plugin_redmine_qbo['settingsWebhookToken']
+    secret = RedmineQbo.webhook_token_secret
 
     raise "Invalid signature" unless valid_signature?(body, signature, secret)
 

app/jobs/webhook_process_job.rb

@@ -47,8 +47,10 @@ class WebhookProcessJob < ActiveJob::Base
     # Allow other plugins to add addtional qbo entities via Hooks
     Redmine::Hook.call_hook( :qbo_additional_entities ).each do |context|
         next unless context
-        entities.push context
+        Array(context).each do |entity|
-        log "Added additional QBO entities: #{context}"
+          entities.push(entity)
+          log "Added additional QBO entity #{entity}"
+        end
     end
     return unless entities.include?(name)
 

app/models/concerns/quickbooks_oauth.rb

@@ -75,11 +75,8 @@ module QuickbooksOauth
     # This method will construct and return an instance of the OAuth2::Client class that is configured with the consumer key, consumer secret and the appropriate URLs for the Intuit OAuth2 service.  It will also set the sandbox mode based on the plugin settings.  This method is used by the instance method oauth_client to create a new OAuth2 client for each instance of the model that includes this concern.
     def construct_oauth2_client
 
-      oauth_consumer_key = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-      oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
-
       # Are we are playing in the sandbox?
-      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false
+      Quickbooks.sandbox_mode = RedmineQbo.sandbox_mode?
       log "Sandbox mode: #{Quickbooks.sandbox_mode}"
 
       options = {
@@ -87,7 +84,7 @@ module QuickbooksOauth
         authorize_url: "https://appcenter.intuit.com/connect/oauth2",
         token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
       }
-      OAuth2::Client.new(oauth_consumer_key, oauth_consumer_secret, options)
+      OAuth2::Client.new(RedmineQbo.oauth_consumer_key, RedmineQbo.oauth_consumer_secret, options)
     end
 
   end

app/services/invoice_attachment_service.rb

@@ -29,8 +29,6 @@ class InvoiceAttachmentService
         issue.save! if issue.changed?
         log "Attached invoice ##{@invoice.id} to issue ##{issue.id}"
       end
-
-      InvoiceCustomFieldSyncService.new(issue, @invoice, @remote).sync
     end
   end
 

app/services/invoice_custom_field_sync_service.rb

@@ -1,69 +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.
-
-class InvoiceCustomFieldSyncService
-
-  def initialize(issue, invoice, remote)
-    @issue   = issue
-    @invoice = invoice
-    @remote = remote
-  end
-
-  # Sync custom fields on the issue based on the invoice data, then push changes to QBO if any fields were updated
-  def sync
-    return if @invoice.qbo_sync_locked?
-
-    log "Syncing custom fields for issue ##{@issue.id} based on invoice ##{@invoice.doc_number}"
-
-    changed = false
-
-    # Process Invoice Custom Fields via Hooks
-    Redmine::Hook.call_hook(
-      :process_invoice_custom_fields,
-      issue: @issue,
-      invoice: @remote
-    ).each do |context|
-        next unless context
-        changed ||= context[:is_changed]
-        log "Custom fields updated by hook, marking invoice for push to QBO" if context[:is_changed]
-    end
-
-    # Process Issue Custom Values from any issue custom fields that match the invoice custom fields
-    begin
-      value = @issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
-      
-      # Check to see if the value is blank...
-      if not value.value.to_s.blank?
-        # Check to see if the value is diffrent
-        if not cf.string_value.to_s.eql? value.value.to_s
-          # update the custom field on the invoice
-          cf.string_value = value.value.to_s
-          is_changed = true
-        end
-      end
-    rescue
-      # Nothing to do here, there is no match
-    end
-
-    push_if_changed if changed
-  end
-
-  private
-
-  # If any custom fields were changed during the sync process, this method will trigger a push of the invoice data to QuickBooks Online to ensure that the remote data stays in sync with the local changes. It uses the InvoicePushService to handle the actual communication with QBO.
-  def push_if_changed
-    InvoicePushService.new(@invoice).push
-  end
-
-  def log(msg)
-    Rails.logger.info "[InvoiceCustomFieldSyncService] #{msg}"
-  end
-  
-end

app/views/customers/_form.html.erb

@@ -7,7 +7,7 @@
         <div class="clearfix">
           <%=t(:label_display_name)%> 
           <div class="input">
-            <%= f.text_field :name, required: true, autocomplete: "off" %>
+            <%= f.text_field :name, required: true, class: "customer-name", autocomplete: "off", data: { autocomplete_url: "/customers/autocomplete" } %>
           </div>
         </div>
         

app/views/customers/_search.html.erb

@@ -1,5 +1,5 @@
 <%= form_tag(customers_path, method: "get", id: "customer-search-form") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
+    <%= text_field_tag :search, params[:search], class: "customer-name", placeholder: t(:label_search_customers), autocomplete: "off", data: { autocomplete_url: "/customers/autocomplete" } %>
     <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>

app/views/customers/show.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo[:sandbox] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{RedmineQbo.sandbox_mode? ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
   <div class="issue">
 
     <div class="splitcontent">

app/views/qbo/_settings.html.erb

@@ -1,111 +1,79 @@
-<!--
-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.
--->
-
-<!-- somewhere in your document include the Javascript -->
 <script type="text/javascript" src="https://appcenter.intuit.com/Content/IA/intuit.ipp.anywhere.js"></script>
-
-<!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
 <script>
   intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_path %>'});
 </script>
 
-<table >
+<div class="box tabular">
-  <tbody>
+  <p>
+    <label><%= t(:label_client_id) %></label>
+    <%= text_field_tag 'settings[oauth_consumer_key]', settings[:oauth_consumer_key], size: 50 %>
+  </p>
 
-    <tr>
+  <p>
-      <th><%=t(:label_client_id)%></th>
+    <label><%= t(:label_client_secret) %></label>
-      <td>
+    <%= password_field_tag 'settings[oauth_consumer_secret]', settings[:oauth_consumer_secret], size: 50 %>
-        <input 
+  </p>
-          type="text" 
-          style="width:350px" 
-          id="settingsOAuthConsumerKey" 
-          value="<%= settings['settingsOAuthConsumerKey'] %>" 
-          name="settings[settingsOAuthConsumerKey]" >
-      </td>
-    </tr>
   
-    <tr>
+  <p>
-      <th><%=t(:label_client_secret)%></th>
+    <label><%= t(:label_webhook_token) %></label>
-      <td>
+    <%= text_field_tag 'settings[webhook_token]', settings[:webhook_token], size: 50 %>
-        <input 
+  </p>
-          type="text" 
-          style="width:350px" 
-          id="settingsOAuthConsumerSecret"
-          value="<%= settings['settingsOAuthConsumerSecret'] %>"
-          name="settings[settingsOAuthConsumerSecret]" >
-      </td>
-    </tr>
 
-    <tr>
+  <p>
-      <th><%=t(:label_webhook_token)%></th>
+    <label><%= t(:label_sandbox) %></label>
-      <td>
+    <%= check_box_tag 'settings[sandbox]', 1, settings[:sandbox] %>
-        <input 
+  </p>
-          type="text" 
-          style="width:350px" 
-          id="settingsWebhookToken"
-          value="<%= settings['settingsWebhookToken'] %>"
-          name="settings[settingsWebhookToken]" >
-      </td>
-    </tr>
 
-    <tr>
+  <hr />
-      <th><%=t(:label_sandbox)%></th>
-      <td>
-        <%= check_box_tag 'settings[sandbox]', @settings[:sandbox], @settings[:sandbox] %>
-      </td>
-    </tr>
 
-     <tr>
+  <p>
-        <th><%=t(:label_oauth_expires)%></th>
+    <label><%= t(:label_oauth_expires) %></label>
-        <td><%= Qbo.oauth2_access_token_expires_at %>
+    <span class="icon <%= Qbo.oauth2_access_token_expires_at&.future? ? 'icon-ok' : 'icon-warning' %>">
-      </tr>
+      <%= Qbo.oauth2_access_token_expires_at || 'N/A' %>
+    </span>
+  </p>
 
-      <tr>
+  <p>
-        <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
+    <label><%= t(:label_customer_count) %></label>
-        <td><%= Qbo.oauth2_refresh_token_expires_at %>
+    <%= Customer.count %> 
-     </tr>
+    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Customer.last_sync %>)</em>
+  </p>
 
-  </tbody>
+  <p>
-</table>
+    <label><%= t(:label_employee_count) %></label>
+    <%= Employee.count %> 
+    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Employee.last_sync %>)</em>
+  </p>
 
-<br/>
+  <p>
-<%=t(:label_oauth_note)%>
+    <label><%= t(:label_invoice_count) %></label>
-<br/>
+    <%= Invoice.count %> 
-<br/>
+    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Item.last_sync %>)</em>
+  </p>
 
-<!-- this will display a button that the user clicks to start the flow -->
+  <p>
+    <label><%= t(:label_estimate_count) %></label>
+    <%= Estimate.count %> 
+    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Account.last_sync %>)</em>
+  </p>
+
+  <p>
+    <label><%= t(:label_last_sync) %> (QBO)</label>
+    <%= Qbo.exists? ? Qbo.last_sync : 'Never synced' %>
+  </p>
+</div>
+
+<fieldset class="box">
+  <legend>Management & Synchronization</legend>
+  
+  <div style="margin-bottom: 20px;">
     <ipp:connectToIntuit></ipp:connectToIntuit>
-
-<br/>
-<br/>
-
-<div>
-    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%> @ <%= Customer.last_sync %>
   </div>
 
-    <div>
+  <div style="margin-bottom: 15px;">
-        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %> @ <%= Employee.last_sync %>
+    <%= link_to t(:label_sync_now_customers), sync_customers_path, class: 'button icon icon-reload' %>
-    </div>
+    <%= link_to t(:label_sync_now_employees), employees_sync_path, class: 'button icon icon-reload' %>
-    
+    <%= link_to t(:label_sync_now_invoices), invoices_sync_path, class: 'button icon icon-reload' %>
-    <div>
+    <%= link_to t(:label_sync_now_estimate), estimates_sync_path, class: 'button icon icon-reload' %>
-        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %> @ <%= Invoice.last_sync%>
-    </div>
-    
-    <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %> @ <%= Estimate.last_sync %>
-    </div>
-      
-    <br/>
-    
-    <div>
-        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path(full_sync: true) %>
   </div>
+</fieldset>

assets/javascripts/autocomplete-rails.js

@@ -1 +0,0 @@
-!function(t){t.fn.railsAutocomplete=function(e){var a=function(){this.railsAutoCompleter||(this.railsAutoCompleter=new t.railsAutocomplete(this))};if(void 0!==t.fn.on){if(!e)return;return t(document).on("focus",e,a)}return this.live("focus",a)},t.railsAutocomplete=function(t){var e=t;this.init(e)},t.railsAutocomplete.options={showNoMatches:!0,noMatchesLabel:"no existing match"},t.railsAutocomplete.fn=t.railsAutocomplete.prototype={railsAutocomplete:"0.0.1"},t.railsAutocomplete.fn.extend=t.railsAutocomplete.extend=t.extend,t.railsAutocomplete.fn.extend({init:function(e){function a(t){return t.split(e.delimiter)}function i(t){return a(t).pop().replace(/^\s+/,"")}e.delimiter=t(e).attr("data-delimiter")||null,e.min_length=t(e).attr("data-min-length")||t(e).attr("min-length")||2,e.append_to=t(e).attr("data-append-to")||null,e.autoFocus=t(e).attr("data-auto-focus")||!1,t(e).autocomplete({appendTo:e.append_to,autoFocus:e.autoFocus,delay:t(e).attr("delay")||0,source:function(a,r){var n=this.element[0],o={term:i(a.term)};t(e).attr("data-autocomplete-fields")&&t.each(t.parseJSON(t(e).attr("data-autocomplete-fields")),function(e,a){o[e]=t(a).val()}),t.getJSON(t(e).attr("data-autocomplete"),o,function(){var a={};t.extend(a,t.railsAutocomplete.options),t.each(a,function(i,r){if(a.hasOwnProperty(i)){var n=t(e).attr("data-"+i);a[i]=n?n:r}}),0==arguments[0].length&&t.inArray(a.showNoMatches,[!0,"true"])>=0&&(arguments[0]=[],arguments[0][0]={id:"",label:a.noMatchesLabel}),t(arguments[0]).each(function(a,i){var r={};r[i.id]=i,t(e).data(r)}),r.apply(null,arguments),t(n).trigger("railsAutocomplete.source",arguments)})},change:function(e,a){if(t(this).is("[data-id-element]")&&""!==t(t(this).attr("data-id-element")).val()&&(t(t(this).attr("data-id-element")).val(a.item?a.item.id:"").trigger("change"),t(this).attr("data-update-elements"))){var i=t.parseJSON(t(this).attr("data-update-elements")),r=a.item?t(this).data(a.item.id.toString()):{};if(i&&""===t(i.id).val())return;for(var n in i){var o=t(i[n]);o.is(":checkbox")?null!=r[n]&&o.prop("checked",r[n]):o.val(a.item?r[n]:"").trigger("change")}}},search:function(){var t=i(this.value);return t.length<e.min_length?!1:void 0},focus:function(){return!1},select:function(i,r){if(r.item.value=r.item.value.toString(),-1!=r.item.value.toLowerCase().indexOf("no match")||-1!=r.item.value.toLowerCase().indexOf("too many results"))return t(this).trigger("railsAutocomplete.noMatch",r),!1;var n=a(this.value);if(n.pop(),n.push(r.item.value),null!=e.delimiter)n.push(""),this.value=n.join(e.delimiter);else if(this.value=n.join(""),t(this).attr("data-id-element")&&t(t(this).attr("data-id-element")).val(r.item.id).trigger("change"),t(this).attr("data-update-elements")){var o=r.item,l=-1!=r.item.value.indexOf("Create New")?!0:!1,u=t.parseJSON(t(this).attr("data-update-elements"));for(var s in u)"checkbox"===t(u[s]).attr("type")?o[s]===!0||1===o[s]?t(u[s]).attr("checked","checked"):t(u[s]).removeAttr("checked"):l&&o[s]&&-1==o[s].indexOf("Create New")||!l?t(u[s]).val(o[s]).trigger("change"):t(u[s]).val("").trigger("change")}var c=this.value;return t(this).bind("keyup.clearId",function(){t.trim(t(this).val())!=t.trim(c)&&(t(t(this).attr("data-id-element")).val("").trigger("change"),t(this).unbind("keyup.clearId"))}),t(e).trigger("railsAutocomplete.select",r),!1}}),t(e).trigger("railsAutocomplete.init")}}),t(document).ready(function(){t("input[data-autocomplete]").railsAutocomplete("input[data-autocomplete]")})}(jQuery);

assets/javascripts/autocomplete.js

@@ -0,0 +1,102 @@
+(function () {
+
+  // Helper: escape HTML for safety
+  function escapeHtml(str) {
+    return $("<div>").text(str).html();
+  }
+
+  // Helper: highlight all occurrences of term (case-insensitive)
+  function highlightTerm(text, term) {
+    if (!term) return text;
+    const escapedTerm = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const regex = new RegExp("(" + escapedTerm + ")", "ig");
+    return text.replace(regex, "<strong>$1</strong>");
+  }
+
+  window.initCustomerAutocomplete = function(context) {
+    let scope = context || document;
+
+    $(scope).find(".customer-name").each(function() {
+      if ($(this).data("autocomplete-initialized")) return;
+      $(this).data("autocomplete-initialized", true);
+
+      let $input = $(this);
+
+      let ac = $input.autocomplete({
+        appendTo: "body",   // crucial for Redmine positioning
+        minLength: 2,
+
+        source: function(request, response) {
+          $.getJSON("/customers/autocomplete", { q: request.term })
+            .done(function(data) {
+              response(data.map(function(item) {
+                // combine secondary info
+                let secondary = [];
+                if (item.phone_number) secondary.push(item.phone_number);
+                if (item.mobile_phone_number) secondary.push(item.mobile_phone_number);
+
+                let meta = secondary.length ? " (" + secondary.join(" • ") + ")" : "";
+
+                // escape HTML to avoid XSS
+                let safeText = escapeHtml(item.name + meta);
+
+                return {
+                  label: item.name + meta,      // plain fallback
+                  value: item.name,             // goes into input
+                  id: item.id,
+                  html: highlightTerm(safeText, request.term)
+                };
+              }));
+            })
+            .fail(function() {
+              response([]);
+            });
+        },
+
+        select: function(event, ui) {
+          $input.val(ui.item.value);  // visible text
+          $("#customer_id").val(ui.item.id); // hidden ID
+
+          // trigger Redmine form update safely
+          setTimeout(function() {
+            $("#customer_id").trigger("change");
+          }, 0);
+
+          return false;
+        },
+
+        change: function(event, ui) {
+          // clear hidden field if no valid selection
+          if (!ui.item && !$input.val()) {
+            $("#customer_id").val("");
+          }
+        }
+      });
+
+      // Render item HTML for highlight
+      ac.autocomplete("instance")._renderItem = function(ul, item) {
+        return $("<li>")
+          .append($("<div>").html(item.html))
+          .appendTo(ul);
+      };
+    });
+  };
+
+  // Re-init after Redmine AJAX form updates
+  $(document).on("ajaxComplete", function() {
+    if (window.initCustomerAutocomplete) {
+      window.initCustomerAutocomplete(document);
+    }
+  });
+
+  // Init on page load
+  $(document).ready(function() {
+    window.initCustomerAutocomplete(document);
+  });
+
+  // Also init on Turbo/Redmine load events
+  document.addEventListener("turbo:load", function() {
+    window.initCustomerAutocomplete(document);
+  });
+
+})();

assets/stylesheets/autocomplete.css

@@ -0,0 +1,5 @@
+/* Keep Redmine default look, just enhance metadata */
+.ui-autocomplete .autocomplete-meta {
+  color: #888;
+  font-size: 0.9em;
+}

config/locales/en.yml

@@ -82,6 +82,10 @@ en:
   label_shipping_address: "Shipping Address"
   label_sync: "Sync"
   label_sync_now: "Sync Now"
+  label_sync_now_customers: "Sync Customers"
+  label_sync_now_employees: "Sync Employees"
+  label_sync_now_invoices: "Sync Invoices"
+  label_sync_now_estimate: "Sync Estimates"
   label_syncing: "Syncing QuickBooks"
   label_trim: "Trim"
   label_webhook_token: "Intuit QBO Webhook Token"

config/routes.rb

@@ -14,16 +14,17 @@ get 'qbo/oauth_callback', to: 'qbo#oauth_callback'
 
 #manual sync
 get 'qbo/sync', to: 'qbo#sync'
-get 'invoices/sync', to: 'invoice#sync'
+get 'invoices/sync', to: 'invoices#sync'
-get 'estimates/sync', to: 'estimate#sync'
+get 'estimates/sync', to: 'estimates#sync'
+get 'employees/sync', to: 'employees#sync'
 
 #webhook
 post 'qbo/webhook', to: 'qbo#webhook'
 
 # Estimate & Invoice PDF
-get 'estimates/:id', to: 'estimate#show', as: :estimate
+get 'estimates/:id', to: 'estimates#show', as: :estimate
-get 'estimates/doc/', to: 'estimate#doc', as: :estimate_doc
+get 'estimates/doc/', to: 'estimates#doc', as: :estimate_doc
-get 'invoices/:id', to: 'invoice#show', as: :invoice
+get 'invoices/:id', to: 'invoices#show', as: :invoice
 
 #manual billing
 get 'bill/:id', to: 'qbo#bill', as: :bill
@@ -37,6 +38,8 @@ get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
 get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
 
 resources :customers do
-  get :autocomplete_customer_name, on: :collection
+  collection do
+    get :autocomplete
     get :sync
   end
+end

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.3.10'
+  version '2026.3.17'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings default: {empty: true}, partial: 'qbo/settings'
@@ -43,10 +43,4 @@ Redmine::Plugin.register :redmine_qbo do
 
 end
 
-# Dynamically load all Hooks & Patches recursively
+RedmineQbo.setup
-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

lib/redmine_qbo.rb

@@ -0,0 +1,55 @@
+#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 RedmineQbo
+  def self.setup
+    # === Models ===
+    Issue.prepend RedmineQbo::Patches::IssuePatch
+    User.prepend RedmineQbo::Patches::UserPatch
+
+    # === Queries ===
+    IssueQuery.prepend RedmineQbo::Patches::QueryPatch
+    TimeEntryQuery.prepend RedmineQbo::Patches::TimeEntryQueryPatch
+
+    # === Controllers ===
+    RedmineQbo::Patches::IssuesControllerPatch.apply
+    RedmineQbo::Patches::AttachmentsControllerPatch.apply
+
+    # === Helpers / Exports ===
+    Redmine::Export::PDF::IssuesPdfHelper.prepend RedmineQbo::Patches::PdfPatch
+
+    # === Hooks ===
+    RedmineQbo::Hooks::IssuesHookListener
+    RedmineQbo::Hooks::UsersShowHookListener
+    RedmineQbo::Hooks::ViewHookListener
+  end
+
+  def self.settings
+    Setting.plugin_redmine_qbo
+  end
+
+  def self.oauth_consumer_key
+    settings[:oauth_consumer_key]
+  end
+  
+  def self.oauth_consumer_secret
+    settings[:oauth_consumer_secret]
+  end
+
+  def self.sandbox_mode?
+    settings[:sandbox] ? true : false
+  end
+
+  def self.webhook_token_secret
+    settings[:webhook_token]
+  end
+
+
+end

lib/redmine_qbo/hooks/issues_hook_listener.rb

@@ -24,12 +24,11 @@ module RedmineQbo
 
         # Customer Name Text Box with database backed autocomplete
         # onchange event will update the hidden customer_id field        
-        search_customer = f.autocomplete_field :customer,
+        search_customer = f.text_field :customer,
-          autocomplete_customer_name_customers_path,
+          class: "customer-name",
-          selected: issue.customer,
+          autocomplete: "off",
-          update_elements: { 
+          data: {
-            id: '#issue_customer_id', 
+            autocomplete_url: "/customers/autocomplete"
-            value: '#issue_customer' 
           }
 
         # We need to handle 3 cases for the onchange event of the customer name field:
@@ -47,7 +46,7 @@ module RedmineQbo
         # This hidden field is used for the customer ID for the issue
         # the onchange event will reload the issue form via ajax to update the available estimates
         customer_id = f.hidden_field :customer_id,
-          id: "issue_customer_id",
+          id: "customer_id",
           onchange: js_path.html_safe
 
         # Generate the drop down list of quickbooks estimates owned by the selected customer

lib/redmine_qbo/hooks/users_show_hook_listener.rb

@@ -16,9 +16,6 @@ module RedmineQbo
       # View User
       def view_users_form(context={})
 
-        # Update the users
-        #Employee.update_all
-    
         # Check to see if there is a quickbooks user attached to the issue
         @selected = context[:user]&.employee&.id
 

lib/redmine_qbo/hooks/view_hook_listener.rb

@@ -17,8 +17,9 @@ module RedmineQbo
       def view_layouts_base_html_head(context = {})
         safe_join([
           javascript_include_tag( 'application.js', plugin: :redmine_qbo),
-          javascript_include_tag( 'autocomplete-rails.js', plugin: :redmine_qbo),
+          javascript_include_tag( 'autocomplete.js', plugin: :redmine_qbo),
-          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo)
+          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo),
+          stylesheet_link_tag( 'autocomplete', plugin: :redmine_qbo)
         ])
       end
 

lib/redmine_qbo/patches/attachments_controller_patch.rb

@@ -8,41 +8,32 @@
 #
 #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 'attachments_controller'
-
 module RedmineQbo
   module Patches
-
     module AttachmentsControllerPatch
-
+      module Helper
-      def self.included(base)
+        # Check if login is globally required to access the application
-
-        base.class_eval do
-
-          # check if login is globally required to access the application
         def check_if_login_required
-            # no check needed if user is already logged in
+          # Return true if the user is already logged in
           return true if User.current.logged?
 
-            # Pull up the attachmet, & verify if we have a valid token for the Issue
+          # Pull up the attachment and verify if we have a valid token for the issue
-            attachment = Attachment.find(params[:id])
+          attachment = Attachment.find_by(id: params[:id])
-            token = CustomerToken.where("token = ? and expires_at > ?", session[:token], Time.now)
+          return require_login if attachment.nil?
-            token = token.first
-            unless token.nil?
-              return true if token.issue_id == attachment.container_id
-            end
 
+          token = CustomerToken.where("token = ? AND expires_at > ?", session[:token], Time.current).first
+          return true if token&.issue_id == attachment.container_id
+
+          # Default to requiring login if all else fails
           require_login if Setting.login_required?
         end
-          
       end
 
-      end
+      def self.apply
-
+        AttachmentsController.class_eval do
-    end   
+          helper Helper
-
+        end
-    # Add module to AttachmentsController
+      end
-    AttachmentsController.send(:include, AttachmentsControllerPatch)
+    end
-
   end
 end

lib/redmine_qbo/patches/issue_patch.rb

@@ -8,60 +8,39 @@
 #
 #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 RedmineQbo
   module Patches
     module IssuePatch
+      extend ActiveSupport::Concern
 
-      def self.included(base)
+      prepended do
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-
-        base.class_eval do
         belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true
-          belongs_to :customer_token, primary_key: :id
+        belongs_to :customer_token, primary_key: :id, optional: true
-          belongs_to :estimate, primary_key: :id
+        belongs_to :estimate, primary_key: :id, optional: true
         has_and_belongs_to_many :invoices
 
         before_save :titlize_subject
         after_commit :enqueue_billing, on: :update
       end
 
-      end
+      # Enqueue a background job to bill the time spent on this issue to QuickBooks if the issue is closed and assigned to an employee
-
-      module ClassMethods
-
-      end
-
-      module InstanceMethods
-
-        # Enqueue a background job to bill the time spent on this issue to the associated customer in Quickbooks, if the issue is closed and has a customer assigned.
       def enqueue_billing
-          log "Checking if issue needs to be billed for issue ##{id}"
+        log "Checking if issue needs billing for ##{id}"
-          return unless closed?
+        return unless closed? && customer.present? && assigned_to&.employee_id.present?
-          return unless customer.present?
-          return unless assigned_to&.employee_id.present?
 
         log "Enqueuing billing for issue ##{id}"
         BillIssueTimeJob.perform_later(id)
       end
 
-        # Titlize the subject of the issue before saving to ensure consistent formatting for billing descriptions in Quickbooks
+      # Titlize the subject for consistent formatting in billing descriptions
       def titlize_subject
         log "Titlizing subject for issue ##{id}"
-
         self.subject = subject.split(/\s+/).map do |word|
-            if word =~ /[A-Z]/ && word =~ /[0-9]/
+          (word =~ /[A-Z]/ && word =~ /[0-9]/) ? word : word.capitalize
-              word
-            else
-              word.capitalize
-            end
         end.join(' ')
       end
-      end
 
-      # This method is used to generate a shareable token for the customer associated with this issue, which can be used to link the issue to the corresponding customer in Quickbooks for billing and tracking purposes.
+      # Generate a shareable token linking this issue to the customer for QuickBooks
       def share_token
         CustomerToken.get_token(self)
       end
@@ -72,7 +51,5 @@ module RedmineQbo
         Rails.logger.info "[IssuePatch] #{msg}"
       end
     end
-
-    Issue.send(:include, IssuePatch)
   end
 end

lib/redmine_qbo/patches/issues_controller_patch.rb

@@ -7,30 +7,31 @@
 #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.
-require_dependency 'issues_controller'
 
 module RedmineQbo
   module Patches
     module IssuesControllerPatch
-
       module Helper
+        # Extend the watcher links to include billing and share options
         def watcher_link(issue, user)
-          link = ''
+          links = ''
-          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?
+          # Admin users can bill time
-          link.html_safe + super
+          links << link_to(I18n.t(:label_bill_time), bill_path(issue.id), method: :get, class: 'icon icon-email-add') if user.admin?
+
+          # Logged-in users can share the issue
+          links << link_to(I18n.t(:label_share), share_path(issue.id), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
+
+          # Append to the original watcher links
+          (links.html_safe + super).html_safe
         end
       end
 
-      def self.included(base)
+      def self.apply
-        base.class_eval do
+        IssuesController.class_eval do
           helper Helper
         end
       end
     end
-
-    # Add module to IssuessController
-    IssuesController.send(:include, IssuesControllerPatch)
-
   end
 end

lib/redmine_qbo/patches/pdf_patch.rb

@@ -8,64 +8,105 @@
 #
 #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 'redmine/export/pdf'
-require_dependency 'redmine/export/pdf/issues_pdf_helper'
-
 module RedmineQbo
   module Patches
     module PdfPatch
+      extend ActiveSupport::Concern
 
-      def self.included(base)
+      def issue_to_pdf(issue, assoc={})
-        base.send(:include, InstanceMethods)
+        pdf = setup_pdf(issue)
-        base.class_eval do
+
-          alias_method :issue_to_pdf, :issue_to_pdf_with_patch
+        render_header(pdf, issue)
-          alias_method :issue_to_pdf_with_patch, :issue_to_pdf
+        render_ancestors_and_subject(pdf, issue)
-        end
+        
+        left, right = build_issue_attributes(issue)
+        render_attributes_grid(pdf, left, right)
+
+        render_description(pdf, issue)
+        render_subtasks(pdf, issue)
+        render_relations(pdf, issue)
+        render_changesets(pdf, issue)
+        render_journals(pdf, issue, assoc)
+        render_attachments(pdf, issue)
+
+        merge_estimate_if_present(pdf, issue)
       end
 
-      module InstanceMethods
+      private
 
-        def issue_to_pdf_with_patch(issue, assoc={})
+      def log(msg)
+        Rails.logger.info "[PdfPatch] #{msg}"
+      end
+
+      def setup_pdf(issue)
         pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
         pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}")
         pdf.alias_nb_pages
         pdf.footer_date = format_date(Date.today)
         pdf.add_page
+        pdf
+      end
+
+      def render_header(pdf, issue)
         pdf.SetFontStyle('B', 11)
-          buf = "#{issue.project} - #{issue.tracker} ##{issue.id}"
+        pdf.RDMMultiCell(190, 5, "#{issue.project} - #{issue.tracker} ##{issue.id}")
-          pdf.RDMMultiCell(190, 5, buf)
         pdf.SetFontStyle('', 8)
+      end
+
+      def render_ancestors_and_subject(pdf, issue)
         base_x = pdf.get_x
         i = 1
+        
+        # Render ancestors
         issue.ancestors.visible.each do |ancestor|
           pdf.set_x(base_x + i)
-            buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}"
+          buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status}): #{ancestor.subject}"
           pdf.RDMMultiCell(190 - i, 5, buf)
           i += 1 if i < 35
         end
+
+        # Render current issue subject and meta
         pdf.SetFontStyle('B', 11)
         pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s)
         pdf.SetFontStyle('', 8)
         pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
         pdf.ln
+      end
 
-          customer = issue.customer.name if issue.customer
+      def build_issue_attributes(issue)
+        left = build_left_attributes(issue)
+        right = build_right_attributes(issue)
+
+        # Pad arrays to equal length
+        rows = [left.size, right.size].max
+        left.fill(nil, left.size...rows)
+        right.fill(nil, right.size...rows)
+
+        # Distribute custom fields evenly
+        half = (issue.visible_custom_field_values.size / 2.0).ceil
+        issue.visible_custom_field_values.each_with_index do |custom_value, i|
+          target_column = i < half ? left : right
+          target_column << [custom_value.custom_field.name, show_value(custom_value, false)]
+        end
+
+        [left, right]
+      end
+
+      def build_left_attributes(issue)
         left = []
         left << [l(:field_status), issue.status]
         left << [l(:field_priority), issue.priority]
-          left << [l(:field_customer), customer]
+        left << [l(:field_customer), issue.customer&.name]
         left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?(:assigned_to_id)
-          #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?(:category_id)
-          #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?(:fixed_version_id)
 
         log "Calling :pdf_left hook"
-          left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
+        left_hook_output = Redmine::Hook.call_hook(:pdf_left, { issue: issue })
-          unless left_hook_output.nil?
+        Array(left_hook_output).compact.each { |l| left.concat(l) }
-            left_hook_output.each do |l|
+        
-              left.concat l unless l.nil?
+        left
-            end
       end
 
+      def build_right_attributes(issue)
         right = []
         right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?(:start_date)
         right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?(:due_date)
@@ -74,181 +115,180 @@ module RedmineQbo
         right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
 
         log "Calling :pdf_right hook"
-          right_hook_output = Redmine::Hook.call_hook :pdf_right, { issue: issue }
+        right_hook_output = Redmine::Hook.call_hook(:pdf_right, { issue: issue })
-          unless right_hook_output.nil?
+        Array(right_hook_output).compact.each { |r| right.concat(r) }
-            right_hook_output.each do |r|
+        
-              right.concat r unless r.nil?
+        right
-            end
       end
 
-          rows = left.size > right.size ? left.size : right.size
+      def render_attributes_grid(pdf, left, right)
-          while left.size < rows
+        base_x = pdf.get_x
-            left << nil
+        borders = determine_borders(pdf.get_rtl)
-          end
+        rows = [left.size, right.size].max
-          while right.size < rows
-            right << nil
-          end
 
-          half = (issue.visible_custom_field_values.size / 2.0).ceil
-          issue.visible_custom_field_values.each_with_index do |custom_value, i|
-            (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
-          end
-
-          if pdf.get_rtl
-            border_first_top = 'RT'
-            border_last_top = 'LT'
-            border_first = 'R'
-            border_last = 'L'
-          else
-            border_first_top = 'LT'
-            border_last_top = 'RT'
-            border_first = 'L'
-            border_last = 'R'
-          end
-
-          rows = left.size > right.size ? left.size : right.size
         rows.times do |i|
-            heights = []
+          item_left = left[i]
-            pdf.SetFontStyle('B',9)
+          item_right = right[i]
-            item = left[i]
-            heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
-            item = right[i]
-            heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
-            pdf.SetFontStyle('',9)
-            item = left[i]
-            heights << pdf.get_string_height(60, item ? item.last.to_s : "")
-            item = right[i]
-            heights << pdf.get_string_height(60, item ? item.last.to_s : "")
-            height = heights.max
 
-            item = left[i]
+          # Calculate dynamic row height
           pdf.SetFontStyle('B', 9)
-            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+          hl1 = pdf.get_string_height(35, item_left ? "#{item_left.first}:" : "")
-            pdf.SetFontStyle('',9)
+          hr1 = pdf.get_string_height(35, item_right ? "#{item_right.first}:" : "")
-            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
           
-            item = right[i]
-            pdf.SetFontStyle('B',9)
-            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
           pdf.SetFontStyle('', 9)
-            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
+          hl2 = pdf.get_string_height(60, item_left ? item_left.last.to_s : "")
+          hr2 = pdf.get_string_height(60, item_right ? item_right.last.to_s : "")
+          
+          height = [hl1, hr1, hl2, hr2].max
+
+          # Render cells
+          render_grid_cell(pdf, item_left, height, i == 0 ? borders[:first_top] : borders[:first], i == 0 ? borders[:last_top] : borders[:last], 0)
+          render_grid_cell(pdf, item_right, height, i == 0 ? borders[:first_top] : borders[:first], i == 0 ? borders[:last_top] : borders[:last], 2)
 
           pdf.set_x(base_x)
         end
+      end
 
+      def determine_borders(is_rtl)
+        if is_rtl
+          { first_top: 'RT', last_top: 'LT', first: 'R', last: 'L' }
+        else
+          { first_top: 'LT', last_top: 'RT', first: 'L', last: 'R' }
+        end
+      end
+
+      def render_grid_cell(pdf, item, height, border_label, border_val, ln_type)
         pdf.SetFontStyle('B', 9)
-          pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
+        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", border_label, '', 0, 0)
+        
+        pdf.SetFontStyle('', 9)
+        pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", border_val, '', 0, ln_type)
+      end
+
+      def render_description(pdf, issue)
+        pdf.SetFontStyle('B', 9)
+        pdf.RDMCell(190, 5, l(:field_description), "LRT", 1)
         pdf.SetFontStyle('', 9)
 
-          # Set resize image scale
         pdf.set_image_scale(1.6)
         text = textilizable(issue, :description,
                             only_path: false,
                             edit_section_links: false,
                             headings: false,
-                              inline_attachments: false
+                            inline_attachments: false)
-          )
+        pdf.RDMwriteFormattedCell(190, 5, '', '', text, issue.attachments, "LRB")
-          pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
+      end
 
-          unless issue.leaf?
+      def render_subtasks(pdf, issue)
-            truncate_length = (!is_cjk? ? 90 : 65)
+        return if issue.leaf?
+
+        truncate_length = !is_cjk? ? 90 : 65
         pdf.SetFontStyle('B', 9)
-            pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR")
+        pdf.RDMCell(190, 5, "#{l(:label_subtask_plural)}:", "LTR")
         pdf.ln
+
+        border_first = pdf.get_rtl ? 'R' : 'L'
+        border_last = pdf.get_rtl ? 'L' : 'R'
+
         issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
-              buf = "#{child.tracker} # #{child.id}: #{child.subject}".
+          buf = "#{child.tracker} # #{child.id}: #{child.subject}".truncate(truncate_length)
-                  truncate(truncate_length)
           level = 10 if level >= 10
+          
           pdf.SetFontStyle('', 8)
-              pdf.RDMCell(35+135,5, (level >=1 ? "  " * level : "") + buf, border_first)
+          pdf.RDMCell(170, 5, (level >= 1 ? "  " * level : "") + buf, border_first)
           pdf.SetFontStyle('B', 8)
           pdf.RDMCell(20, 5, child.status.to_s, border_last)
           pdf.ln
         end
       end
 
+      def render_relations(pdf, issue)
         relations = issue.relations.select { |r| r.other_issue(issue).visible? }
-          unless relations.empty?
+        return if relations.empty?
-            truncate_length = (!is_cjk? ? 80 : 60)
+
+        truncate_length = !is_cjk? ? 80 : 60
         pdf.SetFontStyle('B', 9)
-            pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR")
+        pdf.RDMCell(190, 5, "#{l(:label_related_issues)}:", "LTR")
         pdf.ln
+
+        border_first = pdf.get_rtl ? 'R' : 'L'
+        border_last = pdf.get_rtl ? 'L' : 'R'
+
         relations.each do |relation|
-              buf = relation.to_s(issue) {|other|
+          other = relation.other_issue(issue)
-                text = ""
+          text = Setting.cross_project_issue_relations? ? "#{other.project} - " : ""
-                if Setting.cross_project_issue_relations?
-                  text += "#{relation.other_issue(issue).project} - "
-                end
           text += "#{other.tracker} ##{other.id}: #{other.subject}"
-                text
+
-              }
-              buf = buf.truncate(truncate_length)
           pdf.SetFontStyle('', 8)
-              pdf.RDMCell(35+155-60, 5, buf, border_first)
+          pdf.RDMCell(130, 5, text.truncate(truncate_length), border_first)
           pdf.SetFontStyle('B', 8)
-              pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "")
+          pdf.RDMCell(20, 5, other.status.to_s, "")
-              pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "")
+          pdf.RDMCell(20, 5, format_date(other.start_date), "")
-              pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last)
+          pdf.RDMCell(20, 5, format_date(other.due_date), border_last)
           pdf.ln
         end
-          end
         pdf.RDMCell(190, 5, "", "T")
         pdf.ln
+      end
+
+      def render_changesets(pdf, issue)
+        return unless issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
 
-          if issue.changesets.any? &&
-              User.current.allowed_to?(:view_changesets, issue.project)
         pdf.SetFontStyle('B', 9)
         pdf.RDMCell(190, 5, l(:label_associated_revisions), "B")
         pdf.ln
-            for changeset in issue.changesets
+        
+        issue.changesets.each do |changeset|
           pdf.SetFontStyle('B', 8)
-              csstr = "#{l(:label_revision)} #{changeset.format_identifier} - "
+          csstr = "#{l(:label_revision)} #{changeset.format_identifier} - #{format_time(changeset.committed_on)} - #{changeset.author}"
-              csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
           pdf.RDMCell(190, 5, csstr)
           pdf.ln
+          
           unless changeset.comments.blank?
             pdf.SetFontStyle('', 8)
-                pdf.RDMwriteHTMLCell(190,5,'','',
+            pdf.RDMwriteHTMLCell(190, 5, '', '', changeset.comments.to_s, issue.attachments, "")
-                                    changeset.comments.to_s, issue.attachments, "")
           end
           pdf.ln
         end
       end
 
-          if assoc[:journals].present?
+      def render_journals(pdf, issue, assoc)
+        return unless assoc[:journals].present?
+
         pdf.SetFontStyle('B', 9)
         pdf.RDMCell(190, 5, l(:label_history), "B")
         pdf.ln
+        
         assoc[:journals].each do |journal|
           pdf.SetFontStyle('B', 8)
           title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}"
           title << " (#{l(:field_private_notes)})" if journal.private_notes?
           pdf.RDMCell(190, 5, title)
           pdf.ln
+          
           pdf.SetFontStyle('I', 8)
           details_to_strings(journal.visible_details, true).each do |string|
             pdf.RDMMultiCell(190, 5, "- " + string)
           end
+          
           if journal.notes?
             pdf.ln unless journal.details.empty?
             pdf.SetFontStyle('', 8)
-                text = textilizable(journal, :notes,
+            text = textilizable(journal, :notes, only_path: false, edit_section_links: false, headings: false, inline_attachments: false)
-                                    only_path: false,
-                                    edit_section_links: false,
-                                    headings: false,
-                                    inline_attachments: false
-                )
             pdf.RDMwriteFormattedCell(190, 5, '', '', text, issue.attachments, "")
           end
           pdf.ln
         end
       end
 
-          if issue.attachments.any?
+      def render_attachments(pdf, issue)
+        return unless issue.attachments.any?
+
         pdf.SetFontStyle('B', 9)
         pdf.RDMCell(190, 5, l(:label_attachment_plural), "B")
         pdf.ln
-            for attachment in issue.attachments
+        
+        issue.attachments.each do |attachment|
           pdf.SetFontStyle('', 8)
           pdf.RDMCell(80, 5, attachment.filename)
           pdf.RDMCell(20, 5, number_to_human_size(attachment.filesize), 0, 0, "R")
@@ -258,28 +298,17 @@ module RedmineQbo
         end
       end
 
-          # Check to see if there is an estimate attached, then combine them
+      def merge_estimate_if_present(pdf, issue)
         if issue.estimate
-            e_pdf, ref = PdfService.new(entity: Estimate).fetch_pdf(doc_ids: [issue.estimate.id])
+          e_pdf, _ref = PdfService.new(entity: Estimate).fetch_pdf(doc_ids: [issue.estimate.id])
-            pdf = CombinePDF.parse(pdf.output, allow_optional_content: true)
+          combined = CombinePDF.parse(pdf.output, allow_optional_content: true)
-            pdf << CombinePDF.parse(e_pdf)
+          combined << CombinePDF.parse(e_pdf)
-            return pdf.to_pdf
+          combined.to_pdf
+        else
+          pdf.output
         end
-
-          return pdf.output
       end
 
     end
-
-      private
-
-      def log(msg)
-          Rails.logger.info "[PdfPatch] #{msg}"
-      end
-
-    end
-
-    Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)
-
   end
 end

lib/redmine_qbo/patches/query_patch.rb

@@ -8,11 +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.
 
-require_dependency 'issue_query'
-
 module RedmineQbo
   module Patches
     module QueryPatch
+      extend ActiveSupport::Concern
 
       def base_scope
         scope = super
@@ -59,12 +58,6 @@ module RedmineQbo
 
         Issue.joins(:customer).sanitize_sql_for_conditions([sql, pattern])
       end
-
+    end
-
-    end
-
-    # Add module to Issue
-    IssueQuery.send(:prepend, QueryPatch)
-
   end
 end

lib/redmine_qbo/patches/time_entry_query_patch.rb

@@ -8,11 +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.
 
-require_dependency 'time_entry_query'
-
 module RedmineQbo
   module Patches
     module TimeEntryQueryPatch
+      extend ActiveSupport::Concern
 
       # Add QBO options to columns
       def available_columns
@@ -28,11 +27,6 @@ module RedmineQbo
         add_available_filter "billed", type: :boolean
         super
       end
-
+    end
-    end
-
-    # Add module to TimeEntryQuery
-    TimeEntryQuery.send(:prepend, QueryPatch)
-
   end
 end

lib/redmine_qbo/patches/user_patch.rb

@@ -8,37 +8,14 @@
 #
 #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 'user'
-
 module RedmineQbo
   module Patches
-
-    # Patches Redmine's User dynamically.
-    # Adds a relationships
     module UserPatch
-      def self.included(base) # :nodoc:
+      extend ActiveSupport::Concern
-        base.extend(ClassMethods)
 
-        base.send(:include, InstanceMethods)
+      prepended do
-
-        # Same as typing in the class 
-        base.class_eval do
           belongs_to :employee, primary_key: :id
       end
     end
-        
-      module ClassMethods
-        
-      end
-      
-      module InstanceMethods
-      
-      end
-      
-    end
-
-    # Add module to Issue
-    User.send(:include, UserPatch)
-
   end
 end