Removed unused method

Refactor: Introduce PdfServiceBase for shared PDF fetching functionality and update Invoice/Estimate controllers to utilize new services
Refactor: Simplify invoice PDF fetching and introduce InvoicePdfService for better organization
2026-04-02 16:21:58 -04:00 · 2026-02-28 22:56:03 -05:00 · 2026-02-28 21:59:01 -05:00 · 2026-02-28 21:36:16 -05:00 · 2026-02-28 21:20:35 -05:00 · 2026-02-28 20:03:19 -05:00
36 changed files with 1290 additions and 746 deletions
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -51,7 +51,7 @@ class CustomersController < ApplicationController
  # display a list of all customers
  def index
    if params[:search]
-      @customers = Customer.search(params[:search]).paginate(page: params[:page])
+      @customers = Customer.search(params[:search]).order(:name).paginate(page: params[:page])
      if only_one_non_zero?(@customers)
        redirect_to @customers.first
      end
@@ -134,60 +134,60 @@ class CustomersController < ApplicationController

  # creates new customer view tokens, removes expired tokens & redirects to newly created customer view with new token.
  def share
+    issue = Issue.find(params[:id])

-    Thread.new do
-      logger.info "Removing expired customer tokens"
-      CustomerToken.remove_expired_tokens
-      ActiveRecord::Base.connection.close
-    end
+    token = issue.share_token
+    redirect_to view_path(token.token)

-    begin
-      issue = Issue.find_by_id(params[:id])
-      redirect_to view_path issue.share_token.token
-    rescue
-      flash[:error] = t :notice_issue_not_found
-      render_404
-    end
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = t(:notice_issue_not_found)
+    render_404
  end
  
  # displays an issue for a customer with a provided security CustomerToken
  def view
+    User.current = User.anonymous

-    User.current = User.find_by lastname: 'Anonymous'
+    # Load only active, non-expired token
+    @token = CustomerToken.active.find_by(token: params[:token])
+    return render_403 unless @token

-    @token = CustomerToken.find_by token: params[:token]
-    begin
-      @token.destroy if @token.expired?
-      raise "Token Expired" if @token.destroyed
-      
-      session[:token] = @token.token
-      @issue = Issue.find @token.issue_id
-      @journals = @issue.journals.
-        preload(:details).
-        preload(user: :email_address).
-        reorder(:created_on, :id).to_a
-      @journals.each_with_index {|j,i| j.indice = i+1}
-      @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
-      Journal.preload_journals_details_custom_fields(@journals)
-      @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
-      @journals.reverse! if User.current.wants_comments_in_reverse_order?
+    # Load associated issue
+    @issue = @token.issue
+    return render_403 unless @issue

-      @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
-      @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+    # Optional: enforce token belongs to the issue's customer
+    return render_403 unless @issue.customer_id == @token.issue.customer_id

-      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
-      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-      @priorities = IssuePriority.active
-      @time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
-      @relation = IssueRelation.new
-    rescue
-      flash[:error] = t :notice_forbidden
-      render_403
-    end
+    # Store token in session for subsequent requests if needed
+    session[:token] = @token.token
+
+    load_issue_data
+  rescue ActiveRecord::RecordNotFound
+    render_403
  end

  private

+  def load_issue_data
+    @journals = @issue.journals.preload(:details).preload(user: :email_address).reorder(:created_on, :id).to_a
+
+    @journals.each_with_index { |j, i| j.indice = i + 1 }
+    @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+    Journal.preload_journals_details_custom_fields(@journals)
+    @journals.select! { |journal| journal.notes? || journal.visible_details.any? }
+    @journals.reverse! if User.current.wants_comments_in_reverse_order?
+
+    @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
+    @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+
+    @relations = @issue.relations.select { |r| r.other_issue(@issue)&.visible? }
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    @priorities = IssuePriority.active
+    @time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
+    @relation   = IssueRelation.new
+  end
+
  # redmine permission - add customers
  def add_customer
    global_check_permission(:add_customers)
@@ -225,4 +225,8 @@ class CustomersController < ApplicationController
    return string
  end

+  def log(msg)
+    Rails.logger.info "[CustomersController] #{msg}"
+  end
+
 end
--- a/app/controllers/estimate_controller.rb
+++ b/app/controllers/estimate_controller.rb
@@ -8,64 +8,72 @@
 #
 #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
-  
  include AuthHelper
+
+  before_action :require_user, unless: -> { session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: -> { session[:token].nil? }
+  before_action :load_estimate, only: [:show, :doc]
  
-  before_action :require_user, unless: proc {|c| session[:token].nil? }
-  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  e.nil? && params[:search]
-      begin
-        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
-
-    # Force sync for estimate by id if not found
-    if  e.nil? && params[:id]
-      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
-  
-  #
-  # Downloads and forwards the estimate pdf
-  #
-  def show
-    estimate = get_estimate
-
-    begin
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
-    rescue
-      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
-    end
-  end
-
-  #
-  # Downloads estimate by document number
-  #
+  # Displays the estimate PDF in the browser or redirects with an error if not found.
  def doc
-    estimate = get_estimate
-    
-    begin
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
-    rescue
-      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
+    render_pdf(@estimate)
+  end
+
+  # Displays the estimate PDF in the browser or redirects with an error if not found.
+  def show
+    render_pdf(@estimate)
+  end
+
+  private
+
+  # Loads the estimate based on ID or doc number, with a fallback to sync if not found locally.
+  def load_estimate
+    log "Attempting to load Estimate with params: #{params.inspect}"
+    @estimate = find_estimate || sync_and_find_estimate
+
+    unless @estimate
+      redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_estimate_not_found) }
    end
  end

-end
+  # Attempts to find the estimate locally by ID or doc number.
+  def find_estimate
+    return Estimate.find_by(doc_number: params[:search]) if params[:search].present?
+    return Estimate.find_by(id: params[:id]) if params[:id].present?
+  end
+
+  # If the estimate is not found locally, attempts to sync it from the source and find it again.
+  def sync_and_find_estimate
+
+    if params[:search].present?
+      log "Estimate #{params[:search]} not found locally. Syncing by doc number."
+      Estimate.sync_by_doc_number(params[:search])
+      return Estimate.find_by(doc_number: params[:search])
+    end
+
+    if params[:id].present?
+      log "Estimate #{params[:id]} not found locally. Syncing by ID."
+      Estimate.sync_by_id(params[:id])
+      return Estimate.find_by(id: params[:id])
+    end
+
+    nil
+  rescue StandardError => e
+    log "Estimate sync failed: #{e.message}"
+    nil
+  end
+
+  # Renders the estimate PDF or redirects with an error if rendering fails.
+  def render_pdf(estimate)
+    pdf, ref = EstimatePdfService.new(qbo: Qbo.first).fetch_pdf(doc_ids: [estimate.id])
+    send_data( pdf, filename: "estimate #{ref}.pdf", disposition: :inline, type: "application/pdf" )
+  rescue StandardError => e
+    log "PDF render failed for Estimate #{estimate&.id}: #{e.message}"
+    redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_estimate_not_found) }
+  end
+
+  # Logs messages with a consistent prefix for easier debugging.
+  def log(msg)
+    Rails.logger.info "[EstimateController] #{msg}"
+  end
+end
--- a/app/controllers/invoice_controller.rb
+++ b/app/controllers/invoice_controller.rb
@@ -8,47 +8,29 @@
 #
 #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
-  
  include AuthHelper
-  require 'combine_pdf'

-  before_action :require_user, unless: proc {|c| session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
-  
-  #
-  # Downloads and forwards the invoice pdf
-  #
+  before_action :require_user, unless: -> { session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: -> { session[:token].nil? }
+
+  # Displays the invoice PDF in the browser or redirects with an error if not found.
  def show
-    logger.info("Processing request for URL: #{request.original_url}") 
-    begin
-      qbo = Qbo.first
-        qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-        
-        # If multiple id's then pull each pdf & combine them
-        if params[:invoice_ids]
-          logger.info("Grabbing pdfs for " + params[:invoice_ids].join(', '))
-          ref = ""
-          params[:invoice_ids].each do |i|
-            logger.info("processing " + i)
-            invoice = service.fetch_by_id(i)
-            ref += " #{invoice.doc_number}"
-            @pdf << CombinePDF.parse(service.pdf(invoice)) unless @pdf.nil?
-            if @pdf.nil?
-              @pdf = CombinePDF.parse(service.pdf(invoice))
-            end
-          end
-          @pdf = @pdf.to_pdf
-        else
-          invoice = service.fetch_by_id(params[:id])
-          @pdf = service.pdf(invoice)
-          ref = invoice.doc_number
-        end
+    log "Processing request for #{request.original_url}"

-        send_data @pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"
-      end
-    rescue
-      redirect_to :back, flash: { error: I18n.t(:notice_invoice_not_found) }
-    end
+    invoice_ids = Array(params[:invoice_ids] || params[:id])
+    pdf, ref = InvoicePdfService.new(qbo: Qbo.first).fetch_pdf(doc_ids: invoice_ids)
+
+    send_data pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"
+
+  rescue StandardError => e
+    log "Invoice PDF failure: #{e.message}"
+    redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_invoice_not_found) }
  end
-end
+
+  private
+
+  # Logs messages with a consistent prefix for easier debugging.
+  def log(msg)
+    Rails.logger.info "[InvoiceController] #{msg}"
+  end
+end
--- a/app/controllers/qbo_controller.rb
+++ b/app/controllers/qbo_controller.rb
@@ -26,7 +26,7 @@ class QboController < ApplicationController
  #
  def authenticate
    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
-    logger.info "redirect_uri: #{redirect_uri}"
+    log "redirect_uri: #{redirect_uri}"
    oauth2_client = Qbo.construct_oauth2_client
    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
    redirect_to grant_url
@@ -62,101 +62,76 @@ class QboController < ApplicationController
  
  # Manual Billing
  def bill
-    i = Issue.find_by_id params[:id]
-    if i.customer
-      billed = i.bill_time
+    issue = Issue.find_by(id: params[:id])
+    return render_404 unless issue

-      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_no_customer) }
-    end
-  end
-  
-  # Quickbooks Webhook Callback
-  def webhook
-
-    logger.info "Quickbooks is calling webhook"
-    
-    # check the payload
-    signature = request.headers['intuit-signature']
-    key = Setting.plugin_redmine_qbo['settingsWebhookToken']
-    data = request.body.read
-    hash = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, data)).strip()
-    
-    # proceed if the request is good
-    if hash.eql? signature
-      Thread.new do
-        if request.headers['content-type'] == 'application/json'
-          data = JSON.parse(data)
-        else
-          # application/x-www-form-urlencoded
-          data = params.as_json
-        end
-        # Process the information
-        entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
-        entities.each do |entity|
-          id = entity['id'].to_i
-          name = entity['name']
-        
-          logger.info "Casting #{name.constantize} to obj"
-
-          # Magicly initialize the correct class
-          obj = name.constantize
-
-          # for merge events
-          obj.destroy(entity['deletedId']) if entity['deletedId']
-          
-          #Check to see if we are deleting a record
-          if entity['operation'].eql? "Delete"
-            obj.destroy(id)
-          #if not then update!
-          else
-            begin
-              obj.sync_by_id(id)
-            rescue => e
-              logger.error "Failed to call sync_by_id on obj"
-              logger.error e.message
-              logger.error e.backtrace.join("\n")
-            end
-          end
-        end
-        
-        # Record that last time we updated
-        Qbo.update_time_stamp
-        ActiveRecord::Base.connection.close
-      end
-      # The webhook doesn't require a response but let's make sure we don't send anything
-      render nothing: true, status: 200
-    else
-      render nothing: true, status: 400
+    unless issue.customer
+      redirect_to issue, flash: { error: I18n.t(:label_billing_error_no_customer) }
+      return
    end

-    logger.info "Quickbooks webhook complete"
+    unless issue.assigned_to&.employee_id.present?
+      redirect_to issue, flash: { error: I18n.t(:label_billing_error_no_employee) }
+      return
+    end
+
+    unless Qbo.first
+      redirect_to issue, flash: { error: I18n.t(:label_billing_error_no_qbo) }
+      return
+    end
+
+    BillIssueTimeJob.perform_later(issue.id)
+
+    redirect_to issue, flash: {
+      notice: I18n.t(:label_billing_enqueued) + " #{issue.customer.name}"
+    }
  end

  #
  # Synchronizes the QboCustomer table with QBO
  #
  def sync
-    logger.info "Syncing EVERYTHING"
-    # Update info in background
-    Thread.new do
-      if Qbo.exists?
-        Customer.sync
-        Invoice.sync
-        Employee.sync
-        Estimate.sync
-        
-        # Record the last sync time
-        Qbo.update_time_stamp
-      end
-      ActiveRecord::Base.connection.close
-    end
+    log "Syncing EVERYTHING"
+
+    CustomerSyncJob.perform_later(full_sync: true)
+    EstimateSyncJob.perform_later(full_sync: true)
+    InvoiceSyncJob.perform_later(full_sync: true)
+    EmployeeSyncJob.perform_later(full_sync: true)

    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
  end
+
+  # QuickBooks Webhook Callback
+  def webhook
+    log "Webhook received"
+
+    signature = request.headers['intuit-signature']
+    key       = Setting.plugin_redmine_qbo['settingsWebhookToken']
+    body      = request.raw_post
+
+    digest = OpenSSL::Digest.new('sha256')
+    computed = Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, body))
+
+    unless secure_compare(computed, signature)
+      log "Invalid webhook signature"
+      head :unauthorized
+      return
+    end
+
+    WebhookProcessJob.perform_later(body)
+
+    head :ok
+  end
+
+  private
+
+  # Securely compare two strings to prevent timing attacks. Returns false if either string is blank or if they do not match.
+  def secure_compare(a, b)
+    return false if a.blank? || b.blank?
+    ActiveSupport::SecurityUtils.secure_compare(a, b)
+  end
+
+  def log(msg)
+    Rails.logger.info "[QboController] #{msg}"
+  end
 end
--- a/app/jobs/bill_issue_time_job.rb
+++ b/app/jobs/bill_issue_time_job.rb
@@ -0,0 +1,122 @@
+#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 BillIssueTimeJob < ActiveJob::Base
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Perform billing of unbilled time entries for a given issue by creating corresponding TimeActivity records in QuickBooks Online, and then marking those entries as billed in Redmine. This job is typically triggered after an invoice is created or updated to ensure all relevant time is captured for billing.
+  def perform(issue_id)
+    issue = Issue.find(issue_id)
+
+    log "Starting billing for issue ##{issue.id}"
+
+    issue.with_lock do
+      unbilled_entries = issue.time_entries.where(billed: [false, nil]).lock
+
+      return if unbilled_entries.blank?
+
+      totals = aggregate_hours(unbilled_entries)
+      return if totals.blank?
+      log "Aggregated hours for billing: #{totals.inspect}"
+
+      qbo = Qbo.first
+      raise "No QBO configuration found" unless qbo
+
+      qbo.perform_authenticated_request do |access_token|
+        create_time_activities(issue, totals, access_token, qbo)
+      end
+
+      # Only mark billed AFTER successful QBO creation
+      unbilled_entries.update_all(billed: true)
+    end
+
+    log "Completed billing for issue ##{issue.id}"
+    Qbo.update_time_stamp
+  rescue => e
+    log "Billing failed for issue ##{issue_id} - #{e.message}"
+    raise e
+  end
+
+  private
+
+  # Aggregate time entries by activity name and sum their hours
+  def aggregate_hours(entries)
+    entries.includes(:activity)
+           .group_by { |e| e.activity&.name }
+           .transform_values { |rows| rows.sum(&:hours) }
+           .compact
+  end
+
+  # Create TimeActivity records in QBO for each activity type with the appropriate hours and link them to the issue's assigned employee and customer
+  def create_time_activities(issue, totals, access_token, qbo)
+    log "Creating TimeActivity records in QBO for issue ##{issue.id}"
+    time_service = Quickbooks::Service::TimeActivity.new(
+      company_id: qbo.realm_id,
+      access_token: access_token
+    )
+
+    item_service = Quickbooks::Service::Item.new(
+      company_id: qbo.realm_id,
+      access_token: access_token
+    )
+
+    totals.each do |activity_name, hours_float|
+      next if activity_name.blank?
+      next if hours_float.to_f <= 0
+
+      item = find_item(item_service, activity_name)
+      next unless item
+
+      hours, minutes = convert_hours(hours_float)
+
+      time_entry = Quickbooks::Model::TimeActivity.new
+      time_entry.description     = build_description(issue)
+      time_entry.employee_id     = issue.assigned_to.employee_id
+      time_entry.customer_id     = issue.customer_id
+      time_entry.billable_status = "Billable"
+      time_entry.hours           = hours
+      time_entry.minutes         = minutes
+      time_entry.name_of         = "Employee"
+      time_entry.txn_date        = Date.today
+      time_entry.hourly_rate     = item.unit_price
+      time_entry.item_id         = item.id
+
+      log "Creating TimeActivity for #{activity_name} (#{hours}h #{minutes}m)"
+
+      time_service.create(time_entry)
+    end
+  end
+
+  # Convert a decimal hours float into separate hours and minutes components for QBO TimeActivity
+  def convert_hours(hours_float)
+    total_minutes = (hours_float.to_f * 60).round
+    hours = total_minutes / 60
+    minutes = total_minutes % 60
+    [hours, minutes]
+  end
+
+  # Build a descriptive string for the TimeActivity based on the issue's tracker, ID, subject, and completion status
+  def build_description(issue)
+    base = "#{issue.tracker} ##{issue.id}: #{issue.subject}"
+    return base if issue.closed?
+    "#{base} (Partial @ #{issue.done_ratio}%)"
+  end
+
+  # Find an item in QBO by name, escaping single quotes to prevent query issues. Returns nil if not found.
+  def find_item(item_service, name)
+    safe = name.gsub("'", "\\\\'")
+    item_service.query("SELECT * FROM Item WHERE Name = '#{safe}'").first
+  end
+
+  def log(msg)
+    Rails.logger.info "[BillIssueTimeJob] #{msg}"
+  end
+end
--- a/app/jobs/customer_sync_job.rb
+++ b/app/jobs/customer_sync_job.rb
@@ -0,0 +1,36 @@
+#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 CustomerSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Perform a full sync of all customers, or an incremental sync of only those updated since the last sync
+  def perform(full_sync: false, id: nil)
+    qbo = Qbo.first
+    raise "No QBO configuration found" unless qbo
+
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for customer ##{id || 'all'}..."
+
+    service = CustomerSyncService.new(qbo: qbo)
+
+    if id.present?
+      service.sync_by_id(id)
+    else
+      service.sync(full_sync: full_sync)
+    end
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[CustomerSyncJob] #{msg}"
+  end
+end
--- a/app/jobs/employee_sync_job.rb
+++ b/app/jobs/employee_sync_job.rb
@@ -0,0 +1,36 @@
+#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 EmployeeSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Performs a sync of employees from QuickBooks Online.
+  def perform(full_sync: false, id: nil)
+    qbo = Qbo.first
+    raise "No QBO configuration found" unless qbo
+
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for employee ##{id || 'all'}..."
+
+    service = EmployeeSyncService.new(qbo: qbo)
+
+    if id.present?
+      service.sync_by_id(id)
+    else
+      service.sync(full_sync: full_sync)
+    end
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[EmployeeSyncJob] #{msg}"
+  end
+end
--- a/app/jobs/estimate_sync_job.rb
+++ b/app/jobs/estimate_sync_job.rb
@@ -0,0 +1,38 @@
+#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 EstimateSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Performs a sync of estimates from QuickBooks Online.
+  def perform(full_sync: false, id: nil, doc_number: nil)
+    qbo = Qbo.first
+    raise "No QBO configuration found" unless qbo
+
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for estimate ##{id || doc_number || 'all'}..."
+
+    service = EstimateSyncService.new(qbo: qbo)
+
+    if id.present?
+      service.sync_by_id(id)
+    elsif doc_number.present?
+      service.sync_by_doc(doc_number)
+    else
+      service.sync(full_sync: full_sync)
+    end
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[EstimateSyncJob] #{msg}"
+  end
+end
--- a/app/jobs/invoice_sync_job.rb
+++ b/app/jobs/invoice_sync_job.rb
@@ -0,0 +1,36 @@
+#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 InvoiceSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Performs a sync of invoices from QuickBooks Online.
+  def perform(full_sync: false, id: nil)
+    qbo = Qbo.first
+    raise "No QBO configuration found" unless qbo
+
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for invoice ##{id || 'all'}..."
+
+    service = InvoiceSyncService.new(qbo: qbo)
+
+    if id.present?
+      service.sync_by_id(id)
+    else
+      service.sync(full_sync: full_sync)
+    end
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[InvoiceSyncJob] #{msg}"
+  end
+end
--- a/app/jobs/webhook_process_job.rb
+++ b/app/jobs/webhook_process_job.rb
@@ -0,0 +1,68 @@
+#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 WebhookProcessJob < ActiveJob::Base
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  ALLOWED_ENTITIES = %w[
+    Customer
+    Invoice
+    Estimate
+    Employee
+  ].freeze
+
+  # Process incoming QBO webhook notifications and sync relevant data to Redmine
+  def perform(raw_body)
+    log "Received webhook: #{raw_body}"
+    data = JSON.parse(raw_body)
+
+    data.fetch('eventNotifications', []).each do |notification|
+      entities = notification.dig('dataChangeEvent', 'entities') || []
+
+      entities.each do |entity|
+        process_entity(entity)
+      end
+    end
+
+    Qbo.update_time_stamp
+  end
+
+  private
+
+  # Process a single entity from the webhook payload and sync it to Redmine if it's an allowed type
+  def process_entity(entity)
+    log "Processing entity: #{entity}"
+    name = entity['name']
+    id   = entity['id']&.to_i
+
+    return unless ALLOWED_ENTITIES.include?(name)
+
+    model = name.safe_constantize
+    return unless model
+
+    if entity['deletedId']
+      model.delete(entity['deletedId'])
+      return
+    end
+
+    if entity['operation'] == "Delete"
+      model.delete(id)
+    else
+      model.sync_by_id(id)
+    end
+  rescue => e
+    log "#{e.message}"
+  end
+
+  def log(msg)
+    Rails.logger.info "[WebhookProcessJob] #{msg}"
+  end
+end
--- a/app/models/concerns/quickbooks_oauth.rb
+++ b/app/models/concerns/quickbooks_oauth.rb
@@ -13,12 +13,13 @@ module QuickbooksOauth

  #== Instance Methods

+  # This method will attempt to execute the block and if it encounters an OAuth2::Error or Quickbooks::AuthorizationFailure it will attempt to refresh the token and retry the block.  It will try this up to 3 times before giving up and raising an exception.
  def perform_authenticated_request(&block)
    attempts = 0
    begin
      yield oauth_access_token
    rescue OAuth2::Error, Quickbooks::AuthorizationFailure => ex
-      Rails.logger.error("QuickbooksOauth.perform: #{ex.message}")
+      log "perform_authenticated_request: #{ex.message}"

      # to prevent an infinite loop here keep a counter and bail out after N times...
      attempts += 1
@@ -32,8 +33,9 @@ module QuickbooksOauth
    end
  end

+  # This method will attempt to refresh the access token and update the record with the new access token, refresh token and their respective expiration times.  If the refresh token expires in more than 0 seconds then we will set the refresh token expiration time to that value, otherwise we will set it to 100 days from now.
  def refresh_token!
-    Rails.logger.info("QuickbooksOauth.refresh_token!")
+    log "refresh_token!"
    t = oauth_access_token
    refreshed = t.refresh!

@@ -43,7 +45,7 @@ module QuickbooksOauth
      oauth2_refresh_token_expires_at = 100.days.from_now
    end

-    Rails.logger.info("QuickbooksOauth.refresh_token!: #{oauth2_refresh_token_expires_at}")
+    log "refresh_token!: #{oauth2_refresh_token_expires_at}"

    update!(
      oauth2_access_token: refreshed.token,
@@ -53,20 +55,24 @@ module QuickbooksOauth
    )
  end

+  # This method will 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.
  def oauth_client
    self.class.construct_oauth2_client
  end

+  # This method will return an instance of the OAuth2::AccessToken class that is configured with the current access token, refresh token and the OAuth2 client.  This access token can be used to make authenticated requests to the Intuit API.
  def oauth_access_token
    OAuth2::AccessToken.new(oauth_client, oauth2_access_token, refresh_token: oauth2_refresh_token)
  end

+  # This method is an alias for the oauth_access_token method and is used to provide a more intuitive name for the access token when making authenticated requests.
  def consumer
    oauth_access_token
  end

  module ClassMethods

+    # 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']
@@ -74,7 +80,7 @@ module QuickbooksOauth

      # Are we are playing in the sandbox?
      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false
-      logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}"
+      log "Sandbox mode: #{Quickbooks.sandbox_mode}"

      options = {
        site: "https://appcenter.intuit.com/connect/oauth2",
@@ -85,4 +91,11 @@ module QuickbooksOauth
    end

  end
+
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[QuickbooksOauth] #{msg}"
+  end
 end
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -149,56 +149,11 @@ class Customer < ActiveRecord::Base
      end
    end
  end
-  
-  # proforms a bruteforce sync operation
-  # This needs to be simplified
-  def self.sync 
-    # Sync ALL customers if the database is empty
-    qbo = Qbo.first
-    customers = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
-      service.all
-    end
-    
-    return unless customers
-    
-    customers.each do |c|
-      logger.info "Processing customer #{c.id}"
-      customer = Customer.find_or_create_by(id: c.id)
-      if c.active?
-        #if not customer.name.eql? c.display_name
-          customer.name = c.display_name
-          customer.id = c.id
-          customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
-          customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
-          customer.save_without_push
-        #end
-      else
-        if not c.new_record?
-          customer.delete
-        end
-      end
-    end
-  end

+  # Seach for customers by name or phone number
  def self.search(search)
-    return all if search.blank?
-
-    # 1. Clean the input: Remove existing stars and special Boolean operators
-    # to prevent "red**" or syntax errors from hyphens/plus signs.
-    clean_search = search.gsub(/[*+\-><()~]/, '')
-    
-    # 2. Add a single trailing wildcard for partial matching
-    ft_query = "#{clean_search}*"
-    
-    # 3. Use the exact column list from your migration
-    # Using a hybrid approach to ensure "Jonh" still finds "John"
-    where(
-      "MATCH(name, phone_number, mobile_phone_number) AGAINST(? IN BOOLEAN MODE) OR 
-      SOUNDEX(SUBSTRING_INDEX(name, ' ', 1)) = SOUNDEX(?) OR 
-      name LIKE ?", 
-      ft_query, clean_search, "%#{sanitize_sql_like(clean_search)}%"
-    ).order(Arel.sql("MATCH(name, phone_number, mobile_phone_number) AGAINST(#{connection.quote(clean_search)}) DESC"))
+    search = sanitize_sql_like(search)
+    where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
  end

  # Override the defult redmine seach method to rank results by id
@@ -208,47 +163,51 @@ class Customer < ActiveRecord::Base
    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}%") 
+      scope = scope.search(token)
    end

    ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
-
-    # Assign simple uniform ranking
-    ids.each_with_object({}) { |id, h| h[id] = id }
+    ids.index_with { |id| id }
  end
  
  # proforms a bruteforce sync operation
-  # This needs to be simplified
+  def self.sync 
+    CustomerSyncJob.perform_later(full_sync: false)
+  end
+
+  # proforms a bruteforce sync operation
  def self.sync_by_id(id) 
-    qbo = Qbo.first
-    c = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
-      service.fetch_by_id(id)
-    end
-
-    return unless c
-
-    customer = Customer.find_or_create_by(id: c.id)
-    if c.active?
-      #if not customer.name.eql? c.display_name
-        customer.name = c.display_name
-        customer.id = c.id
-        customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
-        customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
-        customer.save_without_push
-      #end
-    else
-      if not customer.new_record?
-        customer.delete
-      end
-    end
+    CustomerSyncJob.perform_later(id: id)
  end
  
  # returns a human readable string
  def to_s
    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
  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
+
+      self.id = @details.id
+    rescue => e
+      errors.add(:base, e.message)
+      return false
+    end
+
+    save_without_push
+  end
+
+  alias_method :save_without_push, :save
+  alias_method :save, :save_with_push
  
  private
  
@@ -265,24 +224,5 @@ 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
--- a/app/models/customer_token.rb
+++ b/app/models/customer_token.rb
@@ -8,54 +8,49 @@
 #
 #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 CustomerToken < ActiveRecord::Base
-  
-  has_many :issues
-  validates_presence_of :issue_id
-  before_create :generate_token, :generate_expire_date
-  attr_accessor :destroyed
-  after_destroy :mark_as_destroyed
+class CustomerToken < ApplicationRecord
+  belongs_to :issue

-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE__' + SecureRandom.uuid
-  
-  # generates a random token using the plugin setting settingsOAuthConsumerSecret for salt
-  def generate_token
-    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
-  end
+  validates :issue_id, presence: true
+  validates :token, presence: true, uniqueness: true

-  # generates an expiring date
-  def generate_expire_date
-    self.expires_at = Time.now + 1.month
-  end
+  before_validation :generate_token, on: :create
+  before_validation :generate_expire_date, on: :create

-  # set destroyed flag
-  def mark_as_destroyed
-    self.destroyed = true
-  end
+  scope :active, -> { where("expires_at > ?", Time.current) }

-  # purge expired tokens
-  def self.remove_expired_tokens
-    where("expires_at < ?", Time.now).destroy_all
-  end
-  
-  # has the token expired?
+  TOKEN_EXPIRATION = 1.month
+
+  # Check if the token has expired
  def expired?
-    self.expires_at < Time.now
+    expires_at.present? && expires_at <= Time.current
  end

-  # Getter convenience method for tokens
+  # Remove expired tokens from the database
+  def self.remove_expired_tokens
+    where("expires_at <= ?", Time.current).delete_all
+  end
+
+  # Get or create a token for the given issue
  def self.get_token(issue)
-    
-    # check to see if token exists & if it is expired
-    token = find_by_issue_id issue.id
-    unless token.nil?
-      return token unless token.expired?
-      # remove expired tokens
-      token.destroy
-    end
+    return unless issue
+    return unless User.current.allowed_to?(:view_issues, issue.project)

-    # only create new token if we have an issue to attach it to
-    return create(issue_id: issue.id) if User.current.logged?
+    token = active.find_by(issue_id: issue.id)
+    return token if token
+
+    create!(issue: issue)
  end

-end
+  private
+
+  # Generate a unique token for the customer
+  def generate_token
+    self.token ||= SecureRandom.urlsafe_base64(32)
+  end
+
+  # Generate an expiration date for the token
+  def generate_expire_date
+    self.expires_at ||= Time.current + TOKEN_EXPIRATION
+  end
+end
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -12,38 +12,17 @@ class Employee < ActiveRecord::Base
  
  has_many :users
  validates_presence_of :id, :name
-  
-  def self.sync 
-    qbo = Qbo.first
-    employees = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
-      service.all
-    end

-    return unless employees
-    
-    transaction do
-      employees.each { |e|
-        logger.info "Processing employee #{e.id}"
-        employee = 	find_or_create_by(id: e.id)
-        employee.name = e.display_name
-        employee.id = e.id
-        employee.save!
-      }
-    end
+  self.primary_key = :id
+
+  # Sync all employees, typically triggered by a scheduled task or manual sync request
+  def self.sync
+    EmployeeSyncJob.perform_later(full_sync: true)
  end

+  # Sync a single employee by ID, typically triggered by a webhook notification or manual sync request
  def self.sync_by_id(id)
-    qbo = Qbo.first
-    employee = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
-      service.fetch_by_id(id)
-    end
-
-    return unless employee
-    employee = find_or_create_by(id: employee.id)
-    employee.name = employee.display_name
-    employee.id = employee.id
-    employee.save!
+    EmployeeSyncJob.perform_later(id: id)
  end
+  
 end
--- a/app/models/estimate.rb
+++ b/app/models/estimate.rb
@@ -22,78 +22,17 @@ class Estimate < ActiveRecord::Base
  
  # sync all estimates
  def self.sync
-    logger.info "Syncing ALL estimates"
-    qbo = Qbo.first
-    estimates = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
-      service.all
-    end
-
-    return unless estimates
-
-    estimates.each { |estimate|
-      process_estimate(estimate)
-    }
-
-    #remove deleted estimates
-    where.not(estimates.map(&:id)).destroy_all
+    EstimateSyncJob.perform_later(full_sync: false)
  end
  
  # sync only one estimate
  def self.sync_by_id(id)
-    logger.info "Syncing estimate #{id}"
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
-      process_estimate(service.fetch_by_id(id))
-    end
+    EstimateSyncJob.perform_later(id: id)
  end

  # sync only one estimate
  def self.sync_by_doc_number(number)
-    logger.info "Syncing estimate by doc number #{number}"
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
-      process_estimate(service.find_by( :doc_number, number).first)
-    end
-  end
-  
-  # update an estimate
-  def self.update(id)
-    qbo = Qbo.first
-    estimate = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
-      service.fetch_by_id(id)
-    end
-
-    return unless estimate
-
-    e = find_or_create_by(id: id)
-    e.doc_number = estimate.doc_number
-    e.txn_date = estimate.txn_date
-    e.save!
-  end
-  
-  # process an estimate into the database
-  def self.process_estimate(qbo_estimate)
-    logger.info "Processing estimate #{qbo_estimate.id}"
-    estimate = find_or_create_by(id: qbo_estimate.id)
-    estimate.doc_number = qbo_estimate.doc_number
-    estimate.customer_id = qbo_estimate.customer_ref.value
-    estimate.id = qbo_estimate.id
-    estimate.txn_date = qbo_estimate.txn_date
-    estimate.save!
-  end
-
-  # download the pdf from quickbooks
-  def pdf
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
-      estimate = service.fetch_by_id(id)
-      service.pdf(estimate)
-    end
+    EstimateSyncJob.perform_later(doc_number: number)
  end

  # Magic Method
@@ -118,6 +57,7 @@ class Estimate < ActiveRecord::Base
  
  # pull the details
  def pull
+    log "Pulling details for estimate ##{self.id}..."
    begin
      raise Exception unless self.id
      qbo = Qbo.first
@@ -129,5 +69,9 @@ class Estimate < ActiveRecord::Base
      @details = Quickbooks::Model::Estimate.new
    end
  end
+
+  def log(msg)
+    Rails.logger.info "[Estimate] #{msg}"
+  end
  
 end
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -9,200 +9,27 @@
 #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 Invoice < ActiveRecord::Base
-  
  has_and_belongs_to_many :issues
-  belongs_to :customer 
-  validates_presence_of :doc_number, :id, :customer_id, :txn_date
+  belongs_to :customer
+
+  validates :id, presence: true, uniqueness: true
+  validates :doc_number, :txn_date, presence: true
+
  self.primary_key = :id

-   # returns a human readable string
+  # Return the invoice's document number as its string representation
  def to_s
-    return self[:doc_number]
+    doc_number
  end
-  
-  # sync ALL the invoices
+
+  # Sync all invoices from QuickBooks, typically triggered by a scheduled task or manual sync request
  def self.sync
-    logger.info "Syncing all invoices"
-    last = Qbo.first.last_sync
-
-    query = "SELECT Id, DocNumber FROM Invoice"
-    query << " WHERE Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
-  
-    # TODO actually do something with the above query
-    # .all() is never called since count is never initialized
-    qbo = Qbo.first
-    invoices = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-      service.all 
-    end
-
-    return unless invoices
-     
-    invoices.each { | invoice | 
-      process_invoice invoice
-    }
+    InvoiceSyncJob.perform_later(full_sync: true)
  end
-  
-  #sync by invoice ID
+
+  # Sync a single invoice by ID, typically triggered by a webhook notification or manual sync request
  def self.sync_by_id(id)
-    logger.info "Syncing invoice #{id}"
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-      invoice = service.fetch_by_id(id) 
-      process_invoice invoice
-    end
-  end
-  
-  private
-  
-  # Attach the invoice to the issue
-  def self.attach_to_issue(issue, invoice)
-    return if issue.nil?
-    
-    # skip this issue if the issue customer is not the same as the invoice customer
-    return if issue.customer_id != invoice.customer_ref.value.to_i
-    
-    logger.info "Attaching invoice #{invoice.id} to issue #{issue.id}"
-    
-    invoice = Invoice.find_or_create_by(id: invoice.id)
-
-    unless issue.invoices.include?(invoice)
-      issue.invoices << invoice
-      issue.save!
-    end
-    
-    compare_custom_fields(issue, invoice)
-  end
-  
-  # processes the invoice into the database
-  def self.process_invoice(i)
-    logger.info "Processing invoice #{i.id}"
-
-    # Load the invoice into the database
-    invoice = Invoice.find_or_create_by(id: i.id)
-    invoice.doc_number = i.doc_number 
-    invoice.id = i.id
-    invoice.customer_id = i.customer_ref
-    invoice.txn_date = i.txn_date
-    invoice.save!
-
-    # Scan the private notes for hashtags and attach to the applicable issues
-    if not i.private_note.nil?
-      i.private_note.scan(/#(\w+)/).flatten.each { |issue|
-        attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
-      }
-    end
-    
-    # Scan the line items for hashtags and attach to the applicable issues
-    i.line_items.each { |line|
-      if line.description
-        line.description.scan(/#(\w+)/).flatten.each { |issue|
-          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
-        }
-      end
-    }
-  end
-  
-  # compares the custome fields on invoices & issues and updates the invoice as needed
-  #
-  # the issue here is when two or more issues share an invoice with the same custom field, but diffrent values
-  # this condions causes an infinite loop as the webhook is called when an invoice is updated
-  # TODO maybe add a cf_sync_confict flag to invoices
-  def self.compare_custom_fields(issue, invoice)
-    logger.info "Comparing custom fields"
-    # TODO break if Invoice.find(invoice.id).cf_sync_confict
-    is_changed = false
-
-    logger.debug "Calling :process_invoice_custom_fields hook"
-    context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
-
-    # Process updates from the hooks
-    context.each do |c|
-      unless c.nil?
-        logger.debug "Invoice.compare_custom_fields: We have a responce from a hook"
-        push_updates  c[:invoice] if c[:is_changed]
-      end
-    end
-      
-    # Process Issue Custom Values
-    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_updates invoice if is_changed
+    InvoiceSyncJob.perform_later(id: id)
  end

-  # pushes invoice updates
-  def self.push_updates(invoice)
-    begin
-      logger.info "Invoice.push_updates"
-      qbo = Qbo.first
-      qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-        service.update invoice
-      end
-    rescue
-      # Do nothing, probaly custome field sync confict on the invoice. 
-      # This is a problem with how it's billed
-      # TODO Add notes in memo area
-      # TODO flag Invoice.cf_sync_confict here
-      logger.error "Failed to update invoice"
-    end
-  end
-
-  # download the pdf from quickbooks
-  def pdf
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-      invoice = service.fetch_by_id(id)
-      return service.pdf(invoice)
-    end
-  end
-
-  # Magic Method
-  # Maps Get/Set methods to QBO invoice object
-  def method_missing(sym, *arguments)
-    # Check to see if the method exists
-    if Quickbooks::Model::Invoice.method_defined?(sym)
-      # download details if required
-      pull unless @details
-      method_name = sym.to_s
-      # Setter
-      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])
-      # Getter
-      else
-        return @details.method(method_name).call 
-      end
-    end
-  end
-  
-  # pull the details from quickbooks
-  def pull
-    begin
-      raise Exception unless self.id
-      qbo = Qbo.first
-      @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
-        service.fetch_by_id(self.id)
-      end
-    rescue Exception => e
-      @details = Quickbooks::Model::Invoice.new
-    end
-  end
-    
-end
+end
--- a/app/models/qbo.rb
+++ b/app/models/qbo.rb
@@ -16,7 +16,7 @@ class Qbo < ActiveRecord::Base
  # Updates last sync time stamp
  def self.update_time_stamp
    date = DateTime.now
-    logger.info "Updating QBO timestamp to #{date}"
+    log "Updating QBO timestamp to #{date}"
    qbo = Qbo.first
    qbo.last_sync = date
    qbo.save
@@ -25,4 +25,11 @@ class Qbo < ActiveRecord::Base
  def self.last_sync
    format_time(Qbo.first.last_sync)
  end
+
+  private
+
+  def self.log(msg)
+    logger.info "[QBO] #{msg}"
+  end
+
 end
--- a/app/services/customer_sync_service.rb
+++ b/app/services/customer_sync_service.rb
@@ -0,0 +1,32 @@
+#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 CustomerSyncService < SyncServiceBase
+
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Customer
+  end
+
+  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    !remote.active?
+  end
+
+  # Map relevant attributes from the QBO Customer to the local Customer model
+  def process_attributes(local, remote)
+    local.name = remote.display_name
+    local.phone_number = remote.primary_phone&.free_form_number&.gsub(/\D/, '')
+    local.mobile_phone_number = remote.mobile_phone&.free_form_number&.gsub(/\D/, '')
+  end
+
+end
--- a/app/services/employee_sync_service.rb
+++ b/app/services/employee_sync_service.rb
@@ -0,0 +1,30 @@
+#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 EmployeeSyncService < SyncServiceBase
+
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Employee
+  end
+
+  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    !remote.active?
+  end
+
+  # Map relevant attributes from the QBO Employee to the local Employee model
+  def process_attributes(local, remote)
+    local.name = remote.display_name
+  end
+
+end
--- a/app/services/estimate_pdf_service.rb
+++ b/app/services/estimate_pdf_service.rb
@@ -0,0 +1,16 @@
+#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 EstimatePdfService < PdfServiceBase
+
+  def self.model_class
+    Estimate
+  end
+
+end
--- a/app/services/estimate_sync_service.rb
+++ b/app/services/estimate_sync_service.rb
@@ -0,0 +1,27 @@
+#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 EstimateSyncService < SyncServiceBase
+  
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Estimate
+  end
+
+  # Map relevant attributes from the QBO Estimate to the local Estimate model
+  def process_attributes(local, remote)
+    local.doc_number = remote.doc_number
+    local.txn_date = remote.txn_date
+    local.customer = Customer.find_by(id: remote.customer_ref&.value)
+  end
+
+end
--- a/app/services/invoice_attachment_service.rb
+++ b/app/services/invoice_attachment_service.rb
@@ -0,0 +1,62 @@
+#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 InvoiceAttachmentService
+
+  def initialize(invoice, remote)
+    @invoice = invoice
+    @remote  = remote
+  end
+
+  # Attach invoice to issues based on issue IDs found in the invoice's private note and line descriptions
+  def attach
+    extract_issue_ids.each do |issue_id|
+      log "Processing issue ##{issue_id} for invoice ##{@invoice.doc_number}"
+      
+      issue = Issue.find_by(id: issue_id)
+      next unless issue
+      next unless issue.customer&.id == @invoice.customer&.id
+
+      unless issue.invoices.exists?(@invoice.id)
+        issue.invoices << @invoice
+        issue.save! if issue.changed?
+        log "Attached invoice ##{@invoice.id} to issue ##{issue.id}"
+      end
+
+      InvoiceCustomFieldSyncService.new(issue, @invoice, @remote).sync
+    end
+  end
+
+  private
+
+  # Extract issue IDs from the invoice's private note and line descriptions
+  def extract_issue_ids
+    ids = []
+
+    if @remote.private_note.present?
+      ids += scan(@remote.private_note)
+    end
+
+    Array(@remote.line_items).each do |line|
+      ids += scan(line.description.to_s)
+    end
+
+    ids.uniq
+  end
+
+  # Scan text for issue IDs in the format #123
+  def scan(text)
+    text.scan(/#(\d+)/).flatten.map(&:to_i)
+  end
+
+  def log(msg)
+    Rails.logger.info "[InvoiceAttachmentService] #{msg}"
+  end
+end
--- a/app/services/invoice_custom_field_sync_service.rb
+++ b/app/services/invoice_custom_field_sync_service.rb
@@ -0,0 +1,69 @@
+#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
--- a/app/services/invoice_pdf_service.rb
+++ b/app/services/invoice_pdf_service.rb
@@ -0,0 +1,16 @@
+#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 InvoicePdfService < PdfServiceBase
+
+  def self.model_class
+    Invoice
+  end
+
+end
--- a/app/services/invoice_push_service.rb
+++ b/app/services/invoice_push_service.rb
@@ -0,0 +1,47 @@
+#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 InvoicePushService
+  
+  def initialize(invoice)
+    @invoice = invoice
+  end
+
+  # 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)
+
+    qbo = Qbo.first
+
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Invoice.new( company_id: qbo.realm_id, access_token: access_token)
+
+      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
+
+  def log(msg)
+    Rails.logger.info "[InvoicePushService] #{msg}"
+  end
+end
--- a/app/services/invoice_sync_service.rb
+++ b/app/services/invoice_sync_service.rb
@@ -0,0 +1,35 @@
+#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 InvoiceSyncService < SyncServiceBase
+  
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Invoice
+  end
+  
+  # Map relevant attributes from the QBO Invoice to the local Invoice model
+  def process_attributes(local, remote)
+    local.doc_number      = remote.doc_number
+    local.txn_date        = remote.txn_date
+    local.due_date        = remote.due_date
+    local.total_amount    = remote.total
+    local.balance         = remote.balance
+    local.qbo_updated_at  = remote.meta_data&.last_updated_time
+    local.customer = Customer.find_by(id: remote.customer_ref&.value)
+  end
+
+  # Attach QBO Invoices to the local Issues
+  def attach_documents(local, remote)
+    InvoiceAttachmentService.new(local, remote).attach
+  end
+end
--- a/app/services/pdf_service_base.rb
+++ b/app/services/pdf_service_base.rb
@@ -0,0 +1,66 @@
+#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 PdfServiceBase
+  
+  require 'combine_pdf'
+
+  # Subclasses should initialize with a QBO client instance
+  def initialize(qbo:)
+    @qbo = qbo
+    @entity = self.class.model_class
+  end
+
+  # Subclasses must implement this to specify which document model to download pdf (e.g. Estimate, Invoice)
+  def self.model_class
+    raise NotImplementedError
+  end
+
+  # Fetches the PDF for the given entity IDs. If multiple IDs are provided, their PDFs are combined into a single document.
+  def fetch_pdf(doc_ids:)
+    log "Fetching PDFs for #{@entity} IDs: #{doc_ids.join(', ')}"
+    @qbo.perform_authenticated_request do |access_token|
+      service_class = "Quickbooks::Service::#{@entity.name}".constantize
+      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
+
+      return single_pdf(service, doc_ids.first) if doc_ids.size == 1
+
+      combined_pdf(service, doc_ids)
+    end
+  end
+
+  private
+
+  # Fetches a single PDF for the given invoice ID.
+  def single_pdf(service, id)
+    log "Fetching PDF for #{@entity} ID: #{id}"
+    entity = service.fetch_by_id(id)
+    [service.pdf(entity), entity.doc_number]
+  end
+
+  # Combines PDFs for multiple entity IDs into a single PDF document and returns it along with a reference string.
+  def combined_pdf(service, ids)
+    log "Combining PDFs for #{@entity} IDs: #{ids.join(', ')}"
+    pdf = CombinePDF.new
+    ref = []
+
+    ids.each do |id|
+      entity = service.fetch_by_id(id)
+      ref << entity.doc_number
+      pdf << CombinePDF.parse(service.pdf(entity))
+    end
+
+    [pdf.to_pdf, ref.join(" ")]
+  end
+
+  # Logs messages with a consistent prefix for easier debugging.
+  def log(msg)
+    Rails.logger.info "[#{@entity}PdfService] #{msg}"
+  end
+end
--- a/app/services/sync_service_base.rb
+++ b/app/services/sync_service_base.rb
@@ -0,0 +1,126 @@
+#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 SyncServiceBase
+  PAGE_SIZE = 1000
+
+  # Subclasses should initialize with a QBO client instance
+  def initialize(qbo:)
+    @qbo = qbo
+    @entity = self.class.model_class
+  end
+
+  # Subclasses must implement this to specify which local model they sync (e.g. Customer, Invoice)
+  def self.model_class
+    raise NotImplementedError
+  end
+
+  # Sync all entities, or only those updated since the last sync
+  def sync(full_sync: false)
+    log "Starting #{full_sync ? 'full' : 'incremental'} #{@entity.name} sync"
+
+    @qbo.perform_authenticated_request do |access_token|
+      service_class = "Quickbooks::Service::#{@entity.name}".constantize
+      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
+
+      page = 1
+      loop do
+        collection = fetch_page(service, page, full_sync)
+        entries = Array(collection&.entries)
+        break if entries.empty?
+
+        entries.each { |remote| persist(remote) }
+
+        break if entries.size < PAGE_SIZE
+        page += 1
+      end
+    end
+
+    log "#{@entity.name} sync complete"
+  end
+
+  # Sync a single entity by its QBO ID, used for webhook updates
+  def sync_by_id(id)
+    log "Syncing #{@entity.name} with ID #{id}"
+    @qbo.perform_authenticated_request do |access_token|
+      service_class = "Quickbooks::Service::#{@entity.name}".constantize
+      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
+      remote = service.fetch_by_id(id)
+      persist(remote)
+    end
+  end
+
+  private
+
+  def attach_documents(local, remote)
+    # Override in subclasses if the entity has attachments (e.g. Invoice)
+  end
+
+  # Determine if a remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    false
+  end
+
+  # Log messages with the entity type for better traceability
+  def log(msg)
+    Rails.logger.info "[#{@entity.name}SyncService] #{msg}"
+  end
+
+  # Fetch a page of entities, either all or only those updated since the last sync
+  def fetch_page(service, page, full_sync)
+    log "Fetching page #{page} of #{@entity.name} from QBO (#{full_sync ? 'full' : 'incremental'} sync)"
+    start_position = (page - 1) * PAGE_SIZE + 1
+
+    if full_sync
+      service.query("SELECT * FROM #{@entity.name} STARTPOSITION #{start_position} MAXRESULTS #{PAGE_SIZE}")
+    else
+      last_update = @entity.maximum(:updated_at) || 1.year.ago
+      service.query(<<~SQL.squish)
+        SELECT * FROM #{@entity.name}
+        WHERE MetaData.LastUpdatedTime > '#{last_update.utc.iso8601}'
+        STARTPOSITION #{start_position}
+        MAXRESULTS #{PAGE_SIZE}
+      SQL
+    end
+  end
+
+  # Create or update a local entity record based on the QBO remote data
+  def persist(remote)
+    local = @entity.find_or_initialize_by(id: remote.id)
+
+    if destroy_remote?(remote)
+      if local.persisted?
+        local.destroy
+        log "Deleted #{@entity.name} #{remote.id}"
+      end
+      return
+    end
+
+    # Map remote attributes to local model fields, this should be implemented in subclasses
+    process_attributes(local, remote)
+
+    if local.changed?
+      local.save!
+      log "Updated #{@entity.name} #{remote.id}"
+    end
+
+    # Handle attaching documents if applicable to invoices
+    attach_documents(local, remote)
+
+  rescue => e
+      log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
+  end
+
+  # This method should be implemented in subclasses to map remote attributes to local model
+  def process_attributes(local, remote)
+    raise NotImplementedError, "Subclasses must implement process_attributes"
+  end
+
+end
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -29,6 +29,9 @@ en:
  label_billing_address: "Billing Address"
  label_billing_error: "Customer could not be billed. Check for Customer or Assignee and try again."
  label_billing_error_no_customer: "Cannot bill without an assigned customer."
+  label_billing_error_no_employee: "Cannot bill without an assigned employee."
+  label_billing_error_no_qbo: "Cannot bill without a QuickBooks connection. Please connect to QuickBooks and try again."
+  label_billing_enqueued: "Billing has been enqueued for issue"
  label_billed_success: "Successfully billed "
  label_client_id: "Intuit QBO OAuth2 Client ID"
  label_client_secret: "Intuit QBO OAuth2 Client Secret"
@@ -95,7 +98,7 @@ en:
  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_estimate_not_found: "Estimate not found, we are syncing with QuickBooks to find it. Please check back shortly."
  notice_estimate_updated: "Estimate updated in QuickBooks"
  notice_forbidden: "You do not have permission to access this resource."
  notice_invoice_created: "Invoice created in QuickBooks"
--- a/db/migrate/040_add_doc_timestamp.rb
+++ b/db/migrate/040_add_doc_timestamp.rb
@@ -0,0 +1,16 @@
+#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 AddDocTimestamp < ActiveRecord::Migration[5.1]
+  def change
+    add_timestamps(:invoices, null: true)
+    add_timestamps(:estimates, null: true)
+  end
+end
--- a/db/migrate/041_add_invoice_fields.rb
+++ b/db/migrate/041_add_invoice_fields.rb
@@ -0,0 +1,24 @@
+#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 AddInvoiceFields < ActiveRecord::Migration[7.0]
+  def change
+    change_table :invoices, bulk: true do |t|
+      t.date     :due_date
+      t.decimal  :total_amount, precision: 15, scale: 2
+      t.decimal  :balance, precision: 15, scale: 2
+      t.datetime :qbo_updated_at
+      t.boolean  :qbo_sync_locked, null: false, default: false
+    end
+
+    add_index :invoices, :qbo_updated_at
+    add_index :invoices, :qbo_sync_locked
+  end
+end
--- a/db/migrate/042_add_employee_timestamp.rb
+++ b/db/migrate/042_add_employee_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 AddEmployeeTimestamp < ActiveRecord::Migration[7.0]
+  def change
+    add_timestamps(:employees, null: true)
+  end
+end
--- a/init.rb
+++ b/init.rb
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
  name 'Redmine QBO plugin'
  author 'Rick Barrette'
  description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed'
-  version '2026.2.13'
+  version '2026.2.16'
  url 'https://github.com/rickbarrette/redmine_qbo'
  author_url 'https://barrettefabrication.com'
  settings default: {empty: true}, partial: 'qbo/settings'
--- a/lib/redmine_qbo/hooks/issues_hook_listener.rb
+++ b/lib/redmine_qbo/hooks/issues_hook_listener.rb
@@ -17,12 +17,12 @@ module RedmineQbo
      # 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"
+        log "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
+        log issue.inspect
+        log project.inspect

        # Customer Name Text Box with database backed autocomplete
        # onchange event will update the hidden customer_id field
@@ -44,7 +44,7 @@ module RedmineQbo
        #
        # 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
+        log 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
@@ -93,6 +93,12 @@ module RedmineQbo
            } 
          })
      end
+
+      private
+
+      def log(msg)
+        Rails.logger.info "[IssuesHookListener] #{msg}"
+      end
      
    end
  end 
--- a/lib/redmine_qbo/patches/issue_patch.rb
+++ b/lib/redmine_qbo/patches/issue_patch.rb
@@ -12,130 +12,67 @@ require_dependency 'issue'

 module RedmineQbo
  module Patches
-
-    # Patches Redmine's Issues dynamically.
-    # Adds relationships for customers, estimates, invoices, customer_tokens
-    # Adds before and after save hooks
    module IssuePatch

-      def self.included(base) # :nodoc:
+      def self.included(base)
        base.extend(ClassMethods)
-
        base.send(:include, InstanceMethods)

-        # Same as typing in the class 
        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 :estimate, primary_key: :id
          has_and_belongs_to_many :invoices
+
          before_save :titlize_subject
-          after_save :bill_time
+          after_commit :enqueue_billing, on: :update
        end
        
      end
-        
+
      module ClassMethods
-        
+
      end
-      
+
      module InstanceMethods
-        
-        # Create billable time entries
-        def bill_time
-          logger.debug "QBO: Billing time for issue ##{self.id}"
-          logger.debug "Issue is closed? #{self.closed?}"
-          
-          return false if self.assigned_to.nil?
-          return false unless Qbo.first 
-          return false unless self.customer 

-          Thread.new do
-            spent_time = self.time_entries.where(billed: [false, nil])
-            spent_hours ||= spent_time.sum(:hours) || 0
+        # 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}"
+          return unless closed?
+          return unless customer.present?
+          return unless assigned_to&.employee_id.present?

-            logger.debug "Issue has spent hours: #{spent_hours}"
-            
-            if spent_hours > 0 then
-              
-              # Prepare to create a new Time Activity
-              qbo = Qbo.first
-              qbo.perform_authenticated_request do |access_token|
-                time_service = Quickbooks::Service::TimeActivity.new(company_id: qbo.realm_id, access_token: access_token)
-                item_service = Quickbooks::Service::Item.new(company_id: qbo.realm_id, access_token: access_token)
-                time_entry = Quickbooks::Model::TimeActivity.new
-        
-                # Lets total up each activity before billing.
-                # This will simpify the invoicing with a single billable time entry per time activity
-                h = Hash.new(0)
-                spent_time.each do |entry|
-                  h[entry.activity.name] += entry.hours
-                  # update time entries billed status
-                  entry.billed = true
-                  entry.save
-                end
-                
-                # 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}"
+          log "Enqueuing billing for issue ##{id}"
+          BillIssueTimeJob.perform_later(id)
+        end

-                  # Convert float spent time to hours and minutes
-                  hours = val.to_i
-                  minutesDecimal = (( val - hours) * 60)
-                  minutes = minutesDecimal.to_i
+        # Titlize the subject of the issue before saving to ensure consistent formatting for billing descriptions in Quickbooks
+        def titlize_subject
+          log "Titlizing subject for issue ##{id}"

-                  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 = "#{self.tracker} ##{self.id}: #{self.subject} #{"(Partial @ #{self.done_ratio}%)" unless self.closed?}"
-                  time_entry.employee_id = self.assigned_to.employee_id 
-                  time_entry.customer_id = self.customer_id
-                  time_entry.billable_status = "Billable"
-                  time_entry.hours = hours
-                  time_entry.minutes = minutes
-                  time_entry.name_of = "Employee"
-                  time_entry.txn_date = Date.today
-                  time_entry.hourly_rate = item.unit_price
-                  time_entry.item_id = item.id 
-                  time_entry.start_time = start_date
-                  time_entry.end_time = Time.now
-                  time_service.create(time_entry)
-                end
-              end
+          self.subject = subject.split(/\s+/).map do |word|
+            if word =~ /[A-Z]/ && word =~ /[0-9]/
+              word
+            else
+              word.capitalize
            end
-          end
-          return true
+          end.join(' ')
        end
      end
-      
-      # Create a shareable link for a customer
+
+      # 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.
      def share_token
-        CustomerToken.get_token self
+        CustomerToken.get_token(self)
      end
-      
-      # Titleize the subject before save , but keep words containing numbers mixed with letters capitalized
-      def titlize_subject
-        logger.debug "QBO: Titlizing subject for issue ##{self.id}"
-        self.subject = self.subject.split(/\s+/).map do |word|
-          # If word is NOT purely alphanumeric (contains special chars),
-          # or is all upper/lower, we can handle it.
-          # excluding alphanumeric strings with mixed case and numbers (e.g., "ID555ABC") from being altered.
-          if word =~ /[A-Z]/ && word =~ /[0-9]/
-            word
-          else
-            word.downcase
-            word.capitalize
-          end
-        end.join(' ')
-      end
-    end  

-    # Add module to Issue
+      private
+
+      def log(msg)
+          Rails.logger.info "[IssuePatch] #{msg}"
+      end
+    end
+
    Issue.send(:include, IssuePatch)
-
  end
 end
--- a/lib/redmine_qbo/patches/pdf_patch.rb
+++ b/lib/redmine_qbo/patches/pdf_patch.rb
@@ -58,7 +58,7 @@ module RedmineQbo
          #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)
          
-          logger.debug "Calling :pdf_left hook"
+          log "Calling :pdf_left hook"
          left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
          unless left_hook_output.nil?
            left_hook_output.each do |l|
@@ -73,7 +73,7 @@ module RedmineQbo
          right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?(:estimated_hours)
          right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
          
-          logger.debug "Calling :pdf_right hook"
+          log "Calling :pdf_right hook"
          right_hook_output = Redmine::Hook.call_hook :pdf_right, { issue: issue }
          unless right_hook_output.nil?
            right_hook_output.each do |r|
@@ -269,6 +269,13 @@ module RedmineQbo
        end

      end
+
+      private
+
+      def log(msg)
+          Rails.logger.info "[PdfPatch] #{msg}"
+      end
+
    end

    Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)
Author	SHA1	Message	Date
Rick Barrette	6e90548dbb	Removed unused method	2026-02-28 22:56:03 -05:00
Rick Barrette	f921f227e2	Refactor: Introduce PdfServiceBase for shared PDF fetching functionality and update Invoice/Estimate controllers to utilize new services	2026-02-28 21:59:01 -05:00
Rick Barrette	a34ae46358	Refactor: Simplify invoice PDF fetching and introduce InvoicePdfService for better organization	2026-02-28 21:36:16 -05:00
Rick Barrette	e4cfb0674e	Refactor: Enhance estimate loading and syncing logic in EstimateController	2026-02-28 21:20:35 -05:00
Rick Barrette	348c521491	Added comments	2026-02-28 20:03:19 -05:00
Rick Barrette	6cee8c1d81	Fix: Remove logging of fetched page information in SyncServiceBase	2026-02-28 19:59:50 -05:00
Rick Barrette	d4a0aa1db5	Refactor: Introduce SyncServiceBase for shared functionality across sync services	2026-02-28 19:47:45 -05:00
Rick Barrette	12884a211e	Added comments	2026-02-28 18:04:38 -05:00
Rick Barrette	4ed71f5667	Fix: Remove unnecessary QBO configuration check in billing enqueue method	2026-02-28 18:01:32 -05:00
Rick Barrette	8303dec501	Fix: Raise error if no QBO configuration is found in sync jobs	2026-02-28 17:58:11 -05:00
Rick Barrette	9b07ae7073	Fix: Ensure retry_on configuration specifies wait time and attempts for error handling	2026-02-28 17:51:48 -05:00
Rick Barrette	baf321d4d6	Fix: Update retry_on configuration to specify wait time for error handling	2026-02-28 17:51:31 -05:00
Rick Barrette	0a2d38a927	Update plugin version to 2026.2.16 Updated to use active jobs & services for all background work	2026-02-28 09:29:50 -05:00
Rick Barrette	b80dbaa015	Fix: Update last_update query to use correct timestamp field for customer sync	2026-02-28 09:11:01 -05:00
Rick Barrette	9e399b934b	Fix: Update last_update query to use correct timestamp field for employee sync	2026-02-28 09:10:55 -05:00
Rick Barrette	cc6fd07435	Update notice for missing estimate to include syncing information with QuickBooks	2026-02-28 08:53:46 -05:00
Rick Barrette	7a50df24d9	Add logging to get_estimate method for better debugging	2026-02-28 08:53:38 -05:00
Rick Barrette	ca02ead9f9	Use delete not destroy	2026-02-28 08:35:51 -05:00
Rick Barrette	9089adaba0	removed uneeded comments	2026-02-28 08:35:35 -05:00
Rick Barrette	dc6eba8566	Refactor logging in PdfPatch to use custom log method for better clarity and consistency	2026-02-28 08:29:10 -05:00
Rick Barrette	19911b7940	Refactor EstimateSyncJob to support syncing by ID and document number; add EstimateSyncService for handling estimate synchronization	2026-02-28 08:24:25 -05:00
Rick Barrette	a80f59cc45	Refactor sync_by_id method in Estimate model to use EstimateSyncJob for syncing	2026-02-28 07:50:23 -05:00
Rick Barrette	eee99e4d83	Implement CustomerSyncService for customer synchronization and update CustomerSyncJob to support syncing by ID	2026-02-28 07:50:07 -05:00
Rick Barrette	b3f01bd372	Refactor persist method in InvoiceSyncService to use 'local' variable for clarity and add logging for updates	2026-02-28 07:41:22 -05:00
Rick Barrette	d1ba93d61a	Refactor persist method in EmployeeSyncService to use 'local' variable for clarity	2026-02-28 07:41:05 -05:00
Rick Barrette	9a688c4841	Set primary_key	2026-02-27 23:39:34 -05:00
Rick Barrette	e94352e2c4	Added comment	2026-02-27 23:19:44 -05:00
Rick Barrette	ea0f42b68e	Added comment	2026-02-27 23:18:40 -05:00
Rick Barrette	5a31c194a5	Added comments	2026-02-27 23:15:37 -05:00
Rick Barrette	6f8af9bba8	Implement Employee synchronization; add EmployeeSyncJob and EmployeeSyncService for improved background processing and logging	2026-02-27 23:07:12 -05:00
Rick Barrette	03109d5775	Refactor invoice processing and synchronization; implement InvoiceSyncJob and related services for improved background processing and logging	2026-02-27 22:33:04 -05:00
Rick Barrette	a1cbf9a0a9	Refactor logging in CustomerSyncJob to use a centralized log method; enhance consistency and readability of log messages	2026-02-27 22:32:42 -05:00
Rick Barrette	9c0f153518	Refactor logging across controllers and jobs to use a centralized log method; improve consistency and readability of log messages	2026-02-27 22:32:07 -05:00
Rick Barrette	f32b48296d	Refactor estimate synchronization to use EstimateSyncJob; remove direct sync logic from Estimate model for improved background processing	2026-02-27 08:29:52 -05:00
Rick Barrette	3d37f01bff	Added timestamps to estiamtes and invoices	2026-02-27 08:08:39 -05:00
Rick Barrette	889e9bf31f	Refactor customer synchronization to use CustomerSyncJob; remove direct sync logic from Customer model for improved background processing	2026-02-27 08:00:38 -05:00
Rick Barrette	208e839e6a	Refactor CustomerToken model for improved token management; streamline token generation and expiration handling, and enhance association with issues	2026-02-26 21:05:02 -05:00
Rick Barrette	4f55751500	Refactor QuickBooks webhook handling to use ActiveJob for processing; improve security with signature verification and streamline entity processing	2026-02-26 20:30:20 -05:00
Rick Barrette	a64016eb95	Refactor QBO billing to use ActiveJob; remove threaded billing and add manual job enqueue support	2026-02-26 19:48:29 -05:00
Rick Barrette	5d858ae186	Enhance customer search functionality by ordering results and refining search method	2026-02-25 22:05:52 -05:00
Rick Barrette	b38f850df3	2026.2.15	2026-02-25 21:13:55 -05:00
Rick Barrette	138e55933b	Fixed creation of new customers.	2026-02-25 15:32:45 -05:00
Rick Barrette	5fbc169ade	Restored old search	2026-02-25 08:08:02 -05:00
Rick Barrette	d6737a6747	2026.2.14	2026-02-22 19:11:14 -05:00