2026.2.13

Addressed the Bullet (the N+1 query detector) warning to include customers

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]
 
-  default_search_scope :names
-
   autocomplete :customer, :name, full: true, extra_data: [:id]
 
   def allowed_params

app/controllers/estimate_controller.rb

@@ -15,18 +15,31 @@ class EstimateController < ApplicationController
   skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
 
   def get_estimate
+
+    e = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    e = Estimate.find_by_id(params[:id]) if params[:id]
+
     # Force sync for estimate by doc number if not found
-    if  Estimate.find_by_doc_number(params[:search]).nil?
+    if  e.nil? && params[:search]
       begin
-        Estimate.sync_by_doc_number(params[:search]) if params[:search]
+        Estimate.sync_by_doc_number(params[:search])
+        e = Estimate.find_by_doc_number(params[:search])
       rescue
         logger.info "Estimate.find_by_doc_number failed"
       end
     end
 
-    estimate = Estimate.find_by_id(params[:id]) if params[:id]
+    # Force sync for estimate by id if not found
-    estimate = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    if  e.nil? && params[:id]
-    return estimate
+      begin
+        Estimate.sync_by_id(params[:id])
+        e = Estimate.find_by_id(params[:id])
+      rescue
+        logger.info "Estimate.find_by_id failed"
+      end
+    end
+
+    return e
   end
   
   #

app/controllers/qbo_controller.rb

@@ -64,10 +64,15 @@ class QboController < ApplicationController
   def bill
     i = Issue.find_by_id params[:id]
     if i.customer
-      i.bill_time
+      billed = i.bill_time
-      redirect_to i, flash: { notice: I18n.t(:label_billed_success) + i.customer.name }
+
+      if i.bill_time
+        redirect_to i, flash: { notice: I18n.t( :label_billed_success ) + i.customer.name }
+      else
+        redirect_to i, flash: { error: I18n.t(:label_billing_error) }
+      end
     else
-      redirect_to i, flash: { error: I18n.t(:label_billing_error) }
+      redirect_to i, flash: { error: I18n.t(:label_billing_error_no_customer) }
     end
   end
   

app/models/customer.rb

@@ -18,11 +18,6 @@ class Customer < ActiveRecord::Base
   
   self.primary_key = :id
   
-  # returns a human readable string
-  def to_s
-    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
-  end
-  
   # Convenience Method
   # returns the customer's email
   def email
@@ -41,6 +36,27 @@ class Customer < ActiveRecord::Base
     @details.email_address = s
   end
   
+  # Redmine Search Event Interface
+  def event_type
+    :customer
+  end
+
+  def event_title
+    to_s
+  end
+
+  def event_description
+    "#{I18n.t :label_primary_phone}: #{primary_phone} #{I18n.t:label_mobile_phone}: #{mobile_phone}"
+  end
+
+  def event_url
+    Rails.application.routes.url_helpers.customer_path(self)
+  end
+
+  def event_datetime
+    updated_at || created_at
+  end
+
   # Convenience Method
   # returns the customer's primary phone
   def primary_phone
@@ -62,7 +78,12 @@ class Customer < ActiveRecord::Base
     #update our locally stored number too
     update_phone_number
   end
-  
+
+  # Customers are not bound by a project.
+  def project
+    nil
+  end
+
   # Convenience Method
   # returns the customer's mobile phone
   def mobile_phone
@@ -169,9 +190,45 @@ class Customer < ActiveRecord::Base
   
   # Searchs the database for a customer by name or phone number with out special chars
   def self.search(search)
+    search = sanitize_sql_like(search)
     customers = where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
     return customers.order(:name)
   end
+
+  def self.searchable_columns
+    ['name', 'phone_number', 'mobile_phone_number']
+  end
+
+  def self.searchable_options
+    {
+      columns: searchable_columns,
+      scope: self.all
+    }
+  end
+
+  def self.search_results_from_ids(ids, *args)
+    return [] if ids.blank?
+
+    ids = ids.map(&:to_i)
+    records = where(id: ids).index_by(&:id)
+    ids.map { |id| records[id] }.compact
+  end
+
+  def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
+    return {} if tokens.blank?
+
+    scope = self.all
+
+    tokens.each do |token|
+      q = "%#{sanitize_sql_like(token)}%"
+      scope = where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%") 
+    end
+
+    ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
+
+    # Assign simple uniform ranking
+    ids.each_with_object({}) { |id, h| h[id] = id }
+  end
   
   # proforms a bruteforce sync operation
   # This needs to be simplified
@@ -200,25 +257,11 @@ class Customer < ActiveRecord::Base
     end
   end
   
-  # Push the updates
+  # returns a human readable string
-  def save_with_push
+  def to_s
-    begin
+    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
-      qbo = Qbo.first
-      @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
-        service.update(@details)
-      end
-      #raise "QBO Fault" if @details.fault?
-      self.id = @details.id
-    rescue Exception => e
-      errors.add(e.message)
-    end
-    save_without_push
   end
   
-  alias_method :save_without_push, :save
-  alias_method :save, :save_with_push
-  
   private
   
   # pull the details
@@ -234,5 +277,24 @@ class Customer < ActiveRecord::Base
       @details = Quickbooks::Model::Customer.new
     end
   end
+
+  # Push the updates
+  def save_with_push
+    begin
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
+        service.update(@details)
+      end
+      #raise "QBO Fault" if @details.fault?
+      self.id = @details.id
+    rescue Exception => e
+      errors.add(e.message)
+    end
+    save_without_push
+  end
+
+  alias_method :save_without_push, :save
+  alias_method :save, :save_with_push
   
 end

app/views/customers/_actions.html.erb

@@ -3,7 +3,7 @@
 <br/>
 <br/>
 
-<%= button_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank, method: :get %>
+<%= link_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank %>
 
 <br/>
 <br/>

app/views/customers/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(customers_path, method: "get", id: "search-form") do %>
+<%= form_tag(customers_path, method: "get", id: "customer-search-form") do %>
     <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
     <%= submit_tag t(:label_search) %>
 <% end %>

app/views/estimates/_list.html.erb

@@ -2,7 +2,7 @@
 
   <% estimates.sort.reverse.each do |estimate| %>
     <div class="row">
-      <%= check_box_tag "estimate_ids[]", estimate.id, false,  onchange: "updateLink()", class: "estimate-checkbox" %>
+      <%= check_box_tag "estimate_ids[]", estimate.id, false,  onchange: "updateLink()",  data: { url: estimate_path(estimate), text: "Estimate ##{estimate.to_s}" }, class: "estimate-checkbox appointment" %>
       <b><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b> <%= estimate.txn_date %>
     </div>
   <% end %>

app/views/estimates/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(estimate_doc_path, method: "get") do %>
+<%= form_tag(estimate_doc_path, method: "get", id: "estimate-search-form") do %>
     <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), autocomplete: "off" %>
     <%= submit_tag t(:label_search), formtarget: "_blank" %>
 <% end %>

app/views/invoices/_list.html.erb

@@ -12,7 +12,7 @@
 
     <% invoices.sort.reverse.each do |invoice| %>
       <div class="row">
-        <%= check_box_tag "invoice_ids[]", invoice.id, false,  onchange: "updateLink()", class: "invoice-checkbox" if invoices.count > 1 %>
+        <%= check_box_tag "invoice_ids[]", invoice.id, false,  onchange: "updateLink()", data: { url: invoice_path(invoice), text: "Invoice ##{invoice.to_s}" }, class: "invoice-checkbox appointment" if invoices.count > 1 %>
         <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
       </div>
     <% end %>

app/views/qbo/_footer.html.erb

@@ -1,3 +1,3 @@
-"<div id='footer' align='center'>
+<div id='footer' align='center'>
-    <b><%=I18n.translate(:label_last_sync)%>: </b> <%=Qbo.last_sync if Qbo.exists?%>
+     <%= render partial: 'qbo/last_sync' %>
-</div>"
+</div>

assets/javascripts/application.js

@@ -1,31 +1,20 @@
 function updateLink() {
+  console.log("updateLink called");
   const linkElement = document.getElementById("appointment_link");
   const regex = /((?:<br\/>|%3Cbr\/?%3E))([\s\S]*?)(&dates)/gi;
   linkElement.href = linkElement.href.replace(regex, `$1${getSelectedDocs()}$3`);
 }
 
 function getSelectedDocs() {
-  const invoices = document.querySelectorAll('.invoice-checkbox');
+  const appointent_extras = document.querySelectorAll('.appointment');
-  const estimates = document.querySelectorAll('.estimate-checkbox');
-  
-  const invoiceIds = Array.from(invoices)
-      .filter(checkbox => checkbox.checked)
-      .map(checkbox => checkbox.value);
-
-  const estimateIds = Array.from(estimates)
-      .filter(checkbox => checkbox.checked)
-      .map(checkbox => checkbox.value);
 
   let output = '';
-
+  for (const item of appointent_extras) {
-  for (const value of invoiceIds) {
+    if (item.checked) {
-    output += `%0A<a href="${window.location.origin}/invoices/${value}">Invoice:%20${value}</a>%0A`;
+      console.log(`Checked item: ${item.dataset.text} with URL: ${item.dataset.url}`);
-  }
+      output += `%0A`+ encodeURIComponent(`<a href="${window.location.origin}${item.dataset.url}">${item.dataset.text}</a>`) +`%0A`;
-
+    }
-  for (const value of estimateIds) {
-    output += `%0A<a href="${window.location.origin}/estimates/${value}">Estimate:%20${value}</a>%0A`;
   }
   
-  // You can return the array or use it as needed
   return output;
 }

config/locales/en.yml

@@ -11,93 +11,95 @@
 # English strings go here for Rails i18n
 # Usage I18n.t(:label)
 en:
-  field_customer: "Customer"
+  button_bulk_pdf: "Bulk PDF"
-  field_employee: "Employee"
+  customer_details: "Customer Details"
-  field_invoice: "Invoice"
-  field_estimate: "Estimate" 
-  field_notes: "Notes"
   field_billed: "Billed"
-  label_week: "Week"
+  field_customer: "Customer"
-  label_search_estimates: "Search Estimates"
+  field_customers: "Customers"
-  label_search: "Search"
+  field_employee: "Employee"
-  label_estimates: "Estimates"
+  field_estimate: "Estimate"
-  warn_ru_sure: "You sure?"
+  field_invoice: "Invoice"
-  label_delete: "Delete"
+  field_notes: "Notes"
-  label_edit: "Edit"
-  label_year: "Year"
-  label_make: " Make"
-  label_model: "Model"
-  label_no_customers: "There are no customers containing the term(s)"
-  label_matching: "Matching "
-  label_open_issues: "Open Issues"
-  label_closed_issues: "Closed Issues"
-  label_sync: "Sync"
-  label_new_customer: "New Customer"
-  label_search_customers: "Search Customers"
-  label_customers: "Customers"
-  label_edit_customer: "Edit Customer"
-  label_email: "Email"
-  label_primary_phone: "Primary Phone"
-  label_mobile_phone: "Mobile Phone"
-  label_billing_address: "Billing Address"
-  label_shipping_address: "Shipping Address"
   label_account_balance: "Account Balance"
-  label_balance_with_jobs: "Balance With Jobs"
+  label_actions: "Actions"
-  label_display_name: "Display Name"
-  label_details: "Details"
-  label_customer_link_expires: "This customer link expires in"
   label_amount: "Amount"
-  label_deposit_into: "Deposit to Account"
+  label_appointment: "Add Appointment"
-  label_last_sync: "Last Sync"
+  label_balance_with_jobs: "Balance With Jobs"
-  label_redmine_qbo: "Redmine Quickbooks"
+  label_bill_time: "Bill Time"
-  label_customer_count: "Customer Count"
+  label_billing_address: "Billing Address"
-  label_invoice_count: "Invoice Count"
+  label_billing_error: "Customer could not be billed. Check for Customer or Assignee and try again."
-  label_estimate_count: "Estimate Count"
+  label_billing_error_no_customer: "Cannot bill without an assigned customer."
-  label_employee_count: "Employee Count"
+  label_billed_success: "Successfully billed "
   label_client_id: "Intuit QBO OAuth2 Client ID"
   label_client_secret: "Intuit QBO OAuth2 Client Secret"
-  label_webhook_token: "Intuit QBO Webhook Token"
+  label_closed_issues: "Closed Issues"
-  label_oauth_expires: "OAuth2 Access Token Expires At"
+  label_connected: "Successfully connected to QuickBooks"
-  label_oauth_note: "Note: You need to authenticate with Quickbooks after saving your key and secret above"
+  label_create_estimate: "Create Estimate"
-  field_customers: "Customers"
+  label_customer_count: "Customer Count"
+  label_customer_link_expires: "This customer link expires in"
+  label_customers: "Customers"
+  label_delete: "Delete"
+  label_deposit_into: "Deposit to Account"
+  label_details: "Details"
+  label_display_name: "Display Name"
+  label_door: "Door"
+  label_edit: "Edit"
+  label_edit_customer: "Edit Customer"
+  label_email: "Email"
+  label_employee_count: "Employee Count"
+  label_error: "Error"
+  label_estimate_404: "Estimate not found"
+  label_estimate_count: "Estimate Count"
+  label_estimates: "Estimates"
+  label_hours: "Hours"
+  label_invoice_404: "Invoice not found"
+  label_invoice_count: "Invoice Count"
+  label_invoices: "Invoices"
+  label_last_sync: "Last Sync"
+  label_load_customer: "Load Customer"
+  label_make: "Make"
+  label_matching: "Matching"
+  label_mobile_phone: "Mobile Phone"
+  label_model: "Model"
+  label_name: "Name"
+  label_new_customer: "New Customer"
+  label_no_customers: "There are no customers matching the search term(s)."
   label_no_estimates: "No Estimates"
   label_no_invoices: "No Invoices"
-  label_invoices: "Invoices"
-  label_load_customer: "Load Customer"
-  label_door: "Door"
-  label_trim: "Trim"
-  label_bill_time: "Bill Time"
-  label_share: "Share"
-  label_sync_now: "Sync Now"
-  label_invoice_404: "Invoice not found"
-  label_estimate_404: "Estimate not found"
-  label_connected: "Successfully connected to Quickbooks"
-  label_error: "Error"
-  label_billed_success: "Successfully Billed "
-  label_billing_error: "Cannot bill without a customer assigned"
-  label_qbo_sync_success: "Successfully synced to Quickbooks"
-  label_hours: "Hours"
   label_oauth2_refresh_token_expires_at: "Refresh Token Expires At"
-  label_name: "Name"
+  label_oauth_expires: "OAuth2 Access Token Expires At"
-  label_appointment: "Add Appointment"
+  label_oauth_note: "Note: You need to authenticate with QuickBooks after saving your key and secret above."
-  label_actions: "Actions"
+  label_open_issues: "Open Issues"
-  label_create_estimate: "Create Estimate"
+  label_primary_phone: "Primary Phone"
-  label_syncing: "Syncing Quickbooks"
+  label_qbo_sync_success: "Successfully synced to QuickBooks"
+  label_redmine_qbo: "Redmine QuickBooks"
   label_sandbox: "Sandbox"
-  button_bulk_pdf: "Bulk PDF"
+  label_search: "Search"
+  label_search_customers: "Search Customers"
+  label_search_estimates: "Search Estimates"
   label_select_all: "Select All"
-  notice_customer_created: "Customer created in Quickbooks"
+  label_share: "Share"
-  notice_customer_updated: "Customer updated in Quickbooks"
+  label_shipping_address: "Shipping Address"
-  notice_customer_not_found: "Customer not found in Quickbooks"
+  label_sync: "Sync"
-  notice_customer_not_deleted: "Customer could not be deleted in Quickbooks"
+  label_sync_now: "Sync Now"
-  notice_customer_deleted: "Customer deleted in Quickbooks"
+  label_syncing: "Syncing QuickBooks"
-  notice_estimate_created: "Estimate created in Quickbooks"
+  label_trim: "Trim"
-  notice_estimate_updated: "Estimate updated in Quickbooks"
+  label_webhook_token: "Intuit QBO Webhook Token"
+  label_week: "Week"
+  label_year: "Year"
+  notice_customer_created: "Customer created in QuickBooks"
+  notice_customer_deleted: "Customer deleted in QuickBooks"
+  notice_customer_not_deleted: "Customer could not be deleted in QuickBooks"
+  notice_customer_not_found: "Customer not found in QuickBooks"
+  notice_customer_updated: "Customer updated in QuickBooks"
+  notice_error_project_nil: "The issue's project is nil. Set project to:"
+  notice_error_tracker_nil: "The issue's tracker is nil. Set tracker to:"
+  notice_estimate_created: "Estimate created in QuickBooks"
   notice_estimate_not_found: "Estimate not found"
-  notice_invoice_created: "Invoice created in Quickbooks"
+  notice_estimate_updated: "Estimate updated in QuickBooks"
-  notice_invoice_updated: "Invoice updated in Quickbooks"
+  notice_forbidden: "You do not have permission to access this resource."
+  notice_invoice_created: "Invoice created in QuickBooks"
   notice_invoice_not_found: "Invoice not found"
-  notice_forbidden: "You do not have permission to access this resource"
+  notice_invoice_updated: "Invoice updated in QuickBooks"
   notice_issue_not_found: "Issue not found"
-  customer_details: "Customer Details"
+  warn_ru_sure: "Are you sure?"
-  notice_error_project_nil: "The issue's project is nil, set project to: "

db/migrate/038_add_customers_timestamp.rb

@@ -0,0 +1,15 @@
+#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 AddCustomersTimestamp < ActiveRecord::Migration[5.1]
+  def change
+    add_timestamps(:customers, null: true)
+  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.2.2'
+  version '2026.2.13'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings default: {empty: true}, partial: 'qbo/settings'
@@ -37,6 +37,10 @@ Redmine::Plugin.register :redmine_qbo do
   # Register top menu items
   menu :top_menu, :customers, { controller: :customers, action: :index }, caption: :label_customers, if: Proc.new {User.current.logged?}
     
+  Redmine::Search.map do |search|
+    search.register :customers
+  end
+
 end
 
 # Dynamically load all Hooks & Patches recursively

lib/redmine_qbo/hooks/issues_hook_listener.rb

@@ -14,23 +14,15 @@ module RedmineQbo
 
       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. 
       def view_issues_form_details_bottom(context={})
+        Rails.logger.debug "RedmineQbo::Hooks::IssuesHookListener.view_issues_form_details_bottom: Building form components for quickbooks customer, estimate, and invoice data"
         f = context[:form]
         issue = context[:issue]
+        project = context[:project]
+        Rails.logger.debug issue.inspect
+        Rails.logger.debug project.inspect
 
         # Customer Name Text Box with database backed autocomplete
         # onchange event will update the hidden customer_id field
@@ -42,11 +34,23 @@ module RedmineQbo
             value: '#issue_customer' 
           }
 
+        # We need to handle 3 cases for the onchange event of the customer name field:
+        # 1. New issue Withough project:  /issues/new.js
+        # 2. New issue With project:      /projects/rmt/issues/new.js
+        # 3. Existing issue:              /issues/<ID>/edit.js
+        # The built in helper update_issue_form_path requires a project object to determine the correct path for new vs existing issues, 
+        # but it doesn't work for issue.project when creating new issues not in a project i.e. http://redmine.domain.com/issues/new . 
+        # So we need to figure out how to get a the @project from the controller calling the hook.
+        #
+        # If this is not handled correctly, it leads to a 422 error when creating a new issue and selecting a customer.
+        js_path = "updateIssueFrom('#{escape_javascript update_issue_form_path(project, issue)}', this)"
+        Rails.logger.debug js_path
+
         # 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",
-          onchange: "updateIssueFrom('#{escape_javascript update_issue_form_path(issue.project, issue)}', this)".html_safe
+          onchange: js_path.html_safe
 
         # Generate the drop down list of quickbooks estimates owned by the selected customer
         select_estimate = f.select :estimate_id, 

lib/redmine_qbo/hooks/view_hook_listener.rb

@@ -15,10 +15,11 @@ module RedmineQbo
 
       # Load the javascript to support the autocomplete forms
       def view_layouts_base_html_head(context = {})
-        js = javascript_include_tag 'application.js', plugin: :redmine_qbo
+        safe_join([
-        js += javascript_include_tag 'autocomplete-rails.js', plugin: :redmine_qbo
+          javascript_include_tag( 'application.js', plugin: :redmine_qbo),
-        js += javascript_include_tag 'checkbox_controller.js', plugin: :redmine_qbo
+          javascript_include_tag( 'autocomplete-rails.js', plugin: :redmine_qbo),
-        return js
+          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo)
+        ])
       end
 
       render_on :view_layouts_base_sidebar, partial: "qbo/sidebar"

lib/redmine_qbo/patches/issue_patch.rb

@@ -25,7 +25,7 @@ module RedmineQbo
 
         # Same as typing in the class 
         base.class_eval do
-          belongs_to :customer, primary_key: :id
+          belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true
           belongs_to :customer_token, primary_key: :id
           belongs_to :estimate, primary_key: :id
           has_and_belongs_to_many :invoices
@@ -43,15 +43,18 @@ module RedmineQbo
         
         # Create billable time entries
         def bill_time
-          logger.debug "QBO: Billing time for issue ##{id}"
+          logger.debug "QBO: Billing time for issue ##{self.id}"
-          return unless  status.is_closed?
+          logger.debug "Issue is closed? #{self.closed?}"
-          return if assigned_to.nil?
+          
-          return unless Qbo.first 
+          return false if self.assigned_to.nil?
-          return unless customer 
+          return false unless Qbo.first 
+          return false unless self.customer 
 
           Thread.new do
-            spent_time = time_entries.where(billed: [false, nil])
+            spent_time = self.time_entries.where(billed: [false, nil])
             spent_hours ||= spent_time.sum(:hours) || 0
+
+            logger.debug "Issue has spent hours: #{spent_hours}"
             
             if spent_hours > 0 then
               
@@ -74,20 +77,23 @@ module RedmineQbo
                 
                 # Now letes upload our totals for each activity as their own billable time entry
                 h.each do |key, val|
-                  
+                  logger.debug "Processing activity '#{key}' with #{val.to_i} hours for issue ##{self.id}"
+
                   # Convert float spent time to hours and minutes
                   hours = val.to_i
                   minutesDecimal = (( val - hours) * 60)
                   minutes = minutesDecimal.to_i
 
+                  logger.debug "Converted #{val.to_i} hours to #{hours} hours and #{minutes} minutes"
+
                   # Lets match the activity to an qbo item
                   item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
                   next if item.nil?
                   
                   # Create the new billable time entry and upload it
-                  time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
+                  time_entry.description = "#{self.tracker} ##{self.id}: #{self.subject} #{"(Partial @ #{self.done_ratio}%)" unless self.closed?}"
-                  time_entry.employee_id = assigned_to.employee_id 
+                  time_entry.employee_id = self.assigned_to.employee_id 
-                  time_entry.customer_id = customer_id
+                  time_entry.customer_id = self.customer_id
                   time_entry.billable_status = "Billable"
                   time_entry.hours = hours
                   time_entry.minutes = minutes
@@ -102,6 +108,7 @@ module RedmineQbo
               end
             end
           end
+          return true
         end
       end
       

lib/redmine_qbo/patches/issues_controller_patch.rb

@@ -15,6 +15,7 @@ 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_share), share_path( issue.id ), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
           link.html_safe + super

lib/redmine_qbo/patches/query_patch.rb

@@ -13,6 +13,20 @@ require_dependency 'issue_query'
 module RedmineQbo
   module Patches
     module QueryPatch
+
+      def base_scope
+        scope = super
+
+        if filters['customer_name'].present?
+          scope = scope.left_outer_joins(:customer)
+        end
+
+        if has_column?(:customer) || filters['customer_name'].present?
+          scope = scope.includes(:customer)
+        end
+
+        scope
+      end
       
       # Add qbo options to the aviable columns
       def available_columns
@@ -26,10 +40,27 @@ module RedmineQbo
       
       # Add customers to filters
       def initialize_available_filters
-        #add_available_filter "customer", type: :text
+        #add_available_filter "customer_id", type: :list, name: l(:field_customer), :values => lambda {Customer.pluck(:name, :id).map {|name, id| [name, id.to_s]}}
+        add_available_filter( 'customer_name', type: :text, name: l(:field_customer))
         super
       end
 
+      def sql_for_customer_name_field(field, operator, value)
+        pattern = "%#{value.first}%"
+
+        sql = case operator
+              when '~'
+                "#{Customer.table_name}.name LIKE ?"
+              when '!~'
+                "#{Customer.table_name}.name NOT LIKE ?"
+              else
+                return nil
+              end
+
+        Issue.joins(:customer).sanitize_sql_for_conditions([sql, pattern])
+      end
+
+
     end
 
     # Add module to Issue