Fixed the UI, now working

Added Issue safe attributes for line items
Merge branch 'master' into lineitems
2026-04-02 16:21:58 -04:00 · 2026-03-05 07:53:23 -05:00 · 2026-03-05 07:28:30 -05:00 · 2026-03-05 07:08:30 -05:00 · 2026-03-04 07:55:35 -05:00 · 2026-03-01 15:04:25 -05:00
64 changed files with 1472 additions and 1495 deletions
--- a/6
+++ b/6
@@ -4,5 +4,11 @@ gem 'quickbooks-ruby'
 gem 'oauth2'
 gem 'roxml'
 gem 'will_paginate'
+gem 'rails-jquery-autocomplete'
+gem 'jquery-ui-rails'
 gem 'rexml'
 gem 'combine_pdf'
+
+group :assets do
+  gem 'coffee-rails'
+end
--- a/README.md
+++ b/README.md
@@ -1,21 +1,14 @@
-# Redmine QuickBooks Online Plugin
+# Redmine QuickBooks Online

-A plugin for **Redmine** that integrates with **QuickBooks Online (QBO)** to automatically create **Time Activity entries** from billable hours logged on Issues.
+A plugin for Redmine to connect to QuickBooks Online.

-When an Issue associated with a Customer is closed, the plugin generates corresponding Time Activities in QuickBooks based on the Redmine Time Entries recorded for that Issue.
+The goal of this project is to allow Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed.

---
+## Disclaimer

-# Disclaimer
+**Note:** Although the core functionality is complete, this project is still under development and the master branch may be unstable. Tags should be stable and are recommended.

-The core functionality is implemented, but the project is **under active development**.
-
-The `master` branch may contain unstable changes.  
-For production deployments, **use a tagged release**.
-
---
-
-# Compatibility
+## Compatibility

 | Plugin Version | Redmine Version |
 | :--- | :--- |
@@ -24,243 +17,85 @@ For production deployments, **use a tagged release**.
 | Version 1.0.0+ | Redmine 4 |
 | Version 0.8.1 | Redmine 3 |

---
+## Features

-# Features
+* **Customer Assignment:** Issues can be assigned to a Customer via a dropdown in the edit Issue form.
+    * Once a customer is attached to an Issue, you can attach an Estimate to the issue via a dropdown menu.
+* **Employee Mapping:** An Employee is assigned to a Redmine User via a dropdown in the User Administration page.
+* **Automatic Billing:** If an Issue has been assigned a Customer, the following happens when the Issue is closed:
+    * A new Time Activity will be billed against the Customer assigned to the issue for each Redmine Time Entry.
+    * Time Entries will be totalled up by Activity name. This allows billing for different activities without having to create separate Issues.
+    * The Time Activity names are used to dynamically lookup Items in QuickBooks.
+    * If there are no Items that match the Activity name, it will be skipped and will not be billed to the Customer.
+    * Labor Rates are set by the corresponding Item in QuickBooks.
+* **Customer Management:** Customers can be created via the New Customer Page.
+    * Customers can be searched by name or phone number.
+    * Basic information for the Customer can be viewed/edited via the Customer page.
+* **Webhook Support:**
+    * **Invoices:** Automatically attached to an Issue if a line item contains a hashtag number (e.g., `#123`).
+    * **Custom Fields:** Invoice Custom Fields are matched to Issue Custom Fields and are automatically updated in QuickBooks. (Useful for extracting Mileage In/Out from the Issue to update the Invoice).
+    * **Sync:** Customers are automatically updated in the local database.
+* **Plugin View Hooks** Allows intergration of other features supported by companion plugins, for example [redmine_qbo_vehicles](https://github.com/rickbarrette/redmine_qbo_vehicles) adds customer vehicle interation

-## Issue Billing Integration
+## Prerequisites

-*   Assign a **QuickBooks Customer** to a Redmine Issue.
+* Sign up to become a developer for Intuit: https://developer.intuit.com/
+* Create your own application to obtain your API keys.
+* Set up the webhook service to `https://redmine.yourdomain.com/qbo/webhook`

-*   Optionally associate a **QuickBooks Estimate** with the Issue.
+## Installation

-*   Automatically associates a **QuickBooks Invoice** with the Issue.
+1. **Clone the plugin:**
+   Clone this repo into your plugin folder and checkout a tagged version.
+   ```bash
+   cd path/to/redmine/plugins
+   git clone git@github.com:rickbarrette/redmine_qbo.git
+   cd redmine_qbo
+   git checkout <tag>
+   ```

+2.  **Install dependencies:** *Crucial for Redmine 6 / Rails 7 compatibility.*
    
---
+    Bash
    
-## Automatic Time Activity Creation
+    ```
+    bundle install
+    ```
    
-When an Issue with an assigned Customer is closed:
+3.  **Migrate your database:**
    
-*   A **Time Activity** is created in QuickBooks for each relevant Redmine Time Entry.
+    Bash
    
-*   Time Entries are **grouped by Activity name**.
+    ```
+    bundle exec rake redmine:plugins:migrate RAILS_ENV=production
+    ```
    
-*   Activity names are used to **dynamically match Items in QuickBooks**.
+4.  **Restart Redmine:** You must restart your Redmine server instance for the plugin and hooks to load.
    
-*   If no matching Item exists, the activity is **skipped**.
+5.  **Configuration:**
    
-*   **Labor rates** are determined by the associated QuickBooks Item.
+    *   Navigate to the plugin configuration page (`Administration > Plugins > Configure`).
        
+    *   Supply your own OAuth Key & Secret.
        
---
+    *   After saving the Key & Secret, click the **Authenticate** link on the configuration page to connect to QBO.
        
-## Employee Mapping
+6.  **User Mapping:**
    
-Redmine Users can be mapped to **QuickBooks Employees** through the **User Administration** page.
+    *   Assign an Employee to each of your users via the **User Administration Page**.
        
-This ensures Time Activities are recorded under the correct employee in QuickBooks.

---
+## Usage

-## Customer Management
+To enable automatic Time Activity entries for an Issue, you simply need to assign a Customer to an Issue via the dropdowns in the issue creation/update form.

-The plugin provides basic Customer management:
+**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.   

-*   Create Customers directly from Redmine
-    
-*   Search Customers by **name or phone number**
-    
-*   View and edit Customer information
-    
-
-Customers are synchronized with QuickBooks.
-
---
-
-## Webhook Support
-
-The plugin listens for **QuickBooks webhook events**.
-
-Supported automation:
-
-### Invoice Linking
-
-Invoices containing an Issue reference (e.g. `#123`) automatically attach to the corresponding Issue.
-
-### Custom Field Synchronization
-
-Invoice custom fields can be mapped to Issue custom fields.
-
-Example use case:
-
-*   Mileage In/Out recorded in Redmine
-    
-*   Automatically synchronized to the QuickBooks invoice.
-    
-
-### Customer Synchronization
-
-Customer records are automatically updated in the local database when changes occur in QuickBooks.
-
---
-
-## Plugin Hooks
-
-The plugin exposes several hooks for extending functionality through companion plugins.
-
-Example:
-
-`redmine_qbo_vehicles`  
-Adds support for tracking **customer vehicles** associated with Issues.
-
-Available hooks:
-
-|Type|Hook|Note
-|--|--|--|
-View Hook|:pdf_left, { issue: issue }  | Used to add text to left side of PDF
-View Hook|:pdf_right, { issue: issue }  | Used to add text to right side of PDF
-View Hook|:show_customer_view_right, { customer: customer } | Used to show partials on right side of customer view
-Hook| :qbo_additional_entities | Used to add additional entites to be processed by the WebhookProcessJob
-Hook| :qbo_full_sync | Used to add a Class to be called by the QboSyncDispatcher
-
---
-
-# Prerequisites
-
-Before installing the plugin:
-
-1.  Create a QuickBooks developer account:
-    
-
-[https://developer.intuit.com/](https://developer.intuit.com/)
-
-2.  Create an **Intuit application** to obtain:
-    
-
-*   Client ID
-    
-*   Client Secret
-    
-
-3.  Configure the QuickBooks webhook endpoint:
-    
-
-https://redmine.yourdomain.com/qbo/webhook
-
---
-
-# Installation
-
-## 1\. Clone the Plugin
-
-Install the plugin into your Redmine plugins directory.
-
-```bash
-cd /path/to/redmine/plugins  
-git clone https://github.com/rickbarrette/redmine_qbo.git  
-cd redmine_qbo  
-git checkout <tag>
-```
-
-Use a **tagged release** for stability.
-
---
-
-## 2\. Install Dependencies
-
-```bash
-bundle install
-```
-
-Required for **Redmine 6 / Rails 7 compatibility**.
-
---
-
-## 3\. Run Database Migrations
-
-```bash
-bundle exec rake redmine:plugins:migrate RAILS_ENV=production
-```
-
---
-
-## 4\. Restart Redmine
-
-Restart your Redmine server so the plugin and hooks are loaded.
-
---
-
-# Configuration
-
-1.  Navigate to:
-    
-
-Administration → Plugins → Configure
-
-2.  Enter your **QuickBooks Client ID and Client Secret**.
-    
-3.  Save the configuration.
-    
-4.  Click **Authenticate** to complete the OAuth connection with QuickBooks Online.
-    
-
-Once authentication succeeds, the plugin performs an **initial synchronization**.
-
---
-
-# User Mapping
-
-Each Redmine user must be mapped to a QuickBooks Employee.
-
-Navigate to:
-
-Administration → Users
-
-Then assign the corresponding **QuickBooks Employee** to each user.
-
---
-
-# Usage
-
-To enable automatic billing:
-
-1.  Assign a **Customer** to an Issue.
-    
-2.  Log billable time using **Redmine Time Entries**.
-    
-3.  Close the Issue.
-    
-
-When the Issue is closed, the plugin automatically generates the corresponding **Time Activity entries in QuickBooks Online**.
-
-After the initial synchronization, the plugin receives updates through **Intuit webhooks**.
-
---
-
-# Troubleshooting
-
-### Time Activities Not Created
-
-Verify that:
-
-*   The Issue has a **Customer assigned**
-    
-*   Time Entries exist for the Issue
-    
-*   Activity names match **QuickBooks Item names**
-    
-
---
-
-### Webhooks Not Triggering
-
-Ensure the QuickBooks webhook endpoint is reachable:
-
-https://redmine.yourdomain.com/qbo/webhook
-
-Also verify webhook configuration in the Intuit developer dashboard.
+## Companion Plugin Hooks
+* :pdf_left, { issue: issue }
+* :pdf_right, { issue: issue }
+* :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
+* :show_customer_view_right, {customer: @customer}

 ## License

--- a/Screenshots/plugin_config.png
+++ b/Screenshots/plugin_config.png
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -30,49 +30,40 @@ class CustomersController < ApplicationController
  before_action :view_customer, except: [:new, :view]
  skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:view]

-  def address_to_s(address)
-    return if address.nil?
-
-    lines = [
-      address.line1,
-      address.line2,
-      address.line3,
-      address.line4,
-      address.line5
-    ].compact_blank
-
-    city_line = [
-      address.city,
-      address.country_sub_division_code,
-      address.postal_code
-    ].compact_blank.join(" ")
-
-    lines << city_line unless city_line.blank?
-
-    lines.join("\n")
-  end
-
-  def add_customer
-    global_check_permission(:add_customers)
-  end
+  autocomplete :customer, :name, full: true, extra_data: [:id]

  def allowed_params
    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
  end

-  # Used for autocomplete form
-  def autocomplete
-    term = ActiveRecord::Base.sanitize_sql_like(params[:q].to_s)
-
-    items = Customer.where("name LIKE :t OR phone_number LIKE :t OR mobile_phone_number LIKE :t", t: "%#{term}%")
-      .order(:name)
-      .limit(20)
-
-    render json: items.map { |i|
-      { id: i.id, name: i.name, phone_number: i.phone_number, mobile_phone_number: i.mobile_phone_number }
-    }
+  # getter method for a customer's invoices
+  # used for customer autocomplete field / issue form
+  def filter_invoices_by_customer
+    @filtered_invoices = Invoice.all.where(customer_id: params[:selected_customer])
  end

+  # getter method for a customer's estimates
+  # used for customer autocomplete field / issue form
+  def filter_estimates_by_customer
+    @filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
+  end
+
+  # display a list of all customers
+  def index
+    if params[:search]
+      @customers = Customer.search(params[:search]).order(:name).paginate(page: params[:page])
+      if only_one_non_zero?(@customers)
+        redirect_to @customers.first
+      end
+    end
+  end
+
+  # initialize a new customer
+  def new
+    @customer = Customer.new
+  end
+
+  # create a new customer
  def create
    @customer = Customer.new(allowed_params)
    @customer.save
@@ -85,79 +76,7 @@ class CustomersController < ApplicationController
    redirect_to new_customer_path
  end

-  def edit
-    @customer = Customer.find_by_id(params[:id])
-    return render_404 unless @customer
-  rescue => e
-    log "Failed to edit customer"
-    flash[:error] = e.message
-    render_404
-  end
-
-  def filter_estimates_by_customer
-    @filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
-  end
-
-  def filter_invoices_by_customer
-    @filtered_invoices = Invoice.all.where(customer_id: params[:selected_customer])
-  end
-
-  def index
-    if params[:search]
-      @customers = Customer.search(params[:search]).order(:name).paginate(page: params[:page])
-      if only_one_non_zero?(@customers)
-        redirect_to @customers.first
-      end
-    end
-  end
-
-  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
-
-  def log(msg)
-    Rails.logger.info "[CustomersController] #{msg}"
-  end
-
-  def new
-    @customer = Customer.new
-  end
-
-  def only_one_non_zero?(array)
-    found_non_zero = false
-    array.each do |val|
-      if val != 0
-        return false if found_non_zero
-        found_non_zero = true
-      end
-    end
-    found_non_zero
-  end
-
-  def share
-    issue = Issue.find(params[:id])
-    token = issue.share_token
-    redirect_to view_path(token.token)
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = t(:notice_issue_not_found)
-    render_404
-  end
-
+  # display a specific customer
  def show
    @customer = Customer.find_by_id(params[:id])
    return render_404 unless @customer
@@ -190,11 +109,17 @@ class CustomersController < ApplicationController
    render_404
  end

-  def sync
-    Customer.sync
-    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
+  # return an HTML form for editing a customer
+  def edit
+    @customer = Customer.find_by_id(params[:id])
+    return render_404 unless @customer
+  rescue => e
+    log "Failed to edit customer"
+    flash[:error] = e.message
+    render_404
  end

+  # update a specific customer
  def update
    @customer = Customer.find_by_id(params[:id])
    @customer.update(allowed_params)
@@ -206,21 +131,108 @@ class CustomersController < ApplicationController
    redirect_to edit_customer_path
  end

+  # creates new customer view tokens, removes expired tokens & redirects to newly created customer view with new token.
+  def share
+    issue = Issue.find(params[:id])
+    token = issue.share_token
+    redirect_to view_path(token.token)
+  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
+
+    # Load only active, non-expired token
    @token = CustomerToken.active.find_by(token: params[:token])
    return render_403 unless @token
+
+    # Load associated issue
    @issue = @token.issue
    return render_403 unless @issue
+
+    # Optional: enforce token belongs to the issue's customer
    return render_403 unless @issue.customer_id == @token.issue.customer_id
+
+    # 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)
+  end
+
+  # redmine permission - view customers
  def view_customer
    global_check_permission(:view_customers)
  end

+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      if val!=0
+        return false if found_non_zero
+        found_non_zero = true
+      end
+    end
+    found_non_zero
+  end
+
+  # format a quickbooks address to a human readable string
+  def address_to_s(address)
+    return if address.nil?
+
+    lines = [
+      address.line1,
+      address.line2,
+      address.line3,
+      address.line4,
+      address.line5
+    ].compact_blank
+
+    city_line = [
+      address.city,
+      address.country_sub_division_code,
+      address.postal_code
+    ].compact_blank.join(" ")
+
+    lines << city_line unless city_line.blank?
+
+    lines.join("\n")
+  end
+
+  def log(msg)
+    Rails.logger.info "[CustomersController] #{msg}"
+  end
+
 end
--- a/app/controllers/estimates_controller.rb
+++ b/app/controllers/estimates_controller.rb
@@ -7,7 +7,7 @@
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-class EstimatesController < ApplicationController
+class EstimateController < ApplicationController
  include AuthHelper

  before_action :require_user, unless: -> { session[:token].nil? }
@@ -24,11 +24,6 @@ class EstimatesController < ApplicationController
    render_pdf(@estimate)
  end

-  def sync
-    Estimate.sync
-    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
-  end
-
  private

  # Loads the estimate based on ID or doc number, with a fallback to sync if not found locally.
@@ -70,7 +65,7 @@ class EstimatesController < ApplicationController

  # Renders the estimate PDF or redirects with an error if rendering fails.
  def render_pdf(estimate)
-    pdf, ref = PdfService.new(entity: Estimate).fetch_pdf(doc_ids: [estimate.id])
+    pdf, ref = EstimatePdfService.new(qbo: QboConnectionService.current!).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}"
--- a/app/controllers/invoices_controller.rb
+++ b/app/controllers/invoices_controller.rb
@@ -7,7 +7,7 @@
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-class InvoicesController < ApplicationController
+class InvoiceController < ApplicationController
  include AuthHelper

  before_action :require_user, unless: -> { session[:token].nil? }
@@ -18,7 +18,7 @@ class InvoicesController < ApplicationController
    log "Processing request for #{request.original_url}"

    invoice_ids = Array(params[:invoice_ids] || params[:id])
-    pdf, ref = PdfService.new(entity: Invoice).fetch_pdf(doc_ids: invoice_ids)
+    pdf, ref = InvoicePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: invoice_ids)

    send_data pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"

@@ -27,11 +27,6 @@ class InvoicesController < ApplicationController
    redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_invoice_not_found) }
  end

-  def sync
-    Invoice.sync
-    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
-  end
-
  private

  # Logs messages with a consistent prefix for easier debugging.
--- a/app/controllers/line_item_controller.rb
+++ b/app/controllers/line_item_controller.rb
--- a/app/controllers/qbo_controller.rb
+++ b/app/controllers/qbo_controller.rb
@@ -46,13 +46,9 @@ class QboController < ApplicationController
    redirect_to issue || root_path, flash: { error: e.message }
  end

-  # 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.
+  # 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.
  def sync
-    full_sync = ActiveModel::Type::Boolean.new.cast(params[:full_sync])
-    QboSyncDispatcher.sync!(full_sync: full_sync)
-
+    QboSyncDispatcher.full_sync!
    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
  end

--- a/app/jobs/bill_issue_time_job.rb
+++ b/app/jobs/bill_issue_time_job.rb
@@ -17,8 +17,10 @@ class BillIssueTimeJob < ActiveJob::Base
    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)
@@ -26,6 +28,8 @@ class BillIssueTimeJob < ActiveJob::Base
      log "Aggregated hours for billing: #{totals.inspect}"

      qbo = QboConnectionService.current!
+      raise "No QBO configuration found" unless qbo
+
      qbo.perform_authenticated_request do |access_token|
        create_time_activities(issue, totals, access_token, qbo)
      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 = 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
--- 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 = 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
--- a/app/jobs/estimate_sync_job.rb
+++ b/app/jobs/estimate_sync_job.rb
@@ -8,22 +8,23 @@
 #
 #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 QboSyncJob < ApplicationJob
+class EstimateSyncJob < ApplicationJob
  queue_as :default
  retry_on StandardError, wait: 5.minutes, attempts: 5

-  # 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, entity: nil, doc_number: nil)
-    raise "An entity to sync is required" unless entity
-    @entity = entity
+  # Performs a sync of estimates from QuickBooks Online.
+  def perform(full_sync: false, id: nil, doc_number: nil)
+    qbo = QboConnectionService.current!
+    raise "No QBO configuration found" unless qbo

-    log "Starting #{full_sync ? 'full' : 'incremental'} sync for #{entity} ##{id || doc_number || 'all'}..."
-    service = "#{entity}SyncService".constantize.new
+    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_number(doc_number)
+      service.sync_by_doc(doc_number)
    else
      service.sync(full_sync: full_sync)
    end
@@ -31,8 +32,7 @@ class QboSyncJob < ApplicationJob

  private

-  # Log messages with the entity type for better traceability
  def log(msg)
-    Rails.logger.info "[#{@entity}SyncJob] #{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 = 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
--- a/app/jobs/qbo_sync_dispatcher.rb
+++ b/app/jobs/qbo_sync_dispatcher.rb
@@ -11,39 +11,14 @@
 class QboSyncDispatcher

  SYNC_JOBS = [
-    Customer,
-    Estimate,
-    Invoice,
-    Employee
+    CustomerSyncJob,
+    EstimateSyncJob,
+    InvoiceSyncJob,
+    EmployeeSyncJob
  ].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.
-  def self.sync!(full_sync: false)
-    log "Manual Sync initated for #{full_sync ? "full sync" : "incremental sync"}"
-    enque_jobs full_sync: full_sync
+  # 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.
+  def self.full_sync!
+    SYNC_JOBS.each { |job| job.perform_later(full_sync: true) }
  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
-        Array(context).each do |entity|
-          jobs.push(entity)
-          log "Added additional QBO Sync Job for #{entity.to_s}"
-        end
-    end
-
-    jobs.each { |job| QboSyncJob.perform_later(entity: job, full_sync: full_sync) }
-  end
-
-  def self.log(msg)
-    Rails.logger.info "[QboSyncDispatcher] #{msg}"
-  end
-  
 end
--- a/app/jobs/qbo_webhook_processor.rb
+++ b/app/jobs/qbo_webhook_processor.rb
@@ -14,7 +14,7 @@ class QboWebhookProcessor
  def self.process!(request:)
    body = request.raw_post
    signature = request.headers['intuit-signature']
-    secret = RedmineQbo.webhook_token_secret
+    secret = Setting.plugin_redmine_qbo['settingsWebhookToken']

    raise "Invalid signature" unless valid_signature?(body, signature, secret)

--- a/app/jobs/webhook_process_job.rb
+++ b/app/jobs/webhook_process_job.rb
@@ -43,16 +43,7 @@ class WebhookProcessJob < ActiveJob::Base
    name = entity['name']
    id   = entity['id']&.to_i

-    entities = ALLOWED_ENTITIES.dup
-    # Allow other plugins to add addtional qbo entities via Hooks
-    Redmine::Hook.call_hook( :qbo_additional_entities ).each do |context|
-        next unless context
-        Array(context).each do |entity|
-          entities.push(entity)
-          log "Added additional QBO entity #{entity}"
-        end
-    end
-    return unless entities.include?(name)
+    return unless ALLOWED_ENTITIES.include?(name)

    model = name.safe_constantize
    return unless model
--- a/app/models/concerns/quickbooks_oauth.rb
+++ b/app/models/concerns/quickbooks_oauth.rb
@@ -75,8 +75,11 @@ module QuickbooksOauth
    # This method will construct and return an instance of the OAuth2::Client class that is configured with the consumer key, consumer secret and the appropriate URLs for the Intuit OAuth2 service.  It will also set the sandbox mode based on the plugin settings.  This method is used by the instance method oauth_client to create a new OAuth2 client for each instance of the model that includes this concern.
    def construct_oauth2_client

+      oauth_consumer_key = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
+      oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+
      # Are we are playing in the sandbox?
-      Quickbooks.sandbox_mode = RedmineQbo.sandbox_mode?
+      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false
      log "Sandbox mode: #{Quickbooks.sandbox_mode}"

      options = {
@@ -84,7 +87,7 @@ module QuickbooksOauth
        authorize_url: "https://appcenter.intuit.com/connect/oauth2",
        token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
      }
-      OAuth2::Client.new(RedmineQbo.oauth_consumer_key, RedmineQbo.oauth_consumer_secret, options)
+      OAuth2::Client.new(oauth_consumer_key, oauth_consumer_secret, options)
    end

  end
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -8,18 +8,20 @@
 #
 #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 Customer < QboBaseModel
+class Customer < ActiveRecord::Base

  include Redmine::Acts::Searchable
  include Redmine::Acts::Event  
+  include Redmine::I18n

  has_many :issues
  has_many :invoices
  has_many :estimates
-  validates_presence_of :name
+ 
+  validates_presence_of :id, :name
  before_validation :normalize_phone_numbers
+  
  self.primary_key = :id
-  qbo_sync push: true

  acts_as_searchable columns: %w[name phone_number mobile_phone_number ],
                     scope: ->(_context) { left_joins(:project) },
@@ -31,14 +33,41 @@ class Customer < QboBaseModel
                :description => Proc.new {|o| "#{I18n.t :label_primary_phone}: #{o.phone_number} #{I18n.t:label_mobile_phone}: #{o.mobile_phone_number}"},
                :datetime => Proc.new {|o| o.updated_at || o.created_at}

+  # Returns the details of the customer. If the details have already been fetched, it returns the cached version. Otherwise, it fetches the details from QuickBooks Online and caches them for future use. This method is used to access the customer's information in a way that minimizes unnecessary API calls to QBO, improving performance and reducing latency.
+  def details
+    return Quickbooks::Model::Customer.new unless id.present?
+
+    @details ||= begin
+      xml = Rails.cache.fetch(details_cache_key, expires_in: 10.minutes) do
+        fetch_details.to_xml_ns
+      end
+
+      Quickbooks::Model::Customer.from_xml(xml)
+    end
+  end
+
+  # Generates a unique cache key for storing this customer's QBO details.
+  def details_cache_key
+    "customer:#{id}:qbo_details:#{updated_at.to_i}"
+  end
+
  # Returns the customer's email address
  def email
-    return details&.email_address&.address
+    details
+    return @details&.email_address&.address
  end
  
  # Updates the customer's email address
  def email=(s)
-    details.email_address = s
+    details
+    @details.email_address = s
+  end
+  
+
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  def self.last_sync
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+    format_time(maximum(:updated_at))
  end
  
  # Customers are not bound by a project
@@ -47,21 +76,35 @@ class Customer < QboBaseModel
    nil
  end

+  # Magic Method
+  # Maps Get/Set methods to QBO customer object
+  def method_missing(method_name, *args, &block)
+    if Quickbooks::Model::Customer.method_defined?(method_name)
+      details
+      @details.public_send(method_name, *args, &block)
+    else
+      super
+    end
+  end
+
  # returns the customer's mobile phone
  def mobile_phone
-    return details&.mobile_phone&.free_form_number
+    details
+    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.display_name = s
+    details
+    @details.display_name = s
    super
  end

@@ -73,19 +116,27 @@ class Customer < QboBaseModel

  # Sets the notes for the customer
  def notes=(s)
-    details.notes = s
+    details
+    @details.notes = s
  end

  # returns the customer's primary phone
  def primary_phone
-    return details&.primary_phone&.free_form_number
+    details
+    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
+
+  # Repsonds to missing methods by delegating to the QBO customer details object if the method is defined there. This allows for dynamic access to any attributes or methods of the QBO customer without having to explicitly define them in the Customer model, providing flexibility and reducing boilerplate code.
+  def respond_to_missing?(method_name, include_private = false)
+    Quickbooks::Model::Customer.method_defined?(method_name) || super
  end

  # Seach for customers by name or phone number
@@ -109,10 +160,47 @@ class Customer < QboBaseModel
    ids.index_with { |id| id }
  end
  
+  # performs a sync operation for all customers
+  def self.sync 
+    CustomerSyncJob.perform_later(full_sync: false)
+  end
+
+  # performs a sync operation for a specific customer
+  def self.sync_by_id(id) 
+    CustomerSyncJob.perform_later(id: id)
+  end
+  
  # returns a human readable string
  def to_s
    last4 = phone_number&.last(4)
    last4.present? ? "#{name} - #{last4}" : name.to_s
  end

+  # Push the updates
+  def save_with_push
+    log "Starting push for customer ##{self.id}..."
+    qbo = QboConnectionService.current!
+    CustomerService.new(qbo: qbo, customer: self).push()
+    Rails.cache.delete(details_cache_key)
+    save_without_push
+  end
+
+  alias_method :save_without_push, :save
+  alias_method :save, :save_with_push
+  
+  private
+
+  # Fetches the customer's details from QuickBooks Online. If the customer has an ID, it makes an authenticated request to QBO to retrieve the customer's information. If the customer does not have an ID or if there is an error during the fetch, it returns a new instance of Quickbooks::Model::Customer with default values. This method is used to ensure that the customer object has the most up-to-date information from QBO when needed.
+  def fetch_details
+    return Quickbooks::Model::Customer.new unless id.present?
+    log "Fetching details for customer ##{id} from QBO..."
+    qbo = QboConnectionService.current!
+    CustomerService.new(qbo: qbo, customer: self).pull()
+  end
+
+  # Log messages with the entity type for better traceability
+  def log(msg)
+    Rails.logger.info "[Customer] #{msg}"
+  end
+  
 end
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -8,11 +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 Employee < QboBaseModel
+class Employee < ActiveRecord::Base
+  
+  include Redmine::I18n

  has_many :users
  validates_presence_of :id, :name
+
  self.primary_key = :id
-  qbo_sync push: false
+
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  def self.last_sync
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+    format_time(maximum(:updated_at))
+  end
+  
+  # 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)
+    EmployeeSyncJob.perform_later(id: id)
+  end
  
 end
--- a/app/models/estimate.rb
+++ b/app/models/estimate.rb
@@ -8,22 +8,45 @@
 #
 #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 Estimate < QboBaseModel
+class Estimate < ActiveRecord::Base
+  
+  include Redmine::I18n

  has_and_belongs_to_many :issues
  belongs_to :customer 
  validates_presence_of :doc_number, :id
  self.primary_key = :id
-  qbo_sync push: false
+
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  def self.last_sync
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+    format_time(maximum(:updated_at))
+  end

  # returns a human readable string
  def to_s
    return self[:doc_number]
  end
  
-  # sync only one estimate by document number
+  # sync all estimates
+  def self.sync
+    EstimateSyncJob.perform_later(full_sync: false)
+  end
+  
+  # sync only one estimate
+  def self.sync_by_id(id)
+    EstimateSyncJob.perform_later(id: id)
+  end
+
+  # sync only one estimate
  def self.sync_by_doc_number(number)
-    QboSyncJob.perform_later(entity: model_name.name, doc_number: number)
+    EstimateSyncJob.perform_later(doc_number: number)
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[Estimate] #{msg}"
  end
  
 end
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -8,18 +8,37 @@
 #
 #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 < QboBaseModel
+class Invoice < ActiveRecord::Base
+
+  include Redmine::I18n

  has_and_belongs_to_many :issues
  belongs_to :customer
+
  validates :id, presence: true, uniqueness: true
  validates :doc_number, :txn_date, presence: true
+
  self.primary_key = :id
-  qbo_sync push: false
+
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  def self.last_sync
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+    format_time(maximum(:updated_at))
+  end

  # Return the invoice's document number as its string representation
  def to_s
    doc_number
  end

+  # Sync all invoices from QuickBooks, typically triggered by a scheduled task or manual sync request
+  def self.sync
+    InvoiceSyncJob.perform_later(full_sync: true)
+  end
+
+  # Sync a single invoice by ID, typically triggered by a webhook notification or manual sync request
+  def self.sync_by_id(id)
+    InvoiceSyncJob.perform_later(id: id)
+  end
+
 end
--- a/app/models/line_item.rb
+++ b/app/models/line_item.rb
@@ -0,0 +1,7 @@
+class LineItem < ApplicationRecord
+  belongs_to :issue
+
+  validates :description, presence: true
+  validates :quantity, numericality: { greater_than: 0 }
+  validates :unit_price, numericality: { greater_than_or_equal_to: 0 }
+end
--- a/app/models/qbo.rb
+++ b/app/models/qbo.rb
@@ -15,26 +15,6 @@ class Qbo < ActiveRecord::Base

  validate :single_record_only, on: :create
  
-  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
-  def self.last_sync
-    qbo = QboConnectionService.current!
-    format_time(qbo.last_sync)
-  rescue
-    return I18n.t(:label_qbo_never_synced)
-  end
-
-  def self.oauth2_access_token_expires_at
-    QboConnectionService.current!.oauth2_access_token_expires_at
-  rescue
-    return I18n.t(:label_qbo_never_synced)
-  end
-
-  def self.oauth2_refresh_token_expires_at
-    QboConnectionService.current!.oauth2_refresh_token_expires_at
-  rescue
-    return I18n.t(:label_qbo_never_synced)
-  end
-  
  # Updates last sync time stamp
  def self.update_time_stamp
    date = DateTime.now
@@ -44,6 +24,13 @@ class Qbo < ActiveRecord::Base
    qbo.save
  end
  
+  # 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)
+  end
+
  private

  # Logs a message with a QBO-specific prefix for easier identification in the logs.
--- a/app/models/qbo_base_model.rb
+++ b/app/models/qbo_base_model.rb
@@ -1,122 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class QboBaseModel < ActiveRecord::Base
-
-  include Redmine::I18n
-
-  self.abstract_class = true
-  validates_presence_of :id
-  class_attribute :qbo_push_enabled, default: true
-  attr_accessor :skip_qbo_push
-  before_validation :push_to_qbo, on: :create, if: :push_to_qbo?
-  after_commit :push_to_qbo, on: :update, if: :push_to_qbo?
-
-  # Returns the details of the entity. 
-  # If the details have already been fetched, it returns the cached version. 
-  # Otherwise, it fetches the details from QuickBooks Online and caches them for future use. 
-  # This method is used to access the entity's information in a way that minimizes unnecessary API calls to QBO, improving performance and reducing latency.
-  def details
-    @details ||= begin
-      xml = Rails.cache.fetch(details_cache_key, expires_in: 10.minutes) do
-        fetch_details.to_xml_ns
-      end
-      qbo_model_class.from_xml(xml)
-    end
-  end
-
-  # Generates a unique cache key for storing this customer's QBO details.
-  def details_cache_key
-    "#{model_name.name}:#{id}:qbo_details:#{updated_at.to_i}"
-  end
-
-  # Returns the last sync time formatted for display. 
-  # If no sync has occurred, returns a default message.
-  def self.last_sync
-    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
-    format_time(maximum(:updated_at))
-  end
-
-  # Magic Method
-  # Maps Get/Set methods to QBO entity object
-  def method_missing(method_name, *args, &block)
-    if qbo_model_class.method_defined?(method_name)
-      details
-      @details.public_send(method_name, *args, &block)
-    else
-      super
-    end
-  end
-
-  def push_to_qbo?
-    log "qbo_push_enabled #{self.class.qbo_push_enabled}"
-    log "skip_qbo_push #{skip_qbo_push}"
-
-    self.class.qbo_push_enabled && skip_qbo_push != true
-  end
-
-  # Repsonds to missing methods by delegating to the QBO entity calss if the method is defined there.
-  # This allows for dynamic access to any attributes or methods of the QBO customer without having to explicitly define them in the Subclass model, providing flexibility and reducing boilerplate code.
-  def respond_to_missing?(method_name, include_private = false)
-    qbo_model_class.method_defined?(method_name) || super
-  end
-
-  # Sync all entities, typically triggered by a scheduled task or manual sync request
-  def self.sync
-    QboSyncJob.perform_later(entity: model_name.name, 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)
-    QboSyncJob.perform_later(entity: model_name.name, id: id)
-  end
-
-  # Flag used to update local without pushing to QBO.
-  # This is used to prevent loops with the webhook
-  def skip_qbo_push?
-     !!skip_qbo_push
-  end
-
-  def self.qbo_sync(push: true)
-    self.qbo_push_enabled = push
-  end
-
-  private
-  
-  # Log messages with a standarized prefix
-  def log(msg)
-    Rails.logger.info "[#{model_name.name}] #{msg}"
-  end
-
-  # Fetches the entity's details from QuickBooks Online. 
-  def fetch_details
-    log "Fetching details for #{model_name.name} ##{id} from QBO..."
-    service_class.new(local: self).pull()
-  end
-
-  # Pushs the entity's details from QuickBooks Online.
-  def push_to_qbo
-    log "Starting push for #{model_name.name} ##{id}..."
-    reslut = service_class.new(local: self).push
-    Rails.cache.delete(details_cache_key)
-    return reslut
-  end
-
-  # Dynamically get the Quickbooks Model Class
-  def qbo_model_class
-    @qbo_model_class ||= "Quickbooks::Model::#{model_name.name}".constantize
-  end
-
-  # Dynamically get the Service Class
-  def service_class
-    @service_class ||= "#{model_name.name}Service".constantize
-  end
-
-end
--- a/app/services/customer_service.rb
+++ b/app/services/customer_service.rb
@@ -8,13 +8,55 @@
 #
 #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 CustomerService < ServiceBase
+class CustomerService

-  private 
+  # Initializes the service with a QBO client and an optional customer record. The QBO client is used to communicate with QuickBooks Online, while the customer record contains the data that needs to be pushed to QBO. If no customer is provided, the service will not perform any operations.
+  def initialize(qbo:, customer: nil)
+    raise "No QBO configuration found" unless qbo
+    raise "Customer record is required for push operation" unless customer
+    @qbo = qbo
+    @customer = customer
+  end

-  def build_qbo_remote
-    log "Building new QBO Customer"
+  # Pulls the customer data from QuickBooks Online. 
+  def pull
+    return Quickbooks::Model::Customer.new unless @customer.present?
+    log "Fetching details for customer ##{@customer.id} from QBO..."
+    qbo = QboConnectionService.current!
+    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(@customer.id)
+    end
+  rescue => e
+    log "Fetch failed for #{@customer.id}: #{e.message}"
    Quickbooks::Model::Customer.new
  end

+   # Pushes the customer data to QuickBooks Online. This method handles the communication with QBO, including authentication and error handling. It uses the QBO client to send the customer data and logs the process for monitoring and debugging purposes. If the push is successful, it returns the customer record; otherwise, it logs the error and returns false.
+  def push
+    log "Pushing customer ##{@customer.id} to QBO..."
+
+    customer = @qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Customer.new( 
+        company_id: @qbo.realm_id, 
+        access_token: access_token 
+      )
+      service.update(@customer.details)
+    end
+
+    @customer.id = customer.id unless @customer.persisted?
+    log "Push for customer ##{@customer.id} completed."
+    return @customer
+  end
+
+  private 
+
+  # Log messages with the entity type for better traceability
+  def log(msg)
+    Rails.logger.info "[CustomerService] #{msg}"
+  end
+
 end
--- a/app/services/customer_sync_service.rb
+++ b/app/services/customer_sync_service.rb
@@ -17,13 +17,16 @@ class CustomerSyncService < SyncServiceBase
    Customer
  end

-  # Determine if the local entity should be deleted (e.g. if it's marked inactive in QBO)
-  def destroy_local?(remote)
+  # 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_attribute :name, :display_name
-  map_phone :phone_number, :primary_phone
-  map_phone :mobile_phone_number, :mobile_phone
+  # 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
@@ -17,11 +17,14 @@ class EmployeeSyncService < SyncServiceBase
    Employee
  end

-  # Determine if the local entity should be deleted (e.g. if it's marked inactive in QBO)
-  def destroy_local?(remote)
+  # 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_attribute :name, :display_name
+  # 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/controllers/employees_controller.rb
+++ b/app/controllers/employees_controller.rb
@@ -7,20 +7,10 @@
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-class EmployeesController < ApplicationController
-  include AuthHelper
+class EstimatePdfService < PdfServiceBase

-  before_action :require_user, unless: -> { session[:token].nil? }
-
-  def sync
-    Employee.sync
-    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
+  def self.model_class
+    Estimate
  end

-  private
-
-  # Logs messages with a consistent prefix for easier debugging.
-  def log(msg)
-    Rails.logger.info "[EmployeeController] #{msg}"
-  end
 end
--- a/app/services/estimate_sync_service.rb
+++ b/app/services/estimate_sync_service.rb
@@ -10,14 +10,6 @@

 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

  # Specify the local model this service syncs
@@ -25,7 +17,11 @@ class EstimateSyncService < SyncServiceBase
    Estimate
  end

-  map_attributes :doc_number, :txn_date
-  map_belongs_to :customer
+  # 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
@@ -29,6 +29,8 @@ class InvoiceAttachmentService
        issue.save! if issue.changed?
        log "Attached invoice ##{@invoice.id} to issue ##{issue.id}"
      end
+
+      InvoiceCustomFieldSyncService.new(issue, @invoice, @remote).sync
    end
  end

--- 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
@@ -1,26 +1,16 @@
-#The License
+#The MIT License (MIT)
 #
-#Copyright (c) 2016 - 2026 Rick Barrette - All Rights Reserved
+#Copyright (c) 2016 - 2026 rick barrette
 #
-#Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
-#
-#Proprietary and confidential
+#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

-class CreateLineItems < ActiveRecord::Migration[5.1]
-  def change  
-    create_table :line_items do |t| 
-      t.integer  :item_id
-      t.float    :amount
-      t.string   :description 
-      t.float    :unit_price 
-      t.float    :quantity
-      t.boolean  :billed
-    end
-    
-    add_reference :line_items, :issues, index: true
+  def self.model_class
+    Invoice
  end
+
 end
--- a/app/services/invoice_push_service.rb
+++ b/app/services/invoice_push_service.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2026 rick barrette
+#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:
 #
@@ -8,48 +8,40 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-module RedmineQbo
-  def self.setup
-    # === Models ===
-    Issue.prepend RedmineQbo::Patches::IssuePatch
-    User.prepend RedmineQbo::Patches::UserPatch
+class InvoicePushService
  
-    # === Queries ===
-    IssueQuery.prepend RedmineQbo::Patches::QueryPatch
-    TimeEntryQuery.prepend RedmineQbo::Patches::TimeEntryQueryPatch
-
-    # === Controllers ===
-    RedmineQbo::Patches::IssuesControllerPatch.apply
-    RedmineQbo::Patches::AttachmentsControllerPatch.apply
-
-    # === Helpers / Exports ===
-    Redmine::Export::PDF::IssuesPdfHelper.prepend RedmineQbo::Patches::PdfPatch
-
-    # === Hooks ===
-    RedmineQbo::Hooks::IssuesHookListener
-    RedmineQbo::Hooks::UsersShowHookListener
-    RedmineQbo::Hooks::ViewHookListener
+  def initialize(invoice)
+    @invoice = invoice
  end

-  def self.settings
-    Setting.plugin_redmine_qbo
+  # 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 = 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
+    Rails.logger.error "[InvoicePushService] #{e.message}"
+  ensure
+    @invoice.update_column(:qbo_sync_locked, false)
  end

-  def self.oauth_consumer_key
-    settings[:oauth_consumer_key]
+  private
+
+  def log(msg)
+    Rails.logger.info "[InvoicePushService] #{msg}"
  end
-  
-  def self.oauth_consumer_secret
-    settings[:oauth_consumer_secret]
-  end
-
-  def self.sandbox_mode?
-    settings[:sandbox] ? true : false
-  end
-
-  def self.webhook_token_secret
-    settings[:webhook_token]
-  end
-
-
 end
--- a/app/services/invoice_sync_service.rb
+++ b/app/services/invoice_sync_service.rb
@@ -17,14 +17,19 @@ class InvoiceSyncService < SyncServiceBase
    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
-
-  map_attributes :balance, :doc_number, :due_date, :txn_date
-  map_attribute :total_amount, :total
-  map_attribute :qbo_updated_at, "meta_data.last_updated_time"
-  map_belongs_to :customer
-
 end
--- a/app/services/pdf_service_base.rb
+++ b/app/services/pdf_service_base.rb
@@ -7,21 +7,30 @@
 #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 PdfService
+class PdfServiceBase
  
  require 'combine_pdf'

  # Subclasses should initialize with a QBO client instance
-  def initialize(entity: entity)
-    raise "An entity to sync is required" unless entity
-    @entity = entity
+  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(', ')}"
-    QboConnectionService.with_qbo_service(entity: @entity) do |service|
+    @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
--- a/app/services/qbo_connection_service.rb
+++ b/app/services/qbo_connection_service.rb
@@ -10,11 +10,6 @@

 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
@@ -29,14 +24,9 @@ class QboConnectionService
    end
  end

-  # Performs authenticaed requests with QBO service
-  def self.with_qbo_service(entity: nil)
-    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
+  # Returns the current QBO connection record. Raises an error if no connection exists.
+  def self.current!
+    Qbo.first || raise("QBO not connected")
  end
+
 end
--- a/app/services/qbo_oauth_service.rb
+++ b/app/services/qbo_oauth_service.rb
@@ -10,8 +10,7 @@

 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,
@@ -21,8 +20,7 @@ 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 )
--- a/app/services/service_base.rb
+++ b/app/services/service_base.rb
@@ -1,67 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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(local: nil)
-    @entity = local.class.name
-    raise "#{@entity} record is required for push operation" unless local
-    @local = local
-  end
-
-  # Subclasses must implement this to build a new QBO entity if a remote is not found
-  def build_qbo_remote
-    raise NotImplementedError
-  end
-
-  # Pulls the Item data from QuickBooks Online. 
-  def pull
-    return build_qbo_remote unless @local.present?
-    return build_qbo_remote unless @local.id
-    log "Fetching details for #{@entity} ##{@local.id} from QBO..."
-    QboConnectionService.with_qbo_service(entity: @entity) do |service|
-      service.fetch_by_id(@local.id)
-    end
-  rescue => e
-    log "Fetch failed for #{@local.id}: #{e.message}"
-    build_qbo_remote
-  end
-
-   # Pushes the Item data to QuickBooks Online. 
-   # This method handles the communication with QBO, including authentication and error handling. 
-   # It uses the QBO client to send the remote data and logs the process for monitoring and debugging purposes. 
-   # 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 = QboConnectionService.with_qbo_service(entity: @entity) do |service|
-      if @local.id.present?
-        log "Updating #{@entity}"
-        service.update(@local.details)
-      else
-        log "Creating #{@entity}"
-        service.create(@local.details)
-      end
-    end
-    @local.id = remote.id unless @local.persisted?
-    log "Push for remote ##{@local.id} completed."
-    @local
-  end
-
-  private 
-
-  # Log messages with the entity type for better traceability
-  def log(msg)
-    Rails.logger.info "[#{@entity}Service] #{msg}"
-  end
-
-end
--- a/app/services/sync_service_base.rb
+++ b/app/services/sync_service_base.rb
@@ -12,14 +12,10 @@ class SyncServiceBase
  PAGE_SIZE = 1000

  # Subclasses should initialize with a QBO client instance
-  def initialize()
+  def initialize(qbo:)
+    raise "No QBO configuration found" unless qbo
+    @qbo = qbo
    @entity = self.class.model_class
-    @page_size = self.class.page_size 
-  end
-
-  # Subclasses can implement this to overide the default page size
-  def self.page_size
-    @page_size = PAGE_SIZE
  end

  # Subclasses must implement this to specify which local model they sync (e.g. Customer, Invoice)
@@ -29,25 +25,34 @@ 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}"
-    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)
-        log "Processing batch of #{entries.size} #{@entity.name}"
-        entries.each do |remote|
-          persist(remote)
-        end
+    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 (webhook usage)
+  # Sync a single entity by its QBO ID, used for webhook updates
  def sync_by_id(id)
    log "Syncing #{@entity.name} with ID #{id}"
-    QboConnectionService.with_qbo_service(entity: @entity) do |service|
+    @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
@@ -59,152 +64,39 @@ class SyncServiceBase
    # Override in subclasses if the entity has attachments (e.g. Invoice)
  end

-  # Builds a QBO query for retrieving entities
-  def build_query(full_sync)
-    if full_sync
-      "SELECT * FROM #{@entity.name} ORDER BY Id"
-    else
-      last_update = @entity.maximum(:updated_at) || 1.year.ago
-
-      <<~SQL.squish
-        SELECT * FROM #{@entity.name}
-        WHERE MetaData.LastUpdatedTime > '#{last_update.utc.iso8601}'
-        ORDER BY MetaData.LastUpdatedTime
-      SQL
-    end
-  end
-
  # Determine if a remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
-  def destroy_local?(remote)
+  def destroy_remote?(remote)
    false
  end

-  def extract_value(remote, remote_attr)
-    case remote_attr
-    when Proc
-      remote_attr.call(remote)
-    else
-      remote.public_send(remote_attr)
-    end
-  end
-
-  # Attribute Mapping DSL
-  #
-  # This DSL defines how attributes from a QuickBooks Online (QBO) entity
-  # are mapped onto a local ActiveRecord model during synchronization.
-  #
-  # Each mapping registers a lambda in `attribute_map`. When a remote QBO
-  # object is processed, the lambda is executed to extract and transform
-  # the value that will be assigned to the local model attribute.
-  #
-  # The DSL supports several mapping patterns:
-  #
-  # 1. Direct attribute mapping (same name)
-  #
-  #      map_attribute :doc_number
-  #
-  #    Equivalent to:
-  #
-  #      local.doc_number = remote.doc_number
-  #
-  # 2. Renamed attribute mapping
-  #
-  #      map_attribute :total_amount, :total
-  #
-  #    Equivalent to:
-  #
-  #      local.total_amount = remote.total
-  #
-  # 3. Custom transformation logic
-  #
-  #      map_attribute :qbo_updated_at do |remote|
-  #        remote.meta_data&.last_updated_time
-  #      end
-  #
-  #    Useful for nested fields or computed values.
-  #
-  # 4. Bulk attribute mapping
-  #
-  #      map_attributes :doc_number, :txn_date, :due_date
-  #
-  #    Convenience helper that maps multiple attributes with identical names.
-  #
-  # 5. Foreign key / reference mapping
-  #
-  #      map_belongs_to :customer
-  #
-  #    Resolves a QBO reference object (e.g. `customer_ref.value`) and finds
-  #    the associated local ActiveRecord model.
-  #
-  # 6. Specialized helpers
-  #
-  #      map_phone :phone_number, :primary_phone
-  #
-  #    Extracts and normalizes phone numbers by stripping non-digit characters.
-  #
-  # Internally, the mappings are stored in `attribute_map` and executed by the
-  # SyncService during `process_attributes`, which iterates through each mapping
-  # and assigns the computed value to the local record.
-  #
-  # This design keeps synchronization services declarative, readable, and easy
-  # to extend while centralizing transformation logic in a single DSL.
-  class << self
-
-    def map_attributes(*attrs)
-      attrs.each do |attr|
-        map_attribute(attr)
-      end
-    end
-
-
-    def map_attribute(local_attr, remote_attr = nil, &block)
-      attribute_map[local_attr] =
-        if block_given?
-          block
-        elsif remote_attr
-          ->(remote) do
-            remote_attr.to_s.split('.').reduce(remote) do |obj, method|
-              obj&.public_send(method)
-            end
-          end
-        else
-          ->(remote) { remote.public_send(local_attr) }
-        end
-    end
-
-    def attribute_map
-      @attribute_map ||= {}
-    end
-
-    def map_belongs_to(local_attr, ref: nil, model: nil)
-      ref ||= "#{local_attr}_ref"
-      model ||= local_attr.to_s.classify.constantize
-
-      attribute_map[local_attr] = lambda do |remote|
-        ref_obj = remote.public_send(ref)
-        id = ref_obj&.value
-        id ? model.find_by(id: id) : nil
-      end
-    end
-
-    def map_phone(local_attr, remote_attr)
-      attribute_map[local_attr] = lambda do |remote|
-        phone = remote.public_send(remote_attr)
-        phone&.free_form_number&.gsub(/\D/, '')
-      end
-    end
-  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_local?(remote)
+    if destroy_remote?(remote)
      if local.persisted?
        local.destroy
        log "Deleted #{@entity.name} #{remote.id}"
@@ -212,30 +104,24 @@ class SyncServiceBase
      return
    end

+    # Map remote attributes to local model fields, this should be implemented in subclasses
    process_attributes(local, remote)

-    if local.new_record? || local.changed?
-      was_new = local.new_record?
-      local.skip_qbo_push = true
+    if local.changed?
      local.save!
-      log "#{was_new ? 'Created' : 'Updated'} #{@entity.name} #{remote.id}"
+      log "Updated #{@entity.name} #{remote.id}"
+
+      # Handle attaching documents if applicable to invoices
      attach_documents(local, remote) 
    end

  rescue => e
-    log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
+      log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
  end

-  # Maps remote attributes to local model
+  # This method should be implemented in subclasses to map remote attributes to local model
  def process_attributes(local, remote)
-    log "Processing #{@entity} ##{remote.id}"
-
-    self.class.attribute_map.each do |local_attr, mapper|
-      value = mapper.call(remote)
-
-      if local.public_send(local_attr) != value
-        local.public_send("#{local_attr}=", value)
-      end
-    end
+    raise NotImplementedError, "Subclasses must implement process_attributes"
  end
+
 end
--- a/app/views/customers/_form.html.erb
+++ b/app/views/customers/_form.html.erb
@@ -7,7 +7,7 @@
        <div class="clearfix">
          <%=t(:label_display_name)%> 
          <div class="input">
-            <%= f.text_field :name, required: true, class: "customer-name", autocomplete: "off", data: { autocomplete_url: "/customers/autocomplete" } %>
+            <%= f.text_field :name, required: true, autocomplete: "off" %>
          </div>
        </div>
        
--- a/app/views/customers/_search.html.erb
+++ b/app/views/customers/_search.html.erb
@@ -1,6 +1,5 @@
 <%= form_tag(customers_path, method: "get", id: "customer-search-form") do %>
-    <%= text_field_tag :search, params[:search], class: "customer-name", placeholder: t(:label_search_customers), autocomplete: "off", data: { autocomplete_url: "/customers/autocomplete" } %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
    <%= 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?%>
--- a/app/views/customers/show.html.erb
+++ b/app/views/customers/show.html.erb
@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{RedmineQbo.sandbox_mode? ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo[:sandbox] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
  <div class="issue">

    <div class="splitcontent">
--- a/app/views/issues/_form_hook.html.erb
+++ b/app/views/issues/_form_hook.html.erb
@@ -7,3 +7,6 @@
 <p>
    <%= select_estimate %>
 </p> 
+
+
+<%= render "line_items/issue_form", f: f %>
--- a/app/views/line_items/_issue_form.html.erb
+++ b/app/views/line_items/_issue_form.html.erb
@@ -0,0 +1,34 @@
+<% @issue.line_items.build if @issue.line_items.empty? %>
+
+<div class="box tabular" data-nested-form data-wrapper-selector=".line-item">
+  <p><strong>Line Items</strong></p>
+
+  <table class="list line-items-table">
+    <thead>
+      <tr>
+        <th>Description</th>
+        <th style="width:120px;">Quantity</th>
+        <th style="width:150px;">Unit Price</th>
+        <th style="width:80px;"></th>
+      </tr>
+    </thead>
+
+    <tbody data-nested-form-container>
+      <%= f.fields_for :line_items do |item_form| %>
+        <%= render "line_items/line_item_fields", f: item_form %>
+      <% end %>
+    </tbody>
+  </table>
+
+  <template data-nested-form-template>
+    <%= f.fields_for :line_items, LineItem.new, child_index: "NEW_RECORD" do |item_form| %>
+      <%= render "line_items/line_item_fields", f: item_form %>
+    <% end %>
+  </template>
+
+  <p>
+    <button type="button" class="icon icon-add" data-nested-form-add>
+      Add Line Item
+    </button>
+  </p>
+</div>
--- a/app/views/line_items/_line_item_fields.html.erb
+++ b/app/views/line_items/_line_item_fields.html.erb
@@ -0,0 +1,34 @@
+<tr class="line-item">
+  <%= f.hidden_field :id %>
+  <%= f.hidden_field :_destroy %>
+
+  <td>
+    <%= f.text_field :description,
+          size: 50,
+          placeholder: "Description",
+          :no_label => true %>
+  </td>
+
+  <td>
+    <%= f.number_field :quantity,
+          step: 1,
+          min: 1,
+          style: "width:90px;",
+          :no_label => true %>
+  </td>
+
+  <td>
+    <%= f.number_field :unit_price,
+          step: 0.01,
+          style: "width:120px;",
+          :no_label => true %>
+  </td>
+
+  <td style="text-align:center;">
+    <button type="button"
+            class="icon-only icon-del"
+            title="Remove"
+            data-nested-form-remove>
+    </button>
+  </td>
+</tr>
--- a/app/views/qbo/_settings.html.erb
+++ b/app/views/qbo/_settings.html.erb
@@ -1,79 +1,111 @@
+<!--
+The MIT License (MIT)
+
+Copyright (c) 2016 - 2026 rick barrette
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<!-- somewhere in your document include the Javascript -->
 <script type="text/javascript" src="https://appcenter.intuit.com/Content/IA/intuit.ipp.anywhere.js"></script>
+
+<!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
 <script>
  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_path %>'});
 </script>

-<div class="box tabular">
-  <p>
-    <label><%= t(:label_client_id) %></label>
-    <%= text_field_tag 'settings[oauth_consumer_key]', settings[:oauth_consumer_key], size: 50 %>
-  </p>
+<table >
+  <tbody>
  
-  <p>
-    <label><%= t(:label_client_secret) %></label>
-    <%= password_field_tag 'settings[oauth_consumer_secret]', settings[:oauth_consumer_secret], size: 50 %>
-  </p>
+    <tr>
+      <th><%=t(:label_client_id)%></th>
+      <td>
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerKey" 
+          value="<%= settings['settingsOAuthConsumerKey'] %>" 
+          name="settings[settingsOAuthConsumerKey]" >
+      </td>
+    </tr>

-  <p>
-    <label><%= t(:label_webhook_token) %></label>
-    <%= text_field_tag 'settings[webhook_token]', settings[:webhook_token], size: 50 %>
-  </p>
+    <tr>
+      <th><%=t(:label_client_secret)%></th>
+      <td>
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerSecret"
+          value="<%= settings['settingsOAuthConsumerSecret'] %>"
+          name="settings[settingsOAuthConsumerSecret]" >
+      </td>
+    </tr>
    
-  <p>
-    <label><%= t(:label_sandbox) %></label>
-    <%= check_box_tag 'settings[sandbox]', 1, settings[:sandbox] %>
-  </p>
+    <tr>
+      <th><%=t(:label_webhook_token)%></th>
+      <td>
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsWebhookToken"
+          value="<%= settings['settingsWebhookToken'] %>"
+          name="settings[settingsWebhookToken]" >
+      </td>
+    </tr>

-  <hr />
+    <tr>
+      <th><%=t(:label_sandbox)%></th>
+      <td>
+        <%= check_box_tag 'settings[sandbox]', @settings[:sandbox], @settings[:sandbox] %>
+      </td>
+    </tr>

-  <p>
-    <label><%= t(:label_oauth_expires) %></label>
-    <span class="icon <%= Qbo.oauth2_access_token_expires_at&.future? ? 'icon-ok' : 'icon-warning' %>">
-      <%= Qbo.oauth2_access_token_expires_at || 'N/A' %>
-    </span>
-  </p>
+     <tr>
+        <th><%=t(:label_oauth_expires)%></th>
+        <td><%= QboConnectionService.current!&.oauth2_access_token_expires_at %>
+      </tr>
      
-  <p>
-    <label><%= t(:label_customer_count) %></label>
-    <%= Customer.count %> 
-    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Customer.last_sync %>)</em>
-  </p>
+      <tr>
+        <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
+        <td><%= QboConnectionService.current!&.oauth2_refresh_token_expires_at %>
+     </tr>

-  <p>
-    <label><%= t(:label_employee_count) %></label>
-    <%= Employee.count %> 
-    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Employee.last_sync %>)</em>
-  </p>
+  </tbody>
+</table>

-  <p>
-    <label><%= t(:label_invoice_count) %></label>
-    <%= Invoice.count %> 
-    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Item.last_sync %>)</em>
-  </p>
+<br/>
+<%=t(:label_oauth_note)%>
+<br/>
+<br/>

-  <p>
-    <label><%= t(:label_estimate_count) %></label>
-    <%= Estimate.count %> 
-    <em style="color: #777; font-size: 0.9em; margin-left: 8px;">(@ <%= Account.last_sync %>)</em>
-  </p>
+<!-- this will display a button that the user clicks to start the flow -->
+<ipp:connectToIntuit></ipp:connectToIntuit>

-  <p>
-    <label><%= t(:label_last_sync) %> (QBO)</label>
-    <%= Qbo.exists? ? Qbo.last_sync : 'Never synced' %>
-  </p>
+<br/>
+<br/>
+
+<div>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%> @ <%= Customer.last_sync %>
+    </div>
+      
+    <div>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %> @ <%= Employee.last_sync %>
+    </div>
+    
+    <div>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %> @ <%= Invoice.last_sync%>
+    </div>
+    
+    <div>
+        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %> @ <%= Estimate.last_sync %>
+    </div>
+      
+    <br/>
+    
+    <div>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path %>
 </div>
-
-<fieldset class="box">
-  <legend>Management & Synchronization</legend>
-  
-  <div style="margin-bottom: 20px;">
-    <ipp:connectToIntuit></ipp:connectToIntuit>
-  </div>
-
-  <div style="margin-bottom: 15px;">
-    <%= link_to t(:label_sync_now_customers), sync_customers_path, class: 'button icon icon-reload' %>
-    <%= link_to t(:label_sync_now_employees), employees_sync_path, class: 'button icon icon-reload' %>
-    <%= link_to t(:label_sync_now_invoices), invoices_sync_path, class: 'button icon icon-reload' %>
-    <%= link_to t(:label_sync_now_estimate), estimates_sync_path, class: 'button icon icon-reload' %>
-  </div>
-</fieldset>
--- a/assets/javascripts/autocomplete-rails.js
+++ b/assets/javascripts/autocomplete-rails.js
@@ -0,0 +1 @@
+!function(t){t.fn.railsAutocomplete=function(e){var a=function(){this.railsAutoCompleter||(this.railsAutoCompleter=new t.railsAutocomplete(this))};if(void 0!==t.fn.on){if(!e)return;return t(document).on("focus",e,a)}return this.live("focus",a)},t.railsAutocomplete=function(t){var e=t;this.init(e)},t.railsAutocomplete.options={showNoMatches:!0,noMatchesLabel:"no existing match"},t.railsAutocomplete.fn=t.railsAutocomplete.prototype={railsAutocomplete:"0.0.1"},t.railsAutocomplete.fn.extend=t.railsAutocomplete.extend=t.extend,t.railsAutocomplete.fn.extend({init:function(e){function a(t){return t.split(e.delimiter)}function i(t){return a(t).pop().replace(/^\s+/,"")}e.delimiter=t(e).attr("data-delimiter")||null,e.min_length=t(e).attr("data-min-length")||t(e).attr("min-length")||2,e.append_to=t(e).attr("data-append-to")||null,e.autoFocus=t(e).attr("data-auto-focus")||!1,t(e).autocomplete({appendTo:e.append_to,autoFocus:e.autoFocus,delay:t(e).attr("delay")||0,source:function(a,r){var n=this.element[0],o={term:i(a.term)};t(e).attr("data-autocomplete-fields")&&t.each(t.parseJSON(t(e).attr("data-autocomplete-fields")),function(e,a){o[e]=t(a).val()}),t.getJSON(t(e).attr("data-autocomplete"),o,function(){var a={};t.extend(a,t.railsAutocomplete.options),t.each(a,function(i,r){if(a.hasOwnProperty(i)){var n=t(e).attr("data-"+i);a[i]=n?n:r}}),0==arguments[0].length&&t.inArray(a.showNoMatches,[!0,"true"])>=0&&(arguments[0]=[],arguments[0][0]={id:"",label:a.noMatchesLabel}),t(arguments[0]).each(function(a,i){var r={};r[i.id]=i,t(e).data(r)}),r.apply(null,arguments),t(n).trigger("railsAutocomplete.source",arguments)})},change:function(e,a){if(t(this).is("[data-id-element]")&&""!==t(t(this).attr("data-id-element")).val()&&(t(t(this).attr("data-id-element")).val(a.item?a.item.id:"").trigger("change"),t(this).attr("data-update-elements"))){var i=t.parseJSON(t(this).attr("data-update-elements")),r=a.item?t(this).data(a.item.id.toString()):{};if(i&&""===t(i.id).val())return;for(var n in i){var o=t(i[n]);o.is(":checkbox")?null!=r[n]&&o.prop("checked",r[n]):o.val(a.item?r[n]:"").trigger("change")}}},search:function(){var t=i(this.value);return t.length<e.min_length?!1:void 0},focus:function(){return!1},select:function(i,r){if(r.item.value=r.item.value.toString(),-1!=r.item.value.toLowerCase().indexOf("no match")||-1!=r.item.value.toLowerCase().indexOf("too many results"))return t(this).trigger("railsAutocomplete.noMatch",r),!1;var n=a(this.value);if(n.pop(),n.push(r.item.value),null!=e.delimiter)n.push(""),this.value=n.join(e.delimiter);else if(this.value=n.join(""),t(this).attr("data-id-element")&&t(t(this).attr("data-id-element")).val(r.item.id).trigger("change"),t(this).attr("data-update-elements")){var o=r.item,l=-1!=r.item.value.indexOf("Create New")?!0:!1,u=t.parseJSON(t(this).attr("data-update-elements"));for(var s in u)"checkbox"===t(u[s]).attr("type")?o[s]===!0||1===o[s]?t(u[s]).attr("checked","checked"):t(u[s]).removeAttr("checked"):l&&o[s]&&-1==o[s].indexOf("Create New")||!l?t(u[s]).val(o[s]).trigger("change"):t(u[s]).val("").trigger("change")}var c=this.value;return t(this).bind("keyup.clearId",function(){t.trim(t(this).val())!=t.trim(c)&&(t(t(this).attr("data-id-element")).val("").trigger("change"),t(this).unbind("keyup.clearId"))}),t(e).trigger("railsAutocomplete.select",r),!1}}),t(e).trigger("railsAutocomplete.init")}}),t(document).ready(function(){t("input[data-autocomplete]").railsAutocomplete("input[data-autocomplete]")})}(jQuery);
--- a/assets/javascripts/autocomplete.js
+++ b/assets/javascripts/autocomplete.js
@@ -1,102 +0,0 @@
-(function () {
-
-  // Helper: escape HTML for safety
-  function escapeHtml(str) {
-    return $("<div>").text(str).html();
-  }
-
-  // Helper: highlight all occurrences of term (case-insensitive)
-  function highlightTerm(text, term) {
-    if (!term) return text;
-    const escapedTerm = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const regex = new RegExp("(" + escapedTerm + ")", "ig");
-    return text.replace(regex, "<strong>$1</strong>");
-  }
-
-  window.initCustomerAutocomplete = function(context) {
-    let scope = context || document;
-
-    $(scope).find(".customer-name").each(function() {
-      if ($(this).data("autocomplete-initialized")) return;
-      $(this).data("autocomplete-initialized", true);
-
-      let $input = $(this);
-
-      let ac = $input.autocomplete({
-        appendTo: "body",   // crucial for Redmine positioning
-        minLength: 2,
-
-        source: function(request, response) {
-          $.getJSON("/customers/autocomplete", { q: request.term })
-            .done(function(data) {
-              response(data.map(function(item) {
-                // combine secondary info
-                let secondary = [];
-                if (item.phone_number) secondary.push(item.phone_number);
-                if (item.mobile_phone_number) secondary.push(item.mobile_phone_number);
-
-                let meta = secondary.length ? " (" + secondary.join(" • ") + ")" : "";
-
-                // escape HTML to avoid XSS
-                let safeText = escapeHtml(item.name + meta);
-
-                return {
-                  label: item.name + meta,      // plain fallback
-                  value: item.name,             // goes into input
-                  id: item.id,
-                  html: highlightTerm(safeText, request.term)
-                };
-              }));
-            })
-            .fail(function() {
-              response([]);
-            });
-        },
-
-        select: function(event, ui) {
-          $input.val(ui.item.value);  // visible text
-          $("#customer_id").val(ui.item.id); // hidden ID
-
-          // trigger Redmine form update safely
-          setTimeout(function() {
-            $("#customer_id").trigger("change");
-          }, 0);
-
-          return false;
-        },
-
-        change: function(event, ui) {
-          // clear hidden field if no valid selection
-          if (!ui.item && !$input.val()) {
-            $("#customer_id").val("");
-          }
-        }
-      });
-
-      // Render item HTML for highlight
-      ac.autocomplete("instance")._renderItem = function(ul, item) {
-        return $("<li>")
-          .append($("<div>").html(item.html))
-          .appendTo(ul);
-      };
-    });
-  };
-
-  // Re-init after Redmine AJAX form updates
-  $(document).on("ajaxComplete", function() {
-    if (window.initCustomerAutocomplete) {
-      window.initCustomerAutocomplete(document);
-    }
-  });
-
-  // Init on page load
-  $(document).ready(function() {
-    window.initCustomerAutocomplete(document);
-  });
-
-  // Also init on Turbo/Redmine load events
-  document.addEventListener("turbo:load", function() {
-    window.initCustomerAutocomplete(document);
-  });
-
-})();
--- a/assets/javascripts/nested_form_controller.js
+++ b/assets/javascripts/nested_form_controller.js
@@ -0,0 +1,53 @@
+(function () {
+  function initNestedForms() {
+    document.querySelectorAll("[data-nested-form]").forEach(function (wrapper) {
+      if (wrapper.dataset.initialized === "true") return;
+      wrapper.dataset.initialized = "true";
+
+      const container = wrapper.querySelector("[data-nested-form-container]");
+      const template = wrapper.querySelector("[data-nested-form-template]");
+
+      if (!container || !template) return;
+
+      wrapper.addEventListener("click", function (event) {
+        const addButton = event.target.closest("[data-nested-form-add]");
+        const removeButton = event.target.closest("[data-nested-form-remove]");
+
+        // ADD
+        if (addButton) {
+          event.preventDefault();
+
+          const content = template.innerHTML.replace(
+            /NEW_RECORD/g,
+            Date.now().toString()
+          );
+
+          container.insertAdjacentHTML("beforeend", content);
+        }
+
+        // REMOVE
+        if (removeButton) {
+          event.preventDefault();
+
+          const lineItem = removeButton.closest(wrapper.dataset.wrapperSelector);
+          if (!lineItem) return;
+
+          const destroyField = lineItem.querySelector("input[name*='_destroy']");
+
+          if (destroyField) {
+            destroyField.value = "1";
+            lineItem.style.display = "none";
+          } else {
+            lineItem.remove();
+          }
+        }
+      });
+    });
+  }
+
+  // Works for full load
+  document.addEventListener("DOMContentLoaded", initNestedForms);
+
+  // Works for Turbo navigation
+  document.addEventListener("turbo:load", initNestedForms);
+})();
--- a/assets/stylesheets/autocomplete.css
+++ b/assets/stylesheets/autocomplete.css
@@ -1,5 +0,0 @@
-/* Keep Redmine default look, just enhance metadata */
-.ui-autocomplete .autocomplete-meta {
-  color: #888;
-  font-size: 0.9em;
-}
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -82,10 +82,6 @@ en:
  label_shipping_address: "Shipping Address"
  label_sync: "Sync"
  label_sync_now: "Sync Now"
-  label_sync_now_customers: "Sync Customers"
-  label_sync_now_employees: "Sync Employees"
-  label_sync_now_invoices: "Sync Invoices"
-  label_sync_now_estimate: "Sync Estimates"
  label_syncing: "Syncing QuickBooks"
  label_trim: "Trim"
  label_webhook_token: "Intuit QBO Webhook Token"
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,17 +14,14 @@ get 'qbo/oauth_callback', to: 'qbo#oauth_callback'

 #manual sync
 get 'qbo/sync', to: 'qbo#sync'
-get 'invoices/sync', to: 'invoices#sync'
-get 'estimates/sync', to: 'estimates#sync'
-get 'employees/sync', to: 'employees#sync'

 #webhook
 post 'qbo/webhook', to: 'qbo#webhook'

 # Estimate & Invoice PDF
-get 'estimates/:id', to: 'estimates#show', as: :estimate
-get 'estimates/doc/', to: 'estimates#doc', as: :estimate_doc
-get 'invoices/:id', to: 'invoices#show', as: :invoice
+get 'estimates/:id', to: 'estimate#show', as: :estimate
+get 'estimates/doc/', to: 'estimate#doc', as: :estimate_doc
+get 'invoices/:id', to: 'invoice#show', as: :invoice

 #manual billing
 get 'bill/:id', to: 'qbo#bill', as: :bill
@@ -38,8 +35,5 @@ get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
 get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'

 resources :customers do
-  collection do
-    get :autocomplete
-    get :sync
-  end
+  get :autocomplete_customer_name, on: :collection
 end
--- a/db/migrate/034_remove_qbo_items.rb
+++ b/db/migrate/034_remove_qbo_items.rb
@@ -12,6 +12,5 @@ class RemoveQboItems < ActiveRecord::Migration[5.1]
  def change
    drop_table :qbo_items
    drop_table :qbo_purchases
-    drop_table :line_items
  end
 end
--- a/db/migrate/043_create_line_items.rb
+++ b/db/migrate/043_create_line_items.rb
@@ -0,0 +1,42 @@
+#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 CreateLineItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :line_items do |t|
+      t.integer :issue_id, null: false
+
+      t.text    :description, null: false
+
+      t.decimal :quantity,
+                precision: 15,
+                scale: 4,
+                null: false,
+                default: 0
+
+      t.decimal :unit_price,
+                precision: 15,
+                scale: 4,
+                null: false,
+                default: 0
+
+      t.decimal :line_total,
+                precision: 15,
+                scale: 4,
+                null: false,
+                default: 0
+
+      t.timestamps
+    end
+
+    add_index :line_items, :issue_id
+    add_foreign_key :line_items, :issues
+  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.3.16'
+  version '2026.3.1'
  url 'https://github.com/rickbarrette/redmine_qbo'
  author_url 'https://barrettefabrication.com'
  settings default: {empty: true}, partial: 'qbo/settings'
@@ -25,6 +25,7 @@ Redmine::Plugin.register :redmine_qbo do
  Issue.safe_attributes :estimate_id
  Issue.safe_attributes :invoice_id
  User.safe_attributes :employee_id
+  Issue.safe_attributes :line_items_attributes
  TimeEntry.safe_attributes :billed
  
  # set per_page globally
@@ -43,4 +44,10 @@ Redmine::Plugin.register :redmine_qbo do

 end

-RedmineQbo.setup
+# Dynamically load all Hooks & Patches recursively
+base_dir = File.join(File.dirname(__FILE__), 'lib')
+
+# '**' looks inside subdirectories, '*.rb' matches Ruby files
+Dir.glob(File.join(base_dir, '**', '*.rb')).sort.each do |file|
+  require file
+end
--- a/lib/redmine_qbo/hooks/issues_hook_listener.rb
+++ b/lib/redmine_qbo/hooks/issues_hook_listener.rb
@@ -24,11 +24,12 @@ module RedmineQbo

        # Customer Name Text Box with database backed autocomplete
        # onchange event will update the hidden customer_id field
-        search_customer = f.text_field :customer,
-          class: "customer-name",
-          autocomplete: "off",
-          data: {
-            autocomplete_url: "/customers/autocomplete"
+        search_customer = f.autocomplete_field :customer,
+          autocomplete_customer_name_customers_path,
+          selected: issue.customer,
+          update_elements: { 
+            id: '#issue_customer_id', 
+            value: '#issue_customer' 
          }

        # We need to handle 3 cases for the onchange event of the customer name field:
@@ -46,7 +47,7 @@ module RedmineQbo
        # This hidden field is used for the customer ID for the issue
        # the onchange event will reload the issue form via ajax to update the available estimates
        customer_id = f.hidden_field :customer_id,
-          id: "customer_id",
+          id: "issue_customer_id",
          onchange: js_path.html_safe

        # Generate the drop down list of quickbooks estimates owned by the selected customer
@@ -61,7 +62,8 @@ module RedmineQbo
            locals: {
              search_customer: search_customer, 
              customer_id: customer_id, 
-              select_estimate: select_estimate
+              select_estimate: select_estimate,
+              f: context[:form]
            } 
          }
        )
--- a/lib/redmine_qbo/hooks/view_hook_listener.rb
+++ b/lib/redmine_qbo/hooks/view_hook_listener.rb
@@ -17,9 +17,9 @@ module RedmineQbo
      def view_layouts_base_html_head(context = {})
        safe_join([
          javascript_include_tag( 'application.js', plugin: :redmine_qbo),
-          javascript_include_tag( 'autocomplete.js', plugin: :redmine_qbo),
+          javascript_include_tag( 'autocomplete-rails.js', plugin: :redmine_qbo),
          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo),
-          stylesheet_link_tag( 'autocomplete', plugin: :redmine_qbo)
+          javascript_include_tag( 'nested_form_controller.js', plugin: :redmine_qbo)
        ])
      end

--- a/lib/redmine_qbo/patches/attachments_controller_patch.rb
+++ b/lib/redmine_qbo/patches/attachments_controller_patch.rb
@@ -8,32 +8,41 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'attachments_controller'
+
 module RedmineQbo
  module Patches
+
    module AttachmentsControllerPatch
-      module Helper
-        # Check if login is globally required to access the application
-        def check_if_login_required
-          # Return true if the user is already logged in
-          return true if User.current.logged?

-          # Pull up the attachment and verify if we have a valid token for the issue
-          attachment = Attachment.find_by(id: params[:id])
-          return require_login if attachment.nil?
+      def self.included(base)

-          token = CustomerToken.where("token = ? AND expires_at > ?", session[:token], Time.current).first
-          return true if token&.issue_id == attachment.container_id
+        base.class_eval do
+
+          # check if login is globally required to access the application
+          def check_if_login_required
+            # no check needed if user is already logged in
+            return true if User.current.logged?
+            
+            # Pull up the attachmet, & verify if we have a valid token for the Issue
+            attachment = Attachment.find(params[:id])
+            token = CustomerToken.where("token = ? and expires_at > ?", session[:token], Time.now)
+            token = token.first
+            unless token.nil?
+              return true if token.issue_id == attachment.container_id
+            end
+            
+            require_login if Setting.login_required?
+          end
          
-          # Default to requiring login if all else fails
-          require_login if Setting.login_required?
        end
+
      end

-      def self.apply
-        AttachmentsController.class_eval do
-          helper Helper
-        end
-      end
    end   
+
+    # Add module to AttachmentsController
+    AttachmentsController.send(:include, AttachmentsControllerPatch)
+
  end
 end
--- a/lib/redmine_qbo/patches/issue_patch.rb
+++ b/lib/redmine_qbo/patches/issue_patch.rb
@@ -8,39 +8,62 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'issue'
+
 module RedmineQbo
  module Patches
    module IssuePatch
-      extend ActiveSupport::Concern

-      prepended do
-        belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true
-        belongs_to :customer_token, primary_key: :id, optional: true
-        belongs_to :estimate, primary_key: :id, optional: true
-        has_and_belongs_to_many :invoices
+      def self.included(base)
+        base.extend(ClassMethods)
+        base.send(:include, InstanceMethods)
+
+        base.class_eval do
+          belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true
+          belongs_to :customer_token, primary_key: :id
+          belongs_to :estimate, primary_key: :id
+          has_and_belongs_to_many :invoices
+          has_many :line_items, dependent: :destroy
+          accepts_nested_attributes_for :line_items, allow_destroy: true
+
+          before_save :titlize_subject
+          after_commit :enqueue_billing, on: :update
+        end
        
-        before_save :titlize_subject
-        after_commit :enqueue_billing, on: :update
      end

-      # Enqueue a background job to bill the time spent on this issue to QuickBooks if the issue is closed and assigned to an employee
-      def enqueue_billing
-        log "Checking if issue needs billing for ##{id}"
-        return unless closed? && customer.present? && assigned_to&.employee_id.present?
+      module ClassMethods

-        log "Enqueuing billing for issue ##{id}"
-        BillIssueTimeJob.perform_later(id)
      end

-      # Titlize the subject for consistent formatting in billing descriptions
-      def titlize_subject
-        log "Titlizing subject for issue ##{id}"
-        self.subject = subject.split(/\s+/).map do |word|
-          (word =~ /[A-Z]/ && word =~ /[0-9]/) ? word : word.capitalize
-        end.join(' ')
+      module InstanceMethods
+
+        # Enqueue a background job to bill the time spent on this issue to the associated customer in Quickbooks, if the issue is closed and has a customer assigned.
+        def enqueue_billing
+          log "Checking if issue needs to be billed for issue ##{id}"
+          return unless closed?
+          return unless customer.present?
+          return unless assigned_to&.employee_id.present?
+
+          log "Enqueuing billing for issue ##{id}"
+          BillIssueTimeJob.perform_later(id)
+        end
+
+        # Titlize the subject of the issue before saving to ensure consistent formatting for billing descriptions in Quickbooks
+        def titlize_subject
+          log "Titlizing subject for issue ##{id}"
+
+          self.subject = subject.split(/\s+/).map do |word|
+            if word =~ /[A-Z]/ && word =~ /[0-9]/
+              word
+            else
+              word.capitalize
+            end
+          end.join(' ')
+        end
      end

-      # Generate a shareable token linking this issue to the customer for QuickBooks
+      # 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)
      end
@@ -48,8 +71,10 @@ module RedmineQbo
      private

      def log(msg)
-        Rails.logger.info "[IssuePatch] #{msg}"
+          Rails.logger.info "[IssuePatch] #{msg}"
      end
    end
+
+    Issue.send(:include, IssuePatch)
  end
 end
--- a/lib/redmine_qbo/patches/issues_controller_patch.rb
+++ b/lib/redmine_qbo/patches/issues_controller_patch.rb
@@ -7,31 +7,30 @@
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+require_dependency 'issues_controller'

 module RedmineQbo
  module Patches
    module IssuesControllerPatch
+
      module Helper
-        # Extend the watcher links to include billing and share options
        def watcher_link(issue, user)
-          links = ''
-          
-          # Admin users can bill time
-          links << link_to(I18n.t(:label_bill_time), bill_path(issue.id), method: :get, class: 'icon icon-email-add') if user.admin?
-
-          # Logged-in users can share the issue
-          links << link_to(I18n.t(:label_share), share_path(issue.id), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
-
-          # Append to the original watcher links
-          (links.html_safe + super).html_safe
+          link = ''
+          link = link_to(I18n.t(:label_bill_time), bill_path( issue.id ), method: :get, class: 'icon icon-email-add') if user.admin?
+          link << link_to(I18n.t(:label_share), share_path( issue.id ), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
+          link.html_safe + super
        end
      end

-      def self.apply
-        IssuesController.class_eval do
+      def self.included(base)
+        base.class_eval do
          helper Helper
        end
      end 
    end
+
+    # Add module to IssuessController
+    IssuesController.send(:include, IssuesControllerPatch)
+
  end
 end
--- a/lib/redmine_qbo/patches/pdf_patch.rb
+++ b/lib/redmine_qbo/patches/pdf_patch.rb
@@ -8,307 +8,278 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'redmine/export/pdf'
+require_dependency 'redmine/export/pdf/issues_pdf_helper'
+
 module RedmineQbo
  module Patches
    module PdfPatch
-      extend ActiveSupport::Concern

-      def issue_to_pdf(issue, assoc={})
-        pdf = setup_pdf(issue)
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+        base.class_eval do
+          alias_method :issue_to_pdf, :issue_to_pdf_with_patch
+          alias_method :issue_to_pdf_with_patch, :issue_to_pdf
+        end
+      end

-        render_header(pdf, issue)
-        render_ancestors_and_subject(pdf, issue)
+      module InstanceMethods

-        left, right = build_issue_attributes(issue)
-        render_attributes_grid(pdf, left, right)
+        def issue_to_pdf_with_patch(issue, assoc={})
+          pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
+          pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}")
+          pdf.alias_nb_pages
+          pdf.footer_date = format_date(Date.today)
+          pdf.add_page
+          pdf.SetFontStyle('B',11)
+          buf = "#{issue.project} - #{issue.tracker} ##{issue.id}"
+          pdf.RDMMultiCell(190, 5, buf)
+          pdf.SetFontStyle('',8)
+          base_x = pdf.get_x
+          i = 1
+          issue.ancestors.visible.each do |ancestor|
+            pdf.set_x(base_x + i)
+            buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}"
+            pdf.RDMMultiCell(190 - i, 5, buf)
+            i += 1 if i < 35
+          end
+          pdf.SetFontStyle('B',11)
+          pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s)
+          pdf.SetFontStyle('',8)
+          pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
+          pdf.ln

-        render_description(pdf, issue)
-        render_subtasks(pdf, issue)
-        render_relations(pdf, issue)
-        render_changesets(pdf, issue)
-        render_journals(pdf, issue, assoc)
-        render_attachments(pdf, issue)
+          customer = issue.customer.name if issue.customer
+          left = []
+          left << [l(:field_status), issue.status]
+          left << [l(:field_priority), issue.priority]
+          left << [l(:field_customer), customer]
+          left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?(:assigned_to_id)
+          #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?(:category_id)
+          #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?(:fixed_version_id)
+          
+          log "Calling :pdf_left hook"
+          left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
+          unless left_hook_output.nil?
+            left_hook_output.each do |l|
+              left.concat l unless l.nil?
+            end
+          end
+
+          right = []
+          right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?(:start_date)
+          right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?(:due_date)
+          right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?(:done_ratio)
+          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)
+          
+          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|
+              right.concat r unless r.nil?
+            end
+          end
+
+          rows = left.size > right.size ? left.size : right.size
+          while left.size < rows
+            left << nil
+          end
+          while right.size < rows
+            right << nil
+          end
+
+          half = (issue.visible_custom_field_values.size / 2.0).ceil
+          issue.visible_custom_field_values.each_with_index do |custom_value, i|
+            (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
+          end
+
+          if pdf.get_rtl
+            border_first_top = 'RT'
+            border_last_top = 'LT'
+            border_first = 'R'
+            border_last = 'L'
+          else
+            border_first_top = 'LT'
+            border_last_top = 'RT'
+            border_first = 'L'
+            border_last = 'R'
+          end
+
+          rows = left.size > right.size ? left.size : right.size
+          rows.times do |i|
+            heights = []
+            pdf.SetFontStyle('B',9)
+            item = left[i]
+            heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+            item = right[i]
+            heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+            pdf.SetFontStyle('',9)
+            item = left[i]
+            heights << pdf.get_string_height(60, item ? item.last.to_s : "")
+            item = right[i]
+            heights << pdf.get_string_height(60, item ? item.last.to_s : "")
+            height = heights.max
+
+            item = left[i]
+            pdf.SetFontStyle('B',9)
+            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+            pdf.SetFontStyle('',9)
+            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
+
+            item = right[i]
+            pdf.SetFontStyle('B',9)
+            pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+            pdf.SetFontStyle('',9)
+            pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
+
+            pdf.set_x(base_x)
+          end
+
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
+          pdf.SetFontStyle('',9)
+
+          # Set resize image scale
+          pdf.set_image_scale(1.6)
+          text = textilizable(issue, :description,
+                              only_path: false,
+                              edit_section_links: false,
+                              headings: false,
+                              inline_attachments: false
+          )
+          pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
+
+          unless issue.leaf?
+            truncate_length = (!is_cjk? ? 90 : 65)
+            pdf.SetFontStyle('B',9)
+            pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR")
+            pdf.ln
+            issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
+              buf = "#{child.tracker} # #{child.id}: #{child.subject}".
+                  truncate(truncate_length)
+              level = 10 if level >= 10
+              pdf.SetFontStyle('',8)
+              pdf.RDMCell(35+135,5, (level >=1 ? "  " * level : "") + buf, border_first)
+              pdf.SetFontStyle('B',8)
+              pdf.RDMCell(20,5, child.status.to_s, border_last)
+              pdf.ln
+            end
+          end
+
+          relations = issue.relations.select { |r| r.other_issue(issue).visible? }
+          unless relations.empty?
+            truncate_length = (!is_cjk? ? 80 : 60)
+            pdf.SetFontStyle('B',9)
+            pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR")
+            pdf.ln
+            relations.each do |relation|
+              buf = relation.to_s(issue) {|other|
+                text = ""
+                if Setting.cross_project_issue_relations?
+                  text += "#{relation.other_issue(issue).project} - "
+                end
+                text += "#{other.tracker} ##{other.id}: #{other.subject}"
+                text
+              }
+              buf = buf.truncate(truncate_length)
+              pdf.SetFontStyle('', 8)
+              pdf.RDMCell(35+155-60, 5, buf, border_first)
+              pdf.SetFontStyle('B',8)
+              pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "")
+              pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "")
+              pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last)
+              pdf.ln
+            end
+          end
+          pdf.RDMCell(190,5, "", "T")
+          pdf.ln
+
+          if issue.changesets.any? &&
+              User.current.allowed_to?(:view_changesets, issue.project)
+            pdf.SetFontStyle('B',9)
+            pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
+            pdf.ln
+            for changeset in issue.changesets
+              pdf.SetFontStyle('B',8)
+              csstr = "#{l(:label_revision)} #{changeset.format_identifier} - "
+              csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
+              pdf.RDMCell(190, 5, csstr)
+              pdf.ln
+              unless changeset.comments.blank?
+                pdf.SetFontStyle('',8)
+                pdf.RDMwriteHTMLCell(190,5,'','',
+                                    changeset.comments.to_s, issue.attachments, "")
+              end
+              pdf.ln
+            end
+          end
+
+          if assoc[:journals].present?
+            pdf.SetFontStyle('B',9)
+            pdf.RDMCell(190,5, l(:label_history), "B")
+            pdf.ln
+            assoc[:journals].each do |journal|
+              pdf.SetFontStyle('B',8)
+              title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}"
+              title << " (#{l(:field_private_notes)})" if journal.private_notes?
+              pdf.RDMCell(190,5, title)
+              pdf.ln
+              pdf.SetFontStyle('I',8)
+              details_to_strings(journal.visible_details, true).each do |string|
+                pdf.RDMMultiCell(190,5, "- " + string)
+              end
+              if journal.notes?
+                pdf.ln unless journal.details.empty?
+                pdf.SetFontStyle('',8)
+                text = textilizable(journal, :notes,
+                                    only_path: false,
+                                    edit_section_links: false,
+                                    headings: false,
+                                    inline_attachments: false
+                )
+                pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
+              end
+              pdf.ln
+            end
+          end
+
+          if issue.attachments.any?
+            pdf.SetFontStyle('B',9)
+            pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
+            pdf.ln
+            for attachment in issue.attachments
+              pdf.SetFontStyle('',8)
+              pdf.RDMCell(80,5, attachment.filename)
+              pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+              pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
+              pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
+              pdf.ln
+            end
+          end
+
+          # 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])
+            pdf = CombinePDF.parse(pdf.output, allow_optional_content: true)
+            pdf << CombinePDF.parse(e_pdf)
+            return pdf.to_pdf
+          end
+
+          return pdf.output
+        end

-        merge_estimate_if_present(pdf, issue)
      end

      private

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

    end
+
+    Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)
+
  end
 end
--- a/lib/redmine_qbo/patches/query_patch.rb
+++ b/lib/redmine_qbo/patches/query_patch.rb
@@ -8,10 +8,11 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'issue_query'
+
 module RedmineQbo
  module Patches
    module QueryPatch
-      extend ActiveSupport::Concern

      def base_scope
        scope = super
@@ -58,6 +59,12 @@ module RedmineQbo

        Issue.joins(:customer).sanitize_sql_for_conditions([sql, pattern])
      end
+
+
    end
+
+    # Add module to Issue
+    IssueQuery.send(:prepend, QueryPatch)
+
  end
 end
--- a/lib/redmine_qbo/patches/time_entry_query_patch.rb
+++ b/lib/redmine_qbo/patches/time_entry_query_patch.rb
@@ -8,10 +8,11 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'time_entry_query'
+
 module RedmineQbo
  module Patches
    module TimeEntryQueryPatch
-      extend ActiveSupport::Concern

      # Add QBO options to columns
      def available_columns
@@ -27,6 +28,11 @@ module RedmineQbo
        add_available_filter "billed", type: :boolean
        super
      end
+
    end
+
+    # Add module to TimeEntryQuery
+    TimeEntryQuery.send(:prepend, QueryPatch)
+
  end
 end
--- a/lib/redmine_qbo/patches/user_patch.rb
+++ b/lib/redmine_qbo/patches/user_patch.rb
@@ -8,14 +8,37 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+require_dependency 'user'
+
 module RedmineQbo
  module Patches
-    module UserPatch
-      extend ActiveSupport::Concern

-      prepended do
+    # Patches Redmine's User dynamically.
+    # Adds a relationships
+    module UserPatch
+      def self.included(base) # :nodoc:
+        base.extend(ClassMethods)
+
+        base.send(:include, InstanceMethods)
+
+        # Same as typing in the class 
+        base.class_eval do
          belongs_to :employee, primary_key: :id
+        end
      end
+        
+      module ClassMethods
+        
+      end
+      
+      module InstanceMethods
+      
+      end
+      
    end
+
+    # Add module to Issue
+    User.send(:include, UserPatch)
+
  end
 end
Author	SHA1	Message	Date
Rick Barrette	a97d867610	Fixed the UI, now working	2026-03-05 07:53:23 -05:00
Rick Barrette	021a9ec0c6	Added Issue safe attributes for line items	2026-03-05 07:28:30 -05:00
Rick Barrette	f056c27bc5	Merge branch 'master' into lineitems	2026-03-05 07:08:30 -05:00
Rick Barrette	681747e08b	Got the UI working	2026-03-04 07:55:35 -05:00
Rick Barrette	eb6beea5fa	Initial line item idea	2026-03-01 15:04:25 -05:00
				`@@ -0,0 +1 @@`
				!function(t){t.fn.railsAutocomplete=function(e){var a=function(){this.railsAutoCompleter\|\|(this.railsAutoCompleter=new t.railsAutocomplete(this))};if(void 0!==t.fn.on){if(!e)return;return t(document).on("focus",e,a)}return this.live("focus",a)},t.railsAutocomplete=function(t){var e=t;this.init(e)},t.railsAutocomplete.options={showNoMatches:!0,noMatchesLabel:"no existing match"},t.railsAutocomplete.fn=t.railsAutocomplete.prototype={railsAutocomplete:"0.0.1"},t.railsAutocomplete.fn.extend=t.railsAutocomplete.extend=t.extend,t.railsAutocomplete.fn.extend({init:function(e){function a(t){return t.split(e.delimiter)}function i(t){return a(t).pop().replace(/^\s+/,"")}e.delimiter=t(e).attr("data-delimiter")\|\|null,e.min_length=t(e).attr("data-min-length")\|\|t(e).attr("min-length")\|\|2,e.append_to=t(e).attr("data-append-to")\|\|null,e.autoFocus=t(e).attr("data-auto-focus")\|\|!1,t(e).autocomplete({appendTo:e.append_to,autoFocus:e.autoFocus,delay:t(e).attr("delay")\|\|0,source:function(a,r){var n=this.element[0],o={term:i(a.term)};t(e).attr("data-autocomplete-fields")&&t.each(t.parseJSON(t(e).attr("data-autocomplete-fields")),function(e,a){o[e]=t(a).val()}),t.getJSON(t(e).attr("data-autocomplete"),o,function(){var a={};t.extend(a,t.railsAutocomplete.options),t.each(a,function(i,r){if(a.hasOwnProperty(i)){var n=t(e).attr("data-"+i);a[i]=n?n:r}}),0==arguments[0].length&&t.inArray(a.showNoMatches,[!0,"true"])>=0&&(arguments[0]=[],arguments[0][0]={id:"",label:a.noMatchesLabel}),t(arguments[0]).each(function(a,i){var r={};r[i.id]=i,t(e).data(r)}),r.apply(null,arguments),t(n).trigger("railsAutocomplete.source",arguments)})},change:function(e,a){if(t(this).is("[data-id-element]")&&""!==t(t(this).attr("data-id-element")).val()&&(t(t(this).attr("data-id-element")).val(a.item?a.item.id:"").trigger("change"),t(this).attr("data-update-elements"))){var i=t.parseJSON(t(this).attr("data-update-elements")),r=a.item?t(this).data(a.item.id.toString()):{};if(i&&""===t(i.id).val())return;for(var n in i){var o=t(i[n]);o.is(":checkbox")?null!=r[n]&&o.prop("checked",r[n]):o.val(a.item?r[n]:"").trigger("change")}}},search:function(){var t=i(this.value);return t.length<e.min_length?!1:void 0},focus:function(){return!1},select:function(i,r){if(r.item.value=r.item.value.toString(),-1!=r.item.value.toLowerCase().indexOf("no match")\|\|-1!=r.item.value.toLowerCase().indexOf("too many results"))return t(this).trigger("railsAutocomplete.noMatch",r),!1;var n=a(this.value);if(n.pop(),n.push(r.item.value),null!=e.delimiter)n.push(""),this.value=n.join(e.delimiter);else if(this.value=n.join(""),t(this).attr("data-id-element")&&t(t(this).attr("data-id-element")).val(r.item.id).trigger("change"),t(this).attr("data-update-elements")){var o=r.item,l=-1!=r.item.value.indexOf("Create New")?!0:!1,u=t.parseJSON(t(this).attr("data-update-elements"));for(var s in u)"checkbox"===t(u[s]).attr("type")?o[s]===!0\|\|1===o[s]?t(u[s]).attr("checked","checked"):t(u[s]).removeAttr("checked"):l&&o[s]&&-1==o[s].indexOf("Create New")\|\|!l?t(u[s]).val(o[s]).trigger("change"):t(u[s]).val("").trigger("change")}var c=this.value;return t(this).bind("keyup.clearId",function(){t.trim(t(this).val())!=t.trim(c)&&(t(t(this).attr("data-id-element")).val("").trigger("change"),t(this).unbind("keyup.clearId"))}),t(e).trigger("railsAutocomplete.select",r),!1}}),t(e).trigger("railsAutocomplete.init")}}),t(document).ready(function(){t("input[data-autocomplete]").railsAutocomplete("input[data-autocomplete]")})}(jQuery);