Merge branch 'master' into dev

app/controllers/estimate_controller.rb

@@ -65,7 +65,7 @@ class EstimateController < ApplicationController
 
   # Renders the estimate PDF or redirects with an error if rendering fails.
   def render_pdf(estimate)
-    pdf, ref = EstimatePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: [estimate.id])
+    pdf, ref = PdfService.new(entity: Estimate).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}"

app/controllers/invoice_controller.rb

@@ -18,7 +18,7 @@ class InvoiceController < ApplicationController
     log "Processing request for #{request.original_url}"
 
     invoice_ids = Array(params[:invoice_ids] || params[:id])
-    pdf, ref = InvoicePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: invoice_ids)
+    pdf, ref = PdfService.new(entity: Invoice).fetch_pdf(doc_ids: invoice_ids)
 
     send_data pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"
 

app/controllers/qbo_controller.rb

@@ -46,9 +46,13 @@ class QboController < ApplicationController
     redirect_to issue || root_path, flash: { error: e.message }
   end
 
-  # Manual sync endpoint to trigger a full synchronization of QuickBooks entities with the local database. Enqueues all relevant sync jobs and redirects to the home page with a notice that syncing has started.
+  # Manual sync endpoint to trigger synchronization of QuickBooks entities
+  # with the local database. Supports full or partial sync depending on
+  # the `full_sync` boolean parameter.
   def sync
-    QboSyncDispatcher.full_sync!
+    full_sync = ActiveModel::Type::Boolean.new.cast(params[:full_sync])
+    QboSyncDispatcher.sync!(full_sync: full_sync)
+
     redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
   end
 

app/jobs/customer_sync_job.rb

@@ -1,36 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class 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 = QboConnectionService.current!
-    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

app/jobs/employee_sync_job.rb

@@ -1,36 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class 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 = QboConnectionService.current!
-    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

app/jobs/invoice_sync_job.rb

@@ -1,36 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class 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 = QboConnectionService.current!
-    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

app/jobs/qbo_sync_dispatcher.rb

@@ -11,29 +11,35 @@
 class QboSyncDispatcher
 
   SYNC_JOBS = [
-    CustomerSyncJob,
+    Customer,
-    EstimateSyncJob,
+    Estimate,
-    InvoiceSyncJob,
+    Invoice,
-    EmployeeSyncJob
+    Employee
   ].freeze
 
-  # Dispatches all synchronization jobs to perform a full sync of QuickBooks entities with the local database. Each job is enqueued with the `full_sync` flag set to true.
+  # Dispatches all synchronization jobs to perform a full sync of QuickBooks entities with the local database. 
-  def self.full_sync!
+  # Each job is enqueued with the `full_sync` flag set to true.
+  def self.sync!(full_sync: false)
+    log "Manual Sync initated for #{full_sync ? "full sync" : "incremental sync"}"
+    enque_jobs full_sync: full_sync
+  end
 
+  private
+
+  # Dynamically enques all sync jobs
+  def self.enque_jobs(full_sync: full_sync)
     jobs = SYNC_JOBS.dup
 
     # Allow other plugins to add addtional sync jobs via Hooks
     Redmine::Hook.call_hook( :qbo_full_sync ).each do |context|
         next unless context
         jobs.push context
-        log "Added additionals QBO Sync Job for #{contex.to_s}"
+        log "Added additionals QBO Sync Job for #{context.to_s}"
     end
 
-    jobs.each { |job| job.perform_later(full_sync: true) }
+    jobs.each { |job| QboSyncJob.perform_later(entity: job, full_sync: full_sync) }
   end
 
-  private
-
   def self.log(msg)
     Rails.logger.info "[QboSyncDispatcher] #{msg}"
   end

app/jobs/qbo_sync_job.rb

@@ -8,23 +8,22 @@
 #
 #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
+class QboSyncJob < ApplicationJob
   queue_as :default
   retry_on StandardError, wait: 5.minutes, attempts: 5
 
-  # Performs a sync of estimates from QuickBooks Online.
+  # Perform a full sync of all records for the entity, or an incremental sync of only those updated since the last sync
-  def perform(full_sync: false, id: nil, doc_number: nil)
+  def perform(full_sync: false, id: nil, entity: nil, doc_number: nil)
-    qbo = QboConnectionService.current!
+    raise "An entity to sync is required" unless entity
-    raise "No QBO configuration found" unless qbo
+    @entity = entity
 
-    log "Starting #{full_sync ? 'full' : 'incremental'} sync for estimate ##{id || doc_number || 'all'}..."
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for #{entity} ##{id || doc_number || 'all'}..."
-
+    service = "#{entity}SyncService".constantize.new
-    service = EstimateSyncService.new(qbo: qbo)
 
     if id.present?
       service.sync_by_id(id)
     elsif doc_number.present?
-      service.sync_by_doc(doc_number)
+      service.sync_by_doc_number(doc_number)
     else
       service.sync(full_sync: full_sync)
     end
@@ -32,7 +31,8 @@ class EstimateSyncJob < ApplicationJob
 
   private
 
+  # Log messages with the entity type for better traceability
   def log(msg)
-    Rails.logger.info "[EstimateSyncJob] #{msg}"
+    Rails.logger.info "[#{@entity}SyncJob] #{msg}"
   end
 end

app/models/customer.rb

@@ -33,14 +33,12 @@ class Customer < QboBaseModel
 
   # Returns the customer's email address
   def email
-    details
+    return details&.email_address&.address
-    return @details&.email_address&.address
   end
   
   # Updates the customer's email address
   def email=(s)
-    details
+    details.email_address = s
-    @details.email_address = s
   end
   
   # Customers are not bound by a project
@@ -51,22 +49,19 @@ class Customer < QboBaseModel
 
   # returns the customer's mobile phone
   def mobile_phone
-    details
+    return details&.mobile_phone&.free_form_number
-    return @details&.mobile_phone&.free_form_number
   end
   
   # Updates the custome's mobile phone number
   def mobile_phone=(n)
-    details
     pn = Quickbooks::Model::TelephoneNumber.new
     pn.free_form_number = n
-    @details.mobile_phone = pn
+    details.mobile_phone = pn
   end
 
   # Updates Both local DB name & QBO display_name
   def name=(s)
-    details
+    details.display_name = s
-    @details.display_name = s
     super
   end
 
@@ -78,22 +73,19 @@ class Customer < QboBaseModel
 
   # Sets the notes for the customer
   def notes=(s)
-    details
+    details.notes = s
-    @details.notes = s
   end
 
   # returns the customer's primary phone
   def primary_phone
-    details
+    return details&.primary_phone&.free_form_number
-    return @details&.primary_phone&.free_form_number
   end
   
   # Updates the customer's primary phone number
   def primary_phone=(n)
-    details
     pn = Quickbooks::Model::TelephoneNumber.new
     pn.free_form_number = n
-    @details.primary_phone = pn
+    details.primary_phone = pn
   end
 
   # Seach for customers by name or phone number

app/models/estimate.rb

@@ -21,9 +21,9 @@ class Estimate < QboBaseModel
     return self[:doc_number]
   end
 
-  # sync only one estimate
+  # sync only one estimate by document number
   def self.sync_by_doc_number(number)
-    EstimateSyncJob.perform_later(doc_number: number)
+    QboSyncJob.perform_later(entity: model_name.name, doc_number: number)
   end
   
 end

app/models/qbo.rb

@@ -27,8 +27,9 @@ class Qbo < ActiveRecord::Base
   # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
   def self.last_sync
     qbo = QboConnectionService.current!
-    return I18n.t(:label_qbo_never_synced) unless qbo&.last_sync
     format_time(qbo.last_sync)
+  rescue
+    return I18n.t(:label_qbo_never_synced)
   end
 
   private

app/models/qbo_base_model.rb

@@ -70,14 +70,12 @@ class QboBaseModel < ActiveRecord::Base
 
   # Sync all entities, typically triggered by a scheduled task or manual sync request
   def self.sync
-    job = "#{model_name.name}SyncJob".constantize
+    QboSyncJob.perform_later(entity: model_name.name, full_sync: true)
-    job.perform_later(full_sync: true)
   end
 
   # Sync a single entity by ID, typically triggered by a webhook notification or manual sync request
   def self.sync_by_id(id)
-    job = "#{model_name.name}SyncJob".constantize
+    QboSyncJob.perform_later(entity: model_name.name, id: id)
-    job.perform_later(id: id)
   end
 
   # Flag used to update local without pushing to QBO.
@@ -100,15 +98,13 @@ class QboBaseModel < ActiveRecord::Base
   # Fetches the entity's details from QuickBooks Online. 
   def fetch_details
     log "Fetching details for #{model_name.name} ##{id} from QBO..."
-    qbo = QboConnectionService.current!
+    service_class.new(local: self).pull()
-    service_class.new(qbo: qbo, local: self).pull()
   end
 
   # Pushs the entity's details from QuickBooks Online.
   def push_to_qbo
     log "Starting push for #{model_name.name} ##{id}..."
-    qbo = QboConnectionService.current!
+    reslut = service_class.new(local: self).push
-    reslut = service_class.new(qbo: qbo, local: self).push
     Rails.cache.delete(details_cache_key)
     return reslut
   end

app/services/employee_sync_service.rb

@@ -22,6 +22,6 @@ class EmployeeSyncService < SyncServiceBase
     !remote.active?
   end
 
-  map_attribute :name, ->(remote) { remote.display_name }
+  map_attribute :name, :display_name
 
 end

app/services/estimate_pdf_service.rb

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

app/services/estimate_sync_service.rb

@@ -9,6 +9,14 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class EstimateSyncService < SyncServiceBase
+
+  # sync only one estimate
+  def sync_by_doc_number(number)
+    log "Syncing estimate by doc number #{number}"
+    QboConnectionService.with_qbo_service(entity: @entity) do |service|
+      persist(service.find_by( :doc_number, number).first)
+    end
+  end
   
   private
 

app/services/invoice_pdf_service.rb

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

app/services/invoice_push_service.rb

@@ -17,20 +17,11 @@ class InvoicePushService
   # Push invoice changes to QBO if the invoice is linked to any issues with custom field changes that need to be synced
   def push
     return if @invoice.qbo_sync_locked?
-
     log "Pushing invoice ##{@invoice.id} to QBO due to linked issue custom field changes"
-
     @invoice.update_column(:qbo_sync_locked, true)
-
+    remote = QboConnectionService.with_qbo_service(entity: Invoice) do |service|
-    qbo = QboConnectionService.current!
-
-    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

app/services/pdf_service.rb

@@ -7,30 +7,21 @@
 #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
+class PdfService
   
   require 'combine_pdf'
 
   # Subclasses should initialize with a QBO client instance
-  def initialize(qbo:)
+  def initialize(entity: entity)
-    @qbo = qbo
+    raise "An entity to sync is required" unless entity
-    @entity = self.class.model_class
+    @entity = entity
-  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|
+    QboConnectionService.with_qbo_service(entity: @entity) do |service|
-      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

app/services/qbo_connection_service.rb

@@ -10,6 +10,11 @@
 
 class QboConnectionService
 
+  # Returns the current QBO connection record. Raises an error if no connection exists.
+  def self.current!
+    Qbo.first || raise("QBO not connected")
+  end
+
   # Replaces the existing QBO connection with new credentials. Deletes all existing records and creates a new one with the provided token, refresh token, and realm ID. Refreshes the token immediately after creation.
   def self.replace!(token:, refresh_token:, realm_id:)
     Qbo.transaction do
@@ -24,9 +29,14 @@ class QboConnectionService
     end
   end
 
-  # Returns the current QBO connection record. Raises an error if no connection exists.
+  # Performs authenticaed requests with QBO service
-  def self.current!
+  def self.with_qbo_service(entity: nil)
-    Qbo.first || raise("QBO not connected")
+    qbo = current!
+    raise "An entity to sync is required" unless entity
+    service_class ||= "Quickbooks::Service::#{entity}".constantize
+    qbo.perform_authenticated_request do |access_token|
+      service = service_class.new( company_id: qbo.realm_id, access_token: access_token )
+      yield service
+    end
   end
-
 end

app/services/qbo_oauth_service.rb

@@ -10,7 +10,8 @@
 
 class QboOauthService
 
-  # Generates the QuickBooks OAuth authorization URL with the specified callback URL. The URL includes necessary parameters such as response type, state, and scope.
+  # Generates the QuickBooks OAuth authorization URL with the specified callback URL.
+  # The URL includes necessary parameters such as response type, state, and scope.
   def self.authorization_url(callback_url:)
     client.auth_code.authorize_url(
       redirect_uri: callback_url,
@@ -20,7 +21,8 @@ class QboOauthService
     )
   end
 
-  # Exchanges the authorization code for access and refresh tokens. Creates or replaces the QBO connection record with the new credentials and refreshes the token immediately after creation.
+  # Exchanges the authorization code for access and refresh tokens. 
+  # Creates or replaces the QBO connection record with the new credentials and refreshes the token immediately after creation.
   def self.exchange!(code:, callback_url:, realm_id:)
     resp = client.auth_code.get_token(code, redirect_uri: callback_url)
     QboConnectionService.replace!( token: resp.token, refresh_token: resp.refresh_token, realm_id: realm_id )

app/services/service_base.rb

@@ -13,11 +13,9 @@ class ServiceBase
   # Subclasses should Initializes the service with a QBO client and a local record. 
   # The QBO client is used to communicate with QuickBooks Online, while the local record contains the data that needs to be pushed to QBO. 
   # If no local is provided, the service will not perform any operations.
-  def initialize(qbo:, local: nil)
+  def initialize(local: nil)
     @entity = local.class.name
-    raise "No QBO configuration found" unless qbo
     raise "#{@entity} record is required for push operation" unless local
-    @qbo = qbo
     @local = local
   end
 
@@ -31,7 +29,7 @@ class ServiceBase
     return build_qbo_remote unless @local.present?
     return build_qbo_remote unless @local.id
     log "Fetching details for #{@entity} ##{@local.id} from QBO..."
-    with_qbo_service do |service|
+    QboConnectionService.with_qbo_service(entity: @entity) do |service|
       service.fetch_by_id(@local.id)
     end
   rescue => e
@@ -45,7 +43,7 @@ class ServiceBase
    # If the push is successful, it returns the remote record; otherwise, it logs the error and returns false.
   def push
     log "Pushing #{@entity} ##{@local.id} to QBO..."
-    remote = with_qbo_service do |service|
+    remote = QboConnectionService.with_qbo_service(entity: @entity) do |service|
       if @local.id.present?
         log "Updating #{@entity}"
         service.update(@local.details)
@@ -61,22 +59,9 @@ class ServiceBase
 
   private 
 
-  # Performs authenticaed requests with QBO service
-  def with_qbo_service
-    @qbo.perform_authenticated_request do |access_token|
-      service = service_class.new( company_id: @qbo.realm_id, access_token: access_token )
-      yield service
-    end
-  end
-
   # Log messages with the entity type for better traceability
   def log(msg)
     Rails.logger.info "[#{@entity}Service] #{msg}"
   end
 
-  # Dynamically get the Quickbooks Service Class
-  def service_class
-    @service_class ||= "Quickbooks::Service::#{@entity}".constantize
-  end
-
 end

app/services/sync_service_base.rb

@@ -12,9 +12,7 @@ class SyncServiceBase
   PAGE_SIZE = 1000
 
   # Subclasses should initialize with a QBO client instance
-  def initialize(qbo:)
+  def initialize()
-    raise "No QBO configuration found" unless qbo
-    @qbo = qbo
     @entity = self.class.model_class
     @page_size = self.class.page_size 
   end
@@ -32,7 +30,7 @@ class SyncServiceBase
   # 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 with page size of: #{@page_size}"
-    with_qbo_service do |service|
+    QboConnectionService.with_qbo_service(entity: @entity) do |service|
       query = build_query(full_sync)  
       service.query_in_batches(query, per_page: @page_size) do |batch|
         entries = Array(batch)
@@ -49,7 +47,7 @@ class SyncServiceBase
   # Sync a single entity by its QBO ID (webhook usage)
   def sync_by_id(id)
     log "Syncing #{@entity.name} with ID #{id}"
-    with_qbo_service do |service|
+    QboConnectionService.with_qbo_service(entity: @entity) do |service|
       remote = service.fetch_by_id(id)
       persist(remote)
     end
@@ -240,17 +238,4 @@ class SyncServiceBase
       end
     end
   end
-
-  # Dynamically get the Quickbooks Service Class
-  def service_class
-    @service_class ||= "Quickbooks::Service::#{@entity}".constantize
-  end
-
-  # Performs authenticaed requests with QBO service
-  def with_qbo_service
-    @qbo.perform_authenticated_request do |access_token|
-      service = service_class.new( company_id: @qbo.realm_id, access_token: access_token )
-      yield service
-    end
-  end
 end

app/views/customers/_search.html.erb

@@ -3,3 +3,4 @@
     <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>
+<%= button_to(t(:label_sync), qbo_sync_path, method: :get) if User.current.admin?%>

app/views/qbo/_settings.html.erb

@@ -107,5 +107,5 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     <br/>
     
     <div>
-        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path %>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path(full_sync: true) %>
 </div>

init.rb

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
   name 'Redmine QBO plugin'
   author 'Rick Barrette'
   description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed'
-  version '2026.3.7'
+  version '2026.3.8'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings default: {empty: true}, partial: 'qbo/settings'

lib/redmine_qbo/patches/pdf_patch.rb

@@ -260,7 +260,7 @@ module RedmineQbo
 
           # Check to see if there is an estimate attached, then combine them
           if issue.estimate
-            e_pdf, ref = EstimatePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: [issue.estimate.id])
+            e_pdf, ref = PdfService.new(entity: Estimate).fetch_pdf(doc_ids: [issue.estimate.id])
             pdf = CombinePDF.parse(pdf.output, allow_optional_content: true)
             pdf << CombinePDF.parse(e_pdf)
             return pdf.to_pdf